1 |
commit: 36937c9304bd89ee30e601e9e10f8ff7e638bc53 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 31 18:13:40 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 31 18:30:50 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36937c93 |
7 |
|
8 |
net-misc/cfengine: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/875455 |
11 |
Closes: https://bugs.gentoo.org/555214 |
12 |
Closes: https://bugs.gentoo.org/690918 |
13 |
Closes: https://bugs.gentoo.org/713670 |
14 |
Closes: https://bugs.gentoo.org/666006 |
15 |
Closes: https://bugs.gentoo.org/696046 |
16 |
Closes: https://bugs.gentoo.org/796446 |
17 |
Closes: https://bugs.gentoo.org/882759 |
18 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
19 |
|
20 |
net-misc/cfengine/Manifest | 2 - |
21 |
net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 156 --------------------- |
22 |
net-misc/cfengine/files/cf-execd.rc6 | 18 --- |
23 |
net-misc/cfengine/files/cf-monitord.rc6 | 17 --- |
24 |
net-misc/cfengine/files/cf-serverd.rc6 | 17 --- |
25 |
.../cfengine/files/cfengine-3.6.2-ifconfig.patch | 11 -- |
26 |
.../cfengine/files/cfengine-3.6.2-sysmacros.patch | 19 --- |
27 |
net-misc/cfengine/metadata.xml | 34 ----- |
28 |
profiles/package.mask | 5 - |
29 |
9 files changed, 279 deletions(-) |
30 |
|
31 |
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest |
32 |
deleted file mode 100644 |
33 |
index 9c943e341df3..000000000000 |
34 |
--- a/net-misc/cfengine/Manifest |
35 |
+++ /dev/null |
36 |
@@ -1,2 +0,0 @@ |
37 |
-DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc |
38 |
-DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9 |
39 |
|
40 |
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild |
41 |
deleted file mode 100644 |
42 |
index e9cd762ac986..000000000000 |
43 |
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,156 +0,0 @@ |
46 |
-# Copyright 1999-2022 Gentoo Authors |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI="7" |
50 |
- |
51 |
-inherit autotools |
52 |
- |
53 |
-MY_PV="${PV//_beta/b}" |
54 |
-MY_PV="${MY_PV/_p/p}" |
55 |
-MY_P="${PN}-${MY_PV}" |
56 |
- |
57 |
-DESCRIPTION="An suite of programs for configuring and maintaining Unix-like computers" |
58 |
-HOMEPAGE="http://www.cfengine.org/" |
59 |
-SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz |
60 |
- masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )" |
61 |
- |
62 |
-LICENSE="GPL-3" |
63 |
-SLOT="3" |
64 |
-KEYWORDS="~amd64 ~x86" |
65 |
- |
66 |
-IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml" |
67 |
- |
68 |
-DEPEND="acl? ( virtual/acl ) |
69 |
- mysql? ( virtual/mysql ) |
70 |
- postgres? ( dev-db/postgresql:= ) |
71 |
- selinux? ( sys-libs/libselinux ) |
72 |
- tokyocabinet? ( dev-db/tokyocabinet ) |
73 |
- qdbm? ( dev-db/qdbm ) |
74 |
- libvirt? ( app-emulation/libvirt ) |
75 |
- xml? ( dev-libs/libxml2:2 ) \ |
76 |
- dev-libs/openssl:= |
77 |
- dev-libs/libpcre:= |
78 |
- net-libs/libnsl:=" |
79 |
-RDEPEND="${DEPEND}" |
80 |
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" |
81 |
- |
82 |
-REQUIRED_USE="^^ ( qdbm tokyocabinet )" |
83 |
- |
84 |
-S="${WORKDIR}/${MY_P}" |
85 |
- |
86 |
-src_prepare() { |
87 |
- local PATCHES=( |
88 |
- "${FILESDIR}/${P}-ifconfig.patch" |
89 |
- "${FILESDIR}/${P}-sysmacros.patch" |
90 |
- ) |
91 |
- default |
92 |
- eautoreconf |
93 |
-} |
94 |
- |
95 |
-src_unpack() { |
96 |
- unpack ${MY_P}.tar.gz |
97 |
- if use masterfiles; then |
98 |
- unpack ${PN}-masterfiles-${MY_PV}.tar.gz |
99 |
- fi |
100 |
-} |
101 |
- |
102 |
-src_configure() { |
103 |
- # Enforce /var/cfengine for historical compatibility |
104 |
- |
105 |
- econf \ |
106 |
- --enable-fhs \ |
107 |
- --docdir=/usr/share/doc/${PF} \ |
108 |
- --with-workdir=/var/cfengine \ |
109 |
- --with-pcre \ |
110 |
- $(use_with acl libacl) \ |
111 |
- $(use_with qdbm) \ |
112 |
- $(use_with tokyocabinet) \ |
113 |
- $(use_with postgres postgresql) \ |
114 |
- $(use_with mysql mysql check) \ |
115 |
- $(use_with libvirt) \ |
116 |
- $(use_enable selinux) |
117 |
- |
118 |
- # Fix Makefile to skip inputs, see below "examples" |
119 |
- #sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die |
120 |
- |
121 |
- # We install the documentation through portage |
122 |
- sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die |
123 |
-} |
124 |
- |
125 |
-src_install() { |
126 |
- newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd |
127 |
- newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord |
128 |
- newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd |
129 |
- |
130 |
- emake DESTDIR="${D}" install |
131 |
- |
132 |
- # fix ifconfig path in provided promises |
133 |
- find "${ED}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g" |
134 |
- |
135 |
- # Evil workaround for now.. |
136 |
- mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF} |
137 |
- |
138 |
- dodoc AUTHORS |
139 |
- |
140 |
- if ! use examples; then |
141 |
- rm -rf "${ED}"/usr/share/doc/${PF}/example* |
142 |
- fi |
143 |
- |
144 |
- # Create cfengine working directory |
145 |
- dodir /var/cfengine/bin |
146 |
- fperms 700 /var/cfengine |
147 |
- |
148 |
- # Copy cfagent into the cfengine tree otherwise cfexecd won't |
149 |
- # find it. Most hosts cache their copy of the cfengine |
150 |
- # binaries here. This is the default search location for the |
151 |
- # binaries. |
152 |
- for bin in promises agent monitord serverd execd runagent key; do |
153 |
- dosym ../../../usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin |
154 |
- done |
155 |
- |
156 |
- if use masterfiles; then |
157 |
- insinto /var/cfengine |
158 |
- doins -r "${WORKDIR}/masterfiles" |
159 |
- fi |
160 |
- |
161 |
- dodir /etc/env.d |
162 |
- echo 'CONFIG_PROTECT=/var/cfengine/masterfiles' >"${ED}/etc/env.d/99${PN}" || die |
163 |
-} |
164 |
- |
165 |
-pkg_postinst() { |
166 |
- echo |
167 |
- elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0" |
168 |
- echo |
169 |
- einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided." |
170 |
- einfo |
171 |
- einfo "To run cfengine out of cron every half hour modify your crontab:" |
172 |
- einfo "0,30 * * * * /usr/sbin/cf-execd -F" |
173 |
- echo |
174 |
- |
175 |
- elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:" |
176 |
- elog "emerge --config ${CATEGORY}/${PN}" |
177 |
- |
178 |
- # Fix old cf-servd, remove it after some releases. |
179 |
- local found=0 |
180 |
- for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name 'cf-servd'); do |
181 |
- found=1 |
182 |
- rm "$fname" |
183 |
- ln -s /etc/init.d/cf-serverd $(echo "$fname" | sed 's:cf-servd:cf-serverd:') |
184 |
- done |
185 |
- |
186 |
- if [ "${found}" -eq 1 ]; then |
187 |
- echo |
188 |
- elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd" |
189 |
- fi |
190 |
-} |
191 |
- |
192 |
-pkg_config() { |
193 |
- if [[ -z ${ROOT} ]]; then |
194 |
- if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then |
195 |
- einfo "Generating keys for localhost." |
196 |
- /usr/sbin/cf-key |
197 |
- fi |
198 |
- else |
199 |
- die "cfengine cfkey does not support any value of ROOT other than /." |
200 |
- fi |
201 |
-} |
202 |
|
203 |
diff --git a/net-misc/cfengine/files/cf-execd.rc6 b/net-misc/cfengine/files/cf-execd.rc6 |
204 |
deleted file mode 100644 |
205 |
index 8c3936d8a718..000000000000 |
206 |
--- a/net-misc/cfengine/files/cf-execd.rc6 |
207 |
+++ /dev/null |
208 |
@@ -1,18 +0,0 @@ |
209 |
-#!/sbin/openrc-run |
210 |
- |
211 |
-depend() { |
212 |
- need net |
213 |
- after cf-serverd |
214 |
-} |
215 |
- |
216 |
-start() { |
217 |
- ebegin "Starting cf-execd" |
218 |
- start-stop-daemon --start --exec /usr/sbin/cf-execd -- ${EXTRA_OPTS} |
219 |
- eend $? |
220 |
-} |
221 |
- |
222 |
-stop() { |
223 |
- ebegin "Stopping cf-execd" |
224 |
- start-stop-daemon --stop --pidfile /var/cfengine/cf-execd.pid --exec /usr/sbin/cf-execd |
225 |
- eend $? |
226 |
-} |
227 |
|
228 |
diff --git a/net-misc/cfengine/files/cf-monitord.rc6 b/net-misc/cfengine/files/cf-monitord.rc6 |
229 |
deleted file mode 100644 |
230 |
index 6f985a62b020..000000000000 |
231 |
--- a/net-misc/cfengine/files/cf-monitord.rc6 |
232 |
+++ /dev/null |
233 |
@@ -1,17 +0,0 @@ |
234 |
-#!/sbin/openrc-run |
235 |
- |
236 |
-depend() { |
237 |
- need net |
238 |
-} |
239 |
- |
240 |
-start() { |
241 |
- ebegin "Starting cf-monitord" |
242 |
- start-stop-daemon --start --exec /usr/sbin/cf-monitord -- ${EXTRA_OPTS} |
243 |
- eend $? |
244 |
-} |
245 |
- |
246 |
-stop() { |
247 |
- ebegin "Stopping cf-monitord" |
248 |
- start-stop-daemon --stop --pidfile /var/cfengine/cf-monitord.pid --exec /usr/sbin/cf-monitord |
249 |
- eend $? |
250 |
-} |
251 |
|
252 |
diff --git a/net-misc/cfengine/files/cf-serverd.rc6 b/net-misc/cfengine/files/cf-serverd.rc6 |
253 |
deleted file mode 100644 |
254 |
index d73e2bc2c729..000000000000 |
255 |
--- a/net-misc/cfengine/files/cf-serverd.rc6 |
256 |
+++ /dev/null |
257 |
@@ -1,17 +0,0 @@ |
258 |
-#!/sbin/openrc-run |
259 |
- |
260 |
-depend() { |
261 |
- need net |
262 |
-} |
263 |
- |
264 |
-start() { |
265 |
- ebegin "Starting cf-serverd" |
266 |
- start-stop-daemon --start --exec /usr/sbin/cf-serverd -- ${EXTRA_OPTS} |
267 |
- eend $? |
268 |
-} |
269 |
- |
270 |
-stop() { |
271 |
- ebegin "Stopping cf-serverd" |
272 |
- start-stop-daemon --stop --pidfile /var/cfengine/cf-serverd.pid --exec /usr/sbin/cf-serverd |
273 |
- eend $? |
274 |
-} |
275 |
|
276 |
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch |
277 |
deleted file mode 100644 |
278 |
index a31b3513ded4..000000000000 |
279 |
--- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch |
280 |
+++ /dev/null |
281 |
@@ -1,11 +0,0 @@ |
282 |
---- cfengine-3.6.2.orig/libenv/unix_iface.c 2014-09-25 07:53:31.000000000 -0400 |
283 |
-+++ cfengine-3.6.2/libenv/unix_iface.c 2014-11-26 23:55:20.151351070 -0500 |
284 |
-@@ -625,7 +625,7 @@ |
285 |
- return; |
286 |
- } |
287 |
- #else |
288 |
-- if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL) |
289 |
-+ if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL) |
290 |
- { |
291 |
- Log(LOG_LEVEL_VERBOSE, "Could not find interface info"); |
292 |
- return; |
293 |
|
294 |
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch |
295 |
deleted file mode 100644 |
296 |
index 7aa8e2779253..000000000000 |
297 |
--- a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch |
298 |
+++ /dev/null |
299 |
@@ -1,19 +0,0 @@ |
300 |
-Fixes compile on glibc-2.25 |
301 |
- |
302 |
-Fixes: https://bugs.gentoo.org/612658 |
303 |
---- cfengine-3.6.2.orig/libutils/platform.h 2014-09-25 04:53:31.000000000 -0700 |
304 |
-+++ cfengine-3.6.2/libutils/platform.h 2017-10-20 15:11:15.676360363 -0700 |
305 |
-@@ -360,12 +360,13 @@ void globfree(glob_t *pglob); |
306 |
- |
307 |
- #ifdef __linux__ |
308 |
- # if defined(__GLIBC__) || defined(__BIONIC__) |
309 |
- # include <net/route.h> |
310 |
- # include <netinet/in.h> |
311 |
- # include <netinet/ip.h> |
312 |
-+# include <sys/sysmacros.h> |
313 |
- # else |
314 |
- # include <linux/route.h> |
315 |
- # include <linux/in.h> |
316 |
- # include <linux/ip.h> |
317 |
- # endif |
318 |
- #endif |
319 |
|
320 |
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml |
321 |
deleted file mode 100644 |
322 |
index 864d0db466b4..000000000000 |
323 |
--- a/net-misc/cfengine/metadata.xml |
324 |
+++ /dev/null |
325 |
@@ -1,34 +0,0 @@ |
326 |
-<?xml version="1.0" encoding="UTF-8"?> |
327 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
328 |
-<pkgmetadata> |
329 |
- <maintainer type="project"> |
330 |
- <email>sysadmin@g.o</email> |
331 |
- <name>Gentoo Sysadmin Project</name> |
332 |
- </maintainer> |
333 |
- <use> |
334 |
- <flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag> |
335 |
- <flag name="masterfiles">Install the Masterfiles Policy Framework</flag> |
336 |
- <flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag> |
337 |
- <flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag> |
338 |
- </use> |
339 |
- <longdescription> |
340 |
- Cfengine, or the configuration engine is an autonomous agent and a middle to |
341 |
- high level policy language for building expert systems which administrate |
342 |
- and configure large computer networks. Cfengine uses the idea of classes and |
343 |
- a primitive intelligence to define and automate the configuration and |
344 |
- maintenance of system state, for small to huge configurations. Cfengine is |
345 |
- designed to be a part of a computer immune system, and can be thought of as |
346 |
- a gaming agent. It is ideal for cluster management and has been adopted for |
347 |
- use all over the world in small and huge organizations alike. |
348 |
- </longdescription> |
349 |
- <longdescription lang="ja"> |
350 |
- Cfengine 、つまり the configuration engine (設定エンジン)は大規模 |
351 |
- コンピュータ・ネットワークの管理と設定を行うエキスパート・システム |
352 |
- を構築するためのハイレベルなポリシ言語の自律型エージェントとその |
353 |
- ミドルを指します。莫大な設定を軽減するため、Cfengineはクラス概念と |
354 |
- プリミティブ・インテリジェンスの導入及びシステム状態の設定と保守を |
355 |
- 自動化します。Cfengine は免疫型システムの一部としてデザインされ、 |
356 |
- ゲーム・エージェントにもなります。クラスタ制御には最適で、世界中 |
357 |
- の小さな組織および大きな組織で採用されています。 |
358 |
- </longdescription> |
359 |
-</pkgmetadata> |
360 |
|
361 |
diff --git a/profiles/package.mask b/profiles/package.mask |
362 |
index 691f89712f2b..1730cfc91caf 100644 |
363 |
--- a/profiles/package.mask |
364 |
+++ b/profiles/package.mask |
365 |
@@ -1122,11 +1122,6 @@ net-analyzer/snortsam |
366 |
# 30 days. Bugs #849389, #882783. |
367 |
dev-db/percona-xtrabackup-bin |
368 |
|
369 |
-# John Helmert III <ajak@g.o> (2022-11-24) |
370 |
-# Compatibility issues with openssl-1.1*, numerous build issues, version |
371 |
-# in tree is EOL upstream. Removal in 30 days. Bug #882759. |
372 |
-net-misc/cfengine |
373 |
- |
374 |
# Matt Turner <mattst88@g.o> (2022-11-16) |
375 |
# Packages or their dependencies have not been ported to libsoup:3.0, while |
376 |
# other non-slotted dependencies have been. |