gentoo resync : 15.01.2020

3 files changed, 142 insertions, 0 deletions

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index bbb68f6ed4a4..c1c5595d542a 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -3,6 +3,7 @@ AUX admit-noclass-520696.patch 400 BLAKE2B 034166c262cae8df913275c5838faed7403e6
 AUX cf-execd.rc6 319 BLAKE2B 0abc025c3b122627576a4f93b7963a5bfc4b9695153e02b855812cab529ada9acbddbbda63095f893eeccf3d5c1c6b861d5f7130db31d56ebbad3d70c9d33af4 SHA512 cac7ac5126d8d2f3c3acf61a694e89f6a2cddbf0748442e4ce82064a520c077adf2bf6cdcd8dda398b684699c03031e9b48178bd21c97badaa84a2776a04998d
 AUX cf-monitord.rc6 316 BLAKE2B b19ff5106f87b5fed13e090552c9aa00b67d8c6597525e055823638a9c7909da810efddea216177b42557ac15ea760c89e488960526a624c4c7a7b3c30f0dd78 SHA512 d141891e6cac6ddc4dad6c7caa623e5fb43846a91c23ae99fcc27e9fad5aeed6c5ee2ddc4bf88363523bd04c977241d649b818833e13a58319c4b8a48efadb1a
 AUX cf-serverd.rc6 311 BLAKE2B 82ee5abedac139a55ff886c8503d17f6ef35a3da9bb14975b5e9647652545869cfd30cadb3ed553c868040a23f4a42a6da6eb29aed8a4cece5bb19401108b835 SHA512 ef22d159ab71c311e5105709956cfca11dbe1569de4278a87bfbe82a496ac9b0e715b35f65b66a36dc84b7f4254d00172f16ab72240348282f9702b084a7b8bf
+AUX cfengine-2.2.10-lsbrelease.patch 697 BLAKE2B 346d5e21d49504ee1c27847d168cf07978a296c6a87a29303102ddc9b00740514f622ef79e942b679ea9358d4e715181dce349b4487fdd549d04c89e024c57c0 SHA512 dbbeeb73fb61dc194cd9800fe5be00a292bd106e5ba13292929b067f4748ccdd0f1127914382533323cb20e30dc43ead0963136e8e70c562b54998ed214d1864
 AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 460 BLAKE2B 81de82584ff683d13b2a209f9591bd7939e21d806269731cc3cdba73a0e07bcfa8495e108b419d8e80da3e99741df720e38f720b40133aa21bcc003c6bb4bc4b SHA512 14600a9b48c6ed326600ade59f833ab8d93837218070b5420ac7d4e45e1988a3e15554c8d9280c3d33d11613da3084ed728d5b27435d201eaa6a57978ad1167d
 AUX cfengine-3.4.5-acl.patch 1024 BLAKE2B 0cd02ca5c62cc088f9b18e55dae019cd2193d086d4ccba721869f2e2956c4fc613d3af07ad9831593dc06acc9a64788ab6a00ba32c0185a7b07351a578d50583 SHA512 f8e7987cf26c8791d3b0c816a61fdd8b877114729c804d096270f9e98c69f0cdcfe4d72a4120d9d8fa8fd260fae340ef75f9897b4a421da7648d05c10a4bc02b
 AUX cfengine-3.4.5-ifconfig.patch 1447 BLAKE2B 69fb92a9456705342f1231af7a21f3cf3c4f704cf17c85f99f3c4e85402d3364a03de3fb905912416e4c2ad257de017a76e197a7f07f8617eb530908ce843448 SHA512 e2e3f362777951c9778fe9f98f95fb934fd76a3a0af39612ab3a6aeec320d181834d4531382ab70c0ebc3162180dd9e9508f082ee99fd80fb5144eb1815ebc55
@@ -19,6 +20,7 @@ DIST cfengine-3.5.3.tar.gz 1542468 BLAKE2B e7e4fe1194563cc9e72e4262c934f7ce73c0a
 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
 EBUILD cfengine-2.2.10-r5.ebuild 3241 BLAKE2B 71e64eb4d323556416c67ddac89c3170d5178a38d4b072bca81172565d741e0d1c69f0b4de25df5713c8eaaae0f15b9724a579df87e0ca9718276eb117d10d22 SHA512 e4e02b753f443af0bd7966ee7ccddea2170ce080585e807eee514f4071d19da7fb1805b6fd6e42586b3c8ed2bc1777ff134b8853c6730a1b7c821b2f5ee792f6
+EBUILD cfengine-2.2.10-r6.ebuild 3289 BLAKE2B 64136477ff9d507d839024b28cc0e875928dbd15fb2deebbfd2afd75f62b58c95cf6276ad2a116db545fe84933caa5c9e3d8d2cf0ca506ec2e9aef6abeea60a6 SHA512 b7c635a2b631987fc2c773cdc650b46e64f478a7e8bd4e8249b8f6d356dc419e374e9f60702fe589cb2c775f0f8d65746805e16e3bd10da4245dca58198c8184
 EBUILD cfengine-3.3.9.ebuild 3491 BLAKE2B b74a4325583d6ae105e0fe336be431e12d99a5d6a63d9c242e0ef3318b646c0091403507f9cf767bfe719b7ee5c65d1037cd4f9271c2396f290a04e553f1318a SHA512 803ec254482363e66056005af2f2befb886d84247f89f0054b2d9fc8d288aa642764a4a6c686f65dfc954923ade60f3b837df7e1066d1e73992d19ae7b737154
 EBUILD cfengine-3.4.5.ebuild 3717 BLAKE2B e7385a42ab34a3016afb4b0ab01eb6884640d4cfddb77b0f2b23328f4897a42d5cb3654f603b58398bd8a2971c83428a16d68afee37d5cfd93cd9e42f61c8e6f SHA512 ac9b0b051fbb64d80041e9eced6199ab533a0437813e0e37de21c3aa64a6a482bc1722dad68f7b2818f8ed2739165e2e23148631778d17a043f01a966a1e6973
 EBUILD cfengine-3.5.3.ebuild 3791 BLAKE2B 5ea2c138d74ecad59d7a84f3c6deaef9691945087da761fe869e2444d7f5b02083acc32e6af2f9d9c25533fa19fa610f1d7ce0d142dfaa5082d0a55da45baf29 SHA512 3e8d3e5bedd37d0dc9838ef887db2085ff871810a1d98010d280e0fe2570e6aa96739f90bfa12593ba3d25716ef7b3f700cf13f1bc6b10264b98777264e9923a
diff --git a/net-misc/cfengine/cfengine-2.2.10-r6.ebuild b/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
new file mode 100644
index 000000000000..87d5fa9341e0
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="vim-syntax"
+
+RDEPEND=">=sys-libs/db-4:=
+	<dev-libs/openssl-1.1:=
+	app-portage/portage-utils
+	net-libs/libnsl:="
+DEPEND="${RDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+src_prepare() {
+	eapply_user
+
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
+	# https://bugs.gentoo.org/339808
+	eapply "${FILESDIR}/admit-noclass-520696.patch" \
+		"${FILESDIR}/511666-segfault.patch" \
+		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch" \
+		"${FILESDIR}/${PN}-2.2.10-lsbrelease.patch"
+
+	# 2048 causes crashes on some 32-bit hardened kernels, and the warning
+	# messages say to turn it back down.
+	if use x86; then
+		sed -i -e "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h || die
+	fi
+}
+
+src_configure() {
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--disable-static \
+		--with-workdir=/var/cfengine \
+		--with-berkeleydb=/usr
+
+	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
+	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' \
+		-e 's/\(SUBDIRS.*\) contrib inputs/\1/' \
+		-e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+
+	# Fix man pages
+	sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
+	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
+
+	emake DESTDIR="${D}" install
+
+	# Remove static library and libtool file as they are not needed
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	dodoc AUTHORS ChangeLog README TODO INSTALL
+
+	# Manually install doc and inputs
+	doman doc/*.8
+	doinfo doc/*.info*
+	docinto examples
+	dodoc inputs/*.example
+
+	# Create cfengine working directory
+	dodir /var/cfengine
+	fperms 700 /var/cfengine
+	keepdir /var/cfengine/bin
+	keepdir /var/cfengine/inputs
+	keepdir /var/cfengine/modules
+}
+
+pkg_postinst() {
+	# 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.
+
+	cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
+
+	einfo
+	einfo "NOTE: The cfportage module has been deprecated in favor of the"
+	einfo "      upstream 'packages' action."
+	einfo
+	einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
+	einfo
+
+	elog "You MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+}
+
+pkg_config() {
+	if [[ -z ${ROOT} ]]; then
+		if [[ ! -f ${EPREFIX}/var/cfengine/ppkeys/localhost.priv ]]; then
+			einfo "Generating keys for localhost."
+			"${EPREFIX}"/usr/sbin/cfkey
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
new file mode 100644
index 000000000000..6f8dfa04d8f2
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
@@ -0,0 +1,24 @@
+Newer GCC mis-compiles the lsb_release reader function.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- cfengine-2.2.10/src/misc.c	2009-02-10 21:55:36.000000000 -0800
++++ cfengine-2.2.10/src/misc.c	2020-01-06 17:58:07.049226386 -0800
+@@ -1187,6 +1187,7 @@ if ((fp = cfpopen(VBUFF, "r")) == NULL)
+ 
+ if (ReadLine(VBUFF, CF_BUFSIZE, fp))
+    {
++   Debug4("(%s)",VBUFF);
+    char * buffer = VBUFF;
+    strsep(&buffer, ":");
+    
+@@ -1198,7 +1199,8 @@ if (ReadLine(VBUFF, CF_BUFSIZE, fp))
+    info = buffer;
+    while((*buffer != '\0') && !isspace(*buffer))
+       {
+-      *buffer = tolower(*buffer++);
++      *buffer = tolower(*buffer);
++      buffer++;
+       }
+    
+    *buffer = '\0';