gentoo resync : 19.03.2019

5 files changed, 153 insertions, 4 deletions

diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index b095a7c412cf..a8b29d305708 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -1,8 +1,11 @@
 AUX cronie-1.2-cron.deny 148 BLAKE2B 3da92c65667ccacd74e32443e1cd5623d8040a75d783bac5055ed2c6773b1967c516cba82fcfe8ab6a25b65af6d009ae7c4178b332681970c9b2d339bc6473bd SHA512 e2e3a72a527d7d905b8e36f3a988eb71baebab5eb83d4a744d7c4ff4e9d6030d17bd9d8dbea30397027f4f0bbcd8df82ca0c2dd89777aade530af832fa26b5c6
 AUX cronie-1.3-initd 274 BLAKE2B 11ea62f09ca1263b9daecfcccc422d4ce28c200e03a1edbae91db9cae770910490a5c34f0f3e8a6a7ccc677aca6c555450fd9b2e7ec7aade163552f5613cbbd8 SHA512 f80a745dd00c62518dff3faff45bc79df97254e275bd5d26a1edc7452c23cebffa1d3eb3cb1767b23f40eae462f9432cca87b5b075a143169e056b38f21e85ae
 AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff08a0f43d2d686d5c82eb9101455bc3191417323286a483e68795ec3a376c73b216ac4ea6d77fbaf2bf SHA512 32268d8b097e60eb039c023647ecd651b6940a8fe1587111ce0d49314bbb2de451214f98b7b703fd284e231c10bc4e616d4d0c63c107d9cdbc2bb470a17f2c3a
+AUX cronie-1.5.2-systemd.patch 861 BLAKE2B 17bd191d6f33f179d71e1e891b1091ef29092f271ecbaff308658ab3288bb02df101053f1f98f70cd8060c5e538265d8edf3bab39a7dc0d9c8d5a0ebeb0327fc SHA512 99694f838f5fb1fc70f7edd16780fd1822edece7895cee38a71585c2054fbf62b12225e63616935c631996a70b803c2e36b3f6043ccadafa73ebbc1b24edcbcb
+AUX cronie-1.5.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
 AUX cronie-crontab 477 BLAKE2B 3ae5d23fbd5439a314d087f95f7cd469d7c7c617c2d7f2c4b8671b550228906e8e68d539085b260ee52c4b27384d000ba34878f648310b50ba7bf1d6b6ef41e3 SHA512 ee626c83612bc143c5a1ba816c8147751ce519d0bd0de6adc2132b930872259ae4ecdcd465563ebce43d5fa913ab5e52a36392ae7933a71b3ebcdab840742ebb
-AUX cronie-systemd.patch 865 BLAKE2B 3418425036ce7558f516a70203dac43126299d815bd473940c296015cbd4a1fb2fb7032ca2b7d81edc8bb946f72e83a3282c071ef14a1f0dc28505e03cdaba43 SHA512 dcbeb3fba468f3b63965714075bb6619c768e0d14caddf8c4b62a5d6bee6a2f55be2f1d589b9ef5adefe57d9a20eb2c17216550519fd83bcea2151ccf151d4e0
 DIST cronie-1.5.2.tar.gz 121604 BLAKE2B 4225439fd13a32bba3bd24f25d7dd405cdb123e666ebbf14574143af9d161867f82ea3fc479d81a884590faaa9c42e19c971285e01a19d6ac793b7deb7fc4775 SHA512 6455e234becc44e6568fa25fd72abfaa293cb0bc2d2f1d124e551c068ba01083192b21e82e941158c8c1f41cb6dad3851d665b9f3baa82fd49080f3f8619740b
-EBUILD cronie-1.5.2.ebuild 2425 BLAKE2B 74fb6bb92af87b12a03e6041192e22c8c3795c0d6e6851b4cb05398fea9609f2c0f7089f417103381cb0508ee2215f9b5235623b5daa3d812eda52131c0f4244 SHA512 b0a17e79b031687597e3b2c184341b5741ebcbf62afe2e2deb4ce46c05631deffa3f46fc8ff5a0e013e18f9bfa50930cba2e1df86d1313fca80983817461119a
+DIST cronie-1.5.3.tar.gz 122363 BLAKE2B 68bfc5e83a1d006534291ab054dd8aaa4b351ba1abda8feed0a04885b74cfefa39cc3bd5d2caa5394b1167353da9f2c98a30e6343956cee1014d53370743acbd SHA512 18c5b51d27258f7d37286d6d1684142a74ec49994ba8332ae3afeb77320d242ada5fe5923baf043b460c2769658d74ec60ac73f37836947620660a6c2119086d
+EBUILD cronie-1.5.2.ebuild 2430 BLAKE2B 5d32b1ecee5a5ae64d6f62e83450c2c63dda18bce059e9c9bd335cbdacd10714db8f9b71ec28c236b0895dfd12ab2c7cbc7390c38a01f66f35d2b4a1b3ae2bc1 SHA512 da19bbf48fc70609b0b253a4f7b9c074b560edefaf6cae699a2c9db561e7cddaae958be00fc263528dff93222a2238282e95879c001efa39e3a54f3417cc10c2
+EBUILD cronie-1.5.3-r1.ebuild 2433 BLAKE2B e343c543f2c81c84ca1c9826c40fa4e886a1131dc219750974186cd58e981afae08c449a51d3ac460799121ee0bb51c6b60a1d03273982d7b465fe31cafe5795 SHA512 42c899e2e5974500f896c2d188a9da46ea2fbb0b2cbef5b853c54f9a57b3dac141518b266206f4b366952b3458a01b406669345b83cec2381a0d6f5defec91d5
 MISC metadata.xml 1014 BLAKE2B be8a19ba115ac54d9cc8c667072264f4eb134ba5133e404f74436ab5b0fd88b42a21d6a6f0441ebe3158ce475ea29f5eebc5d135e6b2317ef4b35ee1365bce52 SHA512 7f8295708e5049940e4e2147494e8ee2649635b492fe9096f1d61785f6fd8126d380be1517b253e668d6355d0d2d03e97af4fcca47ed42a6b70a5d669e7ab2c5
diff --git a/sys-process/cronie/cronie-1.5.2.ebuild b/sys-process/cronie/cronie-1.5.2.ebuild
index 34872882b77f..9daf0a21a947 100644
--- a/sys-process/cronie/cronie-1.5.2.ebuild
+++ b/sys-process/cronie/cronie-1.5.2.ebuild
@@ -26,7 +26,7 @@ CRON_SYSTEM_CRONTAB="yes"
 S="${WORKDIR}/${PN}-${P}"
 
 PATCHES=(
-	"${FILESDIR}/cronie-systemd.patch"
+	"${FILESDIR}/${PN}-1.5.2-systemd.patch"
 )
 
 pkg_setup() {
diff --git a/sys-process/cronie/cronie-1.5.3-r1.ebuild b/sys-process/cronie/cronie-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..a9589e5fbea2
--- /dev/null
+++ b/sys-process/cronie/cronie-1.5.3-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools cron flag-o-matic pam systemd user
+
+DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
+HOMEPAGE="https://github.com/cronie-crond/cronie"
+SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+anacron +inotify pam selinux"
+
+DEPEND="
+	pam? ( virtual/pam )
+	anacron? ( !sys-process/anacron
+		elibc_musl? ( sys-libs/obstack-standalone )
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/debianutils
+"
+
+#cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
+)
+
+pkg_setup() {
+	enewgroup crontab
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with inotify)
+		$(use_with pam)
+		$(use_with selinux)
+		$(use_enable anacron)
+		--enable-syscrontab
+		--with-daemon_username=cron
+		--with-daemon_groupname=cron
+	)
+
+	if use anacron; then
+		use elibc_musl && append-cflags "-lobstack"
+	fi
+	SPOOL_DIR="/var/spool/cron/crontabs" \
+	ANACRON_SPOOL_DIR="/var/spool/anacron" \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docrondir -m 1730 -o root -g crontab
+	fowners root:crontab /usr/bin/crontab
+	fperms 2751 /usr/bin/crontab
+
+	newconfd "${S}"/crond.sysconfig ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}-crontab" crontab
+	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
+
+	insinto /etc/cron.d
+	doins contrib/0hourly
+
+	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
+	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
+
+	systemd_newunit contrib/cronie.systemd cronie.service
+
+	if use anacron ; then
+		local anacrondir="/var/spool/anacron"
+		keepdir ${anacrondir}
+		fowners root:cron ${anacrondir}
+		fperms 0750 ${anacrondir}
+
+		insinto /etc
+		doins contrib/anacrontab
+
+		insinto /etc/cron.hourly
+		doins contrib/0anacron
+		fperms 0750 /etc/cron.hourly/0anacron
+	else
+		insinto /etc/cron.d
+		doins contrib/dailyjobs
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	cron_pkg_postinst
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
+		ewarn "or ${PN} not working reliably anymore."
+		einfo "(see https://bugs.gentoo.org/557406 for details.)"
+	fi
+}
diff --git a/sys-process/cronie/files/cronie-systemd.patch b/sys-process/cronie/files/cronie-1.5.2-systemd.patch
index 81c191737842..884e6655fa87 100644
--- a/sys-process/cronie/files/cronie-systemd.patch
+++ b/sys-process/cronie/files/cronie-1.5.2-systemd.patch
@@ -21,7 +21,7 @@ index ad46899..7a6c1a9 100644
  ExecReload=/bin/kill -HUP $MAINPID
  KillMode=process
 +Type=forking
-+PIDFile=/var/run/crond.pid
++PIDFile=/run/crond.pid
  
  [Install]
  WantedBy=multi-user.target
diff --git a/sys-process/cronie/files/cronie-1.5.3-systemd.patch b/sys-process/cronie/files/cronie-1.5.3-systemd.patch
new file mode 100644
index 000000000000..0aed5404d39a
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.5.3-systemd.patch
@@ -0,0 +1,33 @@
+From d022f457d838251963b23697d7ec907d43b637ac Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 16 Mar 2019 20:57:37 +0100
+Subject: [PATCH] Adjust systemd service unit for Gentoo
+
+forward-ported to v1.5.3 by Lars Wendler <polynomial-c@gentoo.org>
+---
+ contrib/cronie.systemd | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/cronie.systemd b/contrib/cronie.systemd
+index 19f2a98..6f4c608 100644
+--- a/contrib/cronie.systemd
++++ b/contrib/cronie.systemd
+@@ -3,12 +3,13 @@ Description=Command Scheduler
+ After=auditd.service nss-user-lookup.target systemd-user-sessions.service time-sync.target ypbind.service autofs.service
+ 
+ [Service]
+-EnvironmentFile=/etc/sysconfig/crond
+-ExecStart=/usr/sbin/crond -n $CRONDARGS
++ExecStart=/usr/sbin/crond
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+ RestartSec=30s
++Type=forking
++PIDFile=/run/crond.pid
+ 
+ [Install]
+ WantedBy=multi-user.target
+-- 
+2.21.0
+