From d725480af7cbc67d784e5d96f973fa41e9030123 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2024 14:07:55 +0000 Subject: gentoo auto-resync : 19:01:2024 - 14:07:55 --- sys-process/cronie/Manifest | 2 + sys-process/cronie/cronie-1.7.1-r1.ebuild | 111 +++++++++++++++++++++ .../files/cronie-1.7.1-envelope-revert.patch | 59 +++++++++++ 3 files changed, 172 insertions(+) create mode 100644 sys-process/cronie/cronie-1.7.1-r1.ebuild create mode 100644 sys-process/cronie/files/cronie-1.7.1-envelope-revert.patch (limited to 'sys-process/cronie') diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest index 87fce13ceec9..46b80367184b 100644 --- a/sys-process/cronie/Manifest +++ b/sys-process/cronie/Manifest @@ -3,9 +3,11 @@ AUX cronie-1.3-initd 270 BLAKE2B c98021f1b71578aa0ad19ec9512a58301cb9bf472b5418a AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff08a0f43d2d686d5c82eb9101455bc3191417323286a483e68795ec3a376c73b216ac4ea6d77fbaf2bf SHA512 32268d8b097e60eb039c023647ecd651b6940a8fe1587111ce0d49314bbb2de451214f98b7b703fd284e231c10bc4e616d4d0c63c107d9cdbc2bb470a17f2c3a AUX cronie-1.7.0-optional-default-anacron.patch 610 BLAKE2B 249c8452b9a5cdc7ab0d70cfd642fa495dc29822ee89ce442ddc6fc83850e5620e2bc8405bd010fe0cedb4c20fada97bc725183ac4e71f21f918e9e7404353dc SHA512 0ae0a8c7317b1412a3848ca7099e6235476958e9baf6efb698a2e9ed4e283175be1e39def2d01302f790bb62c308c15d263a5d7b46f12657f8e1dcc2dfafb4b5 AUX cronie-1.7.0-optional-envionment.patch 825 BLAKE2B df9feb6fd53570adf78812d4403092ae974be733a25655d797bdf7f4bca592645c16cd51060fa363d204a859fdf7aa571e45c471305db847b292597b11b148a8 SHA512 43bfd8cc3560e9acee1deaf68a7182f2c101857374b46a03c2bdab2fc16d2957e0e770ef5291ccfbcebd0a78eae7cd869e491d5309e4d64ddd4dbdc7195d3cfe +AUX cronie-1.7.1-envelope-revert.patch 2169 BLAKE2B 70090c54a070e35b548ec58258d607c2d836a1cc3fd1c21ca472c65c46c54a2691d3333a2a8f22ff8126f1301fd1c7ec01e66d0cb3fd762fe29eadf5d3cead71 SHA512 1d363345c21d44a13baf8d3b85b36ff8e79d2a3351386a18cc5fba98c4d6bd2ae402292ab808bf994d502d2c0a8a8a3508721224cde4d8b3a4f97597d3737498 AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5 DIST cronie-1.7.0.tar.gz 271404 BLAKE2B 44745f68dba212da60f3013b10737be2390d8c76186dc641fa1930b1c7d103fa2e3127a63fe73571434683137044f7fda8cc31435c59092a14c0091a372ffead SHA512 a8e6688a164540e2cd3741c58813b6684c4c22a04806bcc8ba028a9ff72f986f165715ac3663bd34133af6566bdbd272a3e7be893f139e315aef35b2dbeb622f DIST cronie-1.7.1.tar.gz 271985 BLAKE2B 9cbf22fe9c86f265e625563fc5426f39f79ac9c9cfa090ba47957c14391ed3b8ac202b244fed35ea043bed428b4c97a71ad400719a265bd95f5ac28bf3dc9b3a SHA512 4479f6f05ca9da3ecefa0e9b73662f1db58ffff309916de9f92f89c5e7f93f1c5c744f18cb3e1a3df9664d533afe7dad710f97484e72a314c87d84f57a6c56fb EBUILD cronie-1.7.0-r2.ebuild 2568 BLAKE2B fa713ec97b38bc019bf3bacf553542944ba237482b942621da644bd1389409cacaec1fbd559acd3be510aa8d0fe42371a3159d0568e6340df17145baf1a71e95 SHA512 d71a57fd6601691b73254b937236b6a71ed51329bcc28d7b4ca8f2c4123e1640b6156e55c86d6919c371cb1259ca985d7fb477f418dfe15fd484c483b0d1167a +EBUILD cronie-1.7.1-r1.ebuild 2516 BLAKE2B 2dbac2c9973413cdc855846333f7e7a69367e1a1dee8330473c98cf1e3fa0903437823181db68a0911382e448459e021db1da65ae281102c7b7b8caa85568ca5 SHA512 049523d9537d826f6d6a9ed0ad8dce557f753fa98e44169256bcc2a28648ce3dfac927e392832a2ed505bce81e22e36ae2a6d362f4387a952bd89f783899f1dc EBUILD cronie-1.7.1.ebuild 2466 BLAKE2B abea16c95c4f53b57d08dab4f58ac0069c14af756fb6d46e93473f4abc3dfb9ffc0df2300676f50108b5e26157b293462aaaad694c2b5126ae518cf6826fa4c5 SHA512 eb97d02eae37aec1973f5da88f1507ec7231741a133d73ee86c67b0774193fd04574d81bd51560168ea2ad7112cc8ca839b8f4d20dabd41316b505bd149cb24f MISC metadata.xml 821 BLAKE2B cb3c9d002c660aea2d9ebff9c48f32ca42e2dfb74b42dbd814b3acdd4afa71a9f6bf28fcd6df44492246b64f52a0537e5c24238bfd813f5b66c274242d4bc63e SHA512 2016c15fc50cb8766a8e701853f56f2823ee730e6cb0df122ba74526d0c0fa6909a3ed945a3a405d2d1c35933c4b80b44a9158ced8d8e68372954a740413dfe5 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..4db79d75ef5d --- /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 +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 +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; -- cgit v1.2.3