core/shadow to 4.14.5-1

This commit is contained in:
Kevin Mihelich 2024-02-18 15:11:42 +00:00
parent 30daaa8b2e
commit 072556ad5f
5 changed files with 63 additions and 51 deletions

View file

@ -1,26 +1,20 @@
pkgbase = shadow
pkgdesc = Password and account management tool suite with support for shadow files and PAM
pkgver = 4.14.3
pkgver = 4.14.5
pkgrel = 1
url = https://github.com/shadow-maint/shadow
arch = x86_64
license = BSD-3-Clause
makedepends = acl
makedepends = attr
makedepends = audit
makedepends = docbook-xsl
makedepends = itstool
makedepends = libcap
makedepends = libxcrypt
makedepends = libxslt
depends = acl
depends = libacl.so
depends = attr
depends = libattr.so
depends = audit
depends = libaudit.so
makedepends = pam
depends = glibc
depends = libxcrypt
depends = libcrypt.so
depends = pam
depends = libpam.so
depends = libpam_misc.so
options = !emptydirs
backup = etc/default/useradd
backup = etc/login.defs
@ -28,8 +22,8 @@ pkgbase = shadow
backup = etc/pam.d/groupmems
backup = etc/pam.d/newusers
backup = etc/pam.d/passwd
source = https://github.com/shadow-maint/shadow/releases/download/4.14.3/shadow-4.14.3.tar.xz
source = https://github.com/shadow-maint/shadow/releases/download/4.14.3/shadow-4.14.3.tar.xz.asc
source = https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz
source = https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc
source = 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch
source = 0002-Adapt-login.defs-for-PAM-and-util-linux.patch
source = 0003-Add-Arch-Linux-defaults-for-login.defs.patch
@ -40,21 +34,21 @@ pkgbase = shadow
source = useradd.defaults
validpgpkeys = 66D0387DB85D320F8408166DB175CFA98F192AF2
validpgpkeys = A9348594CE31283A826FBDD8D57633D441E25BB5
sha512sums = da5bba26ccf64535e39a4918033f76bf40da00959512424b23427511bedd9b5a4973343062cc8e415690ebc842a1d4a3ac344bca8d14a57f38281629d0bf3edd
sha512sums = 30de7837874b3ad41d579ffe337a6defa22fbe151fdbf8a32c54f267af1f565c7e06b92d953571482e3b622f98291f08f3155179a23266a3e54df1546b87b156
sha512sums = SKIP
sha512sums = 8d96630e9144f838edb9a5bc3dfae20158cb67aa9ddb64b07d80094123a21ebb0dd024230ab8e30ac13b64558daf8c0aad1bc301aa05fada44e26f73db2c9dc7
sha512sums = 38b1803c991cec6dc840c71cd7b5461488bedd49d6da37c29aa97e927a8e298b728b5c7566b60d3ac83438003a23d4d2c9d409f014df81d359fb08d61bbabb57
sha512sums = df1a70e27fe665c02113cc8d810bbae968f88fa190314443f4ef58cb5c39c0826aae04da32d7da63eb17806414d7668d513dcfc47747e0e9a15943368805edd8
sha512sums = 316f5138ae0a78a04c55a9b31929468001d34642f9b03c2085cc7de9899aa949041dcf5a19d891f3bb0c34db02372845fa554b0505cadeff5293de153e2e4083
sha512sums = 6586228e329ebdc08645d1989a35cef92899c404d02023c8080378de228ea1bcbe225e1eaf0dbb9564753eb9ab3d257cd643632647cfc98d69a883108a994cb0
sha512sums = bc6bde47387a5d817b94781f5bae2b87b7937b4e2d55a5998f195f184f442e7808efe53519632662dfd9942d206168ae3f44c940bb8d25d17755a7b01a297bb8
sha512sums = e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621
sha512sums = 2c8689b52029f6aa27d75b8b05b0b36e2fc322cab40fdfbb50cdbe331f61bc84e8db20f012cf9af3de8c4e7fdb10c2d5a4925ca1ba3b70eb5627772b94da84b3
sha512sums = 5afac4a96b599b0b8ed7be751e7160037c3beb191629928c6520bfd3f2adcd1c55c31029c92c2ff8543e6cd9e37e2cd515ba4e1789c6d66f9c93b4e7f209ee7a
sha512sums = 97a6a57c07502e02669dc1a91bffc447dba7d98d208b798d80e07de0d2fdf9d23264453978d2d3d1ba6652ca1f2e22cdadc4309c7b311e83fa71b00ad144f877
sha512sums = 706ba6e7fa8298475f2605a28daffef421c9fa8d269cbd5cbcf7f7cb795b40a24d52c20e8d0b73e29e6cd35cd7226b3e9738dc513703e87dde04c1d24087a69c
b2sums = 6707cae41a0f8478cadd94ea5eaba95cdc6b1b23896b8dd903c62c931839a82b0538f04f8c12433f148da5b23c12a033963380be81f6fc97fa0e3f9399e51b21
b2sums = 885d2b23ed670cf26452eb208d561478b7410ffbb04a054feb65efb7da6f1d51eb992da61b72409f8991ee35efd7e7cf7a9bc770edec5f855ace32f82aaa7b55
b2sums = SKIP
b2sums = 9bfdd4d0b7ce997b4a95f9334790fd907e52afa4dd8f2104f2c1413f17c46f9d8f2c3ae9c86927b5f70cedbcae1f1ec522f3c81896f9629ad84eefdd87b0f7ce
b2sums = d8c6a25b7a7a7578dfc9e4dc762e9f40d3d5e3f8a6e44c6abd1dc6d874e81830ce2cf335584c35277b69539cc1172611d2fdfa72c740247f2dd35ba77b66827a
b2sums = 56135cdc049ccce1f1da89f41b840cf2cd7365fec6d2e771906eb4e406b2ffe90703cf2070c52748b1035d7cfd29d90f4d9eed38b06f0fac8a58c3dd89a86ea9
b2sums = 01f5acfd50840ce67a13435400b8d759462fba171d1963bad4e4291005db95b451c18e15dcf8fba4f7d26c764a7a4bdabff8204f6009c51f8ba74093b7daf78b
b2sums = 984f17bffbaa2a973b8dc6cffbe67258272a52df27287dc70e5b5a534b434c796a72fba6985dedec13eeb3ea8d2e213759e0f72170488dc272cd7ac12ba11cc6
b2sums = ee9b8ce37ea0838f6228f9f709804cda9c2b8adb110601b3e0f9d4bba8aa16c9c14c1feb9003a4f20432c963c247a2e65575acafb1ada0155ee2def01ddd2bf3
b2sums = 5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b
b2sums = a69191ab966f146c35e7e911e7e57c29fffd54436ea014aa8ffe0dd46aaf57c635d0a652b35916745c75d82b3fca7234366ea5f810b622e94730b45ec86f122c
b2sums = 511c4ad9f3be530dc17dd68f2a3387d748dcdb84192d35f296b88f82442224477e2a74b1841ec3f107b39a5c41c2d961480e396a48d0578f8fd5f65dbe8d9f04
@ -62,3 +56,15 @@ pkgbase = shadow
b2sums = f743922062494fe342036b3acb8b747429eb33b1a13aa150daa4bb71a84e9c570cfcc8527a5f846e3ea7020e6f23c0b10d78cf2ba8363eea0224e4c34ea10161
pkgname = shadow
depends = glibc
depends = acl
depends = libacl.so
depends = attr
depends = libattr.so
depends = audit
depends = libaudit.so
depends = libxcrypt
depends = libcrypt.so
depends = pam
depends = libpam.so
depends = libpam_misc.so

View file

@ -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 <dvzrv@archlinux.org>
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

View file

@ -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 <dvzrv@archlinux.org>
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
</refsect1>
--
2.43.0
2.43.2

View file

@ -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 <dvzrv@archlinux.org>
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

View file

@ -6,25 +6,26 @@
# - build with libbsd until toolchain is updated
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 libbsd
libxcrypt libcrypt.so
pam libpam.so libpam_misc.so
glibc
libbsd
)
makedepends=(
acl
attr
audit
docbook-xsl
itstool
libcap
libxcrypt
libxslt
pam
)
backup=(
etc/default/useradd
@ -35,7 +36,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
@ -45,21 +46,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'
@ -116,6 +117,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
@ -138,7 +147,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/"
}