diff options
Diffstat (limited to 'sys-process/cronie')
-rw-r--r-- | sys-process/cronie/Manifest | 6 | ||||
-rw-r--r-- | sys-process/cronie/cronie-1.7.0-r2.ebuild (renamed from sys-process/cronie/cronie-1.6.0-r2.ebuild) | 51 | ||||
-rw-r--r-- | sys-process/cronie/cronie-1.7.1-r1.ebuild (renamed from sys-process/cronie/cronie-1.6.1.ebuild) | 49 | ||||
-rw-r--r-- | sys-process/cronie/cronie-1.7.1.ebuild (renamed from sys-process/cronie/cronie-1.5.7.ebuild) | 51 | ||||
-rw-r--r-- | sys-process/cronie/cronie-1.7.2.ebuild | 107 | ||||
-rw-r--r-- | sys-process/cronie/files/cronie-1.5.3-systemd.patch | 33 | ||||
-rw-r--r-- | sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch | 21 | ||||
-rw-r--r-- | sys-process/cronie/files/cronie-1.7.0-optional-default-anacron.patch | 20 | ||||
-rw-r--r-- | sys-process/cronie/files/cronie-1.7.0-optional-envionment.patch | 21 | ||||
-rw-r--r-- | sys-process/cronie/files/cronie-1.7.1-envelope-revert.patch | 59 |
10 files changed, 274 insertions, 144 deletions
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest index ad71e811a63a..6e508534e273 100644 --- a/sys-process/cronie/Manifest +++ b/sys-process/cronie/Manifest @@ -1,3 +1,3 @@ -DIST cronie-1.5.7.tar.gz 148739 BLAKE2B 3e9f8b78a29d2304e2ece7ce2b794b80e6023428d5b07f21936f3690eae2741b9e6814f966d8e3cb3d4f9daf32b3fe730ce6adebb76f8779c3f5039d2a19b6a4 SHA512 cddf1ffd518bf8daed8ae2634ace41da669f6d1039b1936b602200e2f2902944d8e84c80f73f6ab67b2fa755c4192f9181cf44d87bc893201b756367ab55148e -DIST cronie-1.6.0.tar.gz 149859 BLAKE2B 0b63b07d8138c74c57ff0cbe1ae3cd3abb21178116322327d06cbc5e12a0c54e5f2512fb9f810787721f7ad1bba897f206b96fd83645bbfeeace734eedbcaf3d SHA512 9d078e2f8ffc0d2feaa16d419fcccf354f8de8021869b14d315b6f0a0acbd888da98fb47888b71672354ec221bbbaf5b77a543b909ae44b0fc6d2b39394ddf5b -DIST cronie-1.6.1.tar.gz 149913 BLAKE2B 7b563b90f386a8df09398661e2b3ddc1f83d6c0d19290a02c0622be461e1d160218572adf132d634c60ef8fd0a4bb100e830b90e26270c28c75a69591ccc18a6 SHA512 1e095df9670ec25d6629f4cf2cacd82c6c1cb1487a859815a7881a1d130e4f18f9976396f773abae24dadc232166bb6467bbaeac1cb0254209fcadf3530d5e6f +DIST cronie-1.7.0.tar.gz 271404 BLAKE2B 44745f68dba212da60f3013b10737be2390d8c76186dc641fa1930b1c7d103fa2e3127a63fe73571434683137044f7fda8cc31435c59092a14c0091a372ffead SHA512 a8e6688a164540e2cd3741c58813b6684c4c22a04806bcc8ba028a9ff72f986f165715ac3663bd34133af6566bdbd272a3e7be893f139e315aef35b2dbeb622f +DIST cronie-1.7.1.tar.gz 271985 BLAKE2B 9cbf22fe9c86f265e625563fc5426f39f79ac9c9cfa090ba47957c14391ed3b8ac202b244fed35ea043bed428b4c97a71ad400719a265bd95f5ac28bf3dc9b3a SHA512 4479f6f05ca9da3ecefa0e9b73662f1db58ffff309916de9f92f89c5e7f93f1c5c744f18cb3e1a3df9664d533afe7dad710f97484e72a314c87d84f57a6c56fb +DIST cronie-1.7.2.tar.gz 272450 BLAKE2B 8e426fd0e279bc6a98a4f31dff867b66c87fe0629aca12b4b85557d0162b58aabf5b9789f0b36af417a92bdffa721e2309e125e9b07bfa21aee53aa1135294c7 SHA512 5b55c677a5b812dbfa70f6ee25e41907e99cc63a4883974c6bb8115ad65155d66665704808c338d2f7be6b0a57028c319f2d1115c69bb5f3efdda1efafd144de diff --git a/sys-process/cronie/cronie-1.6.0-r2.ebuild b/sys-process/cronie/cronie-1.7.0-r2.ebuild index 6f15a911b057..2dbbbb127ec4 100644 --- a/sys-process/cronie/cronie-1.6.0-r2.ebuild +++ b/sys-process/cronie/cronie-1.7.0-r2.ebuild @@ -1,46 +1,43 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools cron flag-o-matic pam systemd +# 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/archive/${P}.tar.gz" +SRC_URI="https://github.com/cronie-crond/cronie/releases/download/${P}/${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" +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=" - acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) + selinux? ( sys-libs/libselinux ) " -RDEPEND="${DEPEND} +BDEPEND="acct-group/crontab" +RDEPEND=" + ${BDEPEND} + ${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}-crontab_entries_regression.patch" #836888 + "${FILESDIR}"/${P}-optional-envionment.patch + "${FILESDIR}"/${P}-optional-default-anacron.patch ) -src_prepare() { - default - eautoreconf -} - src_configure() { local myeconfargs=( $(use_with inotify) @@ -48,17 +45,16 @@ src_configure() { $(use_with selinux) $(use_enable anacron) --enable-syscrontab - # Required for correct pidfile location #835814 + # Required for correct pidfile location, bug #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 + 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[@]}" @@ -78,7 +74,7 @@ src_install() { newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny insinto /etc/cron.d - doins contrib/dailyjobs + doins contrib/{0hourly,dailyjobs} newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN} @@ -100,9 +96,6 @@ src_install() { insinto /etc/cron.hourly doins contrib/0anacron fperms 0750 /etc/cron.hourly/0anacron - - insinto /etc/cron.d - doins contrib/0hourly fi einstalldocs diff --git a/sys-process/cronie/cronie-1.6.1.ebuild b/sys-process/cronie/cronie-1.7.1-r1.ebuild index 93c845e1da39..aa9d0f91111b 100644 --- a/sys-process/cronie/cronie-1.6.1.ebuild +++ b/sys-process/cronie/cronie-1.7.1-r1.ebuild @@ -1,45 +1,42 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools cron flag-o-matic pam systemd +# 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/archive/${P}.tar.gz" +SRC_URI="https://github.com/cronie-crond/cronie/releases/download/${P}/${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" +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=" - acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) + selinux? ( sys-libs/libselinux ) " -RDEPEND="${DEPEND} +BDEPEND="acct-group/crontab" +RDEPEND=" + ${BDEPEND} + ${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}-envelope-revert.patch ) -src_prepare() { - default - eautoreconf -} - src_configure() { local myeconfargs=( $(use_with inotify) @@ -47,17 +44,16 @@ src_configure() { $(use_with selinux) $(use_enable anacron) --enable-syscrontab - # Required for correct pidfile location #835814 + # Required for correct pidfile location, bug #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 + 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[@]}" @@ -77,7 +73,7 @@ src_install() { newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny insinto /etc/cron.d - doins contrib/dailyjobs + doins contrib/{0hourly,dailyjobs} newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN} @@ -99,9 +95,6 @@ src_install() { insinto /etc/cron.hourly doins contrib/0anacron fperms 0750 /etc/cron.hourly/0anacron - - insinto /etc/cron.d - doins contrib/0hourly fi einstalldocs diff --git a/sys-process/cronie/cronie-1.5.7.ebuild b/sys-process/cronie/cronie-1.7.1.ebuild index e4bba82a5797..623981c18a36 100644 --- a/sys-process/cronie/cronie-1.5.7.ebuild +++ b/sys-process/cronie/cronie-1.7.1.ebuild @@ -1,45 +1,38 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools cron flag-o-matic pam systemd +# 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/archive/${P}.tar.gz" +SRC_URI="https://github.com/cronie-crond/cronie/releases/download/${P}/${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" +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=" - acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) + selinux? ( sys-libs/libselinux ) " -RDEPEND="${DEPEND} +BDEPEND="acct-group/crontab" +RDEPEND=" + ${BDEPEND} + ${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) @@ -47,15 +40,16 @@ src_configure() { $(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 ; then - if use elibc_musl ; then - append-cflags "-lobstack" - fi + 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[@]}" @@ -75,7 +69,7 @@ src_install() { newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny insinto /etc/cron.d - doins contrib/0hourly + doins contrib/{0hourly,dailyjobs} newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN} @@ -97,9 +91,6 @@ src_install() { insinto /etc/cron.hourly doins contrib/0anacron fperms 0750 /etc/cron.hourly/0anacron - else - insinto /etc/cron.d - doins contrib/dailyjobs fi einstalldocs diff --git a/sys-process/cronie/cronie-1.7.2.ebuild b/sys-process/cronie/cronie-1.7.2.ebuild new file mode 100644 index 000000000000..623981c18a36 --- /dev/null +++ b/sys-process/cronie/cronie-1.7.2.ebuild @@ -0,0 +1,107 @@ +# 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 +" + +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.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 - diff --git a/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch b/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch deleted file mode 100644 index 160c03116415..000000000000 --- a/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 62e53f1cdb9c1e12a01ee7814c92cd937d50328d Mon Sep 17 00:00:00 2001 -From: w30023233 <wangyuhang27@huawei.com> -Date: Wed, 23 Mar 2022 15:40:01 +0800 -Subject: [PATCH] Fix regression in handling 1-5 crontab entries - ---- - src/entry.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/entry.c b/src/entry.c -index e9e258b..bb7cb62 100644 ---- a/src/entry.c -+++ b/src/entry.c -@@ -595,6 +595,7 @@ get_range(bitstr_t * bits, int low, int high, const char *names[], - return (EOF); - - case R_RANGE: -+ unget_char(ch, file); - if (get_number(&num2, low, names, file) != EOF) { - state = R_RANGE_NUM2; - break; 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 + 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 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; |