[util-linux]: upgrade to v2.36

1 files changed, 27 insertions, 23 deletions

diff --git a/nonsystemd/util-linux/PKGBUILD b/nonsystemd/util-linux/PKGBUILD
index 1f31c0352..6d55b3fb1 100644
--- a/nonsystemd/util-linux/PKGBUILD
+++ b/nonsystemd/util-linux/PKGBUILD
@@ -4,15 +4,15 @@
 # Contributor (Arch): judd <jvinet@zeroflux.org>
 
 pkgbase=util-linux
-pkgname=(util-linux libutil-linux)
-_pkgmajor=2.35
-pkgver=${_pkgmajor}.1
-pkgrel=1
+pkgname=(util-linux util-linux-libs)
+_pkgmajor=2.36
+pkgver=${_pkgmajor}
+pkgrel=4
 pkgrel+=.nonsystemd1
-pkgdesc="Miscellaneous system utilities for GNU/Linux"
-url="https://github.com/karelzak/util-linux"
+pkgdesc='Miscellaneous system utilities for Linux'
+url='https://github.com/karelzak/util-linux'
 arch=('x86_64' 'i686' 'armv7h')
-makedepends=('udev' 'python' 'libcap-ng')
+makedepends=('udev' 'python' 'libcap-ng' 'libxcrypt')
 license=('GPL2')
 options=('strip')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
@@ -20,7 +20,7 @@ source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-
         pam-{login,common,runuser,su}
         'util-linux.sysusers'
         '60-rfkill.rules')
-sha256sums=('d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9'
+sha256sums=('9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1'
             'SKIP'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
@@ -53,9 +53,9 @@ build() {
     --enable-write \
     --enable-mesg \
     --disable-hardlink \
-    --with-python=3 \
     --with-systemd=no \
-    --with-systemdsystemunitdir=no
+    --with-systemdsystemunitdir=no \
+    --with-python=3 
 
   make
 }
@@ -64,7 +64,9 @@ package_util-linux() {
   conflicts=('rfkill')
   provides=('rfkill')
   replaces=('rfkill')
-  depends=('pam' 'shadow' 'coreutils' 'libudev' 'libcap-ng' 'libutil-linux')
+  depends=('pam' 'shadow' 'coreutils'
+           'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
+           'libmagic.so' 'libncursesw.so' 'libreadline.so')
   optdepends=('python: python bindings to libmount'
               'words: default dictionary for look')
   backup=(etc/pam.d/chfn
@@ -83,13 +85,13 @@ package_util-linux() {
   chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
 
   # install PAM files for login-utils
-  install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
-  install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
-  install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
-  install -m644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser"
-  install -m644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l"
-  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
-  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
+  install -Dm0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
+  install -m0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
+  install -m0644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
+  install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser"
+  install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l"
+  install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
+  install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
 
   # adjust for usrmove
   # TODO(dreisner): fix configure.ac upstream so that this isn't needed
@@ -97,20 +99,22 @@ package_util-linux() {
   mv usr/sbin/* usr/bin
   rmdir usr/sbin
 
-  ### runtime libs are shipped as part of libutil-linux
+  ### runtime libs are shipped as part of util-linux-libs
   rm "$pkgdir"/usr/lib/lib*.{a,so}*
 
   ### install opensysusers
-  install -Dm644 "$srcdir/util-linux.sysusers" \
+  install -Dm0644 "$srcdir/util-linux.sysusers" \
     "$pkgdir/usr/lib/sysusers.d/util-linux.conf"
 
-  install -Dm644 "$srcdir/60-rfkill.rules" \
+  install -Dm0644 "$srcdir/60-rfkill.rules" \
     "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
 }
 
-package_libutil-linux() {
+package_util-linux-libs() {
   pkgdesc="util-linux runtime libraries"
-  provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+  provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+  conflicts=('libutil-linux')
+  replaces=('libutil-linux')
 
   make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
 }