gentoo resync : 25.11.2020

4 files changed, 23 insertions, 120 deletions

diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index be4e1760b77a..3d07507c9da8 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -2,9 +2,8 @@ AUX cronie-1.2-cron.deny 148 BLAKE2B 3da92c65667ccacd74e32443e1cd5623d8040a75d78
 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.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
+AUX cronie-1.5.5-autoconf270.patch 582 BLAKE2B 8bfc34dfa925abab58ac156845d848b4d714430c3cfed0a453b565e76e6462f3214acaa338bb9d36b72a1d3484d7daf16f5ea41d42ccb8cbca024394d3e85c00 SHA512 7a7f5496e68fd43c804a7b39e32e0b7cc07183c02cc60bea91cf949e9783d85cd8e8143b53e0a1341dbc8dc209c688a35ae04940b2ae953db723eae6f0962639
 AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5
-DIST cronie-1.5.4.tar.gz 122452 BLAKE2B 042961390807c22aa1db3ab592470538d9a348d33fee8f088dfa20e45ee72c72d9502bf5eb5a957494c55d99a6705b94774442f5a2fb06eeab1aa0b0e1a4d6ae SHA512 40a8cd750bc18dcb264e88cf049b0ea66f053b7b6cc10f38fd4f4e6b912871f41ce7ad126521a08203e81c00846e001016b47da3c5e8730a7b49fc970d7b2a6a
 DIST cronie-1.5.5.tar.gz 124642 BLAKE2B 19bb690a2ae66b9b99dcd0536c115fbdf46c0f1c58922e08fb31d9789df3358438001bd4b6b55d16e99e3927364c618ac22cb04661db1245d09709fcb58eef1e SHA512 88b0e877e5b36a0063b37a6ce82133117c95ebd4435ce843e09c6247ac50f36c66503b850aafa75512fab07d46a110ddfdf52e7e984638ed794588e338547166
-EBUILD cronie-1.5.4-r1.ebuild 2531 BLAKE2B 8ed94b4f00ecca0133a416edfaabf1a43d7b373d554e84a0bcf823531102926d150790d6aab79d002ede3bd23ee1823eff928023eefe5cfc912563c703731120 SHA512 e33ec97c2f4c0996b73b5529d431faf5b7be7dda860b5a0547168865f030767d943b1ab565f84d9cdbc14a80f97358566ff6ad34f9e3904e7a1ae36d31155765
-EBUILD cronie-1.5.5.ebuild 2531 BLAKE2B 8ed94b4f00ecca0133a416edfaabf1a43d7b373d554e84a0bcf823531102926d150790d6aab79d002ede3bd23ee1823eff928023eefe5cfc912563c703731120 SHA512 e33ec97c2f4c0996b73b5529d431faf5b7be7dda860b5a0547168865f030767d943b1ab565f84d9cdbc14a80f97358566ff6ad34f9e3904e7a1ae36d31155765
+EBUILD cronie-1.5.5.ebuild 2577 BLAKE2B 7e60070eead42b3710877f15f01538fab5b2f51e5060dffba6e198e6aeab91ff4b1ca6eee1edf18f6e5209eb03901c1e4b579a4462737f27357f6d27fc8fa371 SHA512 c25ac36f58e1afc02882c7263b573dc5a752a89f0a3ffa233b0cfc52ebe25edbabeb59e9e08e557280b99657ff940b847dbdbd2de534fab173c7097371250a4e
 MISC metadata.xml 891 BLAKE2B fe26178ef61d59391ea0ec3817c37bf3ca71b196ceb070244099a7cb1a34110c5c0d0903b682d08f1afc69ed2fd9a18aa9aaee21d61e22f388625dfa7a63a908 SHA512 91d9c91d6997261d59cff08c5c2724476d6709993debf0dbcf4abb38d2c99fe301e7d64ed759fd660e9774e81a8fb51e147a0a194ebe733ed6f9c80940ea7658
diff --git a/sys-process/cronie/cronie-1.5.4-r1.ebuild b/sys-process/cronie/cronie-1.5.4-r1.ebuild
deleted file mode 100644
index 50c1b98619e1..000000000000
--- a/sys-process/cronie/cronie-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 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 ~riscv ~s390 sparc x86"
-IUSE="+anacron +inotify pam selinux"
-
-DEPEND="
-	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"
-)
-
-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
-		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}
-	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/cronie-1.5.5.ebuild b/sys-process/cronie/cronie-1.5.5.ebuild
index 50c1b98619e1..c032a0aa2921 100644
--- a/sys-process/cronie/cronie-1.5.5.ebuild
+++ b/sys-process/cronie/cronie-1.5.5.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
+	"${FILESDIR}/${P}-autoconf270.patch" #750728
 )
 
 pkg_setup() {
diff --git a/sys-process/cronie/files/cronie-1.5.5-autoconf270.patch b/sys-process/cronie/files/cronie-1.5.5-autoconf270.patch
new file mode 100644
index 000000000000..d92761d6d4db
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.5.5-autoconf270.patch
@@ -0,0 +1,20 @@
+From 8191b84648efc4dd583fbbfc4350a9cc9bfd58fb Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tmraz@fedoraproject.org>
+Date: Mon, 2 Nov 2020 11:05:26 +0100
+Subject: [PATCH] configure.ac: Drop the bug report e-mail from AC_INIT()
+
+Fixes #70
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 34ff51e..5b746ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([cronie],[1.5.5],[mmaslano@redhat.com,tmraz@fedoraproject.org])
++AC_INIT([cronie],[1.5.5])
+ AC_CONFIG_HEADER([config.h])
+ AC_PREREQ(2.60)
+