summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2014-04-24 11:50:27 +0200
committerNicolas Iooss2015-06-27 11:44:55 +0800
commitc149a6a04bece3507ea8bc50a78bddc8446b7721 (patch)
tree2c9ea34a19e9d3efdb3b0b0ffe684415ecb30d2d
parent0cbf4c8f1946037c0e1d67225d36b2b9bd257a5c (diff)
downloadaur-c149a6a04bece3507ea8bc50a78bddc8446b7721.tar.gz
shadow-selinux 4.1.5.1-8 update
Replace anacron with systemd timers Archlinux commit: https://projects.archlinux.org/svntogit/packages.git/commit/trunk/?h=packages/shadow&id=4e8347bd142a6a194238671b666a3f51d86c0d8b
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD15
-rwxr-xr-xshadow.cron.daily6
-rw-r--r--shadow.service10
-rw-r--r--shadow.timer7
5 files changed, 34 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1b52fc8c919d..86c9c2223bb9 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.1.5.1
- pkgrel = 7
+ pkgrel = 8
url = http://pkg-shadow.alioth.debian.org/
install = shadow.install
arch = i686
@@ -12,8 +12,8 @@ pkgbase = shadow-selinux
depends = pam-selinux
depends = acl
depends = libselinux
- provides = shadow=4.1.5.1-7
- provides = selinux-shadow=4.1.5.1-7
+ provides = shadow=4.1.5.1-8
+ provides = selinux-shadow=4.1.5.1-8
conflicts = shadow
conflicts = selinux-shadow
options = strip
@@ -42,7 +42,8 @@ pkgbase = shadow-selinux
source = login.defs
source = newusers
source = passwd
- source = shadow.cron.daily
+ source = shadow.timer
+ source = shadow.service
source = useradd.defaults
source = xstrdup.patch
source = shadow-strncpy-usage.patch
@@ -56,7 +57,8 @@ pkgbase = shadow-selinux
sha1sums = e92045fb75e0c21a3f294a00de0bd2cd252e9463
sha1sums = 12427b1ca92a9b85ca8202239f0d9f50198b818f
sha1sums = 611be25d91c3f8f307c7fe2485d5f781e5dee75f
- sha1sums = 98f4919014b1a9eb9f01ca7731e04b1d973cedd5
+ sha1sums = a154a94b47a3d0c6c287253b98c0d10b861226d0
+ sha1sums = e40fc20894e69a07fb0070b41f567d0c27133720
sha1sums = 9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19
sha1sums = 6010fffeed1fc6673ad9875492e1193b1a847b53
sha1sums = 21e12966a6befb25ec123b403cd9b5c492fe5b16
diff --git a/PKGBUILD b/PKGBUILD
index 67f09fd76f97..f8c98bea5797 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,11 @@
# SELinux Maintainer: Timothée Ravier <tim@siosm.fr>
# SELinux Contributor: Nicky726 <Nicky726@gmail.com>
# SELinux Contributor: Zezadas
+# SELinux Contributor: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
pkgname=shadow-selinux
pkgver=4.1.5.1
-pkgrel=7
+pkgrel=8
pkgdesc="Password and account management tool suite with support for shadow files and PAM - SELinux support"
arch=('i686' 'x86_64')
url='http://pkg-shadow.alioth.debian.org/'
@@ -32,7 +33,7 @@ source=("ftp://ftp.archlinux.org/other/packages/${pkgname/-selinux}/${pkgname/-s
login.defs
newusers
passwd
- shadow.cron.daily
+ shadow.{timer,service}
useradd.defaults
xstrdup.patch
shadow-strncpy-usage.patch
@@ -46,7 +47,8 @@ sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
'e92045fb75e0c21a3f294a00de0bd2cd252e9463'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'611be25d91c3f8f307c7fe2485d5f781e5dee75f'
- '98f4919014b1a9eb9f01ca7731e04b1d973cedd5'
+ 'a154a94b47a3d0c6c287253b98c0d10b861226d0'
+ 'e40fc20894e69a07fb0070b41f567d0c27133720'
'9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
'6010fffeed1fc6673ad9875492e1193b1a847b53'
'21e12966a6befb25ec123b403cd9b5c492fe5b16'
@@ -93,8 +95,11 @@ package() {
# useradd defaults
install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
- # cron job
- install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow"
+ # systemd timer
+ install -D -m644 ${srcdir}/shadow.timer ${pkgdir}/usr/lib/systemd/system/shadow.timer
+ install -D -m644 ${srcdir}/shadow.service ${pkgdir}/usr/lib/systemd/system/shadow.service
+ install -d -m755 ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants
+ ln -s ../shadow.timer ${pkgdir}//usr/lib/systemd/system/multi-user.target.wants/shadow.timer
# login.defs
install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
diff --git a/shadow.cron.daily b/shadow.cron.daily
deleted file mode 100755
index 1373ecde93af..000000000000
--- a/shadow.cron.daily
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Verify integrity of password and group files
-/usr/bin/pwck -r
-/usr/bin/grpck -r
-
diff --git a/shadow.service b/shadow.service
new file mode 100644
index 000000000000..5c1c84583105
--- /dev/null
+++ b/shadow.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Verify integrity of password and group files
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/pwck -r
+ExecStart=/usr/bin/grpck -r
+Nice=19
+IOSchedulingClass=best-effort
+IOSchedulingPriority=7
diff --git a/shadow.timer b/shadow.timer
new file mode 100644
index 000000000000..9cc6baaa9a87
--- /dev/null
+++ b/shadow.timer
@@ -0,0 +1,7 @@
+[Unit]
+Description=Daily verification of password and group files
+
+[Timer]
+OnCalendar=daily
+AccuracySec=12h
+Persistent=true