* [gentoo-commits] repo/gentoo:master commit in: sys-process/systemd-cron/, sys-process/systemd-cron/files/
@ 2020-07-17 21:19 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-07-17 21:19 UTC (permalink / raw
To: gentoo-commits
commit: a5ddc21c484ac8a4e5515e853cc6fe5b28dd7e76
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 20:40:55 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 21:19:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ddc21c
sys-process/systemd-cron: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-process/systemd-cron/Manifest | 1 -
.../systemd-cron/files/1.5.12-generatordir.patch | 67 -------------------
.../systemd-cron/systemd-cron-1.5.12-r1.ebuild | 78 ----------------------
3 files changed, 146 deletions(-)
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index 054d8089a53..b8b1e37e82c 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -1,2 +1 @@
-DIST systemd-cron-1.5.12.tar.gz 31417 BLAKE2B d0776d2c4aa2d86289dd8ab5dade47f083ee7abc16f54c9527130f587049064d6100eaccd4a3a0a461d21ac8286910d3cb0590db14ea1d3a32e591b7ede0a59e SHA512 6f85cef0870cde5ff6b397fb640a30a8a567e09e3cac48456498f1f102395f12f174731ca9cc8e826bb6c49a0d3a6dd49a9aec63e7b75648b7dccfaa499dcea4
DIST systemd-cron-1.5.14.tar.gz 31634 BLAKE2B 59394128145dbd04a2b1bb10a6ac8821a97a465e3c0d43f3ca8fdfe60db273352d46b1200c966adaf772272835269c5c553b040cb0e0340ec56340181c9b7245 SHA512 772a4f8181a0f8039a8138fdc43bfe0f2bd89222fe19fa971727be265036f86435334d6230e116440f6969425fc6d59dc26e9cf230c00d030ea5d62ba351713c
diff --git a/sys-process/systemd-cron/files/1.5.12-generatordir.patch b/sys-process/systemd-cron/files/1.5.12-generatordir.patch
deleted file mode 100644
index 71c0abd4d80..00000000000
--- a/sys-process/systemd-cron/files/1.5.12-generatordir.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From e9c1dcd5e1a475a1974f0a6464637c4ab731bfae Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 13 Jan 2018 11:42:05 -0500
-Subject: [PATCH] Replace remaining references to
- @libdir@/systemd/system-generators
-
----
- Makefile.in | 1 +
- src/bin/crontab.py | 2 +-
- src/man/systemd-crontab-generator.8.in | 6 +++---
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index b9a9b02..e5a2df8 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -60,6 +60,7 @@ define in2out
- -e "s|\@bindir\@|$(bindir)|g" \
- -e "s|\@libdir\@|$(libdir)|g" \
- -e "s|\@unitdir\@|$(unitdir)|g" \
-+ -e "s|\@generatordir\@|$(generatordir)|g" \
- -e "s|\@runparts\@|$(runparts)|g" \
- -e "s|\@version\@|$(version)|g" \
- -e "s|\@persistent\@|$(persistent)|g" \
-diff --git a/src/bin/crontab.py b/src/bin/crontab.py
-index d95b31e..921db1a 100755
---- a/src/bin/crontab.py
-+++ b/src/bin/crontab.py
-@@ -333,7 +333,7 @@ if __name__ == '__main__':
- 'show': show,
- }.get(args.action, replace)
-
-- loader = importlib.machinery.SourceFileLoader('name', '@libdir@/systemd/system-generators/systemd-crontab-generator')
-+ loader = importlib.machinery.SourceFileLoader('name', '@generatordir@/systemd-crontab-generator')
- parser = loader.load_module()
-
- action(cron_file, args)
-diff --git a/src/man/systemd-crontab-generator.8.in b/src/man/systemd-crontab-generator.8.in
-index ea69688..dedf1d2 100644
---- a/src/man/systemd-crontab-generator.8.in
-+++ b/src/man/systemd-crontab-generator.8.in
-@@ -4,7 +4,7 @@
- systemd-crontab-generator - translate cron schedules in systemd Units
-
- .SH SYNOPSIS
--@libdir@/systemd/system-generators/systemd-crontab-generator output_folder
-+@generatordir@/systemd-crontab-generator output_folder
-
- .SH DESCRIPTION
- systemd-crontab-generator is a generator that translates the legacy cron files (see FILES)
-@@ -77,11 +77,11 @@ to have a overview of timers and know when they will elapse.
-
- If you get errors like
- .br
--.B @libdir@/systemd/system-generators/systemd-crontab-generator failed with error code 1.
-+.B @generatordir@/systemd-crontab-generator failed with error code 1.
- .br
- in the journal, you can manually run
- .br
--.B "@libdir@/systemd/system-generators/systemd-crontab-generator /tmp"
-+.B "@generatordir@/systemd-crontab-generator /tmp"
- .br
- to get a more verbose error message.
-
---
-2.16.0.rc0
-
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
deleted file mode 100644
index b16de1a1a9a..00000000000
--- a/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( pypy3 python3_6 )
-inherit eutils 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 sparc x86"
-IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sys-apps/systemd-217
- sys-apps/debianutils
- !etc-crontab-systemd? ( !sys-process/dcron )
- ${PYTHON_DEPS}
- sys-process/cronbase"
-
-DEPEND="sys-process/cronbase
- test? ( sys-apps/man-db dev-python/pyflakes )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
- epatch "${FILESDIR}/1.5.12-generatordir.patch"
-
- 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
-
- epatch_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_unitdir)" \
- --generatordir="$(systemd_get_systemgeneratordir)" \
- $(my_use_enable cron-boot boot) \
- $(my_use_enable minutely) \
- $(my_use_enable yearly) \
- $(my_use_enable yearly quarterly) \
- $(my_use_enable yearly semi_annually) \
- $(my_use_enable setgid) \
- --enable-persistent=yes
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/systemd-cron/, sys-process/systemd-cron/files/
@ 2023-09-24 0:18 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2023-09-24 0:18 UTC (permalink / raw
To: gentoo-commits
commit: 003194957fafdd2832863e8bd445085189e2a743
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 00:16:25 2023 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 00:17:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00319495
sys-process/systemd-cron: revbump 2.1.3, fix SIGABRT with cxx assertions
Happens on hardened toolchain systems.
Issue: https://github.com/systemd-cron/systemd-cron/issues/134
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
.../systemd-cron-2.1.3-MAYBE_DUPA_SIGABRT.patch | 30 ++++++++++++++++++++++
...n-2.1.3.ebuild => systemd-cron-2.1.3-r1.ebuild} | 3 +++
2 files changed, 33 insertions(+)
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?= <nabijaczleweli@nabijaczleweli.xyz>
+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.ebuild b/sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild
similarity index 92%
rename from sys-process/systemd-cron/systemd-cron-2.1.3.ebuild
rename to sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild
index 752240ab8359..892d8b5f3d04 100644
--- a/sys-process/systemd-cron/systemd-cron-2.1.3.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-2.1.3-r1.ebuild
@@ -50,6 +50,9 @@ src_prepare() {
"${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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/systemd-cron/, sys-process/systemd-cron/files/
@ 2023-12-22 10:04 Richard Freeman
0 siblings, 0 replies; 4+ messages in thread
From: Richard Freeman @ 2023-12-22 10:04 UTC (permalink / raw
To: gentoo-commits
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 <rich0@gentoo.org>
-Date: Mon, 25 Jul 2022 15:36:21 -0400
-Subject: [PATCH] Fix default user fallback.
-
-Signed-off-by: Richard Freeman <rich0@gentoo.org>
----
- 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?= <nabijaczleweli@nabijaczleweli.xyz>
-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."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/systemd-cron/, sys-process/systemd-cron/files/
@ 2024-01-14 17:15 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-01-14 17:15 UTC (permalink / raw
To: gentoo-commits
commit: d77f5a3f40122879f39a97420f170fca226e6e58
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 17:10:48 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 17:15:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77f5a3f
sys-process/systemd-cron: disable PCH
By policy in Gentoo, we don't do PCH as it's too brittle.
Closes: https://bugs.gentoo.org/917646
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/systemd-cron-2.3.0-pch.patch | 46 ++++++++++
.../systemd-cron/systemd-cron-2.3.0-r2.ebuild | 100 +++++++++++++++++++++
2 files changed, 146 insertions(+)
diff --git a/sys-process/systemd-cron/files/systemd-cron-2.3.0-pch.patch b/sys-process/systemd-cron/files/systemd-cron-2.3.0-pch.patch
new file mode 100644
index 000000000000..e27f253a62ca
--- /dev/null
+++ b/sys-process/systemd-cron/files/systemd-cron-2.3.0-pch.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/917646
+https://github.com/systemd-cron/systemd-cron/issues/141
+https://github.com/systemd-cron/systemd-cron/commit/1662b899b206f00face30b9d4671551427262b07
+
+From 1662b899b206f00face30b9d4671551427262b07 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
+Date: Tue, 21 Nov 2023 19:40:05 +0100
+Subject: [PATCH] Add PCH= for broken compilers like #141
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,6 +1,7 @@
+ CFLAGS ?= -O2
+ SHELLCHECK ?= shellcheck
+ CRONTAB ?= crontab
++PCH ?= y
+
+ version := @version@
+ schedules := @schedules@
+@@ -208,12 +209,12 @@ $(builddir)/include/%.hpp: $(srcdir)/include/%.hpp
+ CXXVER := $(shell $(CXX) --version | { read -r l; echo "$$l"; })
+ ifneq "$(findstring clang,$(CXXVER))" ""
+ # clang doesn't use PCHs automatically
+- PCH_ARG := -include-pch $(builddir)/include/libvoreutils.hpp.gch -Wno-gcc-compat
++ PCH_ARG := $(if $(PCH),-include-pch $(builddir)/include/libvoreutils.hpp.gch) -Wno-gcc-compat
+ else
+ PCH_ARG :=
+ endif
+
+-common_headers := $(builddir)/include/configuration.hpp $(builddir)/include/libvoreutils.hpp.gch $(builddir)/include/util.hpp
++common_headers := $(builddir)/include/configuration.hpp $(builddir)/include/libvoreutils.hpp$(if $(PCH),.gch) $(builddir)/include/util.hpp
+ CFLAGS += -Wall -Wextra -fno-exceptions -Wno-psabi
+ $(builddir)/include/libvoreutils.hpp.gch : $(builddir)/include/libvoreutils.hpp
+ $(CXX) $(CFLAGS) $(CPPFLAGS) -std=c++20 -I $(builddir)/include $< -o $@
+--- a/README.md
++++ b/README.md
+@@ -146,6 +146,8 @@ without the override, the jobs would run twice since native-timer detection woul
+ If there is already a perfect 1:1 mapping between `/etc/cron.<freq>/<job>` and `/usr/lib/systemd/system/<job>.timer`,
+ then it is not needed to add an entry to these tables.
+
++If your compiler's [PCH compilation is broken](https://github.com/systemd-cron/systemd-cron/issues/141), build with `make PCH=`.
++
+ ### Caveat
+
+ Your package should also run these extra commands before starting cron.target
+
diff --git a/sys-process/systemd-cron/systemd-cron-2.3.0-r2.ebuild b/sys-process/systemd-cron/systemd-cron-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..f6651f53f31a
--- /dev/null
+++ b/sys-process/systemd-cron/systemd-cron-2.3.0-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 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 yearly"
+RESTRICT="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"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.0-pch.patch
+)
+
+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
+
+ default
+}
+
+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_compile() {
+ emake PCH=
+}
+
+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."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-14 17:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-17 21:19 [gentoo-commits] repo/gentoo:master commit in: sys-process/systemd-cron/, sys-process/systemd-cron/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2023-09-24 0:18 Georgy Yakovlev
2023-12-22 10:04 Richard Freeman
2024-01-14 17:15 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox