From ee55c1ca90a59d8f8e27539118c39b5c9d02fda6 Mon Sep 17 00:00:00 2001 From: joborun Date: Mon, 19 Feb 2024 00:31:39 +0200 Subject: [PATCH] upg ed libffi libnghttp3 nss shadow --- ed/PKGBUILD | 9 +-- ed/PKGBUILD-arch | 4 +- ed/deps | 1 + glibc/deps | 1 + libffi/PKGBUILD | 11 ++- libffi/PKGBUILD-arch | 37 +++++----- libffi/deps | 1 + libnghttp3/PKGBUILD | 10 +-- libnghttp3/PKGBUILD-arch | 18 +---- libnghttp3/deps | 3 +- nss/PKGBUILD | 8 +- nss/PKGBUILD-arch | 4 +- ...-tools-their-man-pages-and-PAM-integ.patch | 12 +-- ...pt-login.defs-for-PAM-and-util-linux.patch | 4 +- ...d-Arch-Linux-defaults-for-login.defs.patch | 4 +- ...Arch-Linux-defaults-for-login.defs.patch.0 | 73 ------------------- shadow/PKGBUILD | 31 ++++---- shadow/PKGBUILD-arch | 41 ++++++----- 18 files changed, 98 insertions(+), 174 deletions(-) delete mode 100644 shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch.0 diff --git a/ed/PKGBUILD b/ed/PKGBUILD index bb5afde..352384f 100644 --- a/ed/PKGBUILD +++ b/ed/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=ed -pkgver=1.20 +pkgver=1.20.1 pkgrel=01 pkgdesc="A POSIX-compliant line-oriented text editor" url="https://www.gnu.org/software/ed/ed.html" @@ -44,8 +44,7 @@ license=('GPL') validpgpkeys=('1D41C14B272A2219A739FA4F8FE99503132D7742') # Antonio Diaz Diaz -sha256sums=(c6030defe6ae172f1687906d7354054c75a6a9130af319d4e73c50a91959c5a6 # ed-1.20.tar.lz - a86077ba7d96bf4f8ce42c1cd6ff99626774e040c9a35c3e15ccfcbcd516f9ed) # ed-1.20.tar.lz.sig - -## 4f9fd54b365d87b58b76f9b9bcf7bdaec630b42ee06a458d0276a9d5324dac57 ed-1.20-01-x86_64.pkg.tar.lz +sha256sums=(b1a463b297a141f9876c4b1fcd01477f645cded92168090e9a35db2af4babbca # ed-1.20.1.tar.lz + 14f54dcb07d55dc6b44bc412ed055ec13dd9c62c218f973e65fef7c225c3d7ef) # ed-1.20.1.tar.lz.sig +## e6b85dd20061b6eee3bc5f988cd428617d1bd16b33be192597e57ca1556d9c54 ed-1.20.1-01-x86_64.pkg.tar.lz diff --git a/ed/PKGBUILD-arch b/ed/PKGBUILD-arch index a7632bb..fc47108 100644 --- a/ed/PKGBUILD-arch +++ b/ed/PKGBUILD-arch @@ -2,7 +2,7 @@ # Maintainer: Andreas Radke pkgname=ed -pkgver=1.20 +pkgver=1.20.1 pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('x86_64') @@ -12,7 +12,7 @@ depends=('glibc' 'sh') options=('!emptydirs') validpgpkeys=('1D41C14B272A2219A739FA4F8FE99503132D7742') # Antonio Diaz Diaz source=("https://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.lz"{,.sig}) -sha256sums=('c6030defe6ae172f1687906d7354054c75a6a9130af319d4e73c50a91959c5a6' +sha256sums=('b1a463b297a141f9876c4b1fcd01477f645cded92168090e9a35db2af4babbca' 'SKIP') build() { diff --git a/ed/deps b/ed/deps index 139597f..b28b04f 100644 --- a/ed/deps +++ b/ed/deps @@ -1,2 +1,3 @@ + diff --git a/glibc/deps b/glibc/deps index 49c3281..3d6b4a3 100644 --- a/glibc/deps +++ b/glibc/deps @@ -6,5 +6,6 @@ bison libjpeg-turbo libgit2 graphite +rav1e diff --git a/libffi/PKGBUILD b/libffi/PKGBUILD index 4066d60..9917cc5 100644 --- a/libffi/PKGBUILD +++ b/libffi/PKGBUILD @@ -6,10 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libffi -pkgver=3.4.4 +pkgver=3.4.6 pkgrel=01 pkgdesc='Portable foreign programming language function interface library' -arch=('x86_64') url='https://sourceware.org/libffi/' depends=('glibc') checkdepends=('dejagnu') @@ -33,6 +32,7 @@ build() { --disable-multi-os-directory \ --disable-exec-static-tramp \ --enable-pax_emutramp + make } @@ -47,10 +47,13 @@ package() { install -Dm 644 README.md -t "$pkgdir"/usr/share/doc/$pkgname } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('MIT') -sha256sums=(d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676) # libffi-3.4.4.tar.gz +sha256sums=(b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e) # libffi-3.4.6.tar.gz +## 9d92418793f2fe4c8835011a522a7a4d74d895ba951239eff28fe5c369a49285 libffi-3.4.6-01-x86_64.pkg.tar.lz diff --git a/libffi/PKGBUILD-arch b/libffi/PKGBUILD-arch index 8fae215..ae8c60b 100644 --- a/libffi/PKGBUILD-arch +++ b/libffi/PKGBUILD-arch @@ -1,33 +1,36 @@ +# Maintainer: David Runge # Maintainer: Levente Polyak # Contributor: Bartłomiej Piotrowski # Contributor: Stéphane Gaudreault # Contributor: Jan de Groot pkgname=libffi -pkgver=3.4.4 +pkgver=3.4.6 pkgrel=1 pkgdesc='Portable foreign function interface library' -arch=('x86_64') +arch=(x86_64) url='https://sourceware.org/libffi/' -license=('MIT') -depends=('glibc') -checkdepends=('dejagnu') -provides=('libffi.so') -options=('debug') +license=(MIT) +depends=(glibc) +checkdepends=(dejagnu) +provides=(libffi.so) source=(https://github.com/libffi/libffi/releases/download/v$pkgver/libffi-$pkgver.tar.gz) -sha256sums=('d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676') -b2sums=('189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd') +sha256sums=('b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e') +b2sums=('af8402a09bdbd59b4e9400d2d71bd5ce98f6f1d981d35d1ab40d77a831b13b32c5bd34ca54ff75999e39f0d8a9c066381fae7a8d6c5216d955e064f929f08b88') build() { - cd $pkgname-$pkgver - # remove --disable-exec-static-tramp once ghc and gobject-introspection - # work fine with it enabled (https://github.com/libffi/libffi/pull/647) - ./configure \ - --prefix=/usr \ - --disable-static \ - --disable-multi-os-directory \ - --disable-exec-static-tramp \ + local configure_options=( + # remove --disable-exec-static-tramp once ghc and gobject-introspection + # work fine with it enabled (https://github.com/libffi/libffi/pull/647) + --disable-exec-static-tramp + --disable-multi-os-directory + --disable-static --enable-pax_emutramp + --prefix=/usr + ) + + cd $pkgname-$pkgver + ./configure "${configure_options[@]}" make } diff --git a/libffi/deps b/libffi/deps index 3d52f1f..bea1f16 100644 --- a/libffi/deps +++ b/libffi/deps @@ -3,3 +3,4 @@ autoconf automake + diff --git a/libnghttp3/PKGBUILD b/libnghttp3/PKGBUILD index b0664bb..b4ab97a 100644 --- a/libnghttp3/PKGBUILD +++ b/libnghttp3/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libnghttp3 -pkgver=1.1.0 -pkgrel=02 +pkgver=1.2.0 +pkgrel=01 pkgdesc="HTTP/3 library written in C" url='https://github.com/ngtcp2/nghttp3' provides=('libnghttp3.so') @@ -44,8 +44,8 @@ license=('MIT') validpgpkeys=('F4F3B91474D1EB29889BD0EF7E8403D5D673C366') # Tatsuhiro Tsujikawa -sha256sums=(f7ffcf21fb889e7d6a8422a3620deb52a8516364805ec3bd7ef296628ca595cb # nghttp3-1.1.0.tar.xz - d366dc27b50a4ed884a951263d3ac70151acf46d307998208469be853403a20a) # nghttp3-1.1.0.tar.xz.asc +sha256sums=(d2e216bae7bd7362f850922e4237a5caa204853b3594b22adccab4c1e1c1d1aa # nghttp3-1.2.0.tar.xz + eaac43b6e53240764728e215ac3335a5064717f8ca0776614097ca54122f9cf4) # nghttp3-1.2.0.tar.xz.asc -## 120e3ec7735794257a82afce1a3507061abe5dd6647623a7e14ee76e538dd591 libnghttp3-1.1.0-02-x86_64.pkg.tar.lz +## ef7541000230eb5f0cb820e0cf407cb51c2491e944d4042e1e78abac65f6654d libnghttp3-1.2.0-01-x86_64.pkg.tar.lz diff --git a/libnghttp3/PKGBUILD-arch b/libnghttp3/PKGBUILD-arch index f0855f0..eb7c653 100644 --- a/libnghttp3/PKGBUILD-arch +++ b/libnghttp3/PKGBUILD-arch @@ -2,8 +2,8 @@ # Maintainer: Christian Hesse pkgname=libnghttp3 -pkgver=1.1.0 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="HTTP/3 library written in C" url='https://github.com/ngtcp2/nghttp3' arch=('x86_64') @@ -11,7 +11,7 @@ license=('MIT') provides=('libnghttp3.so') validpgpkeys=('F4F3B91474D1EB29889BD0EF7E8403D5D673C366') # Tatsuhiro Tsujikawa source=("https://github.com/ngtcp2/nghttp3/releases/download/v${pkgver}/nghttp3-${pkgver}.tar.xz"{,.asc}) -sha256sums=('f7ffcf21fb889e7d6a8422a3620deb52a8516364805ec3bd7ef296628ca595cb' +sha256sums=('d2e216bae7bd7362f850922e4237a5caa204853b3594b22adccab4c1e1c1d1aa' 'SKIP') prepare() { @@ -38,15 +38,3 @@ package() { } # vim: ts=2 sw=2 et: - - -####### diffs between old and new Arch PKGBUILD - - - - -#### systemd crap in new PKGBUILD -scan for systemd ipv6 service & socket -##### systemd crap in new PKGBUILD ### -## -## diff --git a/libnghttp3/deps b/libnghttp3/deps index c05614c..7d39372 100644 --- a/libnghttp3/deps +++ b/libnghttp3/deps @@ -1,3 +1,4 @@ - autoconf automake + + diff --git a/nss/PKGBUILD b/nss/PKGBUILD index c6d74e4..94a44cf 100644 --- a/nss/PKGBUILD +++ b/nss/PKGBUILD @@ -7,14 +7,14 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) -pkgver=3.97 +pkgver=3.98 pkgrel=01 pkgdesc="Network Security Services - zstd mandatory here!" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" depends=('nspr>=4.35' sqlite zlib sh 'p11-kit>=0.23.19') makedepends=(perl python gyp mercurial) #options=(debug) # uncomment this if you need to build the nss debug pkg -_revision=86636d0d8e744dad0e4de24ccea2dd5e2a7ed7e7 # NSS_3_97_RTM +_revision=47e47ad179cdf4dfc1e0c5cd75cb5711bb2a604a # NSS_3_98_RTM source=("hg+https://hg.mozilla.org/projects/nss#revision=$_revision" bundle.sh certdata2pem.py) @@ -108,6 +108,6 @@ sha256sums=(SKIP # nss 3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd # bundle.sh d2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c) # certdata2pem.py -## 065a984675740594077b5df5ec699e66a885da613acb2d8b5717330ee64b9c56 ca-certificates-mozilla-3.97-01-x86_64.pkg.tar.lz -## ea68d2a54ae29c49540923599c5d13e4f6a77238bd2e859fe68510e3449e7a18 nss-3.97-01-x86_64.pkg.tar.lz +## 986ffd760112a698caee9f13fe5874196ae8a90eda98a06953e8f1409eb03024 ca-certificates-mozilla-3.98-01-x86_64.pkg.tar.lz +## 17eaaa83898af110e51359c97362af00bd2e678d70ef757d3a8dbb26f555a4f7 nss-3.98-01-x86_64.pkg.tar.lz diff --git a/nss/PKGBUILD-arch b/nss/PKGBUILD-arch index 75c2d40..8cdfe2e 100644 --- a/nss/PKGBUILD-arch +++ b/nss/PKGBUILD-arch @@ -6,7 +6,7 @@ pkgname=( nss ca-certificates-mozilla ) -pkgver=3.97 +pkgver=3.98 pkgrel=1 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" @@ -26,7 +26,7 @@ makedepends=( perl python ) -_revision=86636d0d8e744dad0e4de24ccea2dd5e2a7ed7e7 # NSS_3_97_RTM +_revision=47e47ad179cdf4dfc1e0c5cd75cb5711bb2a604a # NSS_3_98_RTM source=( "hg+https://hg.mozilla.org/projects/nss#revision=$_revision" bundle.sh diff --git a/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch b/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch index cf5b45d..93bf099 100644 --- a/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch +++ b/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch @@ -1,4 +1,4 @@ -From e3e18593203aa387783439b05ebf745fb6b941c9 Mon Sep 17 00:00:00 2001 +From 61a54ab81ec8f958962c911a89d02a065469a8b3 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 5 Nov 2022 23:40:18 +0100 Subject: [PATCH 1/3] Disable replaced tools, their man pages and PAM @@ -42,20 +42,20 @@ Move newgrp to replace sg (instead of it being a symlink). 20 files changed, 25 insertions(+), 151 deletions(-) diff --git a/etc/pam.d/Makefile.am b/etc/pam.d/Makefile.am -index 38ff26ae..a19ad431 100644 +index b8e4321f..73d4554f 100644 --- a/etc/pam.d/Makefile.am +++ b/etc/pam.d/Makefile.am -@@ -2,10 +2,7 @@ - # and also cooperate to make a distribution for `make dist' +@@ -3,10 +3,7 @@ pamd_files = \ + chpasswd \ - chfn \ - chsh \ groupmems \ - login \ + newusers \ passwd - pamd_acct_tools_files = \ diff --git a/man/Makefile.am b/man/Makefile.am index 89d97937..d2741036 100644 --- a/man/Makefile.am @@ -723,5 +723,5 @@ index fcfee9d2..0bab08a8 100644 chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \ done -- -2.43.0 +2.43.2 diff --git a/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch b/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch index 6b7b43a..dc794a7 100644 --- a/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch +++ b/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch @@ -1,4 +1,4 @@ -From b88c2d336b2e92a9c197eecf9b1f46c3ce3c62a7 Mon Sep 17 00:00:00 2001 +From dcc12b1d2bd612923c6c73d0da92fbe1aefa46b1 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 31 Oct 2022 09:45:13 +0100 Subject: [PATCH 2/3] Adapt login.defs for PAM and util-linux @@ -717,5 +717,5 @@ index ab62fa86..d82c47f1 100644 -- -2.43.0 +2.43.2 diff --git a/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch b/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch index d32d8ce..eab4214 100644 --- a/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch +++ b/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch @@ -1,4 +1,4 @@ -From 033b2507af91b37c40f63ce2183373185325c8d2 Mon Sep 17 00:00:00 2001 +From 7eb2d0b9eff128c404ef7a6d07aa597ac9ca2d84 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 31 Oct 2022 10:10:22 +0100 Subject: [PATCH 3/3] Add Arch Linux defaults for login.defs @@ -69,5 +69,5 @@ index 797ca6b3..c4accbf8 100644 # # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. -- -2.43.0 +2.43.2 diff --git a/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch.0 b/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch.0 deleted file mode 100644 index 809ac79..0000000 --- a/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch.0 +++ /dev/null @@ -1,73 +0,0 @@ -From 09850623c6c5c4e4738088c80de82952f9f48c27 Mon Sep 17 00:00:00 2001 -From: David Runge -Date: Mon, 31 Oct 2022 10:10:22 +0100 -Subject: [PATCH 3/4] Add Arch Linux defaults for login.defs - -etc/login.defs: -Change ENV_SUPATH and ENV_SUPATH to only use -/usr/local/sbin:/usr/local/bin:/usr/bin as Arch Linux is a /usr merge -and bin merge distribution. -Change UMASK to 077 as it is considered a more privacy conserving -default than 022. -Change SYS_UID_MIN and SYS_GID_MIN to 500 which gives more space for -distribution added UIDs and GIDs. -Change ENCRYPT_METHOD to SHA512 as it is a safer hashing algorithm than -DES. ---- - etc/login.defs | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/etc/login.defs b/etc/login.defs -index 7c633a57..ea841257 100644 ---- a/etc/login.defs -+++ b/etc/login.defs -@@ -55,8 +55,8 @@ HUSHLOGIN_FILE .hushlogin - # *REQUIRED* The default PATH settings, for superuser and normal users. - # - # (they are minimal, add the rest in the shell startup files) --ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin --ENV_PATH PATH=/bin:/usr/bin -+ENV_SUPATH PATH=/usr/local/sbin:/usr/local/bin:/usr/bin -+ENV_PATH PATH=/usr/local/sbin:/usr/local/bin:/usr/bin - - # - # Terminal permissions -@@ -79,7 +79,7 @@ TTYPERM 0600 - # 022 is the default value, but 027, or even 077, could be considered - # for increased privacy. There is no One True Answer here: each sysadmin - # must make up their mind. --UMASK 022 -+UMASK 077 - - # HOME_MODE is used by useradd(8) and newusers(8) to set the mode for new - # home directories. -@@ -103,7 +103,7 @@ PASS_WARN_AGE 7 - UID_MIN 1000 - UID_MAX 60000 - # System accounts --SYS_UID_MIN 101 -+SYS_UID_MIN 500 - SYS_UID_MAX 999 - # Extra per user uids - SUB_UID_MIN 100000 -@@ -116,7 +116,7 @@ SUB_UID_COUNT 65536 - GID_MIN 1000 - GID_MAX 60000 - # System accounts --SYS_GID_MIN 101 -+SYS_GID_MIN 500 - SYS_GID_MAX 999 - # Extra per user group ids - SUB_GID_MIN 100000 -@@ -153,7 +153,7 @@ CHFN_RESTRICT rwh - # Note: If you use PAM, it is recommended to use a value consistent with - # the PAM modules configuration. - # --#ENCRYPT_METHOD DES -+ENCRYPT_METHOD SHA512 - - # - # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. --- -2.38.1 - diff --git a/shadow/PKGBUILD b/shadow/PKGBUILD index 10f77e8..3adacd8 100644 --- a/shadow/PKGBUILD +++ b/shadow/PKGBUILD @@ -6,19 +6,12 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=shadow -pkgver=4.14.3 +pkgver=4.14.5 pkgrel=01 pkgdesc="Password and account management tool suite with support for shadow files and PAM w/o systemd" url="https://github.com/shadow-maint/shadow" -depends=( - acl libacl.so - attr libattr.so - audit libaudit.so - glibc - libxcrypt libcrypt.so - pam libpam.so libpam_misc.so -) -makedepends=(docbook-xsl itstool libcap libxslt) +depends=( glibc ) +makedepends=(acl attr audit docbook-xsl itstool libcap libxcrypt libxslt pam) backup=( etc/default/useradd etc/login.defs @@ -31,7 +24,7 @@ backup=( ) #options=(debug !emptydirs) options=('!emptydirs') -# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.14.3.arch1 +# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.14.5.arch1 source=( $url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.asc} 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch @@ -90,6 +83,8 @@ build() { package() { cd $pkgname-$pkgver + depends=(acl libacl.so attr libattr.so audit libaudit.so libxcrypt libcrypt.so + pam libpam.so libpam_misc.so) make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" -C man install @@ -107,7 +102,7 @@ package() { chmod 750 "$pkgdir/usr/bin/groupmems" # manually add PAM config for chpasswd and newusers: https://github.com/shadow-maint/shadow/issues/810 - install -vDm 644 etc/pam.d/{chpasswd,newusers} -t "$pkgdir/etc/pam.d/" + # install -vDm 644 etc/pam.d/{chpasswd,newusers} -t "$pkgdir/etc/pam.d/" } #---- arch license gpg-key & sha256sums ---- @@ -119,14 +114,14 @@ license=(BSD-3-Clause) validpgpkeys=(66D0387DB85D320F8408166DB175CFA98F192AF2 # Serge Hallyn A9348594CE31283A826FBDD8D57633D441E25BB5) # Alejandro Colomar -sha256sums=(6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 # shadow-4.14.3.tar.xz - f4cd34b8c845414fe9b0acf2aa25429d0b8acb40ad332a7ba0e9887238b91b3f # shadow-4.14.3.tar.xz.asc - a7cd87b6fd878eb4db9ab7bd6296ed303341adbca1a5895d0f90bed22dbf75fa # 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch.1 - 245cdb0809cf9bd871e9e7063f0cdf6003e683938ef07ed7f57d7a5e2ede6d4e # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch.1 - 37f1409fc1b14b8dfd769042bf5d8528dfebe9f7bacfcac5f99072bead1e3d9b # 0003-Add-Arch-Linux-defaults-for-login.defs.patch.1 +sha256sums=(cba74bc7b05d89c015afe23131f9159ece38779d40a8af4cf162852e6e85ca23 # shadow-4.14.5.tar.xz + 8117982a631822eba6cc8877b58ff5892c5d54ea3af1482cf6bad83786939572 # shadow-4.14.5.tar.xz.asc + 98287eb9eb1033218dc6be82e27bb7a8735c4e1e4b67e79e5a907e2c80e06873 # 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch + 0f781d3085f710b1475940ee7dedebd50d70c1c6acbc38eb538c45f87c4b2b86 # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch + d4403593b0f1a3cce61a0f741dc4a62e45d92c18db2d2c06fea90219c4391bef # 0003-Add-Arch-Linux-defaults-for-login.defs.patch 29448220f2ecfeab0a1a7aae296f07ca522d0a75a5b20df30f83950f9d54531f # shadow.sysusers c2faa81b894de452e6cd23660ad7e30a4e03d6a4eacb94ff209c6e578df05e61 # shadow.tmpfiles 2d4b7b85ea1d5cddf93c2d636a11b0e76c1f484474449bdb018e3af0fcbd93c3) # useradd.defaults -## 44d15d15ef32cc3a5b4b02e06e0c4fc828563857a0f391df56381498e61eab73 shadow-4.14.3-01-x86_64.pkg.tar.lz +## 964a818b4614d2b2e8ff84a0aa60c5fbad0e0089518cf8c894225c820330b3bf shadow-4.14.5-01-x86_64.pkg.tar.lz diff --git a/shadow/PKGBUILD-arch b/shadow/PKGBUILD-arch index ba48a83..a35fea4 100644 --- a/shadow/PKGBUILD-arch +++ b/shadow/PKGBUILD-arch @@ -3,25 +3,25 @@ # Contributor: Aaron Griffin pkgname=shadow -pkgver=4.14.3 +pkgver=4.14.5 pkgrel=1 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=(x86_64) url="https://github.com/shadow-maint/shadow" license=(BSD-3-Clause) depends=( - acl libacl.so - attr libattr.so - audit libaudit.so glibc - libxcrypt libcrypt.so - pam libpam.so libpam_misc.so ) makedepends=( + acl + attr + audit docbook-xsl itstool libcap + libxcrypt libxslt + pam ) backup=( etc/default/useradd @@ -32,7 +32,7 @@ backup=( etc/pam.d/passwd ) options=(!emptydirs) -# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.14.3.arch1 +# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.14.5.arch1 source=( $url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.asc} 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch @@ -42,21 +42,21 @@ source=( shadow.{sysusers,tmpfiles} useradd.defaults ) -sha512sums=('da5bba26ccf64535e39a4918033f76bf40da00959512424b23427511bedd9b5a4973343062cc8e415690ebc842a1d4a3ac344bca8d14a57f38281629d0bf3edd' +sha512sums=('30de7837874b3ad41d579ffe337a6defa22fbe151fdbf8a32c54f267af1f565c7e06b92d953571482e3b622f98291f08f3155179a23266a3e54df1546b87b156' 'SKIP' - '8d96630e9144f838edb9a5bc3dfae20158cb67aa9ddb64b07d80094123a21ebb0dd024230ab8e30ac13b64558daf8c0aad1bc301aa05fada44e26f73db2c9dc7' - '38b1803c991cec6dc840c71cd7b5461488bedd49d6da37c29aa97e927a8e298b728b5c7566b60d3ac83438003a23d4d2c9d409f014df81d359fb08d61bbabb57' - 'df1a70e27fe665c02113cc8d810bbae968f88fa190314443f4ef58cb5c39c0826aae04da32d7da63eb17806414d7668d513dcfc47747e0e9a15943368805edd8' + '316f5138ae0a78a04c55a9b31929468001d34642f9b03c2085cc7de9899aa949041dcf5a19d891f3bb0c34db02372845fa554b0505cadeff5293de153e2e4083' + '6586228e329ebdc08645d1989a35cef92899c404d02023c8080378de228ea1bcbe225e1eaf0dbb9564753eb9ab3d257cd643632647cfc98d69a883108a994cb0' + 'bc6bde47387a5d817b94781f5bae2b87b7937b4e2d55a5998f195f184f442e7808efe53519632662dfd9942d206168ae3f44c940bb8d25d17755a7b01a297bb8' 'e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621' '2c8689b52029f6aa27d75b8b05b0b36e2fc322cab40fdfbb50cdbe331f61bc84e8db20f012cf9af3de8c4e7fdb10c2d5a4925ca1ba3b70eb5627772b94da84b3' '5afac4a96b599b0b8ed7be751e7160037c3beb191629928c6520bfd3f2adcd1c55c31029c92c2ff8543e6cd9e37e2cd515ba4e1789c6d66f9c93b4e7f209ee7a' '97a6a57c07502e02669dc1a91bffc447dba7d98d208b798d80e07de0d2fdf9d23264453978d2d3d1ba6652ca1f2e22cdadc4309c7b311e83fa71b00ad144f877' '706ba6e7fa8298475f2605a28daffef421c9fa8d269cbd5cbcf7f7cb795b40a24d52c20e8d0b73e29e6cd35cd7226b3e9738dc513703e87dde04c1d24087a69c') -b2sums=('6707cae41a0f8478cadd94ea5eaba95cdc6b1b23896b8dd903c62c931839a82b0538f04f8c12433f148da5b23c12a033963380be81f6fc97fa0e3f9399e51b21' +b2sums=('885d2b23ed670cf26452eb208d561478b7410ffbb04a054feb65efb7da6f1d51eb992da61b72409f8991ee35efd7e7cf7a9bc770edec5f855ace32f82aaa7b55' 'SKIP' - '9bfdd4d0b7ce997b4a95f9334790fd907e52afa4dd8f2104f2c1413f17c46f9d8f2c3ae9c86927b5f70cedbcae1f1ec522f3c81896f9629ad84eefdd87b0f7ce' - 'd8c6a25b7a7a7578dfc9e4dc762e9f40d3d5e3f8a6e44c6abd1dc6d874e81830ce2cf335584c35277b69539cc1172611d2fdfa72c740247f2dd35ba77b66827a' - '56135cdc049ccce1f1da89f41b840cf2cd7365fec6d2e771906eb4e406b2ffe90703cf2070c52748b1035d7cfd29d90f4d9eed38b06f0fac8a58c3dd89a86ea9' + '01f5acfd50840ce67a13435400b8d759462fba171d1963bad4e4291005db95b451c18e15dcf8fba4f7d26c764a7a4bdabff8204f6009c51f8ba74093b7daf78b' + '984f17bffbaa2a973b8dc6cffbe67258272a52df27287dc70e5b5a534b434c796a72fba6985dedec13eeb3ea8d2e213759e0f72170488dc272cd7ac12ba11cc6' + 'ee9b8ce37ea0838f6228f9f709804cda9c2b8adb110601b3e0f9d4bba8aa16c9c14c1feb9003a4f20432c963c247a2e65575acafb1ada0155ee2def01ddd2bf3' '5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b' 'a69191ab966f146c35e7e911e7e57c29fffd54436ea014aa8ffe0dd46aaf57c635d0a652b35916745c75d82b3fca7234366ea5f810b622e94730b45ec86f122c' '511c4ad9f3be530dc17dd68f2a3387d748dcdb84192d35f296b88f82442224477e2a74b1841ec3f107b39a5c41c2d961480e396a48d0578f8fd5f65dbe8d9f04' @@ -113,6 +113,14 @@ build() { } package() { + depends+=( + acl libacl.so + attr libattr.so + audit libaudit.so + libxcrypt libcrypt.so + pam libpam.so libpam_misc.so + ) + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install @@ -135,7 +143,4 @@ package() { # adapt executables to match the modes used by tmpfiles.d, so that pacman does not complain: chmod 750 "$pkgdir/usr/bin/groupmems" - - # manually add PAM config for chpasswd and newusers: https://github.com/shadow-maint/shadow/issues/810 - install -vDm 644 etc/pam.d/{chpasswd,newusers} -t "$pkgdir/etc/pam.d/" }