summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2017-08-15 13:38:38 +0200
committerNicolas Iooss2017-08-15 13:38:38 +0200
commita7eb501fa8d4517884bec91a4a069a08e58cdc75 (patch)
tree4070a2eff5b41516ebc2e4864bae785f05fa17f7
parent9340ccf3186176323a87214939147d17969856b5 (diff)
downloadaur-a7eb501fa8d4517884bec91a4a069a08e58cdc75.tar.gz
shadow-selinux 4.5-2 update
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD16
-rw-r--r--lastlog.tmpfiles1
3 files changed, 9 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0e7f53d0889b..72a79209749f 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.4
- pkgrel = 3
+ pkgver = 4.5
+ pkgrel = 2
url = https://github.com/shadow-maint/shadow
install = shadow.install
arch = i686
@@ -16,8 +16,8 @@ pkgbase = shadow-selinux
depends = pam-selinux
depends = acl
depends = libsemanage
- provides = shadow=4.4-3
- provides = selinux-shadow=4.4-3
+ provides = shadow=4.5-2
+ provides = selinux-shadow=4.5-2
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.4
+ source = git+https://github.com/shadow-maint/shadow.git#tag=4.5
source = LICENSE
source = chgpasswd
source = chpasswd
@@ -50,7 +50,6 @@ pkgbase = shadow-selinux
source = useradd.defaults
source = xstrdup.patch
source = shadow-strncpy-usage.patch
- source = lastlog.tmpfiles
validpgpkeys = D5C2F9BFCA128BBA22A77218872F702C4D6E25A8
sha1sums = SKIP
sha1sums = 33a6cf1e44a1410e5c9726c89e5de68b78f5f922
@@ -65,7 +64,6 @@ pkgbase = shadow-selinux
sha1sums = 9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19
sha1sums = 6010fffeed1fc6673ad9875492e1193b1a847b53
sha1sums = 21e12966a6befb25ec123b403cd9b5c492fe5b16
- sha1sums = f57ecde3f72b4738fad75c097d19cf46a412350f
pkgname = shadow-selinux
diff --git a/PKGBUILD b/PKGBUILD
index 74535fadfa85..550171f9b9cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
# SELinux Contributor: Zezadas
pkgname=shadow-selinux
-pkgver=4.4
-pkgrel=3
+pkgver=4.5
+pkgrel=2
pkgdesc="Password and account management tool suite with support for shadow files and PAM - SELinux support"
arch=('i686' 'x86_64')
url='https://github.com/shadow-maint/shadow'
@@ -38,8 +38,7 @@ source=("git+https://github.com/shadow-maint/shadow.git#tag=$pkgver"
shadow.{timer,service}
useradd.defaults
xstrdup.patch
- shadow-strncpy-usage.patch
- lastlog.tmpfiles)
+ shadow-strncpy-usage.patch)
sha1sums=('SKIP'
'33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
@@ -52,8 +51,7 @@ sha1sums=('SKIP'
'7372dfd8a3030bee4ec39c79bad4f9b9c6f8687a'
'9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
'6010fffeed1fc6673ad9875492e1193b1a847b53'
- '21e12966a6befb25ec123b403cd9b5c492fe5b16'
- 'f57ecde3f72b4738fad75c097d19cf46a412350f')
+ '21e12966a6befb25ec123b403cd9b5c492fe5b16')
pkgver() {
cd "${pkgname/-selinux}"
@@ -68,9 +66,6 @@ prepare() {
patch -Np1 <"$srcdir/xstrdup.patch"
patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
- # Fix regression in useradd not loading defaults properly.
- git cherry-pick -n '507f96cdeb54079fb636c7ce21e371f7a16a520e'
-
autoreconf -v -f --install
# supress etc/pam.d/*, we provide our own
@@ -129,9 +124,6 @@ package() {
install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
done
- # lastlog log file creation
- install -Dm644 "$srcdir/lastlog.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/lastlog.conf"
-
# Remove evil/broken tools
rm "$pkgdir"/usr/sbin/logoutd
diff --git a/lastlog.tmpfiles b/lastlog.tmpfiles
deleted file mode 100644
index 9c07b39f2e83..000000000000
--- a/lastlog.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-f /var/log/lastlog 0644 root root