[gentoo-commits] repo/gentoo:master commit in: profiles/, net-misc/cfengine/, net-misc/cfengine/files/

[Jakov Smolić]

commit:     36937c9304bd89ee30e601e9e10f8ff7e638bc53
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 18:13:40 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 18:30:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36937c93

net-misc/cfengine: treeclean

Closes: https://bugs.gentoo.org/875455
Closes: https://bugs.gentoo.org/555214
Closes: https://bugs.gentoo.org/690918
Closes: https://bugs.gentoo.org/713670
Closes: https://bugs.gentoo.org/666006
Closes: https://bugs.gentoo.org/696046
Closes: https://bugs.gentoo.org/796446
Closes: https://bugs.gentoo.org/882759
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-misc/cfengine/Manifest                         |   2 -
 net-misc/cfengine/cfengine-3.6.2-r1.ebuild         | 156 ---------------------
 net-misc/cfengine/files/cf-execd.rc6               |  18 ---
 net-misc/cfengine/files/cf-monitord.rc6            |  17 ---
 net-misc/cfengine/files/cf-serverd.rc6             |  17 ---
 .../cfengine/files/cfengine-3.6.2-ifconfig.patch   |  11 --
 .../cfengine/files/cfengine-3.6.2-sysmacros.patch  |  19 ---
 net-misc/cfengine/metadata.xml                     |  34 -----
 profiles/package.mask                              |   5 -
 9 files changed, 279 deletions(-)

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
deleted file mode 100644
index 9c943e341df3..000000000000
--- a/net-misc/cfengine/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
-DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9

diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
deleted file mode 100644
index e9cd762ac986..000000000000
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An suite of programs for configuring and maintaining Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz
-	masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml"
-
-DEPEND="acl? ( virtual/acl )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	libvirt? ( app-emulation/libvirt )
-	xml? ( dev-libs/libxml2:2  ) \
-	dev-libs/openssl:=
-	dev-libs/libpcre:=
-	net-libs/libnsl:="
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-REQUIRED_USE="^^ ( qdbm tokyocabinet )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-ifconfig.patch"
-		"${FILESDIR}/${P}-sysmacros.patch"
-	)
-	default
-	eautoreconf
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use masterfiles; then
-		unpack ${PN}-masterfiles-${MY_PV}.tar.gz
-	fi
-}
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-
-	econf \
-		--enable-fhs \
-		--docdir=/usr/share/doc/${PF} \
-		--with-workdir=/var/cfengine \
-		--with-pcre \
-		$(use_with acl libacl) \
-		$(use_with qdbm) \
-		$(use_with tokyocabinet) \
-		$(use_with postgres postgresql) \
-		$(use_with mysql mysql check) \
-		$(use_with libvirt) \
-		$(use_enable selinux)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install the documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
-
-	emake DESTDIR="${D}" install
-
-	# fix ifconfig path in provided promises
-	find "${ED}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
-
-	# Evil workaround for now..
-	mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF}
-
-	dodoc AUTHORS
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/example*
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-	for bin in promises agent monitord serverd execd runagent key; do
-		dosym ../../../usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
-	done
-
-	if use masterfiles; then
-		insinto /var/cfengine
-		doins -r "${WORKDIR}/masterfiles"
-	fi
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT=/var/cfengine/masterfiles' >"${ED}/etc/env.d/99${PN}" || die
-}
-
-pkg_postinst() {
-	echo
-	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm "$fname"
-		ln -s /etc/init.d/cf-serverd $(echo "$fname" | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [[ -z ${ROOT} ]]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}

diff --git a/net-misc/cfengine/files/cf-execd.rc6 b/net-misc/cfengine/files/cf-execd.rc6
deleted file mode 100644
index 8c3936d8a718..000000000000
--- a/net-misc/cfengine/files/cf-execd.rc6
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-	after cf-serverd
-}
-
-start() {
-	ebegin "Starting cf-execd"
-	start-stop-daemon --start --exec /usr/sbin/cf-execd -- ${EXTRA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cf-execd"
-	start-stop-daemon --stop --pidfile /var/cfengine/cf-execd.pid --exec /usr/sbin/cf-execd
-	eend $?
-}

diff --git a/net-misc/cfengine/files/cf-monitord.rc6 b/net-misc/cfengine/files/cf-monitord.rc6
deleted file mode 100644
index 6f985a62b020..000000000000
--- a/net-misc/cfengine/files/cf-monitord.rc6
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting cf-monitord"
-	start-stop-daemon --start --exec /usr/sbin/cf-monitord -- ${EXTRA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cf-monitord"
-	start-stop-daemon --stop --pidfile /var/cfengine/cf-monitord.pid --exec /usr/sbin/cf-monitord
-	eend $?
-}

diff --git a/net-misc/cfengine/files/cf-serverd.rc6 b/net-misc/cfengine/files/cf-serverd.rc6
deleted file mode 100644
index d73e2bc2c729..000000000000
--- a/net-misc/cfengine/files/cf-serverd.rc6
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting cf-serverd"
-	start-stop-daemon --start --exec /usr/sbin/cf-serverd -- ${EXTRA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cf-serverd"
-	start-stop-daemon --stop --pidfile /var/cfengine/cf-serverd.pid --exec /usr/sbin/cf-serverd
-	eend $?
-}

diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
deleted file mode 100644
index a31b3513ded4..000000000000
--- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cfengine-3.6.2.orig/libenv/unix_iface.c	2014-09-25 07:53:31.000000000 -0400
-+++ cfengine-3.6.2/libenv/unix_iface.c	2014-11-26 23:55:20.151351070 -0500
-@@ -625,7 +625,7 @@
-         return;
-     }
- #else
--    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
-+    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
-     {
-         Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
-         return;

diff --git a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
deleted file mode 100644
index 7aa8e2779253..000000000000
--- a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes compile on glibc-2.25
-
-Fixes: https://bugs.gentoo.org/612658
---- cfengine-3.6.2.orig/libutils/platform.h	2014-09-25 04:53:31.000000000 -0700
-+++ cfengine-3.6.2/libutils/platform.h	2017-10-20 15:11:15.676360363 -0700
-@@ -360,12 +360,13 @@ void globfree(glob_t *pglob);
- 
- #ifdef __linux__
- # if defined(__GLIBC__) || defined(__BIONIC__)
- #  include <net/route.h>
- #  include <netinet/in.h>
- #  include <netinet/ip.h>
-+#  include <sys/sysmacros.h>
- # else
- #  include <linux/route.h>
- #  include <linux/in.h>
- #  include <linux/ip.h>
- # endif
- #endif

diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
deleted file mode 100644
index 864d0db466b4..000000000000
--- a/net-misc/cfengine/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sysadmin@g.o</email>
-		<name>Gentoo Sysadmin Project</name>
-	</maintainer>
-	<use>
-		<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
-		<flag name="masterfiles">Install the Masterfiles Policy Framework</flag>
-		<flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag>
-		<flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag>
-	</use>
-	<longdescription>
-	Cfengine, or the configuration engine is an autonomous agent and a middle to
-	high level policy language for building expert systems which administrate
-	and configure large computer networks. Cfengine uses the idea of classes and
-	a primitive intelligence to define and automate the configuration and
-	maintenance of system state, for small to huge configurations. Cfengine is
-	designed to be a part of a computer immune system, and can be thought of as
-	a gaming agent. It is ideal for cluster management and has been adopted for
-	use all over the world in small and huge organizations alike.
-	</longdescription>
-	<longdescription lang="ja">
-	Cfengine 、つまり the configuration engine (設定エンジン)は大規模
-	コンピュータ・ネットワークの管理と設定を行うエキスパート・システム
-	を構築するためのハイレベルなポリシ言語の自律型エージェントとその
-	ミドルを指します。莫大な設定を軽減するため、Cfengineはクラス概念と
-	プリミティブ・インテリジェンスの導入及びシステム状態の設定と保守を
-	自動化します。Cfengine は免疫型システムの一部としてデザインされ、
-	ゲーム・エージェントにもなります。クラスタ制御には最適で、世界中
-	の小さな組織および大きな組織で採用されています。
-	</longdescription>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 691f89712f2b..1730cfc91caf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1122,11 +1122,6 @@ net-analyzer/snortsam
 # 30 days. Bugs #849389, #882783.
 dev-db/percona-xtrabackup-bin
 
-# John Helmert III <ajak@g.o> (2022-11-24)
-# Compatibility issues with openssl-1.1*, numerous build issues, version
-# in tree is EOL upstream. Removal in 30 days. Bug #882759.
-net-misc/cfengine
-
 # Matt Turner <mattst88@g.o> (2022-11-16)
 # Packages or their dependencies have not been ported to libsoup:3.0, while
 # other non-slotted dependencies have been.