Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/cronie/, sys-process/cronie/files/
Date: Thu, 06 Jun 2019 10:07:34
Message-Id: 1559815642.1d6c8257d37ccf5d32d3b061dfd33bcb7b1f74c1.polynomial-c@gentoo
1 commit: 1d6c8257d37ccf5d32d3b061dfd33bcb7b1f74c1
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 6 10:06:55 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 6 10:07:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6c8257
7
8 sys-process/cronie: Security cleanup
9
10 Bug: https://bugs.gentoo.org/685848
11 Package-Manager: Portage-2.3.67, Repoman-2.3.14
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 sys-process/cronie/Manifest | 1 -
15 sys-process/cronie/cronie-1.5.2.ebuild | 109 ---------------------
16 .../cronie/files/cronie-1.5.2-systemd.patch | 30 ------
17 3 files changed, 140 deletions(-)
18
19 diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
20 index 67b6243c32d..caf878723a8 100644
21 --- a/sys-process/cronie/Manifest
22 +++ b/sys-process/cronie/Manifest
23 @@ -1,2 +1 @@
24 -DIST cronie-1.5.2.tar.gz 121604 BLAKE2B 4225439fd13a32bba3bd24f25d7dd405cdb123e666ebbf14574143af9d161867f82ea3fc479d81a884590faaa9c42e19c971285e01a19d6ac793b7deb7fc4775 SHA512 6455e234becc44e6568fa25fd72abfaa293cb0bc2d2f1d124e551c068ba01083192b21e82e941158c8c1f41cb6dad3851d665b9f3baa82fd49080f3f8619740b
25 DIST cronie-1.5.4.tar.gz 122452 BLAKE2B 042961390807c22aa1db3ab592470538d9a348d33fee8f088dfa20e45ee72c72d9502bf5eb5a957494c55d99a6705b94774442f5a2fb06eeab1aa0b0e1a4d6ae SHA512 40a8cd750bc18dcb264e88cf049b0ea66f053b7b6cc10f38fd4f4e6b912871f41ce7ad126521a08203e81c00846e001016b47da3c5e8730a7b49fc970d7b2a6a
26
27 diff --git a/sys-process/cronie/cronie-1.5.2.ebuild b/sys-process/cronie/cronie-1.5.2.ebuild
28 deleted file mode 100644
29 index f0233d3f4e6..00000000000
30 --- a/sys-process/cronie/cronie-1.5.2.ebuild
31 +++ /dev/null
32 @@ -1,109 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit autotools cron flag-o-matic pam systemd user
39 -
40 -DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
41 -HOMEPAGE="https://github.com/cronie-crond/cronie"
42 -SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
43 -
44 -LICENSE="ISC BSD BSD-2 GPL-2"
45 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
46 -IUSE="+anacron +inotify pam selinux"
47 -
48 -DEPEND="pam? ( virtual/pam )
49 - anacron? ( !sys-process/anacron
50 - elibc_musl? ( sys-libs/obstack-standalone )
51 - )"
52 -RDEPEND="${DEPEND}
53 - sys-apps/debianutils"
54 -
55 -#cronie supports /etc/crontab
56 -CRON_SYSTEM_CRONTAB="yes"
57 -
58 -S="${WORKDIR}/${PN}-${P}"
59 -
60 -PATCHES=(
61 - "${FILESDIR}/${PN}-1.5.2-systemd.patch"
62 -)
63 -
64 -pkg_setup() {
65 - enewgroup crontab
66 -}
67 -
68 -src_prepare() {
69 - default
70 - eautoreconf
71 -}
72 -
73 -src_configure() {
74 - local myeconfargs=(
75 - $(use_with inotify)
76 - $(use_with pam)
77 - $(use_with selinux)
78 - $(use_enable anacron)
79 - --enable-syscrontab
80 - --with-daemon_username=cron
81 - --with-daemon_groupname=cron
82 - )
83 -
84 - if use anacron; then
85 - use elibc_musl && append-cflags "-lobstack"
86 - fi
87 - SPOOL_DIR="/var/spool/cron/crontabs" \
88 - ANACRON_SPOOL_DIR="/var/spool/anacron" \
89 - econf "${myeconfargs[@]}"
90 -}
91 -
92 -src_install() {
93 - emake install DESTDIR="${D}"
94 -
95 - docrondir -m 1730 -o root -g crontab
96 - fowners root:crontab /usr/bin/crontab
97 - fperms 2751 /usr/bin/crontab
98 -
99 - newconfd "${S}"/crond.sysconfig ${PN}
100 -
101 - insinto /etc
102 - newins "${FILESDIR}/${PN}-crontab" crontab
103 - newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
104 -
105 - insinto /etc/cron.d
106 - doins contrib/0hourly
107 -
108 - newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
109 - newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
110 -
111 - systemd_newunit contrib/cronie.systemd cronie.service
112 -
113 - if use anacron ; then
114 - local anacrondir="/var/spool/anacron"
115 - keepdir ${anacrondir}
116 - fowners root:cron ${anacrondir}
117 - fperms 0750 ${anacrondir}
118 -
119 - insinto /etc
120 - doins contrib/anacrontab
121 -
122 - insinto /etc/cron.hourly
123 - doins contrib/0anacron
124 - fperms 0750 /etc/cron.hourly/0anacron
125 - else
126 - insinto /etc/cron.d
127 - doins contrib/dailyjobs
128 - fi
129 -
130 - einstalldocs
131 -}
132 -
133 -pkg_postinst() {
134 - cron_pkg_postinst
135 -
136 - if [[ -n "${REPLACING_VERSIONS}" ]] ; then
137 - ewarn "You should restart ${PN} daemon or else you might experience segfaults"
138 - ewarn "or ${PN} not working reliably anymore."
139 - einfo "(see https://bugs.gentoo.org/557406 for details.)"
140 - fi
141 -}
142
143 diff --git a/sys-process/cronie/files/cronie-1.5.2-systemd.patch b/sys-process/cronie/files/cronie-1.5.2-systemd.patch
144 deleted file mode 100644
145 index 884e6655fa8..00000000000
146 --- a/sys-process/cronie/files/cronie-1.5.2-systemd.patch
147 +++ /dev/null
148 @@ -1,30 +0,0 @@
149 -From 11d255eb05ae9814c16cd443a7710d99492e16c1 Mon Sep 17 00:00:00 2001
150 -From: Mike Gilbert <floppym@g.o>
151 -Date: Mon, 13 Jul 2015 10:59:57 -0400
152 -Subject: [PATCH] Adjust systemd service unit for Gentoo
153 -
154 ----
155 - contrib/cronie.systemd | 5 +++--
156 - 1 file changed, 3 insertions(+), 2 deletions(-)
157 -
158 -diff --git a/contrib/cronie.systemd b/contrib/cronie.systemd
159 -index ad46899..7a6c1a9 100644
160 ---- a/contrib/cronie.systemd
161 -+++ b/contrib/cronie.systemd
162 -@@ -3,10 +3,11 @@ Description=Command Scheduler
163 - After=auditd.service nss-user-lookup.target systemd-user-sessions.service time-sync.target ypbind.service
164 -
165 - [Service]
166 --EnvironmentFile=/etc/sysconfig/crond
167 --ExecStart=/usr/sbin/crond -n $CRONDARGS
168 -+ExecStart=/usr/sbin/crond
169 - ExecReload=/bin/kill -HUP $MAINPID
170 - KillMode=process
171 -+Type=forking
172 -+PIDFile=/run/crond.pid
173 -
174 - [Install]
175 - WantedBy=multi-user.target
176 ---
177 -2.4.5
178 -