commit: 1d2c97f4f820f566005e24ce0f10f4a5c464bc9d Author: Richard Freeman <rich0 <AT> gentoo <DOT> org> AuthorDate: Fri Dec 22 10:03:28 2023 +0000 Commit: Richard Freeman <rich0 <AT> gentoo <DOT> org> CommitDate: Fri Dec 22 10:04:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d2c97f4
sys-process/systemd-cron: drop 1.15.19-r1, 1.15.20, 2.1.3-r1 Signed-off-by: Richard Freeman <rich0 <AT> gentoo.org> sys-process/systemd-cron/Manifest | 3 - .../systemd-cron-1.15.19-default-mail-user.patch | 28 ------ .../systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch | 30 ------- .../systemd-cron/systemd-cron-1.15.19-r1.ebuild | 96 -------------------- .../systemd-cron/systemd-cron-1.15.20.ebuild | 93 ------------------- .../systemd-cron/systemd-cron-2.1.3-r1.ebuild | 100 --------------------- 6 files changed, 350 deletions(-) diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest index a7301a128266..8da4bc90b8c5 100644 --- a/sys-process/systemd-cron/Manifest +++ b/sys-process/systemd-cron/Manifest @@ -1,6 +1,3 @@ -DIST systemd-cron-1.15.19.tar.gz 33234 BLAKE2B d03c7024f9e4e569086e60908b07255e59259bc90182e34897746e1477e1b59da1934f239ef7c673e5df52c1831f07b2e759aeb7c514ba23dbbbeb780cb08a7b SHA512 90ddb3584550714a21e88a89e804511af434432b95398f325f547ee226499f8b73e153b9cdb611a11389baf434d12bc39414244b0e5e1d4565ceaac5db12b012 -DIST systemd-cron-1.15.20.tar.gz 33384 BLAKE2B 1e048009d19eb9e40a96ab7dee509975387f1634805c7c428065e720332d10665b6d5662a961304acf59cc688d99afc514500aa829fa2c71f296fc04503419fd SHA512 814a639bd3a06b1c4aa5dbc449c29812e94ad7ed27bff26618637e305bf03800527c1242eb5343cea89aa1345b203c709fbdcd251905009f19c254ab25244bcf DIST systemd-cron-1.16.7.tar.gz 37887 BLAKE2B a900058cef1cd02ac464d3ecdd43ce2f264bdba386f349ef82f0a915104302b1e88d94331d5fbaabe2c54f526900f3e1ac65ea6bdc2f27a6464e6d7514561a19 SHA512 d65d641fd449cdc0e91db3ae6ebe464bc4e24027c501b30a8ab17e7cc40de290cc6141bfb7880a724d97248861587e6f5fea113a6aa6e468d971aff3a13b056f -DIST systemd-cron-2.1.3.tar.gz 53796 BLAKE2B 438229f84e2ad815bf658d93dcd3afd49d382f2c9499b6273d8e94a1d1ecda28016327a2e21882c0ed27e7d9e5603d804d3b697f04bbd130cc11ee9bfa341c80 SHA512 e8fccfdbd52d8e24b77e93db8f5afe25007e43c5d67e50aa7eda70f8a1197ebae8d080a2e179e8cf694188ba4c0bd2795740ef021f6991ae80ece4408e3500f9 DIST systemd-cron-2.2.0.tar.gz 55825 BLAKE2B ca4b02fdea5084439aa56b3f04603000d811f21922c11cd26a22ea6387e4b54575587ff4e1eb7fc7a3260d2f656ea0eb91365942c135982f4bd26aead1a080f1 SHA512 f26c7d7e2da7eb5cd5558f352aff852585bfefd961de6ecc2409a4a53b63f82662a89bdbf71f739ea8e44ef9e3e1fdec15cdc63ce1e90c289fb0e636ff679ca0 DIST systemd-cron-2.3.0.tar.gz 56873 BLAKE2B 3efe8adc1b735ed5eb91c64d0936edceec50ff476d42ba5c1e9941c196a7bc8c777b0c293c8ed71894dae31c5b721a45a2876cab0143298e1b1ab3e82fcb7ceb SHA512 abb7c34d6901160395d64cfc4e5124887909b963bcfee027f64642b25bb138b3f085eb45595197a380faf39b7f5980e32c50d083be6307d7c985a55057962565 diff --git a/sys-process/systemd-cron/files/systemd-cron-1.15.19-default-mail-user.patch b/sys-process/systemd-cron/files/systemd-cron-1.15.19-default-mail-user.patch deleted file mode 100644 index 420f68d81091..000000000000 --- a/sys-process/systemd-cron/files/systemd-cron-1.15.19-default-mail-user.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 525410d5dc2a7c33590d25d6c574dec7eb826ec1 Mon Sep 17 00:00:00 2001 -From: Richard Freeman <[email protected]> -Date: Mon, 25 Jul 2022 15:36:21 -0400 -Subject: [PATCH] Fix default user fallback. - -Signed-off-by: Richard Freeman <[email protected]> ---- - src/bin/mail_on_failure.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/bin/mail_on_failure.py b/src/bin/mail_on_failure.py -index 132eab9..dd2288f 100755 ---- a/src/bin/mail_on_failure.py -+++ b/src/bin/mail_on_failure.py -@@ -26,7 +26,9 @@ user = subprocess.check_output( - ['systemctl', 'show', args.unit, '--property=User'], - universal_newlines=True) - user = user.rstrip('\n') --user = user.split('=')[1] if user else 'root' -+user = user.split('=')[1] -+if not user: -+ user = 'root' - - mailto = user - mailfrom = 'root' --- -2.35.1 - diff --git a/sys-process/systemd-cron/files/systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch b/sys-process/systemd-cron/files/systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch deleted file mode 100644 index 93d44a15c8f2..000000000000 --- a/sys-process/systemd-cron/files/systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch +++ /dev/null @@ -1,30 +0,0 @@ -From acd77f59d58d9ec812f64c833a5e029b9dbae92a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <[email protected]> -Date: Sun, 24 Sep 2023 01:27:09 +0200 -Subject: [PATCH] MAYBE_DUPA needs to work around helpful toolchains that make - string_view::operator[] actually be ::at() - -Closes: #134 ---- - src/include/libvoreutils.hpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/include/libvoreutils.hpp b/src/include/libvoreutils.hpp -index 02fad8e..eaa7adc 100644 ---- a/src/include/libvoreutils.hpp -+++ b/src/include/libvoreutils.hpp -@@ -361,10 +361,10 @@ namespace vore { - #endif - - --#define MAYBE_DUPA(strv) \ -- __extension__({ \ -- auto && _strv = strv; \ -- _strv[_strv.size()] ? strndupa(_strv.data(), _strv.size()) : _strv.data(); \ -+#define MAYBE_DUPA(strv) \ -+ __extension__({ \ -+ auto && _strv = strv; \ -+ _strv.data()[_strv.size()] ? strndupa(_strv.data(), _strv.size()) : _strv.data(); \ - }) - - diff --git a/sys-process/systemd-cron/systemd-cron-1.15.19-r1.ebuild b/sys-process/systemd-cron/systemd-cron-1.15.19-r1.ebuild deleted file mode 100644 index 4aead1dcad2f..000000000000 --- a/sys-process/systemd-cron/systemd-cron-1.15.19-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( pypy3 python3_{9..11} ) -inherit python-single-r1 systemd - -DESCRIPTION="systemd units to create timers for cron directories and crontab" -HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"; -SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" -IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid test yearly" -RESTRICT="!test? ( test )" - -RDEPEND=">=sys-apps/systemd-217 - sys-apps/debianutils - !sys-process/cronie[anacron] - !etc-crontab-systemd? ( !sys-process/dcron ) - ${PYTHON_DEPS} - sys-process/cronbase - acct-user/_cron-failure - acct-group/_cron-failure" - -DEPEND="sys-process/cronbase - test? ( sys-apps/man-db dev-python/pyflakes )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( "${FILESDIR}/${P}-default-mail-user.patch" ) - -src_prepare() { - python_fix_shebang --force "${S}/src/bin" - - sed -i \ - -e 's/^crontab/crontab-systemd/' \ - -e 's/^CRONTAB/CRONTAB-SYSTEMD/' \ - -- "${S}/src/man/crontab."{1,5}".in" || die - - sed -i \ - -e 's!/crontab$!/crontab-systemd!' \ - -e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \ - -e 's/pyflakes3/pyflakes/' \ - -- "${S}/Makefile.in" || die - - if use etc-crontab-systemd - then sed -i \ - -e "s!/etc/crontab!/etc/crontab-systemd!" \ - -- "${S}/src/man/crontab."{1,5}".in" \ - "${S}/src/bin/systemd-crontab-generator.py" || die - fi - - eapply "${PATCHES[@]}" - eapply_user -} - -my_use_enable() { - if use ${1}; then - echo --enable-${2:-${1}}=yes - else - echo --enable-${2:-${1}}=no - fi -} - -src_configure() { - ./configure \ - --prefix="${EPREFIX}/usr" \ - --confdir="${EPREFIX}/etc" \ - --runparts="${EPREFIX}/bin/run-parts" \ - --mandir="${EPREFIX}/usr/share/man" \ - --unitdir="$(systemd_get_systemunitdir)" \ - --generatordir="$(systemd_get_systemgeneratordir)" \ - $(my_use_enable cron-boot boot) \ - $(my_use_enable minutely) \ - $(my_use_enable runparts) \ - $(my_use_enable yearly) \ - $(my_use_enable yearly quarterly) \ - $(my_use_enable yearly semi_annually) \ - $(my_use_enable setgid) \ - --enable-persistent=yes -} - -src_install() { - default - rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf -} - -pkg_postinst() { - elog "This package now supports USE=runparts which is enabled by default." - elog "This enables the traditional run-parts behavior." - elog "If you disable this flag you will get the new behavior of having" - elog "multiple jobs for each cron.* entry run in parallel with" - elog "separate services/logs/etc." -} diff --git a/sys-process/systemd-cron/systemd-cron-1.15.20.ebuild b/sys-process/systemd-cron/systemd-cron-1.15.20.ebuild deleted file mode 100644 index 87efa58e4e82..000000000000 --- a/sys-process/systemd-cron/systemd-cron-1.15.20.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( pypy3 python3_{9..11} ) -inherit python-single-r1 systemd - -DESCRIPTION="systemd units to create timers for cron directories and crontab" -HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"; -SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" -IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid test yearly" -RESTRICT="!test? ( test )" - -RDEPEND=">=sys-apps/systemd-217 - sys-apps/debianutils - !sys-process/cronie[anacron] - !etc-crontab-systemd? ( !sys-process/dcron ) - ${PYTHON_DEPS} - sys-process/cronbase - acct-user/_cron-failure - acct-group/_cron-failure" - -DEPEND="sys-process/cronbase - test? ( sys-apps/man-db dev-python/pyflakes )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_prepare() { - python_fix_shebang --force "${S}/src/bin" - - sed -i \ - -e 's/^crontab/crontab-systemd/' \ - -e 's/^CRONTAB/CRONTAB-SYSTEMD/' \ - -- "${S}/src/man/crontab."{1,5}".in" || die - - sed -i \ - -e 's!/crontab$!/crontab-systemd!' \ - -e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \ - -e 's/pyflakes3/pyflakes/' \ - -- "${S}/Makefile.in" || die - - if use etc-crontab-systemd - then sed -i \ - -e "s!/etc/crontab!/etc/crontab-systemd!" \ - -- "${S}/src/man/crontab."{1,5}".in" \ - "${S}/src/bin/systemd-crontab-generator.py" || die - fi - - eapply_user -} - -my_use_enable() { - if use ${1}; then - echo --enable-${2:-${1}}=yes - else - echo --enable-${2:-${1}}=no - fi -} - -src_configure() { - ./configure \ - --prefix="${EPREFIX}/usr" \ - --confdir="${EPREFIX}/etc" \ - --runparts="${EPREFIX}/bin/run-parts" \ - --mandir="${EPREFIX}/usr/share/man" \ - --unitdir="$(systemd_get_systemunitdir)" \ - --generatordir="$(systemd_get_systemgeneratordir)" \ - $(my_use_enable cron-boot boot) \ - $(my_use_enable minutely) \ - $(my_use_enable runparts) \ - $(my_use_enable yearly) \ - $(my_use_enable yearly quarterly) \ - $(my_use_enable yearly semi_annually) \ - $(my_use_enable setgid) \ - --enable-persistent=yes -} - -src_install() { - default - rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf -} - -pkg_postinst() { - elog "This package now supports USE=runparts which is enabled by default." - elog "This enables the traditional run-parts behavior." - elog "If you disable this flag you will get the new behavior of having" - elog "multiple jobs for each cron.* entry run in parallel with" - elog "separate services/logs/etc." -} diff --git a/sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild b/sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild deleted file mode 100644 index 892d8b5f3d04..000000000000 --- a/sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit systemd toolchain-funcs - -DESCRIPTION="systemd units to create timers for cron directories and crontab" -HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"; -SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid test yearly" -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=">=sys-apps/systemd-253 - dev-libs/openssl - runparts? ( sys-apps/debianutils ) - !sys-process/cronie[anacron] - !etc-crontab-systemd? ( !sys-process/dcron ) - sys-process/cronbase - acct-user/_cron-failure - acct-group/_cron-failure" - -DEPEND="sys-process/cronbase - test? ( sys-apps/man-db || ( dev-util/shellcheck dev-util/shellcheck-bin ) )" - -pkg_pretend() { - if use runparts && ! [ -x /usr/bin/run-parts ] ; then - eerror "Please complete the migration to merged-usr." - eerror "https://wiki.gentoo.org/wiki/Merge-usr"; - die "systemd-cron no longer supports split-usr" - fi -} - -src_prepare() { - sed -i \ - -e 's/^crontab/crontab-systemd/' \ - -e 's/^CRONTAB/CRONTAB-SYSTEMD/' \ - -- "${S}/src/man/crontab."{1,5}".in" || die - - if use etc-crontab-systemd - then sed -i \ - -e "s!/etc/crontab!/etc/crontab-systemd!" \ - -- "${S}/src/man/crontab."{1,5}".in" \ - "${S}/src/bin/systemd-crontab-generator.cpp" \ - "${S}/test/test-generator" || die - fi - - # https://github.com/systemd-cron/systemd-cron/issues/134 - # https://github.com/systemd-cron/systemd-cron/commit/acd77f59d58d9ec812f64c833a5e029b9dbae92a - eapply "${FILESDIR}/${P}-MAYBE_DUPA_SIGABRT.patch" - eapply_user -} - -my_use_enable() { - if use ${1}; then - echo --enable-${2:-${1}}=yes - else - echo --enable-${2:-${1}}=no - fi -} - -src_configure() { - tc-export PKG_CONFIG CXX CC - - ./configure \ - --prefix="${EPREFIX}/usr" \ - --mandir="${EPREFIX}/usr/share/man" \ - --unitdir="$(systemd_get_systemunitdir)" \ - --generatordir="$(systemd_get_systemgeneratordir)" \ - $(my_use_enable cron-boot boot) \ - $(my_use_enable minutely) \ - $(my_use_enable runparts) \ - $(my_use_enable yearly) \ - $(my_use_enable yearly quarterly) \ - $(my_use_enable yearly semi_annually) || die - - export CRONTAB=crontab-systemd -} - -src_install() { - default - rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf -} - -src_test() { - emake test-nounshare -} - -pkg_postinst() { - elog "This package now supports USE=runparts which is enabled by default." - elog "This enables the traditional run-parts behavior." - elog "If you disable this flag you will get the new behavior of having" - elog "multiple jobs for each cron.* entry run in parallel with" - elog "separate services/logs/etc." -}
