From c9e9bdb0db5200d882ed88fe3cbe181bda351bb4 Mon Sep 17 00:00:00 2001 From: kth5 Date: Wed, 6 Dec 2023 09:12:53 +0100 Subject: [PATCH] * update util-linux to 2.39.3-1 --- util-linux/PKGBUILD | 36 +++++++++++++++++++++++++++--------- util-linux/pam-login | 1 - util-linux/pam-remote | 8 ++++++++ 3 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 util-linux/pam-remote diff --git a/util-linux/PKGBUILD b/util-linux/PKGBUILD index 1bdb199ef8..5cf321a7a4 100644 --- a/util-linux/PKGBUILD +++ b/util-linux/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=util-linux pkgname=(util-linux util-linux-libs) -_tag='d32d74bf433a419f2a8976530fb03669bde722cd' # git rev-parse v${_tag_name} -_tag_name=2.39.2 +_tag='bc0e318941a0539be1205ea1ac1dbfa834b7d033' # git rev-parse v${_tag_name} +_tag_name=2.39.3 pkgver=${_tag_name/-/} pkgrel=1 pkgdesc='Miscellaneous system utilities for Linux' @@ -14,18 +14,31 @@ url='https://github.com/util-linux/util-linux' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) makedepends=('git' 'meson' 'asciidoctor' 'bash-completion' 'libcap-ng' 'libutempter' 'libxcrypt' 'python' 'systemd') -license=('GPL2') +license=( + 'BSD-2-Clause' + 'BSD-3-Clause' + 'BSD-4-Clause-UC' + 'GPL-2.0-only' + 'GPL-2.0-or-later' + 'GPL-3.0-or-later' + 'ISC' + 'LGPL-2.1-or-later' + 'LicenseRef-PublicDomain' +) options=('strip') validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak source=("git+https://github.com/util-linux/util-linux#tag=${_tag}?signed" - pam-{login,common,runuser,su} + $pkgbase-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE + pam-{login,common,remote,runuser,su} 'util-linux.sysusers' '60-rfkill.rules' 'rfkill-unblock_.service' 'rfkill-block_.service') sha256sums=('SKIP' - '99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f' + '6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a' + 'ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275' '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af' + '8bfbee453618ba44d60ba7fb00eced6c62edebfc592f2e75dede08e769ed8931' '48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1' '3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b' '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3' @@ -84,13 +97,14 @@ package_util-linux() { conflicts=('rfkill' 'hardlink') provides=('rfkill' 'hardlink') replaces=('rfkill' 'hardlink') - depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so' + depends=('glibc' 'pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so' 'libudev.so' 'libcap-ng' 'libutempter' 'libxcrypt' 'libcrypt.so' 'util-linux-libs' - 'libmagic.so' 'libncursesw.so') + 'libmagic.so' 'libncursesw.so' 'readline' 'zlib') optdepends=('words: default dictionary for look') backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login + etc/pam.d/remote etc/pam.d/runuser etc/pam.d/runuser-l etc/pam.d/su @@ -110,6 +124,7 @@ package_util-linux() { install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn" install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh" install -m0644 pam-login "${pkgdir}/etc/pam.d/login" + install -m0644 pam-remote "${pkgdir}/etc/pam.d/remote" install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser" install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l" install -m0644 pam-su "${pkgdir}/etc/pam.d/su" @@ -139,8 +154,8 @@ package_util-linux() { install -Dm0644 rfkill-block_.service \ "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service" - ln -sf /usr/bin/setarch "${pkgdir}/usr/bin/ppc32" - ln -sf /usr/bin/setarch "${pkgdir}/usr/bin/ppc64" + install -vDm 644 $pkgbase/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/" + install -vDm 644 $pkgbase-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/" } package_util-linux-libs() { @@ -156,4 +171,7 @@ package_util-linux-libs() { mv util-linux-libs/include "$pkgdir"/usr/include mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3 + + install -vDm 644 $pkgbase/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/" + install -vDm 644 $pkgbase-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/" } diff --git a/util-linux/pam-login b/util-linux/pam-login index 2dac6ab611..28f6fc5de5 100644 --- a/util-linux/pam-login +++ b/util-linux/pam-login @@ -1,6 +1,5 @@ #%PAM-1.0 -auth required pam_securetty.so auth requisite pam_nologin.so auth include system-local-login account include system-local-login diff --git a/util-linux/pam-remote b/util-linux/pam-remote new file mode 100644 index 0000000000..7fce079c1d --- /dev/null +++ b/util-linux/pam-remote @@ -0,0 +1,8 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-remote-login +account include system-remote-login +session include system-remote-login +password include system-remote-login