summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
2 files changed, 13 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0fbb2e996bdc..6ca3729af50a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = shadow-selinux
pkgdesc = Password and account management tool suite with support for shadow files and PAM - SELinux support
- pkgver = 4.8
+ pkgver = 4.8.1
pkgrel = 1
url = https://github.com/shadow-maint/shadow
install = shadow.install
@@ -17,8 +17,8 @@ pkgbase = shadow-selinux
depends = audit
depends = libaudit.so
depends = libsemanage
- provides = shadow=4.8-1
- provides = selinux-shadow=4.8-1
+ provides = shadow=4.8.1-1
+ provides = selinux-shadow=4.8.1-1
conflicts = shadow
conflicts = selinux-shadow
options = strip
@@ -37,7 +37,7 @@ pkgbase = shadow-selinux
backup = etc/pam.d/chgpasswd
backup = etc/pam.d/groupmems
backup = etc/default/useradd
- source = git+https://github.com/shadow-maint/shadow.git#tag=4.8
+ source = git+https://github.com/shadow-maint/shadow.git#tag=4.8.1
source = LICENSE
source = chgpasswd
source = chpasswd
diff --git a/PKGBUILD b/PKGBUILD
index 78a6920b89ca..d8f6c628b893 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
# If you want to help keep it up to date, please open a Pull Request there.
pkgname=shadow-selinux
-pkgver=4.8
+pkgver=4.8.1
pkgrel=1
pkgdesc="Password and account management tool suite with support for shadow files and PAM - SELinux support"
arch=('x86_64')
@@ -123,10 +123,12 @@ package() {
done
# Remove evil/broken tools
- rm "$pkgdir"/usr/bin/logoutd
+ rm "$pkgdir"/usr/sbin/logoutd
# Remove utilities provided by util-linux
- rm "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin,vipw,vigr}
+ rm \
+ "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \
+ "$pkgdir"/usr/sbin/{vipw,vigr}
# but we keep newgrp, as sg is really an alias to it
mv "$pkgdir"/usr/bin/{newgrp,sg}
@@ -146,4 +148,8 @@ package() {
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
+ rmdir "$pkgdir/usr/sbin"
}