diff options
| author | Nicolas Iooss | 2017-12-13 20:27:40 +0100 |
|---|---|---|
| committer | Nicolas Iooss | 2017-12-14 19:48:06 +0100 |
| commit | b23b323bc980af1cbded507329997b9bcea89dd5 (patch) | |
| tree | a630477b959fc2e530b6763b4a72dc4dae264579 | |
| parent | a7eb501fa8d4517884bec91a4a069a08e58cdc75 (diff) | |
| download | aur-b23b323bc980af1cbded507329997b9bcea89dd5.tar.gz | |
shadow-selinux 4.5-3 update
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | shadow.service | 3 | ||||
| -rw-r--r-- | useradd.defaults | 2 |
5 files changed, 13 insertions, 12 deletions
@@ -1,10 +1,9 @@ pkgbase = shadow-selinux pkgdesc = Password and account management tool suite with support for shadow files and PAM - SELinux support pkgver = 4.5 - pkgrel = 2 + pkgrel = 3 url = https://github.com/shadow-maint/shadow install = shadow.install - arch = i686 arch = x86_64 groups = selinux license = BSD @@ -16,8 +15,8 @@ pkgbase = shadow-selinux depends = pam-selinux depends = acl depends = libsemanage - provides = shadow=4.5-2 - provides = selinux-shadow=4.5-2 + provides = shadow=4.5-3 + provides = selinux-shadow=4.5-3 conflicts = shadow conflicts = selinux-shadow options = strip @@ -60,8 +59,8 @@ pkgbase = shadow-selinux sha1sums = 12427b1ca92a9b85ca8202239f0d9f50198b818f sha1sums = 611be25d91c3f8f307c7fe2485d5f781e5dee75f sha1sums = a154a94b47a3d0c6c287253b98c0d10b861226d0 - sha1sums = 7372dfd8a3030bee4ec39c79bad4f9b9c6f8687a - sha1sums = 9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19 + sha1sums = b5540736f5acbc23b568973eb5645604762db3dd + sha1sums = c173208c5cf34528602f9931468a67b7f68abad3 sha1sums = 6010fffeed1fc6673ad9875492e1193b1a847b53 sha1sums = 21e12966a6befb25ec123b403cd9b5c492fe5b16 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..2bbe3b49e7c0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/shadow/ @@ -8,9 +8,9 @@ pkgname=shadow-selinux pkgver=4.5 -pkgrel=2 +pkgrel=3 pkgdesc="Password and account management tool suite with support for shadow files and PAM - SELinux support" -arch=('i686' 'x86_64') +arch=('x86_64') url='https://github.com/shadow-maint/shadow' license=('BSD') groups=('selinux') @@ -48,8 +48,8 @@ sha1sums=('SKIP' '12427b1ca92a9b85ca8202239f0d9f50198b818f' '611be25d91c3f8f307c7fe2485d5f781e5dee75f' 'a154a94b47a3d0c6c287253b98c0d10b861226d0' - '7372dfd8a3030bee4ec39c79bad4f9b9c6f8687a' - '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' + 'b5540736f5acbc23b568973eb5645604762db3dd' + 'c173208c5cf34528602f9931468a67b7f68abad3' '6010fffeed1fc6673ad9875492e1193b1a847b53' '21e12966a6befb25ec123b403cd9b5c492fe5b16') diff --git a/shadow.service b/shadow.service index 82da5c41d962..39025d90e1cb 100644 --- a/shadow.service +++ b/shadow.service @@ -4,7 +4,8 @@ After=systemd-sysusers.service [Service] Type=simple -ExecStart=/bin/sh -c '/usr/bin/pwck -r ; /usr/bin/grpck -r' +# Always run both checks, but fail the service if either fails +ExecStart=/bin/sh -c '/usr/bin/pwck -r || r=1; /usr/bin/grpck -r && exit $r' Nice=19 IOSchedulingClass=best-effort IOSchedulingPriority=7 diff --git a/useradd.defaults b/useradd.defaults index b800b17773e1..e07fe271ca3b 100644 --- a/useradd.defaults +++ b/useradd.defaults @@ -1,6 +1,6 @@ # useradd defaults file for ArchLinux # original changes by TomK -GROUP=100 +GROUP=users HOME=/home INACTIVE=-1 EXPIRE= |