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

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

5 files changed, 63 insertions, 12 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/Manifest b/net-misc/cfengine/Manifest
index f552c45917c3..47f50d0622b9 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 511666-segfault.patch 731 RMD160 5a1965029fcc27f95ef89aaf74ea7b5e93ff30eb SHA1 1c93030161d91bab21e46df355bbb7da77772f27 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d
+AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6abdb SHA1 39e8a42c9ecca02d51d340fd6dabe91626c494c8 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2
 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
@@ -19,17 +21,17 @@ DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e26
 DIST cfengine-2.2.8.tar.gz 2715678 RMD160 a35ac5d87a345f38a779719314d3978ee9e3045c SHA1 670b5fc15a4dd5c80b301adf1e1bf7979161a049 SHA256 6423ad330057b28524bf4a91b064d459af2be01d5cddb5064c15d8cb1130e7b8
 DIST cfengine-3.0.4.tar.gz 2217103 RMD160 6c7507d72b646b055b82513c943cecd237430072 SHA1 71c6c41bc717a03df6db8585e11a673415f1f94c SHA256 7e0aa7807e68ca7a9ccda9ed0b57fd20c91020bd2810c2140b2802e8ca461a21
 EBUILD cfengine-2.1.22-r2.ebuild 2544 RMD160 2c136ba13744c57d6e3735a8d6920a96ec207bae SHA1 10118a326a26378db15539b0757bcf479575a077 SHA256 b1144f77d16ce5ddb9609671694fc3e2946ccd68ac6f92be457f5bb70946c146
-EBUILD cfengine-2.2.10-r1.ebuild 2789 RMD160 854c9b7b3c9266ee96aa18ec855dd8324e8312f7 SHA1 f3fe58ce6c3da77aa5800190a19d4fc8b126840a SHA256 46c1027a79e6582689b516be00a35b73490f1ec91f6d74017f44ae137508189e
+EBUILD cfengine-2.2.10-r2.ebuild 2908 RMD160 953c64f18e3fdf8cd07a4f896cbb3a0a4ef8d7b5 SHA1 a0babe44794f2c546394755fe393aa13b4507c8f SHA256 d4d955d000ccf70f190bd1b2e0523a557e01884261ecbb7e3a6859ae45010bb6
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
 EBUILD cfengine-2.2.8-r1.ebuild 2677 RMD160 555ec1ab9cc2a84dba02cc5dcfd7c62532196c51 SHA1 706b55a68fba41158a30f1b773a3b92f1ae50034 SHA256 6d265c2ae8a63c20ab3553a92d6489a4b747bc64618fb5c0687e89f8ee594081
 EBUILD cfengine-2.2.8.ebuild 2324 RMD160 ef2b1d60c3723fb596bcadd4bfff1292b4a0e7cd SHA1 66ade9c3000a5d2c4a870b1932b5ecd0e055b9d8 SHA256 eca8411b2605956b66b32010ffa63dbbbc793e68d7640c5fb84b485afe0aa03a
 EBUILD cfengine-3.0.4.ebuild 2980 RMD160 9a3f34ba4c6d4caca3f2d88408ed884caf4c02bc SHA1 3afa99fc4b8228ba23e3ea5ee4918146df47a847 SHA256 76374b301fa4ac5f249d75c4460cd6cbe66cc06e9987973bbc8bf4bc6a7424fa
-MISC ChangeLog 15792 RMD160 0a54e36f0d16909e980e0d4c04a3f467fa50702d SHA1 44cf2b7cb82b5e658170edee1831e7031a6704ae SHA256 883e5e0fbac419548af1d797c947040ddd2deee7d4fbbcdeec1dbafe4283ebd2
+MISC ChangeLog 16145 RMD160 50e874e1a13b4a6545c057c88cb9fb4a6c92533b SHA1 02544d3f07d44c6cf010e0ffa036ad5485496944 SHA256 f0353179016e4e3e541ca5cc1bf331f4392eca59ecbbc1c579cb528e2ba52b99
 MISC metadata.xml 1778 RMD160 a2f0a0604ba979552761a74b22c0f5fd74d2b7b7 SHA1 88909229ff2a2773d58ff91499bd2272eca34499 SHA256 e39a880a0da5fdeb4f9a0548a99b1ff5ead65d12442c9de16db2776afdbd09a9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iD8DBQFLlCbXQW+hXSf0t0IRAmKKAJ9zO/TrGdR3BZhYvbjQpg/Y7lj61wCdHoHx
-iWsMnGf+TkWsTtiZNpWRK/E=
-=zBfU
+iEYEARECAAYFAkvoWsoACgkQixe2jn+ufTjAtACePtpEZwHRwT2XddJ9saYRHCSK
+O6EAnjTpGCIYpVCZDYELd0TRHL5W7SiW
+=dflN
 -----END PGP SIGNATURE-----
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;
+    }
+