Incorporate changes from upstream

1 files changed, 12 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 63fe4f1bcd60..c22d26ec6165 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=shadow-relaxed
-pkgver=4.8.1
-pkgrel=4
+pkgver=4.11.1
+pkgrel=1
 pkgdesc="The official Arch shadow package with Fedora's shadow-4.8-goodname.patch"
 arch=('x86_64')
 url='https://github.com/shadow-maint/shadow'
@@ -19,11 +19,10 @@ backup=(etc/login.defs
         etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
         etc/pam.d/{chgpasswd,groupmems}
         etc/default/useradd)
-options=(strip debug)
-validpgpkeys=('D5C2F9BFCA128BBA22A77218872F702C4D6E25A8'   # Christian Perrier
-              'F1D08DB778185BF784002DFFE9FEEA06A85E3F9D')  # Serge Hallyn
-source=("https://github.com/shadow-maint/shadow/releases/download/$pkgver/shadow-$pkgver.tar.xz"{,.asc}
-	"shadow-4.8-goodname.patch::https://src.fedoraproject.org/rpms/shadow-utils/raw/f33/f/shadow-4.8-goodname.patch"
+options=('!emptydirs')
+validpgpkeys=('66D0387DB85D320F8408166DB175CFA98F192AF2')  # Serge Hallyn
+source=("https://github.com/shadow-maint/shadow/releases/download/v$pkgver/shadow-$pkgver.tar.xz"{,.asc}
+	"https://src.fedoraproject.org/rpms/shadow-utils/raw/rawhide/f/shadow-4.8-goodname.patch"
         LICENSE
         chgpasswd
         chpasswd
@@ -34,8 +33,8 @@ source=("https://github.com/shadow-maint/shadow/releases/download/$pkgver/shadow
         shadow.{timer,service}
         useradd.defaults)
 install=shadow.install
-sha1sums=('63457a0ba58dc4e81b2663b839dc6c89d3343f12'
-	  'SKIP'
+sha1sums=('9cb767b86ff2b46e880b428e817972aa07b3a67c'
+          'SKIP'
 	  '3a26667844689c69a26fc964b798586f652d3df5'
           '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
           '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
@@ -54,7 +53,6 @@ build() {
   # apply Fedora's shadow-utils/raw/f33/f/shadow-4.8-goodname.patch
   patch -Np1 <"$srcdir/shadow-4.8-goodname.patch"
 
-  autoreconf -fsiv
   ./configure \
     --prefix=/usr \
     --bindir=/usr/bin \
@@ -66,7 +64,8 @@ build() {
     --with-libpam \
     --with-group-name-max-length=32 \
     --with-audit \
-    --without-selinux
+    --without-selinux \
+    --without-su
 
   make
 }
@@ -75,6 +74,7 @@ package() {
   cd "shadow-$pkgver"
 
   make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C man install
 
   # license
   install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
@@ -109,7 +109,7 @@ package() {
 
   # Remove utilities provided by util-linux
   rm \
-      "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \
+      "$pkgdir"/usr/bin/{login,chsh,chfn,sg,nologin} \
       "$pkgdir"/usr/sbin/{vipw,vigr}
 
   # but we keep newgrp, as sg is really an alias to it
@@ -127,9 +127,6 @@ package() {
           -name 'vigr.8'    -o \
           -name 'newgrp.1' ')' \
       -delete
-  rmdir \
-      "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \
-      "$pkgdir"/usr/share/man/{fi,ko/man8}
 
   # move everything else to /usr/bin, because this isn't handled by ./configure
   mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin