| 1 |
robbat2 10/01/26 11:00:16 |
| 2 |
|
| 3 |
Modified: ChangeLog cfengine-2.1.22-r2.ebuild |
| 4 |
Log: |
| 5 |
Compile-fix for using cfengine-2.1 and db4.8 together. |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.96 net-misc/cfengine/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.96&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.96&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/ChangeLog?r1=1.95&r2=1.96 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v |
| 18 |
retrieving revision 1.95 |
| 19 |
retrieving revision 1.96 |
| 20 |
diff -p -w -b -B -u -u -r1.95 -r1.96 |
| 21 |
--- ChangeLog 19 Jan 2010 18:32:06 -0000 1.95 |
| 22 |
+++ ChangeLog 26 Jan 2010 11:00:16 -0000 1.96 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for net-misc/cfengine |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.95 2010/01/19 18:32:06 nixnut Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.96 2010/01/26 11:00:16 robbat2 Exp $ |
| 28 |
+ |
| 29 |
+ 26 Jan 2010; Robin H. Johnson <robbat2@g.o> |
| 30 |
+ cfengine-2.1.22-r2.ebuild, |
| 31 |
+ +files/cfengine-2.1.22-db48-namespace-fix.patch: |
| 32 |
+ Compile-fix for using cfengine-2.1 and db4.8 together. |
| 33 |
|
| 34 |
19 Jan 2010; nixnut <nixnut@g.o> cfengine-2.2.10.ebuild: |
| 35 |
ppc stable #300483 |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 net-misc/cfengine/cfengine-2.1.22-r2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r2.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r2.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r2.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: cfengine-2.1.22-r2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r2.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -p -w -b -B -u -u -r1.2 -r1.3 |
| 51 |
--- cfengine-2.1.22-r2.ebuild 23 Aug 2009 23:22:18 -0000 1.2 |
| 52 |
+++ cfengine-2.1.22-r2.ebuild 26 Jan 2010 11:00:16 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
-# Copyright 1999-2009 Gentoo Foundation |
| 55 |
+# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $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 $ |
| 58 |
+# $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 $ |
| 59 |
|
| 60 |
inherit eutils |
| 61 |
|
| 62 |
@@ -24,6 +24,9 @@ src_unpack() { |
| 63 |
|
| 64 |
epatch "${FILESDIR}"/${P}-package-fix.patch |
| 65 |
epatch "${FILESDIR}"/${PN}-2.1-package-locking-fixup.patch |
| 66 |
+ # DB4.8 uses 'ENV' as a typedef, and it conflicts with symbols in cfengine |
| 67 |
+ # on the same name. Change the cfengine ones. |
| 68 |
+ epatch "${FILESDIR}"/${PN}-2.1.22-db48-namespace-fix.patch |
| 69 |
} |
| 70 |
|
| 71 |
src_compile() { |
Archives