Revision bump, fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696 and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666

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

4 files changed, 55 insertions, 6 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index fcb606c6091b..775e30f35e62 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.98 2010/03/07 22:23:15 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.99 2010/05/10 19:13:05 idl0r Exp $
+
+*cfengine-2.2.10-r2 (10 May 2010)
+
+  10 May 2010; Christian Ruppert <idl0r@gentoo.org>
+  +files/511666-segfault.patch, -cfengine-2.2.10-r1.ebuild,
+  +cfengine-2.2.10-r2.ebuild, +files/admit-noclass-520696.patch:
+  Revision bump, fixes
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696 and
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
 
 *cfengine-2.2.10-r1 (07 Mar 2010)
 
diff --git a/net-misc/cfengine/cfengine-2.2.10-r1.ebuild b/net-misc/cfengine/cfengine-2.2.10-r2.ebuild
index 45e19697e5e8..4de4138390d0 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r1.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r2.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-r1.ebuild,v 1.1 2010/03/07 22:23:15 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r2.ebuild,v 1.1 2010/05/10 19:13:05 idl0r Exp $
 
 EAPI="2"
 
@@ -22,11 +22,16 @@ DEPEND=">=sys-libs/db-4
 RDEPEND="${DEPEND}"
 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 
+src_prepare() {
+	epatch "${FILESDIR}/admit-noclass-520696.patch" \
+		"${FILESDIR}/511666-segfault.patch"
+}
+
 src_configure() {
 	# Enforce /var/cfengine for historical compatibility
 	econf \
 		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr || die
+		--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
@@ -38,9 +43,9 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
-	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
+	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
+	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
 
 	make DESTDIR="${D}" install || die
 
diff --git a/net-misc/cfengine/files/511666-segfault.patch b/net-misc/cfengine/files/511666-segfault.patch
new file mode 100644
index 000000000000..ea3ae9686254
--- /dev/null
+++ b/net-misc/cfengine/files/511666-segfault.patch
@@ -0,0 +1,20 @@
+Fix a bug involving CheckFriendReliability (see bug #482439)
+
+Index: cfengine2-2.2.9/src/instrument.c
+===================================================================
+--- cfengine2-2.2.9.orig/src/instrument.c	2009-03-06 21:25:59.000000000 +0000
++++ cfengine2-2.2.9/src/instrument.c	2009-03-06 21:26:31.000000000 +0000
+@@ -716,11 +716,11 @@
+       key.data = timekey;
+       key.size = strlen(timekey)+1;
+ 
+-      if ((errno = dbp->get(dbp,NULL,&key,&value,0)) != 0)
++      if ((errno = dbpent->get(dbpent,NULL,&key,&value,0)) != 0)
+          {
+          if (errno != DB_NOTFOUND)
+             {
+-            dbp->err(dbp,errno,NULL);
++            dbpent->err(dbpent,errno,NULL);
+             exit(1);
+             }
+          }
diff --git a/net-misc/cfengine/files/admit-noclass-520696.patch b/net-misc/cfengine/files/admit-noclass-520696.patch
new file mode 100644
index 000000000000..1e5d8594aaed
--- /dev/null
+++ b/net-misc/cfengine/files/admit-noclass-520696.patch
@@ -0,0 +1,15 @@
+Fix a bug with admit/grant that let cfengine2 fails when the class
+of a cfengine fragment does not exist and more than a host or IP
+ranges are specified for a path (see #520696)
+
+--- a/src/install.c
++++ b/src/install.c
+@@ -6561,7 +6561,7 @@
+ if (!IsDefinedClass(classes))
+    {
+    Debug1("Not installing Auth path, no match\n");
+-   InitializeAction();
++//   InitializeAction();
+    return;
+    }
+