updpkg: nonsystemd/util-linux 2.35.1-1.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>

3 files changed, 24 insertions, 53 deletions

diff --git a/nonsystemd/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/nonsystemd/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch
deleted file mode 100644
index 3fc342b37..000000000
--- a/nonsystemd/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 27 Jun 2019 09:22:18 +0200
-Subject: [PATCH 1/1] lsblk: force to print PKNAME for partition
-
-PKNAME (parent kernel device name) is based on printed tree according
-to parent -> child relationship. The tree is optional and not printed
-if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
-versions print the PKNAME also in this case.
-
-Addresses: https://github.com/karelzak/util-linux/issues/813
-Signed-off-by: Karel Zak <kzak@redhat.com>
-Signed-off-by: Christian Hesse <mail@eworm.de>
----
- misc-utils/lsblk.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
-index e95af7af0..3ce6da730 100644
---- a/misc-utils/lsblk.c
-+++ b/misc-utils/lsblk.c
-@@ -1019,6 +1019,9 @@ static void device_to_scols(
- 	DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
- 	ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name));
- 
-+	if (!parent && dev->wholedisk)
-+		parent = dev->wholedisk;
-+
- 	/* Do not print device more than one in --list mode */
- 	if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
- 		return;
diff --git a/nonsystemd/util-linux/PKGBUILD b/nonsystemd/util-linux/PKGBUILD
index fe06042e5..1f31c0352 100644
--- a/nonsystemd/util-linux/PKGBUILD
+++ b/nonsystemd/util-linux/PKGBUILD
@@ -5,37 +5,30 @@
 
 pkgbase=util-linux
 pkgname=(util-linux libutil-linux)
-_pkgmajor=2.34
-pkgver=${_pkgmajor}
-pkgrel=3
+_pkgmajor=2.35
+pkgver=${_pkgmajor}.1
+pkgrel=1
 pkgrel+=.nonsystemd1
-pkgdesc="Miscellaneous system utilities for Linux"
+pkgdesc="Miscellaneous system utilities for GNU/Linux"
 url="https://github.com/karelzak/util-linux"
 arch=('x86_64' 'i686' 'armv7h')
 makedepends=('udev' 'python' 'libcap-ng')
 license=('GPL2')
-options=('strip' 'debug')
+options=('strip')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign}
-        '0001-lsblk-force-to-print-PKNAME-for-partition.patch'
-        pam-{login,common,su}
+        pam-{login,common,runuser,su}
         'util-linux.sysusers'
         '60-rfkill.rules')
-sha256sums=('743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5'
+sha256sums=('d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9'
             'SKIP'
-            'cfadc020011f88c028dc50c4e6790f5bae385b881417d917a8706c6ff78613d9'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
+            '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935'
             '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
             '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
             '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37')
 
-prepare() {
-  cd "$pkgbase-$pkgver"
-
-  patch -Np1 < ../0001-lsblk-force-to-print-PKNAME-for-partition.patch
-}
-
 build() {
   cd "$pkgbase-$pkgver"
 
@@ -49,8 +42,10 @@ build() {
     --prefix=/usr \
     --libdir=/usr/lib \
     --bindir=/usr/bin \
+    --sbindir=/usr/bin \
     --localstatedir=/var \
-    --enable-fs-paths-extra=/usr/bin \
+    --enable-usrdir-path \
+    --enable-fs-paths-default=/usr/bin:/usr/local/bin \
     --enable-raw \
     --enable-vipw \
     --enable-newgrp \
@@ -66,16 +61,17 @@ build() {
 }
 
 package_util-linux() {
-  conflicts=('eject' 'zramctl' 'rfkill')
-  provides=('eject' 'zramctl' 'rfkill')
-  replaces=('zramctl' 'rfkill')
+  conflicts=('rfkill')
+  provides=('rfkill')
+  replaces=('rfkill')
   depends=('pam' 'shadow' 'coreutils' 'libudev' 'libcap-ng' 'libutil-linux')
   optdepends=('python: python bindings to libmount'
               'words: default dictionary for look')
-  groups=('base' 'base-devel')
   backup=(etc/pam.d/chfn
           etc/pam.d/chsh
           etc/pam.d/login
+          etc/pam.d/runuser
+          etc/pam.d/runuser-l
           etc/pam.d/su
           etc/pam.d/su-l)
 
@@ -90,14 +86,16 @@ package_util-linux() {
   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"
 
   # adjust for usrmove
   # TODO(dreisner): fix configure.ac upstream so that this isn't needed
   cd "$pkgdir"
-  mv {,usr/}sbin/* usr/bin
-  rmdir sbin usr/sbin
+  mv usr/sbin/* usr/bin
+  rmdir usr/sbin
 
   ### runtime libs are shipped as part of libutil-linux
   rm "$pkgdir"/usr/lib/lib*.{a,so}*
diff --git a/nonsystemd/util-linux/pam-runuser b/nonsystemd/util-linux/pam-runuser
new file mode 100644
index 000000000..d5b1ea353
--- /dev/null
+++ b/nonsystemd/util-linux/pam-runuser
@@ -0,0 +1,4 @@
+#%PAM-1.0
+
+auth    sufficient pam_rootok.so
+session include    system-login