gentoo resync : 13.10.2019

3 files changed, 32 insertions, 30 deletions

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 6240dc5cc2f8..12bbd174e64c 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -3,7 +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-snprintf_buffer_overflow.patch 456 BLAKE2B 9466bbae7d47fccf3169c082abf5c32565a67816788d4c577a374a40c5914a0946e54b2374855f4bf98d1107989c5afc19cd0ba7cfab5bd04dc95d6f6f1a04aa SHA512 6e38707d638ad9570ba88d07c13ba0c0a5f13e8642b040b10a2cc25cbb27599c4108692ca44cc98a79b390a471e082cf68496e980d787be2f74fa11288ca817c
+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
 AUX cfengine-3.5.3-ifconfig.patch 1776 BLAKE2B e96d9ac013494d43ad2dcf9c7ee5499eae3f799ddf36cf6c147fa9c416b01f31a2fd9b1de1377e82c4f389fda874b06e862055701343c58e5124eba58ab09e6b SHA512 33c7ce6a3f064e8d9fbb393dcf56816be3ed4e679864dd2163681686b15c458b7694a05731607971acadd643c763c8d94d3fd14d19e5fb1814e4898cfedf9ef9
@@ -18,7 +18,7 @@ DIST cfengine-3.4.5.tar.gz 4671628 BLAKE2B d6964631ef6a6ba2fab661c5d0b287f8a5fb8
 DIST cfengine-3.5.3.tar.gz 1542468 BLAKE2B e7e4fe1194563cc9e72e4262c934f7ce73c0a74749b131a424201445b954492d90dfc6a8b0530d5f9bcd2852b41b32ed25dc43e70b525dafc9c4a111b7c4990f SHA512 20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18
 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-r4.ebuild 3259 BLAKE2B 44a97cbb3ee1eac5145b4c5bad3b3055a79f870f4ccb0c9f7480c8d26137f558c227a17f9804aeb71b2bb9341f6d5a4666cd2224834db7830f1079df6ca041dc SHA512 8677db197908832d122a5670666f8ae335ad2501fe0cb1afca99f728bf97bb41f8f5bfce0325344efb98eca5c371f337f65b50423c24d3ae92d9e239dad138e0
+EBUILD cfengine-2.2.10-r5.ebuild 3241 BLAKE2B 71e64eb4d323556416c67ddac89c3170d5178a38d4b072bca81172565d741e0d1c69f0b4de25df5713c8eaaae0f15b9724a579df87e0ca9718276eb117d10d22 SHA512 e4e02b753f443af0bd7966ee7ccddea2170ce080585e807eee514f4071d19da7fb1805b6fd6e42586b3c8ed2bc1777ff134b8853c6730a1b7c821b2f5ee792f6
 EBUILD cfengine-3.3.9.ebuild 3533 BLAKE2B ad0ad3ba282e9d595d6f5e6b049d8657171f0365125e0659c19ed0916671f84d6f2021a7f6480df675b152d4d5051a9746038392d1e0584e9efd3e8f1d732447 SHA512 a7b32de25e48d8ef00bda6d6dae9c5e734afd3511602d2c3f80a3a632d339eb811a0ebf39cc71a48b88492295f3210fa69f2fe16b9a0ebe929b0dbcca5e5a4a3
 EBUILD cfengine-3.4.5.ebuild 3759 BLAKE2B c661c7270bb701b4b5b6438bd6a1bbed609637aab9c9000e9b0daf3ba3a702d2d5953d51be8dc6e56a04bfe42583205ccdf8b26213de7be678d8ee254c75aed2 SHA512 c588abc9740b0ced92e16b2862cba76d6c12622d9d4965bca43ad5519e6e0d0e205ac1e3879af7f55fff6eea55feb07f6b17d9e69dc913e949490b85482e7de8
 EBUILD cfengine-3.5.3.ebuild 3826 BLAKE2B 9c78d56b8f52ccb0f28ebe9d432af2d486913b6f808c324ff99b2c2a0af6fb852dad3c3800b0a35bdadae2a97e8bb75ae516f64137062dc086dafdab91a4f0b0 SHA512 612841631d6587d12e0f3bb3867139bdb1719778d14c464b47226ea88c7063e9a4c1408c52068c9f43297a635addd20ee3f14ec1c9b49739bdd8939a5e6a7d08
diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild b/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
index 0c4a8b4c5523..22bdd71cfd9d 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="An automated suite of programs for configuring and maintaining
 Unix-like computers"
@@ -12,71 +10,75 @@ SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="vim-syntax"
 
-RDEPEND=">=sys-libs/db-4
-	>=dev-libs/openssl-0.9.7
+RDEPEND=">=sys-libs/db-4:=
+	<dev-libs/openssl-1.1:=
 	app-portage/portage-utils
-	net-libs/libnsl"
+	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
-	epatch "${FILESDIR}/admit-noclass-520696.patch" \
+	eapply "${FILESDIR}/admit-noclass-520696.patch" \
 		"${FILESDIR}/511666-segfault.patch" \
 		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
 
 	# 2048 causes crashes on some 32-bit hardened kernels, and the warning
 	# messages say to turn it back down.
-	use x86 && sed -ie "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h
+	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/' Makefile
-	sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile
+	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
+	sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
-	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
+	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
 
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Remove static library and libtool file as they are not needed
-	rm "${D}"/usr/$(get_libdir)/*.la
-	rm "${D}"/usr/$(get_libdir)/*.a
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
 
 	dodoc AUTHORS ChangeLog README TODO INSTALL
 
 	# Manually install doc and inputs
 	doman doc/*.8
-	docinto examples
 	doinfo doc/*.info*
+	docinto examples
 	dodoc inputs/*.example
 
 	# Create cfengine working directory
-	mkdir -p "${D}"/var/cfengine
+	dodir /var/cfengine
 	fperms 700 /var/cfengine
 	keepdir /var/cfengine/bin
 	keepdir /var/cfengine/inputs
-	dodir /var/cfengine/modules
+	keepdir /var/cfengine/modules
 }
 
 pkg_postinst() {
@@ -102,10 +104,10 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+	if [[ -z ${ROOT} ]]; then
+		if [[ ! -f ${EPREFIX}/var/cfengine/ppkeys/localhost.priv ]]; then
 			einfo "Generating keys for localhost."
-			/usr/sbin/cfkey
+			"${EPREFIX}"/usr/sbin/cfkey
 		fi
 	else
 		die "cfengine cfkey does not support any value of ROOT other than /."
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
index dee9b797f6ac..80a3a542974b 100644
--- a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
+++ b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
@@ -1,5 +1,5 @@
---- src/instrument.c.old	2010-10-15 22:20:58.014091858 +0200
-+++ src/instrument.c	2010-10-15 22:21:34.132271440 +0200
+--- a/src/instrument.c.old	2010-10-15 22:20:58.014091858 +0200
++++ b/src/instrument.c	2010-10-15 22:21:34.132271440 +0200
 @@ -542,7 +542,7 @@ while (dbcp->c_get(dbcp, &key, &value, D
     
     tthen = (time_t)then;