[pkg] prepare for kernel 5.1 switch

3 files changed, 28 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecbb61962e82..fc72f2274908 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 # Generated by mksrcinfo v8
-# Fri Apr 12 18:59:39 UTC 2019
+# Mon May  6 04:52:52 UTC 2019
 pkgbase = tomoyo-tools
-	pkgdesc = TOMOYO Linux userspace tools for Linux kernels >=3.2
+	pkgdesc = TOMOYO Linux userspace tools for Linux kernels >=3.2 and <5.1
 	pkgver = 2.5.0.20170102
-	pkgrel = 2
+	pkgrel = 3
 	url = https://tomoyo.osdn.jp
 	install = tomoyo-tools.install
 	arch = x86_64
 	license = GPL
 	depends = ncurses>=6.0
+	conflicts = linux>=5.1
+	conflicts = linux-zen>=5.1
+	conflicts = linux-hardened>=5.1
 	source = https://jaist.dl.osdn.jp/tomoyo/53357/tomoyo-tools-2.5.0-20170102.tar.gz
 	source = https://jaist.dl.osdn.jp/tomoyo/53357/tomoyo-tools-2.5.0-20170102.tar.gz.asc
 	source = tomoyo-tools.install
 	source = tomoyo-auditd.service
 	sha256sums = 00fedfac5e514321250bbe69eaccc732c8a8158596f77a785c2e3ae9f9968283
 	sha256sums = SKIP
-	sha256sums = 8236b6f3f268e3991d1f677dbf0ae5f520b900540f44f23ad547f6a1c75254f5
+	sha256sums = 0df2401456f5377df529c1c8774670636b3ba365534d7ecbaf96b2e7ef6bf093
 	sha256sums = 7c3c01a8ba34af9dc3601d470afdd0d3a2b01a1ca1951e3479cfd1fb4dfdafa3
 
 pkgname = tomoyo-tools
diff --git a/PKGBUILD b/PKGBUILD
index 2395fa0b8227..0f89222919da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: dysphoria <dysphoria@noreply.com>
+# Maintainer: TH Campbell (dysphoria) <thcampbell (at) protonmail (dot) com>
 # Contributor: Steven Allen <steven@stebalien.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
@@ -8,20 +8,20 @@ _file=53357
 _basever=2.5.0
 _timestamp=20170102
 pkgver=${_basever}.${_timestamp}
-pkgrel=2
-pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2'
+pkgrel=3
+pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2 and <5.1'
 arch=('x86_64')
 url='https://tomoyo.osdn.jp'
-#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
 license=('GPL')
 depends=('ncurses>=6.0')
+conflicts=('linux>=5.1' 'linux-zen>=5.1' 'linux-hardened>=5.1')
 install=tomoyo-tools.install
 source=("https://jaist.dl.osdn.jp/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz"{,.asc}
         'tomoyo-tools.install'
         'tomoyo-auditd.service')
 sha256sums=('00fedfac5e514321250bbe69eaccc732c8a8158596f77a785c2e3ae9f9968283'
             'SKIP'
-            '8236b6f3f268e3991d1f677dbf0ae5f520b900540f44f23ad547f6a1c75254f5'
+            '0df2401456f5377df529c1c8774670636b3ba365534d7ecbaf96b2e7ef6bf093'
             '7c3c01a8ba34af9dc3601d470afdd0d3a2b01a1ca1951e3479cfd1fb4dfdafa3')
 validpgpkeys=('43C83369623D7AD3A96C2FC7425F128D0C64F52A')
 
diff --git a/tomoyo-tools.install b/tomoyo-tools.install
index 09d974751d9e..e5777b46efc6 100644
--- a/tomoyo-tools.install
+++ b/tomoyo-tools.install
@@ -1,7 +1,18 @@
 post_install () {
-  echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel"
-  echo "   boot options and initialize policy with this command:"
-  echo "     /usr/lib/tomoyo/init_policy"
-  echo "  Also you may pass TOMOYO_trigger parameter if CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER"
-  echo "  kernel option has wrong value"
+  echo " *  To enable TOMOYO Linux, append 'security=tomoyo' to the kernel"
+  echo '    boot options and initialize policy with this command:'
+  echo '      /usr/lib/tomoyo/init_policy'
+  echo '    Also you may pass TOMOYO_trigger parameter'
+  echo '    if CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER'
+  echo '    kernel option has wrong value'
+  echo ''
+  echo ' *  Kernel version >=3.2 and <5.1 is required'
+  echo "    Your version is $(uname -r)"
+  echo ' !! Using the wrong version may render your system unbootable'
+}
+
+post_upgrade () {
+  echo ' *  Kernel version >=3.2 and <5.1 is required'
+  echo "    Your version is $(uname -r)"
+  echo ' !! Using the wrong version may render your system unbootable'
 }