From 0a482e821cff2c6874da9b2ae534a57287ba3ed5 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Wed, 4 Dec 2019 18:39:08 +0100
Subject: [PATCH] shadow: update to 4.8

---
 shadow/.signature |  6 +++---
 shadow/Pkgfile    | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/shadow/.signature b/shadow/.signature
index 9971ef42..6bc25efe 100644
--- a/shadow/.signature
+++ b/shadow/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqkA2HVyo6w07SgPK+XJKVrzWZ2ki36k9sTDP7aN7igZRA90ieLAyr0/6ifdgUcw875MKIpsqtDmSVCi9CaPPvgE=
-SHA256 (Pkgfile) = 01caa744f56574e33636718a13d4bc3c47d53ecd0872da2f0e19da2845c8ccfb
+RWRJc1FUaeVeql6aBQdzHvZDRSkv7rKQOB5yltDf8Qfk5tLJEbApWLG1itgLRlRVbUoimv/D1/EHioIqDsjI16/BBf+IxNbkiwk=
+SHA256 (Pkgfile) = 2a1df5b3b073fd317fa94a1de71d6a7e3d91d9d1f60e7da0faf20560ef63e5df
 SHA256 (.footprint) = 63fc924400dd4fcaf8a613912291d830ae89c2fa3cc17983f06f0d54597f3640
-SHA256 (shadow-4.7.tar.xz) = e5e196a4a7e3b228c812f3163d368be3e932e6eaa4e616677a148d9ec921e16c
+SHA256 (shadow-4.8.tar.xz) = 64b46683b9c1f35b2cd2da9fa87a1383917666e85a56b35e081c7257d10dac64
 SHA256 (pwck) = c62f1bf5785c2bb93bb269156bfa02b06728a01ff5d6c2e09cf6285701a1fda0
 SHA256 (login.defs) = def991c4bc012834d726a4010783634a930558b91650bc4cba5fe822064c3535
 SHA256 (chfn) = b31ef7a14f747e114c970027a57acb5dcefffee439ce0b4a7d55cc2f6b632fcf
diff --git a/shadow/Pkgfile b/shadow/Pkgfile
index 53ebc4f7..700ea06c 100644
--- a/shadow/Pkgfile
+++ b/shadow/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  acl linux-pam
 
 name=shadow
-version=4.7
+version=4.8
 release=1
 source=(https://github.com/shadow-maint/$name/releases/download/$version/$name-$version.tar.xz \
         pwck login.defs chfn chsh login groupadd groupdel \
@@ -14,6 +14,8 @@ build() {
     cd $name-$version
 
     ./configure --prefix=/usr \
+                --bindir=/usr/bin \
+                --sbindir=/usr/sbin \
                 --sysconfdir=/etc \
                 --disable-shared \
                 --disable-shadowgrp \
@@ -24,10 +26,14 @@ build() {
     make
     make DESTDIR=$PKG install
 
+    install -d $PKG/{bin,sbin}
+    mv $PKG/usr/bin/login $PKG/bin
+    mv $PKG/usr/sbin/nologin $PKG/sbin
+    chmod -s $PKG/usr/sbin/*
+
     install -d $PKG/etc/cron/daily $PKG/var/log
     install -m 644 $SRC/login.defs $PKG/etc
     install -m 755 $SRC/pwck $PKG/etc/cron/daily
-    mv $PKG/bin/{su,groups} $PKG/usr/bin
     touch $PKG/var/log/{lastlog,faillog}
 
     rm -r $PKG/usr/bin/gpasswd \