Date: Tuesday, November 8, 2022 @ 09:47:23 Author: dvzrv Revision: 460911
upgpkg: shadow 4.12.3-1: Upgrade to 4.12.3. This includes fixes for CVE-2013-4235. Rebase distribution patches on top of 4.12.3. Modified: shadow/trunk/0001-Disable-replaced-tools-and-man-pages.patch shadow/trunk/0002-Adapt-login.defs-for-PAM-and-util-linux.patch shadow/trunk/0003-Add-Arch-Linux-defaults-for-login.defs.patch shadow/trunk/0004-Add-Arch-Linux-defaults-for-etc-pam.d.patch shadow/trunk/PKGBUILD ----------------------------------------------------+ 0001-Disable-replaced-tools-and-man-pages.patch | 50 +++++++++++++++++-- 0002-Adapt-login.defs-for-PAM-and-util-linux.patch | 2 0003-Add-Arch-Linux-defaults-for-login.defs.patch | 2 0004-Add-Arch-Linux-defaults-for-etc-pam.d.patch | 2 PKGBUILD | 32 ++++++------ 5 files changed, 66 insertions(+), 22 deletions(-) Modified: 0001-Disable-replaced-tools-and-man-pages.patch =================================================================== --- 0001-Disable-replaced-tools-and-man-pages.patch 2022-11-08 09:23:56 UTC (rev 460910) +++ 0001-Disable-replaced-tools-and-man-pages.patch 2022-11-08 09:47:23 UTC (rev 460911) @@ -1,4 +1,4 @@ -From e0394dfa98a4b4a1b86a19f39a1a982adc1bb7fa Mon Sep 17 00:00:00 2001 +From 2fad83b45d4cf64f7d1fb41ba075e627189df75c Mon Sep 17 00:00:00 2001 From: David Runge <[email protected]> Date: Sat, 5 Nov 2022 23:40:18 +0100 Subject: [PATCH 1/4] Disable replaced tools and man pages @@ -29,13 +29,14 @@ man/ru/Makefile.am | 11 +---------- man/sv/Makefile.am | 8 +------- man/tr/Makefile.am | 3 --- + man/uk/Makefile.am | 11 +---------- man/zh_CN/Makefile.am | 11 +---------- man/zh_TW/Makefile.am | 4 ---- src/Makefile.am | 18 +++++++----------- - 18 files changed, 23 insertions(+), 138 deletions(-) + 19 files changed, 24 insertions(+), 148 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am -index e9cab28a..7168625c 100644 +index 4382df60..078db349 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -8,10 +8,8 @@ endif @@ -519,6 +520,49 @@ man8/useradd.8 \ man8/userdel.8 \ man8/usermod.8 +diff --git a/man/uk/Makefile.am b/man/uk/Makefile.am +index 30c86272..82dc3a82 100644 +--- a/man/uk/Makefile.am ++++ b/man/uk/Makefile.am +@@ -3,10 +3,8 @@ mandir = @mandir@/uk + + man_MANS = \ + man1/chage.1 \ +- man1/chfn.1 \ + man8/chgpasswd.8 \ + man8/chpasswd.8 \ +- man1/chsh.1 \ + man1/expiry.1 \ + man5/faillog.5 \ + man8/faillog.8 \ +@@ -22,12 +20,8 @@ man_MANS = \ + man8/grpunconv.8 \ + man5/gshadow.5 \ + man8/lastlog.8 \ +- man1/login.1 \ + man5/login.defs.5 \ +- man8/logoutd.8 \ +- man1/newgrp.1 \ + man8/newusers.8 \ +- man8/nologin.8 \ + man1/passwd.1 \ + man5/passwd.5 \ + man8/pwck.8 \ +@@ -36,13 +30,10 @@ man_MANS = \ + man1/sg.1 \ + man3/shadow.3 \ + man5/shadow.5 \ +- man1/su.1 \ + man5/suauth.5 \ + man8/useradd.8 \ + man8/userdel.8 \ +- man8/usermod.8 \ +- man8/vigr.8 \ +- man8/vipw.8 ++ man8/usermod.8 + + man_nopam = \ + man5/login.access.5 \ diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am index e9d8f2c2..c2e6cdfd 100644 --- a/man/zh_CN/Makefile.am Modified: 0002-Adapt-login.defs-for-PAM-and-util-linux.patch =================================================================== --- 0002-Adapt-login.defs-for-PAM-and-util-linux.patch 2022-11-08 09:23:56 UTC (rev 460910) +++ 0002-Adapt-login.defs-for-PAM-and-util-linux.patch 2022-11-08 09:47:23 UTC (rev 460911) @@ -1,4 +1,4 @@ -From 07fba2b985f29e49643cb1e543e625f02f218db9 Mon Sep 17 00:00:00 2001 +From db62b53ff601451e900548dceb72f5165f362fa6 Mon Sep 17 00:00:00 2001 From: David Runge <[email protected]> Date: Mon, 31 Oct 2022 09:45:13 +0100 Subject: [PATCH 2/4] Adapt login.defs for PAM and util-linux Modified: 0003-Add-Arch-Linux-defaults-for-login.defs.patch =================================================================== --- 0003-Add-Arch-Linux-defaults-for-login.defs.patch 2022-11-08 09:23:56 UTC (rev 460910) +++ 0003-Add-Arch-Linux-defaults-for-login.defs.patch 2022-11-08 09:47:23 UTC (rev 460911) @@ -1,4 +1,4 @@ -From ea4efaa94e473474b9cba0d38de414c9e4cbca69 Mon Sep 17 00:00:00 2001 +From 09850623c6c5c4e4738088c80de82952f9f48c27 Mon Sep 17 00:00:00 2001 From: David Runge <[email protected]> Date: Mon, 31 Oct 2022 10:10:22 +0100 Subject: [PATCH 3/4] Add Arch Linux defaults for login.defs Modified: 0004-Add-Arch-Linux-defaults-for-etc-pam.d.patch =================================================================== --- 0004-Add-Arch-Linux-defaults-for-etc-pam.d.patch 2022-11-08 09:23:56 UTC (rev 460910) +++ 0004-Add-Arch-Linux-defaults-for-etc-pam.d.patch 2022-11-08 09:47:23 UTC (rev 460911) @@ -1,4 +1,4 @@ -From 440f7bcaad147729629640ddb06bc9e82f173efc Mon Sep 17 00:00:00 2001 +From 6f1cf7cbe378532b808ca6dc5ec7e5c56d877bbc Mon Sep 17 00:00:00 2001 From: David Runge <[email protected]> Date: Sat, 5 Nov 2022 22:52:58 +0100 Subject: [PATCH 4/4] Add Arch Linux defaults for /etc/pam.d/ Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-08 09:23:56 UTC (rev 460910) +++ PKGBUILD 2022-11-08 09:47:23 UTC (rev 460911) @@ -3,8 +3,8 @@ # Contributor: Aaron Griffin <[email protected]> pkgname=shadow -pkgver=4.11.1 -pkgrel=4 +pkgver=4.12.3 +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"; @@ -24,9 +24,9 @@ etc/pam.d/{chage,{,ch,chg}passwd,group{add,del,mems,mod},newusers,shadow,user{add,del,mod}} ) options=(debug !emptydirs) -# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/v4.11.1.arch2 +# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/v4.12.3.arch2 source=( - https://github.com/shadow-maint/shadow/releases/download/v$pkgver/shadow-$pkgver.tar.xz{,.asc} + https://github.com/shadow-maint/shadow/releases/download/$pkgver/shadow-$pkgver.tar.xz{,.asc} 0001-Disable-replaced-tools-and-man-pages.patch 0002-Adapt-login.defs-for-PAM-and-util-linux.patch 0003-Add-Arch-Linux-defaults-for-login.defs.patch @@ -34,23 +34,23 @@ shadow.{timer,service} useradd.defaults ) -sha512sums=('12fbe4d6ac929ad3c21525ed0f1026b5b678ccec9762f2ec7e611d9c180934def506325f2835fb750dd30af035b592f827ff151cd6e4c805aaaf8e01425c279f' +sha512sums=('0529889258f54e7634762dc154aa680d55f8c5f1654afadd1b7431cfbb890a3b1ba27c7ff4b7c45986e4ee2289946db2e420b23ed13e4e5b15800a1fb3a013bc' 'SKIP' - '495edd2eb2c6ed36121fd5a73e112e5a7c7c15b10c00fc5cf31c8c8671a2317581f9d4468871b69d8302e18decf91e0ed4c37ea875e00a83a3bc14e7edcdd168' - 'f6c6ecf958714df3dd74cfef3e33f6d8def82645fdccbed034e330eeffe87a54491e774a237b18fb097695ed9314bb29f7ca39d8d93e642557f558daa0d0e9c3' - '9aaddc6919b513adff5e07ba9f4cfefe294aa98ba60274d90cf56ba4bb0df8f4205e04aa7752bcd830d48d96bd30e4640a10cdaf1bb8472e87e1d4b67a313eb9' - 'a3d39d452a8ad51e8801be09f54b11ee18c1d8b1625c78e190b649923429c98ad6f06237a1fbfb2ccabbd8656dd46419444bf2b51bf433e3d89f14d9e2723270' + 'a0c69c252a8e41b1e3aa4c76cc6c37893a667dd079db9b7bdb54143d4b81f56551b787a93dad6e4adcd532cd12b51c9a5a5a4ae509f7ab5fe732fb9f23f57b5c' + 'a44f3d71376a39bc7bb9d43290f619964f83184dba938857f5765c439150df2c9ba00f115579a7eeca5b316ea71808e9606c6ba977a41aa7fc4b1675606f1351' + 'e8418e6d518101be63e7890254f9a0490f94302882689a0b69601186c9f1915831a34bb6998dbc92b753bff3f762793a7ccade66c2bac2d7b7a77d1a861d5cb7' + '4e6b1f88ab1e3416ab0633b897ebb1359d422b5c2222f3ed3631732f790c42352d1cbe66fa08f45eb2e1679af8f602a95fcc7f463f1bba94c2414e902a4fa215' 'e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621' - '67a49415f676a443f81021bfa29d198462008da1224086f8c549b19c2fd21514ca3302d5ac23edec28b9c724fef921596586423ebe41e852ebfbe7216af727e6' + 'cbcaf50bc48da71caa1f97a1a5789e56004e9507a56680ce73e4e23b9c4fa446bc47aeb50b821324d4a86df2158f051f2d8f89089a90d0f723866c3cde16fe60' 'e9ffea021ee4031b9ad3a534bfb94dbf9d0dfd45a55ecac5dedb2453ea0c17fb80bbb9ad039686bc1f3349dc371977eb548e3a665c56531469c22f29fc4eced8') -b2sums=('d459a1e0ffb342b6b455caf65e6af60b32eee72d4a9b1ab126485fb4632503a42061d3f0b960554c8155af6dc0564c585335b27aecca6538b394a0d58d927588' +b2sums=('63b10d75a11d419156a996b8acf1bebbfab28999c2ab796e6625c028882073d4021806d8b56224190886c076a1205955e7797cb6f797ef73af3a8a33ac34bf2f' 'SKIP' - '1df7f3b7a7637f2977ee581fefa4a56f92ad57585d140bdd4aeef90e51a36568d7624657fdb81aa53b8114ca9d0bd8ba1eb67110c4bc8d36a4c26229b5170c0a' - '2e17e67bd9671aeb6897c116b8ecf69acd0da073515ecc14fb42a83bafded0ad3532ddafcbed3e303d3f8511f7c5430bd50a9b8b808f578952eab476bdc46dfb' - 'c3145b63e42d2e25d702c59787889ebd13acdb1e97416119dd8dd5a6035f6c5f52c32f46c282f0ba4401c43c92bcc5fdb237c7b1d04c3a53da63e9774bf42a61' - '85009831f3e2ad74801393b7d6351f0a553517706b2bd0a72daf379b903768ffcaa9696340abcbc489f3364e50ca5d287430b72cef0cf504d5e25728fe0dc8a4' + 'f1bf37abe10f554abea4635c62e74c43e09e64181e83d68dd8e2031d44d3a46835c5b4997b04614115a2dbd51a1caa67f7ca70fed623ee7f2916538a8ac85593' + 'a1cd3ffd50335eee265587a6a8733bc4c6b0d354c6ea90b2dd5d42642d782acc00d690a40e71ba31b56fd374b1619cc05f9dc876b2f6279ff32f95a17bbbbd87' + '9715184569ca6769b31c01a58a1c8a0b5bb8099f6c07a888a2e0fab6748ac18eed7dd4297cc98449fd2a123cff6b027ab757d34a4cad113a4d9e5e02b28bb668' + 'f11abd5dbe0cc4029eb8e7eb101d95f0fbf48550bdab73ebea1f25a5bc9a401713061832bf494d614711d834ab1e79ef14831bc8a2d18b8980fcb2fe7e0fe5c3' '5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b' - '4a9cb6fe6658f2182655d42761d9d669654c6f0e891610e1b7fd256ce32a561f05e71daf8e473d98f16f5ee9d16d46a097a2d0de42eac58b4ce3be1525a74856' + '860d05baed87715d30b353c7d34b8f3dc0cf82926155d7e65695bff7c799388dfce998b7c83d0d1ccd9c5a1c6990c93c9f4a864582a9c342c675150d473939ea' 'd5bea0cfc2e6d3d1749c65440ca911533d41b6f8117fe09e9efec23524637cfa823d230303a7fbb45d3cd251bf8036d48b9b21049ced208f7ed191fcbd75e879') validpgpkeys=(66D0387DB85D320F8408166DB175CFA98F192AF2) # Serge Hallyn <[email protected]>
