util-linux: update to 2.31.1

1 files changed, 34 insertions, 41 deletions

diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD
index 72df84c..c672254 100644
--- a/abs/core/util-linux/PKGBUILD
+++ b/abs/core/util-linux/PKGBUILD
@@ -5,43 +5,31 @@
 
 pkgbase=util-linux
 pkgname=(util-linux libutil-linux)
-_pkgmajor=2.29
-pkgver=${_pkgmajor}
+_pkgmajor=2.31
+pkgver=${_pkgmajor}.1
 pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-makedepends=('systemd' 'python2')
+arch=('x86_64')
+makedepends=('systemd' 'python' 'libcap-ng')
 license=('GPL2')
 options=('strip' 'debug')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign}
         pam-{login,common,su}
-        '0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch'
-        '0001-sfdisk-cleanup-dump-error-messages.patch'
-        '0001-sfdisk-support-empty-label-use-case.patch'
-        '0001-chrt-default-to-SCHED_RR-policy.patch'
-        '0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch')
-md5sums=('07b6845f48a421ad5844aa9d58edb837'
-         'SKIP'
-         '4368b3f98abd8a32662e094c54e7f9b1'
-         'a31374fef2cba0ca34dfc7078e2969e4'
-         'fa85e5cce5d723275b14365ba71a8aad'
-         '3fce7192ce1b3d97fdffd0226ed63a90'
-         '2f3c061865360170cacda948035fd02d'
-         '6d2e3915124938577f0ff18ef701c87f'
-         '168c1cb2cfe7d4eddfc6e3f3b19d3ced'
-         '68c2076a9a09564ba0c9776540a175fa')
-
-prepare() {
-  cd "$pkgbase-$pkgver"
-
-  patch -Np1 <../0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch
-  patch -Np1 <../0001-sfdisk-cleanup-dump-error-messages.patch
-  patch -Np1 <../0001-sfdisk-support-empty-label-use-case.patch
-  patch -Np1 <../0001-chrt-default-to-SCHED_RR-policy.patch
-  patch -Np1 <../0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch
-}
+        'util-linux.sysusers'
+        '60-rfkill.rules'
+        'rfkill-unblock_.service'
+        'rfkill-block_.service')
+sha256sums=('1a51b16fa9cd51d26ef9ab52d2f1de12403b810fc8252bf7d478df91b3cddf11'
+            'SKIP'
+            '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
+            'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
+            '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
+            '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
+            '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
+            '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
+            'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
 
 build() {
   cd "$pkgbase-$pkgver"
@@ -57,18 +45,17 @@ build() {
               --enable-chfn-chsh \
               --enable-write \
               --enable-mesg \
-              --disable-tailf \
-              --with-python=2
+              --with-python=3
 
   make
 }
 
 package_util-linux() {
-  conflicts=('util-linux-ng' 'eject' 'zramctl')
-  provides=("util-linux-ng=$pkgver" 'eject' 'zramctl')
-  replaces=('zramctl')
-  depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux')
-  optdepends=('python2: python bindings to libmount')
+  conflicts=('eject' 'zramctl' 'rfkill')
+  provides=('eject' 'zramctl' 'rfkill')
+  replaces=('zramctl' 'rfkill')
+  depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libcap-ng' 'libutil-linux')
+  optdepends=('python: python bindings to libmount')
   groups=('base' 'base-devel')
   backup=(etc/pam.d/chfn
           etc/pam.d/chsh
@@ -102,11 +89,17 @@ package_util-linux() {
   ### runtime libs are shipped as part of libutil-linux
   rm "$pkgdir"/usr/lib/lib*.{a,so}*
 
-  ### tailf has been deprecated for a while. let's not include it anymore.
-  rm \
-    "$pkgdir"/usr/bin/tailf \
-    "$pkgdir"/usr/share/bash-completion/completions/tailf \
-    "$pkgdir"/usr/share/man/man1/tailf.1
+  ### install systemd-sysusers
+  install -Dm644 "$srcdir/util-linux.sysusers" \
+    "$pkgdir/usr/lib/sysusers.d/util-linux.conf"
+
+  install -Dm644 "$srcdir/60-rfkill.rules" \
+    "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
+
+  install -Dm644 "$srcdir/rfkill-unblock_.service" \
+    "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service"
+  install -Dm644 "$srcdir/rfkill-block_.service" \
+    "$pkgdir/usr/lib/systemd/system/rfkill-block@.service"
 }
 
 package_libutil-linux() {