Date: Friday, October 25, 2019 @ 13:50:05
Author: foutrelis
Revision: 365549
archrelease: copy trunk to staging-x86_64
Added:
util-linux/repos/staging-x86_64/
util-linux/repos/staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
(from rev 365548,
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
util-linux/repos/staging-x86_64/60-rfkill.rules
(from rev 365548, util-linux/trunk/60-rfkill.rules)
util-linux/repos/staging-x86_64/PKGBUILD
(from rev 365548, util-linux/trunk/PKGBUILD)
util-linux/repos/staging-x86_64/pam-common
(from rev 365548, util-linux/trunk/pam-common)
util-linux/repos/staging-x86_64/pam-login
(from rev 365548, util-linux/trunk/pam-login)
util-linux/repos/staging-x86_64/pam-runuser
(from rev 365548, util-linux/trunk/pam-runuser)
util-linux/repos/staging-x86_64/pam-su
(from rev 365548, util-linux/trunk/pam-su)
util-linux/repos/staging-x86_64/rfkill-block_.service
(from rev 365548, util-linux/trunk/rfkill-block_.service)
util-linux/repos/staging-x86_64/rfkill-unblock_.service
(from rev 365548, util-linux/trunk/rfkill-unblock_.service)
util-linux/repos/staging-x86_64/util-linux.sysusers
(from rev 365548, util-linux/trunk/util-linux.sysusers)
------------------------------------------------------+
0001-lsblk-force-to-print-PKNAME-for-partition.patch | 31 ++++
60-rfkill.rules | 1
PKGBUILD | 130 +++++++++++++++++
pam-common | 6
pam-login | 7
pam-runuser | 4
pam-su | 9 +
rfkill-block_.service | 10 +
rfkill-unblock_.service | 10 +
util-linux.sysusers | 2
10 files changed, 210 insertions(+)
Copied:
util-linux/repos/staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
(from rev 365548,
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
===================================================================
--- staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
(rev 0)
+++ staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,31 @@
+From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
+From: Karel Zak <k...@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 <k...@redhat.com>
+Signed-off-by: Christian Hesse <m...@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;
Copied: util-linux/repos/staging-x86_64/60-rfkill.rules (from rev 365548,
util-linux/trunk/60-rfkill.rules)
===================================================================
--- staging-x86_64/60-rfkill.rules (rev 0)
+++ staging-x86_64/60-rfkill.rules 2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
Copied: util-linux/repos/staging-x86_64/PKGBUILD (from rev 365548,
util-linux/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,130 @@
+# Maintainer: Tom Gundersen <t...@jklm.no>
+# Maintainer: Dave Reisner <dreis...@archlinux.org>
+# Contributor: judd <jvi...@zeroflux.org>
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+_pkgmajor=2.34
+pkgver=${_pkgmajor}
+pkgrel=4
+pkgdesc="Miscellaneous system utilities for Linux"
+url='https://github.com/karelzak/util-linux'
+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}
+ '0001-lsblk-force-to-print-PKNAME-for-partition.patch'
+ pam-{login,common,runuser,su}
+ 'util-linux.sysusers'
+ '60-rfkill.rules'
+ 'rfkill-unblock_.service'
+ 'rfkill-block_.service')
+sha256sums=('743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5'
+ 'SKIP'
+ 'cfadc020011f88c028dc50c4e6790f5bae385b881417d917a8706c6ff78613d9'
+ '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
+ 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
+ '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935'
+ '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
+ '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
+ '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
+ '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
+ 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
+
+prepare() {
+ cd "$pkgbase-$pkgver"
+
+ patch -Np1 < ../0001-lsblk-force-to-print-PKNAME-for-partition.patch
+}
+
+build() {
+ cd "$pkgbase-$pkgver"
+
+ # We ship Debian's hardlink in package 'hardlink', Fedora's hardlink was
+ # merged in util-linux. For now we disable the latter, but let's dicuss
+ # the details:
+ # https://bugs.archlinux.org/task/62896
+ # https://github.com/karelzak/util-linux/issues/808
+
+ ./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib \
+ --bindir=/usr/bin \
+ --localstatedir=/var \
+ --enable-fs-paths-default=/usr/bin:/usr/local/bin \
+ --enable-raw \
+ --enable-vipw \
+ --enable-newgrp \
+ --enable-chfn-chsh \
+ --enable-write \
+ --enable-mesg \
+ --disable-hardlink \
+ --with-python=3
+
+ make
+}
+
+package_util-linux() {
+ conflicts=('rfkill')
+ provides=('rfkill')
+ replaces=('rfkill')
+ depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libcap-ng'
'libutil-linux')
+ optdepends=('python: python bindings to libmount'
+ 'words: default dictionary for look')
+ 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)
+
+ cd "$pkgbase-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # setuid chfn and chsh
+ 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"
+
+ # TODO(dreisner): offer this upstream?
+ sed -i '/ListenStream/ aRuntimeDirectory=uuidd'
"$pkgdir/usr/lib/systemd/system/uuidd.socket"
+
+ # 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
+
+ ### runtime libs are shipped as part of libutil-linux
+ rm "$pkgdir"/usr/lib/lib*.{a,so}*
+
+ ### 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() {
+ pkgdesc="util-linux runtime libraries"
+ provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so'
'libuuid.so')
+
+ make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
+}
Copied: util-linux/repos/staging-x86_64/pam-common (from rev 365548,
util-linux/trunk/pam-common)
===================================================================
--- staging-x86_64/pam-common (rev 0)
+++ staging-x86_64/pam-common 2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth sufficient pam_rootok.so
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
+password required pam_permit.so
Copied: util-linux/repos/staging-x86_64/pam-login (from rev 365548,
util-linux/trunk/pam-login)
===================================================================
--- staging-x86_64/pam-login (rev 0)
+++ staging-x86_64/pam-login 2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
Copied: util-linux/repos/staging-x86_64/pam-runuser (from rev 365548,
util-linux/trunk/pam-runuser)
===================================================================
--- staging-x86_64/pam-runuser (rev 0)
+++ staging-x86_64/pam-runuser 2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,4 @@
+#%PAM-1.0
+
+auth sufficient pam_rootok.so
+session include system-login
Copied: util-linux/repos/staging-x86_64/pam-su (from rev 365548,
util-linux/trunk/pam-su)
===================================================================
--- staging-x86_64/pam-su (rev 0)
+++ staging-x86_64/pam-su 2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth sufficient pam_rootok.so
+# Uncomment the following line to implicitly trust users in the "wheel" group.
+#auth sufficient pam_wheel.so trust use_uid
+# Uncomment the following line to require a user to be in the "wheel" group.
+#auth required pam_wheel.so use_uid
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
Copied: util-linux/repos/staging-x86_64/rfkill-block_.service (from rev 365548,
util-linux/trunk/rfkill-block_.service)
===================================================================
--- staging-x86_64/rfkill-block_.service (rev 0)
+++ staging-x86_64/rfkill-block_.service 2019-10-25 13:50:05 UTC (rev
365549)
@@ -0,0 +1,10 @@
+[Unit]
+Description=RFKill-Block %I
+After=rfkill-unblock@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rfkill block %I
+
+[Install]
+WantedBy=multi-user.target
Copied: util-linux/repos/staging-x86_64/rfkill-unblock_.service (from rev
365548, util-linux/trunk/rfkill-unblock_.service)
===================================================================
--- staging-x86_64/rfkill-unblock_.service (rev 0)
+++ staging-x86_64/rfkill-unblock_.service 2019-10-25 13:50:05 UTC (rev
365549)
@@ -0,0 +1,10 @@
+[Unit]
+Description=RFKill-Unblock %I
+After=rfkill-block@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rfkill unblock %I
+
+[Install]
+WantedBy=multi-user.target
Copied: util-linux/repos/staging-x86_64/util-linux.sysusers (from rev 365548,
util-linux/trunk/util-linux.sysusers)
===================================================================
--- staging-x86_64/util-linux.sysusers (rev 0)
+++ staging-x86_64/util-linux.sysusers 2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,2 @@
+u uuidd 68
+g rfkill - - -
