* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2018-02-14 10:21 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2018-02-14 10:21 UTC (permalink / raw
To: gentoo-commits
commit: f79f8ac5d95fa3f88301f0bad8b03e9d5f497a59
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Feb 5 03:23:05 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 10:21:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79f8ac5
sys-process/cronie: fix USE=anacron mess
run-crons script from sys-process/cronbase is duplicating anacron's
functionality. And since we run run-crons every 10 minutes and anacron
every hour, we end up running every daily/weekly/monthly cron job twice.
Fix this by removing run-crons from crontab.
Also enable USE=anacron by default because this is closer to behaviour we
previously had with USE=-anacron (thanks to run-crons).
Closes: https://bugs.gentoo.org/621706
Closes: https://github.com/gentoo/gentoo/pull/7079
sys-process/cronie/cronie-1.5.1-r1.ebuild | 101 ++++++++++++++++++++++++++++++
sys-process/cronie/files/cronie-crontab | 17 +++++
2 files changed, 118 insertions(+)
diff --git a/sys-process/cronie/cronie-1.5.1-r1.ebuild b/sys-process/cronie/cronie-1.5.1-r1.ebuild
new file mode 100644
index 00000000000..9030fc8fb1d
--- /dev/null
+++ b/sys-process/cronie/cronie-1.5.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cron 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 )"
+RDEPEND="${DEPEND}
+ sys-apps/debianutils"
+
+#cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+ "${FILESDIR}/cronie-systemd.patch"
+)
+
+pkg_setup() {
+ enewgroup crontab
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ SPOOL_DIR="/var/spool/cron/crontabs" \
+ ANACRON_SPOOL_DIR="/var/spool/anacron" \
+ econf \
+ $(use_with inotify) \
+ $(use_with pam) \
+ $(use_with selinux) \
+ $(use_enable anacron) \
+ --enable-syscrontab \
+ --with-daemon_username=cron \
+ --with-daemon_groupname=cron
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+
+ 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-crontab b/sys-process/cronie/files/cronie-crontab
new file mode 100644
index 00000000000..275f06c603d
--- /dev/null
+++ b/sys-process/cronie/files/cronie-crontab
@@ -0,0 +1,17 @@
+# Global variables
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+MAILTO=root
+HOME=/
+
+# For details see man 4 crontabs
+
+# Example of job definition:
+# .---------------- minute (0 - 59)
+# | .------------- hour (0 - 23)
+# | | .---------- day of month (1 - 31)
+# | | | .------- month (1 - 12) OR jan,feb,mar,apr ...
+# | | | | .---- day of week (0 - 6) (Sunday=0 or 7) OR sun,mon,tue,wed,thu,fri,sat
+# | | | | |
+# * * * * * user-name command to be executed
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2019-03-16 20:03 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2019-03-16 20:03 UTC (permalink / raw
To: gentoo-commits
commit: ac2430ebc6a1354009def936d1281e3a4fa67845
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 19:53:21 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 20:02:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2430eb
sys-process/cronie: Properly name the systemd patch.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/cronie/cronie-1.5.2.ebuild | 2 +-
.../cronie/files/{cronie-systemd.patch => cronie-1.5.2-systemd.patch} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-process/cronie/cronie-1.5.2.ebuild b/sys-process/cronie/cronie-1.5.2.ebuild
index 34872882b77..9daf0a21a94 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/files/cronie-systemd.patch b/sys-process/cronie/files/cronie-1.5.2-systemd.patch
similarity index 100%
rename from sys-process/cronie/files/cronie-systemd.patch
rename to sys-process/cronie/files/cronie-1.5.2-systemd.patch
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2019-06-06 10:07 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2019-06-06 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 1d6c8257d37ccf5d32d3b061dfd33bcb7b1f74c1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 10:06:55 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 10:07:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6c8257
sys-process/cronie: Security cleanup
Bug: https://bugs.gentoo.org/685848
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/cronie/Manifest | 1 -
sys-process/cronie/cronie-1.5.2.ebuild | 109 ---------------------
.../cronie/files/cronie-1.5.2-systemd.patch | 30 ------
3 files changed, 140 deletions(-)
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 67b6243c32d..caf878723a8 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -1,2 +1 @@
-DIST cronie-1.5.2.tar.gz 121604 BLAKE2B 4225439fd13a32bba3bd24f25d7dd405cdb123e666ebbf14574143af9d161867f82ea3fc479d81a884590faaa9c42e19c971285e01a19d6ac793b7deb7fc4775 SHA512 6455e234becc44e6568fa25fd72abfaa293cb0bc2d2f1d124e551c068ba01083192b21e82e941158c8c1f41cb6dad3851d665b9f3baa82fd49080f3f8619740b
DIST cronie-1.5.4.tar.gz 122452 BLAKE2B 042961390807c22aa1db3ab592470538d9a348d33fee8f088dfa20e45ee72c72d9502bf5eb5a957494c55d99a6705b94774442f5a2fb06eeab1aa0b0e1a4d6ae SHA512 40a8cd750bc18dcb264e88cf049b0ea66f053b7b6cc10f38fd4f4e6b912871f41ce7ad126521a08203e81c00846e001016b47da3c5e8730a7b49fc970d7b2a6a
diff --git a/sys-process/cronie/cronie-1.5.2.ebuild b/sys-process/cronie/cronie-1.5.2.ebuild
deleted file mode 100644
index f0233d3f4e6..00000000000
--- a/sys-process/cronie/cronie-1.5.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}
- sys-apps/debianutils"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.2-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() {
- emake install DESTDIR="${D}"
-
- 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-1.5.2-systemd.patch b/sys-process/cronie/files/cronie-1.5.2-systemd.patch
deleted file mode 100644
index 884e6655fa8..00000000000
--- a/sys-process/cronie/files/cronie-1.5.2-systemd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 11d255eb05ae9814c16cd443a7710d99492e16c1 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 13 Jul 2015 10:59:57 -0400
-Subject: [PATCH] Adjust systemd service unit for Gentoo
-
----
- contrib/cronie.systemd | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/cronie.systemd b/contrib/cronie.systemd
-index ad46899..7a6c1a9 100644
---- a/contrib/cronie.systemd
-+++ b/contrib/cronie.systemd
-@@ -3,10 +3,11 @@ Description=Command Scheduler
- After=auditd.service nss-user-lookup.target systemd-user-sessions.service time-sync.target ypbind.service
-
- [Service]
--EnvironmentFile=/etc/sysconfig/crond
--ExecStart=/usr/sbin/crond -n $CRONDARGS
-+ExecStart=/usr/sbin/crond
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
-+Type=forking
-+PIDFile=/run/crond.pid
-
- [Install]
- WantedBy=multi-user.target
---
-2.4.5
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2021-07-15 20:13 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-07-15 20:13 UTC (permalink / raw
To: gentoo-commits
commit: a068a044750cfc9998bd8493dc655d85f3f20d08
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 15 20:12:47 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 20:13:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a068a044
sys-process/cronie: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/cronie/Manifest | 2 -
sys-process/cronie/cronie-1.5.5-r1.ebuild | 121 ---------------------
sys-process/cronie/cronie-1.5.6.ebuild | 118 --------------------
.../cronie/files/cronie-1.5.5-autoconf270.patch | 20 ----
.../cronie/files/cronie-1.5.6-autoconf-2.70.patch | 38 -------
5 files changed, 299 deletions(-)
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index ed42df79f8b..d7b2a169a5d 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -1,3 +1 @@
-DIST cronie-1.5.5.tar.gz 124642 BLAKE2B 19bb690a2ae66b9b99dcd0536c115fbdf46c0f1c58922e08fb31d9789df3358438001bd4b6b55d16e99e3927364c618ac22cb04661db1245d09709fcb58eef1e SHA512 88b0e877e5b36a0063b37a6ce82133117c95ebd4435ce843e09c6247ac50f36c66503b850aafa75512fab07d46a110ddfdf52e7e984638ed794588e338547166
-DIST cronie-1.5.6.tar.gz 148374 BLAKE2B d511ea49804bf8e1fb10bd43bd37c03594ca4836c79a25b6c8a3e29efe50c11d0ecb6252e4d45bb186c33e2034040c7fdf009d20c305a03198365aba93979fd1 SHA512 bfae9b03627256367c7cdecd8ee13a3625386ea01ffa318d6f2b2d9c3f8efd5e31572125fbf7efd6ade8a22e5cd69e36e915a4ca8f554b553478059bc8be3337
DIST cronie-1.5.7.tar.gz 148739 BLAKE2B 3e9f8b78a29d2304e2ece7ce2b794b80e6023428d5b07f21936f3690eae2741b9e6814f966d8e3cb3d4f9daf32b3fe730ce6adebb76f8779c3f5039d2a19b6a4 SHA512 cddf1ffd518bf8daed8ae2634ace41da669f6d1039b1936b602200e2f2902944d8e84c80f73f6ab67b2fa755c4192f9181cf44d87bc893201b756367ab55148e
diff --git a/sys-process/cronie/cronie-1.5.5-r1.ebuild b/sys-process/cronie/cronie-1.5.5-r1.ebuild
deleted file mode 100644
index 87d7137e8e3..00000000000
--- a/sys-process/cronie/cronie-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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 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"
- "${FILESDIR}/${P}-autoconf270.patch" #750728
-)
-
-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}
-
- 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/cronie-1.5.6.ebuild b/sys-process/cronie/cronie-1.5.6.ebuild
deleted file mode 100644
index d676c18a563..00000000000
--- a/sys-process/cronie/cronie-1.5.6.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.5-autoconf270.patch b/sys-process/cronie/files/cronie-1.5.5-autoconf270.patch
deleted file mode 100644
index d92761d6d4d..00000000000
--- a/sys-process/cronie/files/cronie-1.5.5-autoconf270.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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)
-
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
deleted file mode 100644
index 958047784c5..00000000000
--- a/sys-process/cronie/files/cronie-1.5.6-autoconf-2.70.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2022-03-22 18:13 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2022-03-22 18:13 UTC (permalink / raw
To: gentoo-commits
commit: e064a543ab94d8c2378fe1368292e78f6f6af0f2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 18:11:51 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 18:13:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e064a543
sys-process/cronie: Bump to version 1.6.0
Do some more anacron adjustments. Hopefully all is set now for anacron.
Use /run instead of /var/run for pidfile.
Bug: https://bugs.gentoo.org/825026
Closes: https://bugs.gentoo.org/685306
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/cronie/Manifest | 1 +
sys-process/cronie/cronie-1.6.0.ebuild | 116 ++++++++++++++++++++++++++++++
sys-process/cronie/files/cronie-1.3-initd | 2 +-
3 files changed, 118 insertions(+), 1 deletion(-)
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index d7b2a169a5dc..8238b355cca7 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -1 +1,2 @@
DIST cronie-1.5.7.tar.gz 148739 BLAKE2B 3e9f8b78a29d2304e2ece7ce2b794b80e6023428d5b07f21936f3690eae2741b9e6814f966d8e3cb3d4f9daf32b3fe730ce6adebb76f8779c3f5039d2a19b6a4 SHA512 cddf1ffd518bf8daed8ae2634ace41da669f6d1039b1936b602200e2f2902944d8e84c80f73f6ab67b2fa755c4192f9181cf44d87bc893201b756367ab55148e
+DIST cronie-1.6.0.tar.gz 149859 BLAKE2B 0b63b07d8138c74c57ff0cbe1ae3cd3abb21178116322327d06cbc5e12a0c54e5f2512fb9f810787721f7ad1bba897f206b96fd83645bbfeeace734eedbcaf3d SHA512 9d078e2f8ffc0d2feaa16d419fcccf354f8de8021869b14d315b6f0a0acbd888da98fb47888b71672354ec221bbbaf5b77a543b909ae44b0fc6d2b39394ddf5b
diff --git a/sys-process/cronie/cronie-1.6.0.ebuild b/sys-process/cronie/cronie-1.6.0.ebuild
new file mode 100644
index 000000000000..803851ce4c04
--- /dev/null
+++ b/sys-process/cronie/cronie-1.6.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 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 )
+ )
+"
+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"
+)
+
+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 ; 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/dailyjobs
+
+ 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
+
+ insinto /etc/cron.d
+ doins contrib/0hourly
+ 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.3-initd b/sys-process/cronie/files/cronie-1.3-initd
index 793e6213bfae..def72818357c 100644
--- a/sys-process/cronie/files/cronie-1.3-initd
+++ b/sys-process/cronie/files/cronie-1.3-initd
@@ -4,7 +4,7 @@
command="/usr/sbin/crond"
command_args="${CRONDARGS}"
-pidfile="/var/run/crond.pid"
+pidfile="/run/crond.pid"
depend() {
use clock logger
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2023-10-13 23:11 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-10-13 23:11 UTC (permalink / raw
To: gentoo-commits
commit: 4b27c5fc01548928042ad09f4983ffb563163dba
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 23:10:21 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 23:10:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b27c5fc
sys-process/cronie: fix systemd unit file
Closes: https://bugs.gentoo.org/915699
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{cronie-1.7.0.ebuild => cronie-1.7.0-r1.ebuild} | 4 ++++
.../files/cronie-1.7.0-optional-envionment.patch | 21 +++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/sys-process/cronie/cronie-1.7.0.ebuild b/sys-process/cronie/cronie-1.7.0-r1.ebuild
similarity index 97%
rename from sys-process/cronie/cronie-1.7.0.ebuild
rename to sys-process/cronie/cronie-1.7.0-r1.ebuild
index 8dfc21e17ea9..7df18878c8a5 100644
--- a/sys-process/cronie/cronie-1.7.0.ebuild
+++ b/sys-process/cronie/cronie-1.7.0-r1.ebuild
@@ -33,6 +33,10 @@ RDEPEND="
sys-apps/debianutils
"
+PATCHES=(
+ "${FILESDIR}"/${P}-optional-envionment.patch
+)
+
src_configure() {
local myeconfargs=(
$(use_with inotify)
diff --git a/sys-process/cronie/files/cronie-1.7.0-optional-envionment.patch b/sys-process/cronie/files/cronie-1.7.0-optional-envionment.patch
new file mode 100644
index 000000000000..b3032fe982e8
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.7.0-optional-envionment.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/915699
+https://github.com/cronie-crond/cronie/commit/1a6bed1dcf1871c47fdc6d5957f00eae5a854cc7
+
+From 1a6bed1dcf1871c47fdc6d5957f00eae5a854cc7 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Fri, 13 Oct 2023 11:17:12 +0200
+Subject: [PATCH] make the environment file optional
+
+Starting the daemon works without additional environment variables, so
+make the file optional.
+--- a/contrib/cronie.systemd
++++ b/contrib/cronie.systemd
+@@ -3,7 +3,7 @@ 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
++EnvironmentFile=-/etc/sysconfig/crond
+ ExecStart=/usr/sbin/crond -n $CRONDARGS
+ ExecReload=/bin/kill -URG $MAINPID
+ KillMode=process
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2023-10-16 23:45 Louis Sautier
0 siblings, 0 replies; 9+ messages in thread
From: Louis Sautier @ 2023-10-16 23:45 UTC (permalink / raw
To: gentoo-commits
commit: a80bf43dee8debe9a7da1519e1e4ebbdb6b588c5
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 23:38:45 2023 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 23:42:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a80bf43d
sys-process/cronie: fix error message in 0anacron, #915724
Closes: https://bugs.gentoo.org/915724
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
...cronie-1.7.0-r1.ebuild => cronie-1.7.0-r2.ebuild} | 1 +
.../cronie-1.7.0-optional-default-anacron.patch | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/sys-process/cronie/cronie-1.7.0-r1.ebuild b/sys-process/cronie/cronie-1.7.0-r2.ebuild
similarity index 98%
rename from sys-process/cronie/cronie-1.7.0-r1.ebuild
rename to sys-process/cronie/cronie-1.7.0-r2.ebuild
index 7df18878c8a5..f546d36ecbbd 100644
--- a/sys-process/cronie/cronie-1.7.0-r1.ebuild
+++ b/sys-process/cronie/cronie-1.7.0-r2.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-optional-envionment.patch
+ "${FILESDIR}"/${P}-optional-default-anacron.patch
)
src_configure() {
diff --git a/sys-process/cronie/files/cronie-1.7.0-optional-default-anacron.patch b/sys-process/cronie/files/cronie-1.7.0-optional-default-anacron.patch
new file mode 100644
index 000000000000..33cd1c79a72d
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.7.0-optional-default-anacron.patch
@@ -0,0 +1,20 @@
+From ca1b98aaa79975376b729d7f4cc2e8bb2e5939b8 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sat, 14 Oct 2023 15:13:22 +0200
+Subject: [PATCH] anacron: only source /etc/default/anacron if it is readable,
+ fixes #159
+
+Signed-off-by: Louis Sautier <sautier.louis@gmail.com>
+--- a/contrib/0anacron
++++ b/contrib/0anacron
+@@ -8,7 +8,9 @@ if [ `date +%Y%m%d` = "$day" ]; then
+ fi
+
+ # Check whether run on battery should be allowed
+-. /etc/default/anacron
++if test -r /etc/default/anacron; then
++ . /etc/default/anacron
++fi
+
+ if [ "$ANACRON_RUN_ON_BATTERY_POWER" != "yes" ]; then
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2023-12-28 4:23 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-12-28 4:23 UTC (permalink / raw
To: gentoo-commits
commit: 3d67b1f7855e0235bad9f1eb0d454992841b3912
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 04:18:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 04:18:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d67b1f7
sys-process/cronie: drop 1.6.1-r3
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-process/cronie/Manifest | 1 -
sys-process/cronie/cronie-1.6.1-r3.ebuild | 118 ---------------------
.../cronie/files/cronie-1.5.3-systemd.patch | 33 ------
3 files changed, 152 deletions(-)
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 280c35491b30..a302c696b61e 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -1,2 +1 @@
-DIST cronie-1.6.1.tar.gz 149913 BLAKE2B 7b563b90f386a8df09398661e2b3ddc1f83d6c0d19290a02c0622be461e1d160218572adf132d634c60ef8fd0a4bb100e830b90e26270c28c75a69591ccc18a6 SHA512 1e095df9670ec25d6629f4cf2cacd82c6c1cb1487a859815a7881a1d130e4f18f9976396f773abae24dadc232166bb6467bbaeac1cb0254209fcadf3530d5e6f
DIST cronie-1.7.0.tar.gz 271404 BLAKE2B 44745f68dba212da60f3013b10737be2390d8c76186dc641fa1930b1c7d103fa2e3127a63fe73571434683137044f7fda8cc31435c59092a14c0091a372ffead SHA512 a8e6688a164540e2cd3741c58813b6684c4c22a04806bcc8ba028a9ff72f986f165715ac3663bd34133af6566bdbd272a3e7be893f139e315aef35b2dbeb622f
diff --git a/sys-process/cronie/cronie-1.6.1-r3.ebuild b/sys-process/cronie/cronie-1.6.1-r3.ebuild
deleted file mode 100644
index 2658c34efbc0..000000000000
--- a/sys-process/cronie/cronie-1.6.1-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 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"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="ISC BSD BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 )
- )
- selinux? ( sys-libs/libselinux )
-"
-BDEPEND="acct-group/crontab"
-RDEPEND="
- ${BDEPEND}
- ${DEPEND}
- sys-apps/debianutils
-"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.3-systemd.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with inotify)
- $(use_with pam)
- $(use_with selinux)
- $(use_enable anacron)
- --enable-syscrontab
- # Required for correct pidfile location #835814
- --runstatedir="${EPREFIX}/run"
- --with-daemon_username=cron
- --with-daemon_groupname=cron
- )
-
- if use anacron ; then
- if use elibc_musl ; 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,dailyjobs}
-
- 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
- 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.3-systemd.patch b/sys-process/cronie/files/cronie-1.5.3-systemd.patch
deleted file mode 100644
index 0aed5404d39a..000000000000
--- a/sys-process/cronie/files/cronie-1.5.3-systemd.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
@ 2024-01-19 10:28 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-01-19 10:28 UTC (permalink / raw
To: gentoo-commits
commit: c8d03c5fd70d4e1f0696ed140203f2475869ea7b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 10:28:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 10:28:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d03c5f
sys-process/cronie: backport envelope revert
Closes: https://bugs.gentoo.org/922477
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-process/cronie/cronie-1.7.1-r1.ebuild | 111 +++++++++++++++++++++
.../files/cronie-1.7.1-envelope-revert.patch | 59 +++++++++++
2 files changed, 170 insertions(+)
diff --git a/sys-process/cronie/cronie-1.7.1-r1.ebuild b/sys-process/cronie/cronie-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..cd49c8370d95
--- /dev/null
+++ b/sys-process/cronie/cronie-1.7.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+inherit 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/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 )
+ )
+ selinux? ( sys-libs/libselinux )
+"
+BDEPEND="acct-group/crontab"
+RDEPEND="
+ ${BDEPEND}
+ ${DEPEND}
+ sys-apps/debianutils
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-envelope-revert.patch
+)
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with inotify)
+ $(use_with pam)
+ $(use_with selinux)
+ $(use_enable anacron)
+ --enable-syscrontab
+ # Required for correct pidfile location, bug #835814
+ --runstatedir="${EPREFIX}/run"
+ --with-daemon_username=cron
+ --with-daemon_groupname=cron
+ )
+
+ if use anacron && use elibc_musl ; then
+ 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,dailyjobs}
+
+ 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
+ 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.7.1-envelope-revert.patch b/sys-process/cronie/files/cronie-1.7.1-envelope-revert.patch
new file mode 100644
index 000000000000..ac10c1a132b5
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.7.1-envelope-revert.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/922477
+https://github.com/cronie-crond/cronie/issues/166
+https://github.com/cronie-crond/cronie/issues/170
+https://github.com/cronie-crond/cronie/pull/118
+
+https://github.com/cronie-crond/cronie/commit/aeb3f8a9cbc0da7e6367d41a2b769eb7e90855f3
+https://github.com/cronie-crond/cronie/commit/6181605fafe6aaedc0c19a8bdc85a335403b42d8
+
+From aeb3f8a9cbc0da7e6367d41a2b769eb7e90855f3 Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tmraz@fedoraproject.org>
+Date: Fri, 19 Jan 2024 11:17:48 +0100
+Subject: [PATCH] Revert "Use empty envelope address with default mailfrom"
+
+This reverts commit c640f4f39e5c20995e960e4b954cd0574a96c028.
+
+This causes more harm than expected and is also strictly speaking
+not RFC compliant.
+--- a/src/do_command.c
++++ b/src/do_command.c
+@@ -471,9 +471,7 @@ static int child_process(entry * e, char **jobenv) {
+ if (MailCmd[0] == '\0') {
+ int len;
+
+- /* Use empty envelope address with default mailfrom */
+- len = snprintf(mailcmd, sizeof mailcmd, MAILFMT, MAILARG,
+- mailfrom == e->pwd->pw_name ? "<>" : mailfrom);
++ len = snprintf(mailcmd, sizeof mailcmd, MAILFMT, MAILARG, mailfrom);
+ if (len < 0) {
+ fprintf(stderr, "mailcmd snprintf failed\n");
+ (void) _exit(ERROR_EXIT);
+
+From 6181605fafe6aaedc0c19a8bdc85a335403b42d8 Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tmraz@fedoraproject.org>
+Date: Fri, 19 Jan 2024 11:19:32 +0100
+Subject: [PATCH] Inherit MAILFROM from the crond process environment
+
+This allows setting it in /etc/sysconfig/crond or in the systemd unit.
+--- a/man/crontab.5
++++ b/man/crontab.5
+@@ -98,7 +98,8 @@ This option is useful if you decide to use /bin/mail instead of
+ aliasing and UUCP usually does not read its mail. If
+ .I MAILFROM
+ is defined (and non-empty), it is used as the envelope sender address,
+-otherwise, ``root'' is used.
++otherwise, ``root'' is used. This variable is also inherited from the
++crond process environment.
+ .PP
+ (Note: Both
+ .I MAILFROM
+--- a/src/env.c
++++ b/src/env.c
+@@ -138,6 +138,7 @@ int env_set_from_environ(char ***envpp) {
+ "LC_ALL",
+ "LANGUAGE",
+ "RANDOM_DELAY",
++ "MAILFROM",
+ NULL
+ };
+ const char **name;
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-01-19 10:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-22 18:13 [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2024-01-19 10:28 Sam James
2023-12-28 4:23 Sam James
2023-10-16 23:45 Louis Sautier
2023-10-13 23:11 Sam James
2021-07-15 20:13 Lars Wendler
2019-06-06 10:07 Lars Wendler
2019-03-16 20:03 Lars Wendler
2018-02-14 10:21 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox