cronie-selinux 1.5.4-3 update

3 files changed, 29 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c47c5c464aa4..4a3f5126c72f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cronie-selinux
 	pkgdesc = Daemon that runs specified programs at scheduled times and related tools with SELinux support
 	pkgver = 1.5.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/cronie-crond/cronie/
 	arch = i686
 	arch = x86_64
@@ -14,8 +14,8 @@ pkgbase = cronie-selinux
 	optdepends = smtp-server: send job output via email
 	optdepends = smtp-forwarder: forward job output to email server
 	provides = cron
-	provides = cronie=1.5.4-2
-	provides = selinux-cronie=1.5.4-2
+	provides = cronie=1.5.4-3
+	provides = selinux-cronie=1.5.4-3
 	conflicts = cron
 	conflicts = cronie
 	conflicts = selinux-cronie
@@ -25,11 +25,13 @@ pkgbase = cronie-selinux
 	backup = etc/anacrontab
 	source = https://github.com/cronie-crond/cronie/releases/download/cronie-1.5.4-final/cronie-1.5.4.tar.gz
 	source = 0001-do-not-log-carriage-return.patch
+	source = 80-cronie.hook
 	source = service
 	source = pam.d
 	source = deny
 	sha256sums = af8970559cad4262f8ffd7ec72abf682d2dcce04fdfb8f206a71d96566aba882
 	sha256sums = 595e96997afe506ad93a98896830f3651667f56406a5ae67f4bcf513cfcb45ad
+	sha256sums = f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db
 	sha256sums = ac3ff3c8a5ce1b6367b06877b4b12ff74e7f18a3c510fb9f80d6ea6b6321e3b1
 	sha256sums = 00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c
 	sha256sums = ae6e533ecdfc1bd2dd80a9e25acb0260cbe9f00c4e4abee93d552b3660f263fc
diff --git a/80-cronie.hook b/80-cronie.hook
new file mode 100644
index 000000000000..ca52570f9d6a
--- /dev/null
+++ b/80-cronie.hook
@@ -0,0 +1,9 @@
+[Trigger]
+Operation = Upgrade
+Type = Package
+Target = glibc
+
+[Action]
+Description = Restarting cronie for libc upgrade...
+When = PostTransaction
+Exec = /usr/bin/systemctl try-restart cronie.service
diff --git a/PKGBUILD b/PKGBUILD
index 9685c97c71bb..ff6d19a2e816 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname='cronie-selinux'
 pkgver=1.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools with SELinux support'
 url='https://github.com/cronie-crond/cronie/'
 license=('custom:BSD')
@@ -17,27 +17,27 @@ arch=('i686' 'x86_64')
 depends=('pam-selinux' 'bash' 'run-parts' 'libselinux')
 optdepends=('smtp-server: send job output via email'
             'smtp-forwarder: forward job output to email server')
+conflicts=('cron' "${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
+provides=('cron' "${pkgname/-selinux}=${pkgver}-${pkgrel}"
+          "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
+groups=('selinux')
 source=("https://github.com/cronie-crond/cronie/releases/download/${pkgname/-selinux}-${pkgver}-final/${pkgname/-selinux}-${pkgver}.tar.gz"
         '0001-do-not-log-carriage-return.patch'
+        '80-cronie.hook'
         'service'
         'pam.d'
         'deny')
 sha256sums=('af8970559cad4262f8ffd7ec72abf682d2dcce04fdfb8f206a71d96566aba882'
             '595e96997afe506ad93a98896830f3651667f56406a5ae67f4bcf513cfcb45ad'
+            'f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db'
             'ac3ff3c8a5ce1b6367b06877b4b12ff74e7f18a3c510fb9f80d6ea6b6321e3b1'
             '00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c'
             'ae6e533ecdfc1bd2dd80a9e25acb0260cbe9f00c4e4abee93d552b3660f263fc')
-
 backup=('etc/cron.deny'
         'etc/pam.d/crond'
         'etc/cron.d/0hourly'
         'etc/anacrontab')
 
-conflicts=('cron' "${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
-provides=('cron' "${pkgname/-selinux}=${pkgver}-${pkgrel}"
-          "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
-groups=('selinux')
-
 prepare() {
 	cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
 	patch -Np1 < ../0001-do-not-log-carriage-return.patch
@@ -67,13 +67,14 @@ package() {
 	install -d "${pkgdir}"/var/spool/{ana,}cron
 	install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
 
-	install -Dm644 ../deny "${pkgdir}"/etc/cron.deny
-	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service
+	install -Dm0644 ../deny "${pkgdir}"/etc/cron.deny
+	install -Dm0644 ../pam.d "${pkgdir}"/etc/pam.d/crond
+	install -Dm0644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service
+	install -Dm0644 ../80-cronie.hook "${pkgdir}"/usr/share/libalpm/hooks/80-cronie.hook
 
-	install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab
-	install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly
-	install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
+	install -Dm0644 contrib/anacrontab "${pkgdir}"/etc/anacrontab
+	install -Dm0644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly
+	install -Dm0755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
 
-	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+	install -Dm0644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }