From 5f730b09e82d0e49d69599be60f3a27c1c37b372 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 4 Oct 2020 17:02:36 +0000 Subject: util-linux: update to 2.36 --- abs/core/util-linux/PKGBUILD | 104 +++++++++++++++++++++++----------------- abs/core/util-linux/pam-runuser | 4 ++ 2 files changed, 65 insertions(+), 43 deletions(-) create mode 100644 abs/core/util-linux/pam-runuser diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD index c672254..d6a168e 100644 --- a/abs/core/util-linux/PKGBUILD +++ b/abs/core/util-linux/PKGBUILD @@ -1,30 +1,30 @@ -# $Id$ # Maintainer: Tom Gundersen # Maintainer: Dave Reisner # Contributor: judd pkgbase=util-linux -pkgname=(util-linux libutil-linux) -_pkgmajor=2.31 -pkgver=${_pkgmajor}.1 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux" -url="https://www.kernel.org/pub/linux/utils/util-linux/" +pkgname=(util-linux util-linux-libs) +_pkgmajor=2.36 +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') +makedepends=('systemd' 'python' 'libcap-ng' 'libxcrypt') 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} - pam-{login,common,su} + pam-{login,common,runuser,su} 'util-linux.sysusers' '60-rfkill.rules' 'rfkill-unblock_.service' 'rfkill-block_.service') -sha256sums=('1a51b16fa9cd51d26ef9ab52d2f1de12403b810fc8252bf7d478df91b3cddf11' +sha256sums=('9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1' 'SKIP' '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92' 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20' + '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935' '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0' '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3' '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37' @@ -34,32 +34,46 @@ sha256sums=('1a51b16fa9cd51d26ef9ab52d2f1de12403b810fc8252bf7d478df91b3cddf11' build() { cd "$pkgbase-$pkgver" - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --bindir=/usr/bin \ - --localstatedir=/run \ - --enable-fs-paths-extra=/usr/bin \ - --enable-raw \ - --enable-vipw \ - --enable-newgrp \ - --enable-chfn-chsh \ - --enable-write \ - --enable-mesg \ - --with-python=3 + # 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 \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --enable-usrdir-path \ + --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=('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') + conflicts=('rfkill') + provides=('rfkill') + replaces=('rfkill') + depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so' + '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 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) @@ -71,11 +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-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" # TODO(dreisner): offer this upstream? sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket" @@ -83,28 +99,30 @@ package_util-linux() { # 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 + ### runtime libs are shipped as part of util-linux-libs rm "$pkgdir"/usr/lib/lib*.{a,so}* ### install systemd-sysusers - 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" - install -Dm644 "$srcdir/rfkill-unblock_.service" \ + install -Dm0644 "$srcdir/rfkill-unblock_.service" \ "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service" - install -Dm644 "$srcdir/rfkill-block_.service" \ + install -Dm0644 "$srcdir/rfkill-block_.service" \ "$pkgdir/usr/lib/systemd/system/rfkill-block@.service" } -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 } diff --git a/abs/core/util-linux/pam-runuser b/abs/core/util-linux/pam-runuser new file mode 100644 index 0000000..d5b1ea3 --- /dev/null +++ b/abs/core/util-linux/pam-runuser @@ -0,0 +1,4 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so +session include system-login -- cgit v0.12