Compile-fix for using cfengine-2.1 and db4.8 together.

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

4 files changed, 118 insertions, 5 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index e42a4b3d0001..0aac4cb497e0 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.95 2010/01/19 18:32:06 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.96 2010/01/26 11:00:16 robbat2 Exp $
+
+  26 Jan 2010; Robin H. Johnson <robbat2@gentoo.org>
+  cfengine-2.1.22-r2.ebuild,
+  +files/cfengine-2.1.22-db48-namespace-fix.patch:
+  Compile-fix for using cfengine-2.1 and db4.8 together.
 
   19 Jan 2010; nixnut <nixnut@gentoo.org> cfengine-2.2.10.ebuild:
   ppc stable #300483
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index deafa38ac7f8..9a4771da290f 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,4 +1,5 @@
 AUX cfengine-2.1-package-locking-fixup.patch 2194 RMD160 572ee1ac251de0102ed256545cc1f0deb6ebdf40 SHA1 af3972d0c19a902c588d1486e3c22c6fe3352068 SHA256 296236fba653b041f396d4b19387a29a3c39e9c6c3be4d319a97b2a33d3a10d5
+AUX cfengine-2.1.22-db48-namespace-fix.patch 3058 RMD160 5967a3697acdd3460b2a1b24fb7e9193f9f9356b SHA1 659d2047b33b4f7c3d78beada6c34f4243c02632 SHA256 cc3590d63bb84a92d76155b8fb1d61fbcda94c9ddaa55f549f02023c53af55fd
 AUX cfengine-2.1.22-package-fix.patch 431 RMD160 c92f6b497e1d03aeefb5fb7cb6fd64ce2ac5aa15 SHA1 a587359f0d180d776065546112c0623e91016dd8 SHA256 3fff21b705fb84d7e1efc3c7891f466182b977bd88855f55c85aa283b2ccd584
 AUX cfengine-2.2-package-locking-fixup.patch 2200 RMD160 b68bd05683de8def1e5c8b570965c73e0919e6f7 SHA1 a881bde8191b1362b296bce20af68d247b69ecf1 SHA256 b3829d2e8999d7ec38771f28ed329dce964a02ff665cb5bdc3cac5d2cb0f9db8
 AUX cfengine-2.2.6-typo-fix.patch 400 RMD160 6e23769b84335ae2433912af2709b11669c0fd08 SHA1 141b9d74ceb0ca947ef717461b002c2a84fb927e SHA256 4047ab39c1bc2029c32c57eb796cc8c6bb2822fb9bd7f8b3186172ef0e745da7
@@ -10,9 +11,9 @@ AUX module-cfportage.tbz2 3099 RMD160 21826b2263d6aa9ad83037d465adc40bafc0222b S
 DIST cfengine-2.1.22.tar.gz 3673965 RMD160 9109a5156aa24e29137ff51ad1b5a0050b62eb2f SHA1 79501a4d430bc5a955b56519e0d00f62d8353229 SHA256 fa30e5b29517370e5cea8d9935999e437709e574d103eb317eeed007c975d451
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
 DIST cfengine-2.2.8.tar.gz 2715678 RMD160 a35ac5d87a345f38a779719314d3978ee9e3045c SHA1 670b5fc15a4dd5c80b301adf1e1bf7979161a049 SHA256 6423ad330057b28524bf4a91b064d459af2be01d5cddb5064c15d8cb1130e7b8
-EBUILD cfengine-2.1.22-r2.ebuild 2362 RMD160 9959294df8e49f146dde55a0feea02a43c9dfa53 SHA1 046af5ed45906366bf3a8ae424d7cf09d522b8c4 SHA256 a390b6a46316062b1f193638905d74630eef6682a073403321a3111c28c89001
+EBUILD cfengine-2.1.22-r2.ebuild 2544 RMD160 2c136ba13744c57d6e3735a8d6920a96ec207bae SHA1 10118a326a26378db15539b0757bcf479575a077 SHA256 b1144f77d16ce5ddb9609671694fc3e2946ccd68ac6f92be457f5bb70946c146
 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
-MISC ChangeLog 15172 RMD160 5987cee7340d131acfc43a9a77fb9ee8bb362374 SHA1 4d0c61721f764329a93f0d4717c3cdbfafb299b8 SHA256 3e2411500aea0efed99a9ce5abaa88b45266359c11e7f06dfab381af40c9a75a
+MISC ChangeLog 15364 RMD160 6b55e9a1aefcafaf9b12dd342462318cda18419f SHA1 307178be4915d0610020ed184f2e104b0b2216af SHA256 9228a94e01844e5c6790de6f648aa95f2b706baffb0fe00ab00b8199de8ed282
 MISC metadata.xml 1778 RMD160 a2f0a0604ba979552761a74b22c0f5fd74d2b7b7 SHA1 88909229ff2a2773d58ff91499bd2272eca34499 SHA256 e39a880a0da5fdeb4f9a0548a99b1ff5ead65d12442c9de16db2776afdbd09a9
diff --git a/net-misc/cfengine/cfengine-2.1.22-r2.ebuild b/net-misc/cfengine/cfengine-2.1.22-r2.ebuild
index 52b078657073..36547bd3db51 100644
--- a/net-misc/cfengine/cfengine-2.1.22-r2.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.22-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.1.22-r2.ebuild,v 1.2 2009/08/23 23:22:18 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r2.ebuild,v 1.3 2010/01/26 11:00:16 robbat2 Exp $
 
 inherit eutils
 
@@ -24,6 +24,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-package-fix.patch
 	epatch "${FILESDIR}"/${PN}-2.1-package-locking-fixup.patch
+	# DB4.8 uses 'ENV' as a typedef, and it conflicts with symbols in cfengine
+	# on the same name. Change the cfengine ones.
+	epatch "${FILESDIR}"/${PN}-2.1.22-db48-namespace-fix.patch
 }
 
 src_compile() {
diff --git a/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch b/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch
new file mode 100644
index 000000000000..5f27e46f5a84
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch
@@ -0,0 +1,104 @@
+diff -Nuar cfengine-2.1.22.orig/src/cfenvd.c cfengine-2.1.22/src/cfenvd.c
+--- cfengine-2.1.22.orig/src/cfenvd.c	2007-01-07 14:15:42.000000000 +0000
++++ cfengine-2.1.22/src/cfenvd.c	2010-01-26 10:58:20.328601944 +0000
+@@ -69,8 +69,8 @@
+ 
+ char BATCHFILE[CF_BUFSIZE];
+ char STATELOG[CF_BUFSIZE];
+-char ENV_NEW[CF_BUFSIZE];
+-char ENV[CF_BUFSIZE];
++char CF_ENV_NEW[CF_BUFSIZE];
++char CF_ENV[CF_BUFSIZE];
+ 
+ short TCPDUMP = false;
+ short TCPPAUSE = false;
+@@ -284,8 +284,8 @@
+  
+ snprintf(AVDB,CF_MAXVARSIZE,"%s/state/%s",CFWORKDIR,CF_AVDB_FILE);
+ snprintf(STATELOG,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_STATELOG_FILE);
+-snprintf(ENV_NEW,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENVNEW_FILE);
+-snprintf(ENV,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENV_FILE);
++snprintf(CF_ENV_NEW,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENVNEW_FILE);
++snprintf(CF_ENV,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENV_FILE);
+ 
+ if (!BATCH_MODE)
+    {
+@@ -1070,9 +1070,9 @@
+ 
+ /* Publish class list */
+ 
+-unlink(ENV_NEW);
++unlink(CF_ENV_NEW);
+  
+-if ((fp = fopen(ENV_NEW,"a")) == NULL)
++if ((fp = fopen(CF_ENV_NEW,"a")) == NULL)
+    {
+    DeleteItemList(PREVIOUS_STATE);
+    PREVIOUS_STATE = classlist;
+@@ -1095,7 +1095,7 @@
+ DeleteItemList(ENTROPIES); 
+ fclose(fp);
+ 
+-rename(ENV_NEW,ENV);
++rename(CF_ENV_NEW,CF_ENV);
+ }
+ 
+ /*********************************************************************/
+diff -Nuar cfengine-2.1.22.orig/src/cfetool.c cfengine-2.1.22/src/cfetool.c
+--- cfengine-2.1.22.orig/src/cfetool.c	2006-01-29 15:34:23.000000000 +0000
++++ cfengine-2.1.22/src/cfetool.c	2010-01-26 10:58:13.145262988 +0000
+@@ -157,8 +157,8 @@
+ int time_to_update = false;
+ int DEBUGGING = false;
+ int DEBUGGING2 = false;
+-char ENV_NEW[CF_BUFSIZE];
+-char ENV[CF_BUFSIZE];
++char CF_ENV_NEW[CF_BUFSIZE];
++char CF_ENV[CF_BUFSIZE];
+ 
+ #define Debugging if(DEBUGGING) printf
+ #define Debugging2 if(DEBUGGING2) printf
+@@ -267,8 +267,8 @@
+   }
+   strncpy(VLOCKDIR,WORKDIR,CF_BUFSIZE-1);
+   strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
+-  snprintf(ENV_NEW,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENVNEW_FILE);
+-  snprintf(ENV,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENV_FILE);
++  snprintf(CF_ENV_NEW,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENVNEW_FILE);
++  snprintf(CF_ENV,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENV_FILE);
+   argv += 2;
+   argc -= 2;
+   if (strcmp(command, "create") == 0)
+@@ -2437,7 +2437,7 @@
+ 
+   if(cfenvd_compatible)
+   {
+-    unlink(ENV_NEW);
++    unlink(CF_ENV_NEW);
+     strcpy(temp1, NAME);
+     strcat(temp1, "_");
+     temp2[0] = '_';
+@@ -2452,12 +2452,12 @@
+       lock.l_whence = SEEK_SET;
+       lock.l_len = 0;
+  
+-      if ((newfp = fopen(ENV_NEW,"a")) == NULL)
++      if ((newfp = fopen(CF_ENV_NEW,"a")) == NULL)
+       {
+         DeleteItemList(classlist);
+         return code; 
+       }
+-      if ((oldfp = fopen(ENV, "r")) != NULL)
++      if ((oldfp = fopen(CF_ENV, "r")) != NULL)
+       {
+         if(fcntl(fileno(oldfp), F_SETLK, &lock) == -1)
+         {
+@@ -2481,7 +2481,7 @@
+  
+       fclose(newfp);
+ 
+-      rename(ENV_NEW,ENV);
++      rename(CF_ENV_NEW,CF_ENV);
+       break;
+     }
+   }