Bump version. Fixes #525914. Thanks to freak132 for the ifconfig patch.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

4 files changed, 166 insertions, 15 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 2ff9aabf4a85..7d46aaf4275d 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.170 2014/11/26 10:40:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.171 2014/11/30 10:36:40 mschiff Exp $
+
+*cfengine-3.6.2 (30 Nov 2014)
+
+  30 Nov 2014; Marc Schiffbauer <mschiff@gentoo.org> +cfengine-3.6.2.ebuild,
+  +files/cfengine-3.6.2-ifconfig.patch:
+  Bump version. Fixes #525914. Thanks to freak132 for the ifconfig patch.
 
   26 Nov 2014; Agostino Sarubbo <ago@gentoo.org> cfengine-3.3.9.ebuild:
   Stable for amd64, wrt bug #529726
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index ff366eeb0d19..8cd6731c7e4a 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -10,6 +10,7 @@ AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 SHA256 25a37e3d2316345984
 AUX cfengine-3.4.5-acl.patch 1024 SHA256 f2d20259aeb1e9cfe42cc3781a870ea57a8d6b5ee6e8aceda875f749e9919cf3 SHA512 f8e7987cf26c8791d3b0c816a61fdd8b877114729c804d096270f9e98c69f0cdcfe4d72a4120d9d8fa8fd260fae340ef75f9897b4a421da7648d05c10a4bc02b WHIRLPOOL 9b2f5063eda082987a19979059b3a99c445c21a951336090029f733d3c602b545673f80bb4ec2813e87e4765404d913fefe71df4d4b30b8c0120fe421bdecc28
 AUX cfengine-3.4.5-ifconfig.patch 1447 SHA256 fe38644ff8befa5b6e760fc0773b174d2ab0bf872d40c8909cb5529f8069a1e3 SHA512 e2e3f362777951c9778fe9f98f95fb934fd76a3a0af39612ab3a6aeec320d181834d4531382ab70c0ebc3162180dd9e9508f082ee99fd80fb5144eb1815ebc55 WHIRLPOOL 3848016a9b96c4d37a09794f933bbdff7804e64d1a1e4637062c554d43d74bad240c97fcd466836c99fd31b829404e50f4532ac1dc21588ac6513f5bdde0a82d
 AUX cfengine-3.5.3-ifconfig.patch 1776 SHA256 ab42f79688799fc76bfd0825f6ce2ccee8c86ebe948b757949353c235b625eb0 SHA512 33c7ce6a3f064e8d9fbb393dcf56816be3ed4e679864dd2163681686b15c458b7694a05731607971acadd643c763c8d94d3fd14d19e5fb1814e4898cfedf9ef9 WHIRLPOOL 4d2fe1611ef7af8b560bc7e8c5c08fc88d8ace62f211d2033d65043c8aa4dcc89c0a34135ac690157eab08194b4d194bdc50a55e394f6c67b175950ea35ef8b1
+AUX cfengine-3.6.2-ifconfig.patch 486 SHA256 e0e891429b3e56150840c7e5d1c6b9033e8be7403c302a3a1122ac638b08f28a SHA512 e0c308dcb1ac1d865b6410e5e4a5afb4619dc56e77ddb247a4c3314e9b2e9ffcab7dd09682ead3acd259dfdc76403c5c7312d3306e53285da7812912f59d8582 WHIRLPOOL 19f924480dcb34640d727d3cf0decc31033a78cf3d5eebf815c39d17b2efc74435b90e4a88f828e4a78ac2237cd2c44c390e5dc1e363b16b19448a8a2c89b55a
 AUX cfenvd.rc6 254 SHA256 de0877e26bbb5cd8eb5da1827308b8fa00c9ce487e61263306c4b57e3ba9e150 SHA512 8e889ec756184cbffd039acc91b57ad438311575b910dbb8c6bacce2806c0f645f349ab23d0d74cc75f795fd3de607a494bdc18bfb2f6ea6208c6efdddc25a93 WHIRLPOOL 93f14f07da4dab5f5e3c86bb56f1e8f74c7c5af0f7138ea65bf0446ecf3f3a06dac38a2792baba58e4fab68a71b616123f647bdba9b578f9dca7e7b6944bb0ab
 AUX cfexecd.rc6 259 SHA256 98735d665038e372be29ac8b173861491dde1d71fad7d0cefddab0fbf99a157c SHA512 7c5798679d2eb9c22bb17dfe526d6b3afdd4d425a43c5c3ff6525a0a403b677564aa9198a0496220d771679e6f52e1dec16e2411584388ff04431b7904ae9a4f WHIRLPOOL ca973d2716ee4b4fe926c4b7370bd77781f9b182e38dd1da948cff4da046ee467d564293bd29979bdafbe70f079e9b9801887261dcd1a9e794699a5ffd8c35c2
 AUX cfservd.rc6 259 SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f SHA512 65390788c0bfa8140ff1ea9d2b89f6037a71709230cf0a839007479305ee420b360e4dc43ecb41f009666a6def4f07c988d15c5f2698bfbec75c4cf0efb3d857 WHIRLPOOL 5cfe286e6d6c950399378a9856d22ae76a40fb44ab784369044eea65fd02cd77170294bcb768c32646f64ee7f2c681055c492f3980a371eb313c2805a9fbf938
@@ -19,28 +20,20 @@ DIST cfengine-3.3.5.tar.gz 1254473 SHA256 f7d948d85c54ee7b49a03d9b1b8b8cc6d27cdb
 DIST cfengine-3.3.9.tar.gz 1256138 SHA256 54b44dd1c7a77a7ec4e4dea9542ac4d79cb689a7aaefda88ef227e571a462a61 SHA512 9d64667d001daa2db506abf97ecde43e6b6ac672d3ca6dba4c5e68b742b72f2c7cee65c2f5ab82a12cf0f9b385f48fb0d2bb9eae7fe2ff57b187c725238faf1f WHIRLPOOL d57204c63835c75a4bd4b23390a7013149920c856a19fd76f960d72bbc051c3ef2f220361afb225d41e51d5f0eb6cf817d6605d290c7452dcf112e7f54ee0528
 DIST cfengine-3.4.5.tar.gz 4671628 SHA256 542808b9f532e77d66dca19e83bdc1f995d7d0066b940a39bdd5db9a71680011 SHA512 3de95b511c03b4e4f83b13b605d4cc8185419fb7ee6b42e34faf300e5af2a755713b2f8f61305a1cd3dea02f89c09076b164469549cfc96fec09a813c7069f0f WHIRLPOOL 9e7516bfeffc1fae87eeb67f51207f056b0644a6d51e7b1da8d4f1eb27e581781af3f5f56bb98ed405909b2497eea3668df5bb78ece447dac528d7b18fdcd90f
 DIST cfengine-3.5.3.tar.gz 1542468 SHA256 0e2d13ba1d75f826bf15411912ce21075734796a35e8fb8ecf545d70d60f41e1 SHA512 20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18 WHIRLPOOL 2434abd1b6228e87fb848ea013dafca7d1e62dfeaa3ddafd534d663f69eb8b84221f452f8d288571352b641efbde0d1e65f6377d74f7cfa7678267f548036c7b
+DIST cfengine-3.6.2.tar.gz 1966966 SHA256 0e0195c1998fc261d4ef2e47e9cc50b273d204bc8b221d469bb83071933c4a09 SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc WHIRLPOOL 989a7853b74848a69d4323f0e10ab05a7522132b6b52362b02d40e95a361ef85b74bef3e3263942376c3f6f4a29c3174967a3ca00fc5acef774537af14ce6352
 EBUILD cfengine-2.2.10-r4.ebuild 3360 SHA256 2307923e4ef6c38b97b45a448b17f542bcce53faa3a18e5ea37059286e796e58 SHA512 c2cd0debc80f852b387e31c8c005a4d5cd41ddd95bc1bdaac22778c0833ff100bc9c2fe63542d1652b51abcab8ce93d7000b7842feaec211b284d92b07ae4035 WHIRLPOOL 3a68304305c00ed129274dfd1012646386d954bd23dba4cea2fcf65e7e85dff7a2525edc5bad89014129e222c7c7d32df597a18235a5355c5a084274d0cffdef
 EBUILD cfengine-3.2.4.ebuild 4076 SHA256 f1517b13ec27f555fb76448a824da57a9a98ab8a0fa226787fe545957dc4a8cc SHA512 7a5839abe140df2472cbe4951198159d1ebc6d92ba941e8280304184108a74d9392501d59de22cec56834828e31bb4fdb1a4806333fc9d06f330ce1f46df3679 WHIRLPOOL dce09c3c6fc929cad0a98d32d144433a541b0a23a6ab39f093bff7087030dd8c9c832400f14635a72be294d14b1e0bd1d4009cf6aa8386e56dd1bff6d12711c6
 EBUILD cfengine-3.3.5.ebuild 3710 SHA256 d1d456c8069270cd0eaf0fbb0cb3c73d1fb9ce716162fb036b68935d11080d03 SHA512 1f25d4480576719ce690104c1f85b3856292ed8322ebe8ceee526e886bf891d638abc101523c9a1c1637679fe8b10e6eda38dcc9db1af23d1a199f24161c4ebd WHIRLPOOL 97748e30d5c8c5bddf01c6b0c224f4db49fb8dfc6e930b19bc65150a36d9f97890fa53220ac7f68c76ff81929378b7bd6c68db8b196ac3df7cbfd984cb17bb4e
 EBUILD cfengine-3.3.9.ebuild 3706 SHA256 701d83912c7a9533b13c74a18fc30376e4d4503a779b17144c69c3343f69cf41 SHA512 bc30e99065ff1ce911d27a05f46cc4f23f1f5a64f38fc23da5d6d6074c1f6113d7e2b931893cac95d4303c0c92923b64e5d3c4675d55f064e08add426a9b0939 WHIRLPOOL 5807fb62e189bc50c5b1c3a802c9a1e3270b94a27a9d4ac375f4dcd55f588efa5bf74687c13a48745e510774ee2c26365d96f63d705ec3fefc723f4c5d0269a4
 EBUILD cfengine-3.4.5.ebuild 3938 SHA256 84cba93a79be8670be4d2f6aeca51a90b8722c2b86e0ed5837af382407053ca8 SHA512 3b50ef01a34395a4c475c7fd83754abb98e39aa8001bc20bb2527087ea098e757480c30f9342a46fa5c8e5c12d891caaae639c66ded5d6982434e153dee48a41 WHIRLPOOL fd099734aee7bfd59205ed10807e6dd1c920fb475675b085c5e8274a277878496824011d1f2ffe1b82c6608ccaf569354806f628472917462a8812c76cac93cb
 EBUILD cfengine-3.5.3.ebuild 4005 SHA256 e25d1cdc0aafef7cbb17e131090c1e40472966749dc0c14cd3351dd1fb3345c3 SHA512 86ef2ad7ff151f615859312a38a610341ac526516fa7aa9c6d6a3be8646d7010d50908b497b3dbefd3658a4c57f2c84bf67aa436b76d0e893a4032728d1270db WHIRLPOOL 367363b5ad5c76cb91e0309e633054b0db0029238bfdbc945910028f87877da1631f37c49be4c5b1ea544da7c583cd7a7d83784956c062d676a65e8dd9149647
-MISC ChangeLog 28102 SHA256 58bc453da909d6b2d03cc27f4cea5d1fe1c18170f4ae72a521803bdcf56cf7db SHA512 c0609c6c57a3ba6e7bdc9b65a859fd8813ed116ba9c1e45597a16ef836f208f0e6c71b3787a17c449d75a52914d1404a21a6a295eb55378b2e0c01d67ceacf88 WHIRLPOOL 3fdfa09e27222973d52345ecca8197c0f6a057690726ab6d05d4abd3f81ba9560ab63df94db5358433fe49b4fe8cc24432308ccdd2b9ba28418eec323ad7b0ec
+EBUILD cfengine-3.6.2.ebuild 3943 SHA256 f04c6455d9fa0debd5b5757ed128ece822cbbe6ffe3deb979c192139d241ed5b SHA512 e67d1c1f84b56cae7711082e0e822b1e2e6cc5e3a25225180a7396087fd5d5f681263b5c375cae8cd48724f829c7b115f05b0c99e950cafcdc1c63118f9e0d73 WHIRLPOOL 2d987867505321f4381dc376ce6d33ae8e6dd632363f4efea5ff6ec355e5b37a45aa50be9e778da261988adef37d5cf2221d33e80c1dd388cf5605c7fcca8982
+MISC ChangeLog 28329 SHA256 b7183aad343a79be89295475a1a6701bdcebffb066751203a4b0a68815a203e7 SHA512 d465e5a66aa85c33d183d8a00dc7f3b5adc7b585a765a0160d7d2fa0c4b60fdcf069144f6385025db83e2259b972b042351db22b13eafae0a48d07d1df6b63a9 WHIRLPOOL ac3e50cc5ee91c7d69dda0343d00d0a182e83b9fc72e9459248d80074bde0afa371cbf2f37fc7e64be3f8111f0743b765c88b829668777fc2a81b7d9d9e2e567
 MISC metadata.xml 2275 SHA256 33cfade86435ed73933e269515541be176b88d7720e11459098515aaa25d797c SHA512 2888f2041495e44703b8b9bd852d3b7037d1daa209278d779bd7078c9be398ad8f3b463545dfa9696a512e0cb8cfb34af7652fe9b00c6e142ba45f9d41be7b5c WHIRLPOOL 6de56594f4ea573e5cd684be29ea5d01543b86a1c1832d157a36199220cda32c4babd13a35f511a7ea98f27e0ef658440b16b1f0e3b71fabbb4badf8800d2c4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUda4tAAoJELp701BxlEWfOawP/0m/RNAw5fAcl4VGgy/T5wy5
-1PbgJlsxn3JT1NWHfEyCbS81JWPDCD2rYQyOxF5NnfNy9f8ljSYm3YGear5lql7i
-yl79wUCiLKjFLy99P1XLpoUq8CB/Sn2aMX2qoAi7O8q02BM27h40g6KCFEMhIvt/
-QrOvliXDi5H6FcxhwAf1/iromUg/GIsMmSUrXBSKnrXqQiDy1wZLriU7U6RYGacx
-AA0Xfvswrb+/Es2vRsGq6v98vhMLhw5O8okaRRHIQ2KABhzxCt0X4YKKMaGISy/b
-pzO/r5Tm9vmqLFMk2yvvIqqkowFYw5hljpfcUt8McO19AK+wtCkO9dj/hX6Jfmuv
-/zt5wnnq1kSQO0QzBZY0V6J6AIWiG6oh2/QPAhtn+bEEB4Gr7T9WyqtBK/mGrrxz
-0pmO09M/BhSFbZg/3i4lg6xzJp1lsnmynRhogrF6NfGGwqngORIUVm17MkMyu8hi
-HGjsWBJrpJculRFzjampqvxjCKz1F9ZLrO/WoJ4R/22ta/S/QBBe3uoQpvzBzEnm
-m1uY0WZuFWg9535jMSCLOWPLwyic0EVaHE4pFtKiFjskGOeUvcwxMx7AX6m/GDtp
-eRD+o5cpxvi8tXODmlQHJEqegcK0itjQ2BTqoofi5ToRJRBFQB/BO0UJC2dLxqGJ
-iHvbVJlYGY+Gwm02HTDX
-=WjKq
+iD8DBQFUevM+KWxsyjWmQTQRCHuoAKCi2gFsNtXzWshTG5ZBbVyByeogsQCgseAc
+WNgSZY/fHjN5CGwU2acWCOg=
+=uGf1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
new file mode 100644
index 000000000000..54792d0e4fb4
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.6.2.ebuild,v 1.1 2014/11/30 10:36:40 mschiff Exp $
+
+EAPI="5"
+
+inherit eutils autotools flag-o-matic
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An automated 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 -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="acl examples libvirt mysql postgres +qdbm selinux tokyocabinet vim-syntax xml"
+
+DEPEND="acl? ( virtual/acl )
+	mysql? ( virtual/mysql )
+	postgres? ( virtual/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"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+REQUIRED_USE="qdbm? ( !tokyocabinet )
+	tokyocabinet? ( !qdbm )
+	!tokyocabinet? ( qdbm )
+	!qdbm? ( tokyocabinet )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}/${P}-ifconfig.patch"
+	eautoreconf
+}
+
+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 || die
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+
+	emake DESTDIR="${D}" install || die
+
+	# fix ifconfig path in provided promises
+	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
+
+	# Evil workaround for now..
+	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+
+	dodoc AUTHORS
+
+	if ! use examples; then
+		rm -rf "${D}"/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 || die
+	done
+}
+
+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 /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 [ "${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/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
new file mode 100644
index 000000000000..ae0f491347f9
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
@@ -0,0 +1,11 @@
+--- 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;