From fcf991edcc1b310199e4e829a3706bc1c267d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Sep 2023 05:21:45 +0100 Subject: gentoo auto-resync : 24:09:2023 - 05:21:45 --- sys-process/Manifest.gz | Bin 10159 -> 10158 bytes sys-process/systemd-cron/Manifest | 3 +- .../systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch | 30 +++++++ .../systemd-cron/systemd-cron-2.1.3-r1.ebuild | 100 +++++++++++++++++++++ sys-process/systemd-cron/systemd-cron-2.1.3.ebuild | 97 -------------------- 5 files changed, 132 insertions(+), 98 deletions(-) create mode 100644 sys-process/systemd-cron/files/systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch create mode 100644 sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild delete mode 100644 sys-process/systemd-cron/systemd-cron-2.1.3.ebuild (limited to 'sys-process') diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz index cbecbd1a0b22..42b19a39d10f 100644 Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest index c81e7e46d293..29e9cb6338cc 100644 --- a/sys-process/systemd-cron/Manifest +++ b/sys-process/systemd-cron/Manifest @@ -1,4 +1,5 @@ AUX systemd-cron-1.15.19-default-mail-user.patch 853 BLAKE2B a6ba1e178995e92dfe9fbc4dfbfdae3a4f5545c97c4da9a0e66976953049ab789fbad57e8b8ce989bff2b1b64f422923b3078eafe68bab506223288462652798 SHA512 7c72ba576249eee46fa29a464059ce345729ae158a5bf5fe08bc04062b321a8dfaaa1bd383c1295382ceca8122c47283685add5027f19bdadfc82b3e1c1faeb5 +AUX systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch 1322 BLAKE2B 300327c853b61052250ec76d6f6973c676f8f5cc7dab3edebbad3af0737a191d0fa8697a33171894af6013f8f6b97521caa04bf8982ecbaedbb7127d9201eeb3 SHA512 ff9c1a4599899cabc8f5afb006a2f7188cdde225b887200520d363c9e139de558539581316cb2afecb5b853c89804571c743f7b1904f74fec0e871ee358dae3e 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 @@ -6,5 +7,5 @@ DIST systemd-cron-2.1.3.tar.gz 53796 BLAKE2B 438229f84e2ad815bf658d93dcd3afd49d3 EBUILD systemd-cron-1.15.19-r1.ebuild 2646 BLAKE2B e42edaa6de87527bdc3e25db680a8d1e236e36e56f755cc27407fe1ca5fdf9040db15c904d6971c50a2219129988c5c1c20c719c3b714ed4969d79d19a4b365c SHA512 c07aa1c2059f2709ae6e10de145714565848a2ff7f75adaa365c00ea90c5105ebaaf5d66aced16f6b267273c5e5e2b95aade1a07d3bacc3d049d0f235309d546 EBUILD systemd-cron-1.15.20.ebuild 2566 BLAKE2B 80dbeb713766dba8ef75d4765beed90a78c48913754b8710c1e1a174cfce7a70b39b2bf1baf71115fd81dba86693a914e85a23809781396f285443f40be11b8c SHA512 1b929cf3912280aa354e013a6dbd080664459f638c945e3bcc1e358c3ffa0cf2cd09b4a113c6911573b1bc2e04b2f2be682b63d3e04ef05febf86e81019bf961 EBUILD systemd-cron-1.16.7-r1.ebuild 2618 BLAKE2B 3f1c10ea49fdf96584a327e3c647fff1408fdddecb81c97e4387e52d10a86459c557f926687c32d66fbdab3f12e3fe9e9b36c9fc2802739e7c9219fd99461179 SHA512 38beb5ce0f1f8046513cda4346b2996138b541c4d41f4eef33ce7b7aa89fb2360b194a4b15607f36e5b257f75b5398e147e77cbfd670a096df19874bce42991d -EBUILD systemd-cron-2.1.3.ebuild 2612 BLAKE2B 8422516417790c0e41e8c030a2712296c095bb5fa6725c9ac37b3262d1b5d050b2daaf9ead3ea4452baac317df7c86a818348268349a0f37ce4143c20699bdce SHA512 185a716ec643467f9dd1ca42d37751ba59d53942567531a1b35876da6d4eec5318a383a4699eda71cb69f61bf0d6f0a44ef17b65fda9dfce3931313871a1f6e8 +EBUILD systemd-cron-2.1.3-r1.ebuild 2819 BLAKE2B 4f3e3130660f9153f493f064ead6f52b46bb9ee5448bab9ea51827353fd2554b75f40660687d0cd044aabdf957c6058215ab0c64e681c8fffc5160753f3e9f57 SHA512 4413d4c79c36257d5d11952fc1de138c055c20a250f5ca76540652a084273e0d2399aa50614e1b4a2af5945869dda6a011062d611e08612a3d90fe47a9daf80e MISC metadata.xml 801 BLAKE2B 8ac1580d5dae701d11c893bc7d9990b8a0c023c148b9fb7a945ba7f12429dd4a2abc78331f659831fa26b5f5c570919156848c3ebcd4df7ea050fdc50272f43c SHA512 1c7e77f04d294fc51de86b07f63c9163468dcb321d14c8447c61a4a0a7f99efc438d6ae1ffe315cf148377c2ac5e038afcc93f68516b11ca5eb066f8b186bcef 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 new file mode 100644 index 000000000000..93d44a15c8f2 --- /dev/null +++ b/sys-process/systemd-cron/files/systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch @@ -0,0 +1,30 @@ +From acd77f59d58d9ec812f64c833a5e029b9dbae92a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= +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-2.1.3-r1.ebuild b/sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild new file mode 100644 index 000000000000..892d8b5f3d04 --- /dev/null +++ b/sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild @@ -0,0 +1,100 @@ +# 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." +} diff --git a/sys-process/systemd-cron/systemd-cron-2.1.3.ebuild b/sys-process/systemd-cron/systemd-cron-2.1.3.ebuild deleted file mode 100644 index 752240ab8359..000000000000 --- a/sys-process/systemd-cron/systemd-cron-2.1.3.ebuild +++ /dev/null @@ -1,97 +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 - - 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." -} -- cgit v1.2.3