From a0f0d2a90269b6864a785a4df8a6b459d1dbce5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Oct 2023 06:19:37 +0100 Subject: gentoo auto-resync : 14:10:2023 - 06:19:37 --- sys-process/cronie/Manifest | 3 +- sys-process/cronie/cronie-1.7.0-r1.ebuild | 111 +++++++++++++++++++++ sys-process/cronie/cronie-1.7.0.ebuild | 107 -------------------- .../files/cronie-1.7.0-optional-envionment.patch | 21 ++++ 4 files changed, 134 insertions(+), 108 deletions(-) create mode 100644 sys-process/cronie/cronie-1.7.0-r1.ebuild delete mode 100644 sys-process/cronie/cronie-1.7.0.ebuild create mode 100644 sys-process/cronie/files/cronie-1.7.0-optional-envionment.patch (limited to 'sys-process/cronie') diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest index 4767c596c392..bf71987d7d6b 100644 --- a/sys-process/cronie/Manifest +++ b/sys-process/cronie/Manifest @@ -2,9 +2,10 @@ AUX cronie-1.2-cron.deny 148 BLAKE2B 3da92c65667ccacd74e32443e1cd5623d8040a75d78 AUX cronie-1.3-initd 270 BLAKE2B c98021f1b71578aa0ad19ec9512a58301cb9bf472b5418a523a7bb4cad142af4576b4168b141418450d46a074486e7d6b994b4bab0595840a369982004aee0b1 SHA512 4769377ee15fd58a96a4cfe9e42ef4322b4796af417ec146c8e2d6f7dc3c8f5ca94c7b115b5b57e8fb1ff999739ed8f83a45b30a022655bb26fee459cbbd734c 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.7.0-optional-envionment.patch 825 BLAKE2B df9feb6fd53570adf78812d4403092ae974be733a25655d797bdf7f4bca592645c16cd51060fa363d204a859fdf7aa571e45c471305db847b292597b11b148a8 SHA512 43bfd8cc3560e9acee1deaf68a7182f2c101857374b46a03c2bdab2fc16d2957e0e770ef5291ccfbcebd0a78eae7cd869e491d5309e4d64ddd4dbdc7195d3cfe AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5 DIST cronie-1.6.1.tar.gz 149913 BLAKE2B 7b563b90f386a8df09398661e2b3ddc1f83d6c0d19290a02c0622be461e1d160218572adf132d634c60ef8fd0a4bb100e830b90e26270c28c75a69591ccc18a6 SHA512 1e095df9670ec25d6629f4cf2cacd82c6c1cb1487a859815a7881a1d130e4f18f9976396f773abae24dadc232166bb6467bbaeac1cb0254209fcadf3530d5e6f DIST cronie-1.7.0.tar.gz 271404 BLAKE2B 44745f68dba212da60f3013b10737be2390d8c76186dc641fa1930b1c7d103fa2e3127a63fe73571434683137044f7fda8cc31435c59092a14c0091a372ffead SHA512 a8e6688a164540e2cd3741c58813b6684c4c22a04806bcc8ba028a9ff72f986f165715ac3663bd34133af6566bdbd272a3e7be893f139e315aef35b2dbeb622f EBUILD cronie-1.6.1-r3.ebuild 2581 BLAKE2B 2d5038f76830f6e0aac5ef8fa76e3ad1107858c0033621776b9e679aa2754208f8e1aff5b59dd33a5edd9366b5a23c9ca010ae1bafcb2d87029669f8de4303e0 SHA512 61949d93df0da25e220025b28dc53866bd47c067cfa5d2c5fe749db00d41e0c8ab8086f639097f799f1dd16ad2b06a9506aa9e7790a94aa9df5c992fbe9c0cc9 -EBUILD cronie-1.7.0.ebuild 2465 BLAKE2B 25a1fd20d8aae2e8ea0ce5c36afcd8220c1b272ccfc8c282fc9dd20d93486cf4b3decd9d70643481a2b31266be0d111924bab9ae7d43ae59831c44209cda29b8 SHA512 5bf72574b6a2d3ebb7ecaf95b39c8618a2eff9c1a8058531e09049a11d36b86b8b9d47623b0b9053f110cdd7aa73b1567cf5012e1f886fa1e1890b4f2eb35e35 +EBUILD cronie-1.7.0-r1.ebuild 2524 BLAKE2B e5ee180808bbcd3fcaa674b3c998b4dde80b37b6647bec9e01df3c73a872b14b63ff9b5e58d7059f31e972ca529a510dd580756077ae8e6dbbb70f0bcf85d553 SHA512 b34b91fdbcb75bc651125bd4c7cd15b1560a29975ae51686bd2bf56ce89364ccad054c3cdb2235cd2e205fa735a109415da002f8ecef2587936defc9cf0781cd MISC metadata.xml 821 BLAKE2B cb3c9d002c660aea2d9ebff9c48f32ca42e2dfb74b42dbd814b3acdd4afa71a9f6bf28fcd6df44492246b64f52a0537e5c24238bfd813f5b66c274242d4bc63e SHA512 2016c15fc50cb8766a8e701853f56f2823ee730e6cb0df122ba74526d0c0fa6909a3ed945a3a405d2d1c35933c4b80b44a9158ced8d8e68372954a740413dfe5 diff --git a/sys-process/cronie/cronie-1.7.0-r1.ebuild b/sys-process/cronie/cronie-1.7.0-r1.ebuild new file mode 100644 index 000000000000..7df18878c8a5 --- /dev/null +++ b/sys-process/cronie/cronie-1.7.0-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2023 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}-optional-envionment.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/cronie-1.7.0.ebuild b/sys-process/cronie/cronie-1.7.0.ebuild deleted file mode 100644 index 8dfc21e17ea9..000000000000 --- a/sys-process/cronie/cronie-1.7.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2023 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.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 +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 -- cgit v1.2.3