gentoo resync : 20.03.2021

4 files changed, 160 insertions, 2 deletions

diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index b3a4447aacd9..76ee93065051 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -3,7 +3,10 @@ AUX cronie-1.3-initd 274 BLAKE2B 11ea62f09ca1263b9daecfcccc422d4ce28c200e03a1edb
 AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff08a0f43d2d686d5c82eb9101455bc3191417323286a483e68795ec3a376c73b216ac4ea6d77fbaf2bf SHA512 32268d8b097e60eb039c023647ecd651b6940a8fe1587111ce0d49314bbb2de451214f98b7b703fd284e231c10bc4e616d4d0c63c107d9cdbc2bb470a17f2c3a
 AUX cronie-1.5.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
 AUX cronie-1.5.5-autoconf270.patch 582 BLAKE2B 8bfc34dfa925abab58ac156845d848b4d714430c3cfed0a453b565e76e6462f3214acaa338bb9d36b72a1d3484d7daf16f5ea41d42ccb8cbca024394d3e85c00 SHA512 7a7f5496e68fd43c804a7b39e32e0b7cc07183c02cc60bea91cf949e9783d85cd8e8143b53e0a1341dbc8dc209c688a35ae04940b2ae953db723eae6f0962639
+AUX cronie-1.5.6-autoconf-2.70.patch 1303 BLAKE2B eae651f061c318c890e1854dd66d600fa301d0060ca200621ce5cd0fa654221cb75ed512921ddc0287e5c2708eb31b7bfd6dd10a75107f4048ac85cc143ec612 SHA512 bb3986249c9cf8d9456ce65925a77b8f25b99b8d7443b7cc09903efbd55702bbbcbc7f65ef7ab55a5bd2a6c62adeb4abf90d41ba946b82b7db9a4b122c834d50
 AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5
 DIST cronie-1.5.5.tar.gz 124642 BLAKE2B 19bb690a2ae66b9b99dcd0536c115fbdf46c0f1c58922e08fb31d9789df3358438001bd4b6b55d16e99e3927364c618ac22cb04661db1245d09709fcb58eef1e SHA512 88b0e877e5b36a0063b37a6ce82133117c95ebd4435ce843e09c6247ac50f36c66503b850aafa75512fab07d46a110ddfdf52e7e984638ed794588e338547166
+DIST cronie-1.5.6.tar.gz 148374 BLAKE2B d511ea49804bf8e1fb10bd43bd37c03594ca4836c79a25b6c8a3e29efe50c11d0ecb6252e4d45bb186c33e2034040c7fdf009d20c305a03198365aba93979fd1 SHA512 bfae9b03627256367c7cdecd8ee13a3625386ea01ffa318d6f2b2d9c3f8efd5e31572125fbf7efd6ade8a22e5cd69e36e915a4ca8f554b553478059bc8be3337
 EBUILD cronie-1.5.5-r1.ebuild 2602 BLAKE2B 67149bc5f6e388930042163ebb28b62e5d2dc6710283c635ad4bf036d7d0c08d6aafca69bbf92e62340313ae3dd0fdb3f0034e5c4f87e2f4c03a821ea2f23d53 SHA512 77b5a10e3ad99ecc1d555c429060979d2fc9e8d4310383ee426d33b6f100a206b3e2f13d89e01a1d607bf6703388f8baa9d395068c70bfa5e9654868285479f6
-MISC metadata.xml 891 BLAKE2B fe26178ef61d59391ea0ec3817c37bf3ca71b196ceb070244099a7cb1a34110c5c0d0903b682d08f1afc69ed2fd9a18aa9aaee21d61e22f388625dfa7a63a908 SHA512 91d9c91d6997261d59cff08c5c2724476d6709993debf0dbcf4abb38d2c99fe301e7d64ed759fd660e9774e81a8fb51e147a0a194ebe733ed6f9c80940ea7658
+EBUILD cronie-1.5.6.ebuild 2591 BLAKE2B b125c30b1623a190c0408a03c5de7a919552076ac4b290a7433768aa5a54af95ad827a3482f76fe9b79c8a41c04710a9f84500588335e87f0fa3e6dda510c49c SHA512 0dfe51d1ba61b20a91192342577a1bf133a054139db34304b5f90a2ad9b4de7cc795aea7096694cc8aa3a7fb1d1566f7d8bfd423c6b81df7d7deab8f857aae63
+MISC metadata.xml 813 BLAKE2B f6af6d92d0a7c0fa8f38574b969dde935bbfc791f05e55c90c21a12c82738c436daa3e40c75d800c683f5ddc9bda177d78218d6b897e00ed0355fe1447d950b9 SHA512 f45dc3cca0b355df94bc5b67aaea6d903440e47f317e8abe8b963a77f18477ac02fd7f21eb7a7cb168216e17f5783461dc9fc5a2e01dc7d408481c75cfc4740a
diff --git a/sys-process/cronie/cronie-1.5.6.ebuild b/sys-process/cronie/cronie-1.5.6.ebuild
new file mode 100644
index 000000000000..d676c18a563a
--- /dev/null
+++ b/sys-process/cronie/cronie-1.5.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools cron flag-o-matic pam systemd
+
+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 ~riscv ~s390 ~sparc ~x86"
+IUSE="+anacron +inotify pam selinux"
+
+DEPEND="
+	acct-group/crontab
+	pam? ( sys-libs/pam )
+	anacron? (
+		!sys-process/anacron
+		!sys-process/systemd-cron
+		elibc_musl? ( sys-libs/obstack-standalone )
+		elibc_uclibc? ( sys-libs/obstack-standalone )
+	)
+"
+RDEPEND="${DEPEND}
+	sys-apps/debianutils
+"
+
+#cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
+	"${FILESDIR}/${PN}-1.5.6-autoconf-2.70.patch"
+)
+
+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
+		if use elibc_musl || use elibc_uclibc ; then
+			append-cflags "-lobstack"
+		fi
+	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}
+
+	if use pam ; then
+		newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
+	fi
+
+	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-1.5.6-autoconf-2.70.patch b/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch
new file mode 100644
index 000000000000..958047784c5f
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch
@@ -0,0 +1,38 @@
+From 44f6a0db3bac50deb11d15d3d847c41932afbfea Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 17 Mar 2021 17:44:38 +0100
+Subject: [PATCH] configure.ac: Don't use AM_CONDITIONAL inside an if statement
+
+or else configure might break:
+
+  configure: error: conditional "NEED_OBSTACK" was never defined.
+  Usually this means the macro was only invoked conditionally.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c575dd..b578431 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,11 +260,11 @@ if test "$enable_anacron" != no; then
+ 	dnl obstack.h is part of GLIBC and may not be present on other systems,
+ 	dnl eg. musl and AIX. There, we static link in our own copy.
+ 	AC_CHECK_HEADER(obstack.h, [have_obstack=yes], [have_obstack=no], [])
+-	AM_CONDITIONAL([NEED_OBSTACK], [test "$have_obstack" = no])
+-	if test "$have_obstack" = no; then
+-		CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/obstack"
+-	fi
+ fi
++AM_CONDITIONAL([NEED_OBSTACK], [test "$have_obstack" = no])
++AS_IF([test "$enable_anacron" != no && test "$have_obstack" = no], [
++	CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/obstack"
++])
+ 
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+-- 
+2.31.0
+
diff --git a/sys-process/cronie/metadata.xml b/sys-process/cronie/metadata.xml
index 091908ba8d48..a9981088401d 100644
--- a/sys-process/cronie/metadata.xml
+++ b/sys-process/cronie/metadata.xml
@@ -14,7 +14,6 @@
   </longdescription>
   <use>
     <flag name="anacron">Install the periodic anacron command scheduler.</flag>
-    <flag name="inotify">Enable inotify filesystem monitoring support.</flag>
   </use>
   <upstream>
     <remote-id type="github">cronie-crond/cronie</remote-id>