summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-01-26 11:00:16 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-01-26 11:00:16 +0000
commite012d17ad9954c6f639f3b5540f6450c89a762c4 (patch)
tree80c1bf708c612cb2f0fff3816ba3361e9bc44e3f /net-misc
parentRevert multilib change from bug #296917 as it breaks cross-compiling, bug #30... (diff)
downloadgentoo-2-e012d17ad9954c6f639f3b5540f6450c89a762c4.tar.gz
gentoo-2-e012d17ad9954c6f639f3b5540f6450c89a762c4.tar.bz2
gentoo-2-e012d17ad9954c6f639f3b5540f6450c89a762c4.zip
Compile-fix for using cfengine-2.1 and db4.8 together.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/cfengine/ChangeLog7
-rw-r--r--net-misc/cfengine/cfengine-2.1.22-r2.ebuild7
-rw-r--r--net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch104
3 files changed, 115 insertions, 3 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/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;
+ }
+ }