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.

(Portage version: 2.2_rc96/cvs/Linux x86_64)

5 files changed, 27 insertions, 114 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/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);