Remove cfengine-3.0.4. Revision bump from cfengine-2.2.10-r2 to -r3, fixes bug 339808. Remove ~arm, ~sparc, ~ppc keywords due to libvirt useflag.

Package-Manager: portage-2.2_rc96/cvs/Linux x86_64

6 files changed, 38 insertions, 126 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index f3f8032538c7..023721c7eddf 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.106 2010/09/16 12:15:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.107 2010/10/15 20:52:29 idl0r Exp $
+
+*cfengine-2.2.10-r3 (15 Oct 2010)
+
+  15 Oct 2010; Christian Ruppert <idl0r@gentoo.org> -cfengine-2.2.10-r2.ebuild,
+  +cfengine-2.2.10-r3.ebuild,
+  +files/cfengine-2.2.10-snprintf_buffer_overflow.patch,
+  -cfengine-3.0.4.ebuild, cfengine-3.0.5_p1-r1.ebuild:
+  Remove cfengine-3.0.4. Revision bump from cfengine-2.2.10-r2 to -r3, fixes
+  bug 339808. Remove ~arm, ~sparc, ~ppc keywords due to libvirt useflag.
 
 *cfengine-3.0.5_p1-r1 (16 Sep 2010)
 
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 293330b1a172..79055d051744 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -6,6 +6,7 @@ AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6ab
 AUX cf-execd.rc6 263 RMD160 bec43d07a575100aba0e845b70d2296ec1936417 SHA1 313fd7150e56cb62241863f9ae27edc1ba86b1b5 SHA256 a5fc7f9994c48fc18885d07ddef7e3a69abd500e6a0e2eff2f688f54e886d1b9
 AUX cf-monitord.rc6 275 RMD160 75fe87edaaeac30a40abf0dbf3bf41b6d1a73ba7 SHA1 b6b35fae103c593aee295da36fb5cc3389492205 SHA256 3e78f87709c8abd69bcc4a2c25787f986655c8c7d1221784600c59af23535bed
 AUX cf-serverd.rc6 271 RMD160 55ef90418fb1f6ca943c0807ba520644d6b2c20d SHA1 91e0b17009e80be23f6886e71b3584dc9533a3d6 SHA256 6829f3cd53334a657bf808ec96b995f2510baf2a16f2712b4609e09d5eaaff7d
+AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 RMD160 58c7369342d9042dd6c02ec37bbc1e05b8272c50 SHA1 4668f24858a8c48c8f60f3840de6277612955ed1 SHA256 25a37e3d23163459844789b3817814768a7126f564fd473ec0a6d1136897ebff
 AUX cfengine-3.0.5_p1-Makefile.am.patch 1010 RMD160 63be934e2e0529f320034882cfa7a477bf818d6b SHA1 5370668dc725135cf27252c4928c54e6560ca0e7 SHA256 17558b112bdd3991f4ca18a135e8c96cd10f5477dab5eed208d8f33222ca4dac
 AUX cfengine-3.0.5_p1-configure.ac.patch 13597 RMD160 645163b58d05124f03dc8aa4525954f7412ce038 SHA1 a716dc0af3f835a5327e0e9096ef53d7c0e6120b SHA256 82ff6baf5e8c0215ddda4824d233cd9ab7a144e6bc8c409112980c03cc804835
 AUX cfengine-3.0.5_p1-regex.c.patch 330 RMD160 d5cf6c473f11432b6d215666a0257f1ed980ff44 SHA1 cb4c994df51d91a45ca1d73fef6f9f8951d61a8a SHA256 bc50e35480ab2fb0837f5a68d3ce5d33e06f098ee7c219f4b5c7fe63326ecf4d
@@ -14,24 +15,22 @@ AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df77
 AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7f7598154775bf9f180383f69294a00624a69735 SHA256 c1a5a2af3b7e41a9b1c6d5e252e7a3673ec17d12ed3fa0aa34581b5893c8f833
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
-DIST cfengine-3.0.4.tar.gz 2217103 RMD160 6c7507d72b646b055b82513c943cecd237430072 SHA1 71c6c41bc717a03df6db8585e11a673415f1f94c SHA256 7e0aa7807e68ca7a9ccda9ed0b57fd20c91020bd2810c2140b2802e8ca461a21
 DIST cfengine-3.0.5.tar.gz 1512755 RMD160 a8ad67570dd382c13dcecd3b80e6d029c2efd1e3 SHA1 3d014c410ad0479040b33f82d85fd737a28372bd SHA256 4aea3c7a6b38a211b85d76d0b30f525684d741062897d47d19c88334f4cf79d5
 DIST cfengine-3.0.5p1.tar.gz 1517992 RMD160 909ee306cdbd0e674fbdb54ddcbca66b0cc5213b SHA1 bc7cc5fbc6c9a973f2f74c45e6835934230b6d63 SHA256 38a389969ff095775e206df24b0fbc66ae30fa404d92dcb26b94a568e790610b
-EBUILD cfengine-2.2.10-r2.ebuild 3026 RMD160 207e3472692821d04ac70539038abf895c9bd163 SHA1 7911f0e5fa96e152b0658c232621b75b1bf30232 SHA256 61cc0e5cc7ba710c94c828f19abcda7523d26dd9e75553ab5898c310433cbb06
+EBUILD cfengine-2.2.10-r3.ebuild 3113 RMD160 2f9c3d613e0b47d92084702e870bf22e7b9430a6 SHA1 fd7066de09810f8659834d790eb1953c98e48b47 SHA256 bc5c3bb658ff03441ecc378542026203f3ac0b4d028c071fa7af7de64efbe320
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.0.4.ebuild 2976 RMD160 49d0fe986fe15528eb4978850be26548ae76d33b SHA1 d155348f12bfdf5cb072f9e99bfeba142bb3d3be SHA256 e35e0c67f0e50b4a57cca3b49a0b298bb24011b6577517611cf50b0057772dad
 EBUILD cfengine-3.0.5.ebuild 2976 RMD160 c099526c8658650ca8f111628c2cf97b797e1c3c SHA1 f05732b9c9858e7b29dccc207ea6ec4db60643bd SHA256 bd4e1fcd4f7b10a795c9acc45030a647e98d516bafc7679d6f3629383f8bfa05
-EBUILD cfengine-3.0.5_p1-r1.ebuild 3667 RMD160 34a70eb44c47cfcc5e02fc69b704b331c3a32046 SHA1 8db85e6faaecf79ea0c3b2b738ec63fe996befe8 SHA256 32f924e075084b56536798d88028037e80eda280e69bcdc70c009dd78bf0ee82
-MISC ChangeLog 17820 RMD160 4a069382ad36fc4483595f8903eb6ac7b3794393 SHA1 29771aa02fb44a4df776e3b0736fdee519f7eb36 SHA256 97da6ab435eeb920b0f0679470d7fed7f80ca188aa94f5bf68ee28c7619a9e7a
+EBUILD cfengine-3.0.5_p1-r1.ebuild 3650 RMD160 e2e9a252280693ace7d67f2f37019143ae93a7c8 SHA1 a09ac7cb6f92a5b44e7973f1d6902721de6ae808 SHA256 b4445a99b8fa90a8e74da59624fcd935d3a2bac8ae2d007e68b7e2baa79f9d88
+MISC ChangeLog 18228 RMD160 c122ab0d1372667fca9989e60683d1ffbabb689e SHA1 aee7ceb5fe1b161f324386febd5e16593b6f8e77 SHA256 61c7a3c79d2f166a289a30a48467d687492f1c980f8083c76e1a2cc2f45befcb
 MISC metadata.xml 2550 RMD160 54b3002fb2ec4fa40c1f8ada30a96888dce49152 SHA1 783075e090785dd673ac6ba68c5ec20706348c9b SHA256 7872950fe463d7c39fe36a2381ca3819784a52325069b2bc607ddd5849934640
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMkgpyAAoJEMOx0zmdw4Z1erQH/0DDDUm+oBOWQcG5BmXj/vtj
-p0omabzELnzV7pksOV0jrRLe+DXX36wSUn2gOuqLknnNNII+Yftk6ia7ENBy56jc
-8l0jKHmnP6BQTasiW8nX93dewYAiRbEqFO8R05eNq0RyyPHnS2oiuRgRdes5mKLK
-u+asonxNhY27oGosSOeEvStO/9LVU+x1fli392BVzxXmLdrwNUU2ORCv6fQJT2li
-2ZjTznFIXC5OGgs9a2Q2coS85kclDtGSeojNvTDdJ8w2K+Rk00qG5isIY4Z+DStK
-u5kvTPTq54FTWIEq10hHHoJ33JBBkDOsoizyWkVA+aSew5257a7R2k7hvRoibDw=
-=Fv2M
+iQEcBAEBAgAGBQJMuL8TAAoJEMOx0zmdw4Z1bHwIAMIy4vGc4zd8V8GL2qBncqH3
+xp/31o2DNFn0CiNerVwzdpDSu5uudDcK9W28XIl7FWnPa9TAIZHVQid5sKnzErkN
+Qrypm6M0bI/aN/cJtdHnVwz0t4Uni6G/D8Nzb/z1lNPz34zB8JeSU7GXivhqb/QZ
+vhnDFCw+lEIowulyyD9ypgha1hOOWIV/Cpw4VhnnBqoTpzZngAiQ3xNT6dzC+uvC
+XncluIFPiTaTAm2fQriHbhGgm8xjS9Kq2zTcl8leVyZ0urEAZs3kNVxTWQ850xzo
+psy6+AJ1xgAOpIJI321BhN4Be6uDkEq6dymBBtgR4z7Ox1NIj+xitVbBep8gdnU=
+=eChs
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.2.10-r2.ebuild b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
index b0c8fb023ed4..d2bd383ca083 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r2.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r2.ebuild,v 1.2 2010/05/10 19:18:54 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild,v 1.1 2010/10/15 20:52:29 idl0r Exp $
 
 EAPI="2"
 
@@ -25,8 +25,10 @@ PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 src_prepare() {
 	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
 	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
+	# http://bugs.gentoo.org/339808
 	epatch "${FILESDIR}/admit-noclass-520696.patch" \
-		"${FILESDIR}/511666-segfault.patch"
+		"${FILESDIR}/511666-segfault.patch" \
+		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
 }
 
 src_configure() {
diff --git a/net-misc/cfengine/cfengine-3.0.4.ebuild b/net-misc/cfengine/cfengine-3.0.4.ebuild
deleted file mode 100644
index 792f36a9e7ef..000000000000
--- a/net-misc/cfengine/cfengine-3.0.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.4.ebuild,v 1.4 2010/08/29 10:57:19 idl0r Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MY_PV="${PV//_beta/b}"
-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://www.cfengine.org/tarballs/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
-IUSE="mysql postgres selinux vim-syntax"
-
-DEPEND=">=sys-libs/db-4
-	>=dev-libs/openssl-0.9.7
-	dev-libs/libpcre
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	app-portage/portage-utils"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf
-
-	if use mysql || use postgres ; then
-		myconf="--with-sql"
-	else
-		myconf="--without-sql"
-	fi
-	# selinux incorrectly enables if it sets --disable-selinux
-	if use selinux ; then
-		myconf="${myconf} $(use_enable selinux)"
-	fi
-
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		"${myconf}" \
-		--with-workdir=/var/cfengine \
-		--docdir=/usr/share/doc/"${P}" \
-		--with-berkeleydb=/usr || die
-
-	# Fix Makefile to skip inputs
-	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile
-	# Fix Makefiles to install tests in correct directory
-	for i in file_masters file_operands units ; do
-		sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${P}\/tests\/${i}/" \
-			tests/${i}/Makefile
-	done
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-servd
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
-
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TODO INSTALL
-
-	# Manually install inputs
-	docinto examples
-	dodoc inputs/*.cf
-
-	# Create cfengine working directory
-	mkdir -p "${D}"/var/cfengine
-	fperms 700 /var/cfengine
-	keepdir /var/cfengine/bin
-	keepdir /var/cfengine/inputs
-}
-
-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,serverd,execd} "${ROOT}"/var/cfengine/bin/
-
-	einfo
-	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"
-	einfo
-
-	elog "You MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-}
-
-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/cfengine-3.0.5_p1-r1.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild
index 66294a83e634..a06d28367bf0 100644
--- a/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild,v 1.1 2010/09/16 12:15:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild,v 1.2 2010/10/15 20:52:29 idl0r Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~s390 ~x86"
 
 IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
 
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
new file mode 100644
index 000000000000..dee9b797f6ac
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
@@ -0,0 +1,11 @@
+--- src/instrument.c.old	2010-10-15 22:20:58.014091858 +0200
++++ 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;
+ 
+-   snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime(&tthen));
++   snprintf(datebuf,CF_MAXVARSIZE-1,"%s",ctime(&tthen));
+    datebuf[strlen(datebuf)-9] = '\0';                     /* Chop off second and year */
+ 
+    snprintf(addr,15,"%s",hostname+1);