shadow-selinux 4.14.2-1 update

5 files changed, 41 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3facc1d275c4..b9a84c3f06e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = shadow-selinux
 	pkgdesc = Password and account management tool suite with support for shadow files and PAM - SELinux support
-	pkgver = 4.14.0
-	pkgrel = 4
+	pkgver = 4.14.2
+	pkgrel = 1
 	url = https://github.com/shadow-maint/shadow
 	arch = x86_64
 	arch = aarch64
@@ -24,8 +24,8 @@ pkgbase = shadow-selinux
 	depends = libpam.so
 	depends = libpam_misc.so
 	depends = libsemanage>=3.2
-	provides = shadow=4.14.0-4
-	provides = selinux-shadow=4.14.0-4
+	provides = shadow=4.14.2-1
+	provides = selinux-shadow=4.14.2-1
 	conflicts = shadow
 	conflicts = selinux-shadow
 	options = !emptydirs
@@ -35,9 +35,9 @@ pkgbase = shadow-selinux
 	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.0/shadow-4.14.0.tar.xz
-	source = https://github.com/shadow-maint/shadow/releases/download/4.14.0/shadow-4.14.0.tar.xz.asc
-	source = 0001-Disable-replaced-tools-and-their-man-pages-and-PAM-i.patch
+	source = https://github.com/shadow-maint/shadow/releases/download/4.14.2/shadow-4.14.2.tar.xz
+	source = https://github.com/shadow-maint/shadow/releases/download/4.14.2/shadow-4.14.2.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
 	source = shadow.timer
@@ -46,21 +46,22 @@ pkgbase = shadow-selinux
 	source = shadow.tmpfiles
 	source = useradd.defaults
 	validpgpkeys = 66D0387DB85D320F8408166DB175CFA98F192AF2
-	sha512sums = ff960481d576f9db5a9f10becc4e1a74c03de484ecfdcd7f1ea735fded683d7ba0f9cd895dc6a431b77e5a633752273178b1bcda4cefaa5adbf0f143c9a0c86f
+	validpgpkeys = A9348594CE31283A826FBDD8D57633D441E25BB5
+	sha512sums = b417dbe0fbbeced1022e64efe9dcd8b41d14779c45163e6de63891ac63f837d43f3e559f99f884099aa45282299ceb4dcb9fd29d21c9925687ff8462fe6ead2f
 	sha512sums = SKIP
-	sha512sums = ac119fd4a7867021923c54d54612499313686bb2faa957133f63c77700b8777dd87628fd4f36d4e4c1160700624a776510bc5d450ef5be1adc128552edfcb062
-	sha512sums = 57166e14262df3ddcf03008a34ef603a624a31b6d40b18b9fc4d8be50fb857540dea2ffc9dab81c91bcd87bbb3b0dee381219ebd3e68f71864c64a33d5ec7b15
-	sha512sums = 16c00e8ae1e4f86c9075e08b420ddd5e948345db5611390167ce08d7e3e4ec469954b255b3384d855484803ce3fa5d78c88ff8ae722c0215b692b9dece2ed6f6
+	sha512sums = d1f05cb5bbd92fc4dd25d31ef59307214fcf6e57742cde984252ca77ba8fc8a5ada98769ad23976c23907ef6c2f399f6b3d59e3d655843fa18a1d050fd33c933
+	sha512sums = eaf8122f12824da7de4665e78b807dd8d0e731f27267227b35dac99c3d1712a9527487b2b20c7fa3279fc3e1d6d5a0ece0d15e91f2f5255da9e31a3fb01a87c5
+	sha512sums = f879b24ee304a93a5d34ee5868778ce928eddf40cd11c62ca782ab5322467bcff28ddca6ce83df4cede068bbe8277d54030f329b9fd6f90ad7fb511d23ef028f
 	sha512sums = e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621
 	sha512sums = 2c8689b52029f6aa27d75b8b05b0b36e2fc322cab40fdfbb50cdbe331f61bc84e8db20f012cf9af3de8c4e7fdb10c2d5a4925ca1ba3b70eb5627772b94da84b3
 	sha512sums = 5afac4a96b599b0b8ed7be751e7160037c3beb191629928c6520bfd3f2adcd1c55c31029c92c2ff8543e6cd9e37e2cd515ba4e1789c6d66f9c93b4e7f209ee7a
 	sha512sums = 97a6a57c07502e02669dc1a91bffc447dba7d98d208b798d80e07de0d2fdf9d23264453978d2d3d1ba6652ca1f2e22cdadc4309c7b311e83fa71b00ad144f877
 	sha512sums = 706ba6e7fa8298475f2605a28daffef421c9fa8d269cbd5cbcf7f7cb795b40a24d52c20e8d0b73e29e6cd35cd7226b3e9738dc513703e87dde04c1d24087a69c
-	b2sums = 6e9a6108f856953ec91c597e46ad4f912101a829c7b3ff3389510be43f56f0a70425bd562119282d73df269df45af354e626741ad748f9c1e6f27b74a462a62c
+	b2sums = 419f0a516753616ef691f71ec9002eef6fd7568c013ac71900d7481eff1bd9165c69d9587b7ca25800543a2eac58cfb7ce4224063e8af7b278f589640485c28f
 	b2sums = SKIP
-	b2sums = 77b6e4bc6dc070b992728440fc29a8ed04e8f51cc7e58628f294c68bec7f102c8a80af6a41cf9a3c37d33e7a40ead4f4729f2e68412ab5606e6ecbd3008f5048
-	b2sums = e6359de24e563564979fd0b7915a3227239a84f175cb188392097394d4d41c782100655cbd0a779b6dfde7eddcf8b314ab15eb15ca891287a820547551d54c04
-	b2sums = fe88e173ea5531c083c1f3fb640cad1de463ce5446cb097bd30bc54e9082ba0540a57a9effd11c0779196583cf58bfc7066ab10ef4088f78c7d74928a73889b2
+	b2sums = 0631587a1a7209f411f4eb72511b3523cdeb543b750f56be664ca135531dd0f7b1c1611fe9f2e1e5c5594f5f6703fdf8b982b41f1527d855d806a2a04deeb02d
+	b2sums = 44228c694fbd92ade47852a85b52b58385e1ef9755a2dd2254be21b0bf80dc17f57c7ef9d64f092f10b7302fea05c5a9fa3ae0d8ba40e3ce00ecf26c98793202
+	b2sums = 22d4ea8ec0ce9ba5e2e4ea9817c39d9bdae18e7a15797497319024265547dccf3dfb5f3cf59a904c10a45cb5282dda76c8ccb0f4a94f0f327174277dd98d8312
 	b2sums = 5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b
 	b2sums = a69191ab966f146c35e7e911e7e57c29fffd54436ea014aa8ffe0dd46aaf57c635d0a652b35916745c75d82b3fca7234366ea5f810b622e94730b45ec86f122c
 	b2sums = 511c4ad9f3be530dc17dd68f2a3387d748dcdb84192d35f296b88f82442224477e2a74b1841ec3f107b39a5c41c2d961480e396a48d0578f8fd5f65dbe8d9f04
diff --git a/0001-Disable-replaced-tools-and-their-man-pages-and-PAM-i.patch b/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch
index 98d36b674967..a02f3f7f08b6 100644
--- a/0001-Disable-replaced-tools-and-their-man-pages-and-PAM-i.patch
+++ b/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch
@@ -1,7 +1,7 @@
-From c6fe55f198b1e3bd3087f9213193d94f5c1c3d31 Mon Sep 17 00:00:00 2001
+From 02fa48fc3189e834f3d0caa410288b06b00d3972 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 and their man pages and PAM
+Subject: [PATCH 1/3] Disable replaced tools, their man pages and PAM
  integration
 
 etc/pam.d/Makefile.am:
@@ -652,7 +652,7 @@ index c36ed2c7..26696b67 100644
  	man8/userdel.8 \
  	man8/usermod.8
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 585a0b7e..69ec939a 100644
+index fcfee9d2..0bab08a8 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -3,7 +3,7 @@ EXTRA_DIST = \
@@ -664,7 +664,7 @@ index 585a0b7e..69ec939a 100644
  suidperms = 4755
  sgidperms = 2755
  
-@@ -27,9 +27,9 @@ AM_CFLAGS = $(LIBBSD_CFLAGS)
+@@ -26,9 +26,9 @@ AM_CFLAGS = $(LIBBSD_CFLAGS)
  # and installation would be much simpler (just two directories,
  # $prefix/bin and $prefix/sbin, no install-data hacks...)
  
@@ -677,7 +677,7 @@ index 585a0b7e..69ec939a 100644
  if ENABLE_SUBIDS
  ubin_PROGRAMS += newgidmap newuidmap
  endif
-@@ -49,22 +49,20 @@ usbin_PROGRAMS = \
+@@ -48,22 +48,20 @@ usbin_PROGRAMS = \
  	grpck \
  	grpconv \
  	grpunconv \
@@ -702,7 +702,7 @@ index 585a0b7e..69ec939a 100644
  if WITH_SU
  suidbins      += su
  endif
-@@ -137,18 +135,16 @@ sulogin_LDADD  = $(LDADD) $(LIBCRYPT) $(LIBECONF)
+@@ -135,18 +133,16 @@ sulogin_LDADD  = $(LDADD) $(LIBCRYPT) $(LIBECONF)
  useradd_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) -ldl
  userdel_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBECONF) -ldl
  usermod_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) -ldl
diff --git a/0002-Adapt-login.defs-for-PAM-and-util-linux.patch b/0002-Adapt-login.defs-for-PAM-and-util-linux.patch
index 2c8d026e8b8a..b17c7f3b3543 100644
--- a/0002-Adapt-login.defs-for-PAM-and-util-linux.patch
+++ b/0002-Adapt-login.defs-for-PAM-and-util-linux.patch
@@ -1,4 +1,4 @@
-From 04208ea372acef47175b48ad85959b43b8042831 Mon Sep 17 00:00:00 2001
+From da36e0350eba96ad1031d87af93042c3a604f06b 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
diff --git a/0003-Add-Arch-Linux-defaults-for-login.defs.patch b/0003-Add-Arch-Linux-defaults-for-login.defs.patch
index 5e687b02a2c3..e59e99688096 100644
--- a/0003-Add-Arch-Linux-defaults-for-login.defs.patch
+++ b/0003-Add-Arch-Linux-defaults-for-login.defs.patch
@@ -1,4 +1,4 @@
-From 2642dcf11171a701f1997dcd19a769bb5baec410 Mon Sep 17 00:00:00 2001
+From bafabf49d443bf4fa4f422805c5dc381ca0332a9 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
diff --git a/PKGBUILD b/PKGBUILD
index a2bed5e7fdba..1bd67be98d9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
 # If you want to help keep it up to date, please open a Pull Request there.
 
 pkgname=shadow-selinux
-pkgver=4.14.0
-pkgrel=4
+pkgver=4.14.2
+pkgrel=1
 pkgdesc="Password and account management tool suite with support for shadow files and PAM - SELinux support"
 arch=(x86_64 aarch64)
 url="https://github.com/shadow-maint/shadow"
@@ -44,37 +44,40 @@ conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
 provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
           "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
 options=(!emptydirs)
-# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/v4.14.0.arch2
+# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/v4.14.2.arch1
 source=(
   $url/releases/download/$pkgver/${pkgname/-selinux}-$pkgver.tar.xz{,.asc}
-  0001-Disable-replaced-tools-and-their-man-pages-and-PAM-i.patch
+  0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch
   0002-Adapt-login.defs-for-PAM-and-util-linux.patch
   0003-Add-Arch-Linux-defaults-for-login.defs.patch
   shadow.{timer,service}
   shadow.{sysusers,tmpfiles}
   useradd.defaults
 )
-sha512sums=('ff960481d576f9db5a9f10becc4e1a74c03de484ecfdcd7f1ea735fded683d7ba0f9cd895dc6a431b77e5a633752273178b1bcda4cefaa5adbf0f143c9a0c86f'
+sha512sums=('b417dbe0fbbeced1022e64efe9dcd8b41d14779c45163e6de63891ac63f837d43f3e559f99f884099aa45282299ceb4dcb9fd29d21c9925687ff8462fe6ead2f'
             'SKIP'
-            'ac119fd4a7867021923c54d54612499313686bb2faa957133f63c77700b8777dd87628fd4f36d4e4c1160700624a776510bc5d450ef5be1adc128552edfcb062'
-            '57166e14262df3ddcf03008a34ef603a624a31b6d40b18b9fc4d8be50fb857540dea2ffc9dab81c91bcd87bbb3b0dee381219ebd3e68f71864c64a33d5ec7b15'
-            '16c00e8ae1e4f86c9075e08b420ddd5e948345db5611390167ce08d7e3e4ec469954b255b3384d855484803ce3fa5d78c88ff8ae722c0215b692b9dece2ed6f6'
+            'd1f05cb5bbd92fc4dd25d31ef59307214fcf6e57742cde984252ca77ba8fc8a5ada98769ad23976c23907ef6c2f399f6b3d59e3d655843fa18a1d050fd33c933'
+            'eaf8122f12824da7de4665e78b807dd8d0e731f27267227b35dac99c3d1712a9527487b2b20c7fa3279fc3e1d6d5a0ece0d15e91f2f5255da9e31a3fb01a87c5'
+            'f879b24ee304a93a5d34ee5868778ce928eddf40cd11c62ca782ab5322467bcff28ddca6ce83df4cede068bbe8277d54030f329b9fd6f90ad7fb511d23ef028f'
             'e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621'
             '2c8689b52029f6aa27d75b8b05b0b36e2fc322cab40fdfbb50cdbe331f61bc84e8db20f012cf9af3de8c4e7fdb10c2d5a4925ca1ba3b70eb5627772b94da84b3'
             '5afac4a96b599b0b8ed7be751e7160037c3beb191629928c6520bfd3f2adcd1c55c31029c92c2ff8543e6cd9e37e2cd515ba4e1789c6d66f9c93b4e7f209ee7a'
             '97a6a57c07502e02669dc1a91bffc447dba7d98d208b798d80e07de0d2fdf9d23264453978d2d3d1ba6652ca1f2e22cdadc4309c7b311e83fa71b00ad144f877'
             '706ba6e7fa8298475f2605a28daffef421c9fa8d269cbd5cbcf7f7cb795b40a24d52c20e8d0b73e29e6cd35cd7226b3e9738dc513703e87dde04c1d24087a69c')
-b2sums=('6e9a6108f856953ec91c597e46ad4f912101a829c7b3ff3389510be43f56f0a70425bd562119282d73df269df45af354e626741ad748f9c1e6f27b74a462a62c'
+b2sums=('419f0a516753616ef691f71ec9002eef6fd7568c013ac71900d7481eff1bd9165c69d9587b7ca25800543a2eac58cfb7ce4224063e8af7b278f589640485c28f'
         'SKIP'
-        '77b6e4bc6dc070b992728440fc29a8ed04e8f51cc7e58628f294c68bec7f102c8a80af6a41cf9a3c37d33e7a40ead4f4729f2e68412ab5606e6ecbd3008f5048'
-        'e6359de24e563564979fd0b7915a3227239a84f175cb188392097394d4d41c782100655cbd0a779b6dfde7eddcf8b314ab15eb15ca891287a820547551d54c04'
-        'fe88e173ea5531c083c1f3fb640cad1de463ce5446cb097bd30bc54e9082ba0540a57a9effd11c0779196583cf58bfc7066ab10ef4088f78c7d74928a73889b2'
+        '0631587a1a7209f411f4eb72511b3523cdeb543b750f56be664ca135531dd0f7b1c1611fe9f2e1e5c5594f5f6703fdf8b982b41f1527d855d806a2a04deeb02d'
+        '44228c694fbd92ade47852a85b52b58385e1ef9755a2dd2254be21b0bf80dc17f57c7ef9d64f092f10b7302fea05c5a9fa3ae0d8ba40e3ce00ecf26c98793202'
+        '22d4ea8ec0ce9ba5e2e4ea9817c39d9bdae18e7a15797497319024265547dccf3dfb5f3cf59a904c10a45cb5282dda76c8ccb0f4a94f0f327174277dd98d8312'
         '5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b'
         'a69191ab966f146c35e7e911e7e57c29fffd54436ea014aa8ffe0dd46aaf57c635d0a652b35916745c75d82b3fca7234366ea5f810b622e94730b45ec86f122c'
         '511c4ad9f3be530dc17dd68f2a3387d748dcdb84192d35f296b88f82442224477e2a74b1841ec3f107b39a5c41c2d961480e396a48d0578f8fd5f65dbe8d9f04'
         'd727923dc6ed02e90ef31f10b3427df50afbfe416bd03c6de0c341857d1bb33ab6168312bd4ba18d19d0653020fb332cbcfeeb24e668ae3916add9d01b89ccb4'
         'f743922062494fe342036b3acb8b747429eb33b1a13aa150daa4bb71a84e9c570cfcc8527a5f846e3ea7020e6f23c0b10d78cf2ba8363eea0224e4c34ea10161')
-validpgpkeys=(66D0387DB85D320F8408166DB175CFA98F192AF2)  # Serge Hallyn <sergeh@kernel.org>
+validpgpkeys=(
+  66D0387DB85D320F8408166DB175CFA98F192AF2  # Serge Hallyn <sergeh@kernel.org>
+  A9348594CE31283A826FBDD8D57633D441E25BB5  # Alejandro Colomar <alx@kernel.org>
+)
 
 prepare() {
   local filename
@@ -104,6 +107,7 @@ build() {
     --with-fcaps  # use capabilities instead of setuid for setuidmap and setgidmap
     --with-group-name-max-length=32
     --with-libpam  # PAM integration for chpasswd, groupmems, newusers, passwd
+    --with-yescrypt
     --without-libbsd  # shadow can use internal implementation for getting passphrase
     --without-nscd  # we do not ship nscd anymore
     --with-selinux