Fix compilation with gcc 4.2. Closes bug #186706. Thanks to Tiziano for the patch.

Package-Manager: portage-2.1.2.9

5 files changed, 402 insertions, 17 deletions

diff --git a/net-libs/libfwbuilder/ChangeLog b/net-libs/libfwbuilder/ChangeLog
index 6c63b34d9bec..67f76ea4da4f 100644
--- a/net-libs/libfwbuilder/ChangeLog
+++ b/net-libs/libfwbuilder/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libfwbuilder
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.67 2007/07/25 18:40:51 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.68 2007/07/30 21:34:10 r3pek Exp $
+
+*libfwbuilder-2.1.13-r1 (30 Jul 2007)
+
+  30 Jul 2007; Carlos Silva <r3pek@gentoo.org>
+  +files/libfwbuilder-2.1.13-gcc42.patch, -libfwbuilder-2.1.13.ebuild,
+  +libfwbuilder-2.1.13-r1.ebuild:
+  Fix compilation with gcc 4.2. Closes bug #186706. Thanks to Tiziano for the
+  patch.
 
 *libfwbuilder-2.1.13 (25 Jul 2007)
 
diff --git a/net-libs/libfwbuilder/Manifest b/net-libs/libfwbuilder/Manifest
index c3b7f5f5c275..68a351d1113f 100644
--- a/net-libs/libfwbuilder/Manifest
+++ b/net-libs/libfwbuilder/Manifest
@@ -1,17 +1,21 @@
+AUX libfwbuilder-2.1.13-gcc42.patch 9090 RMD160 72dc591b420ef090769629ce6005cf5d6007a3dc SHA1 3d2ec5ac74d241f6269a49c493d1373de38aa035 SHA256 44ad1d48d17cda18ea128855e49535da56a79d4bb975037310b34eba73ebd53d
+MD5 1a1b7c6877c749f97c3887e1d5c71bd9 files/libfwbuilder-2.1.13-gcc42.patch 9090
+RMD160 72dc591b420ef090769629ce6005cf5d6007a3dc files/libfwbuilder-2.1.13-gcc42.patch 9090
+SHA256 44ad1d48d17cda18ea128855e49535da56a79d4bb975037310b34eba73ebd53d files/libfwbuilder-2.1.13-gcc42.patch 9090
 DIST libfwbuilder-2.0.12.tar.gz 282065 RMD160 69f996659d30863e97340c52d814469a8e5173b7 SHA1 a287de04e81a4ee480d34e8f209718eb63da457a SHA256 24304bf97ed366801ceed94675b26971c865c39d83d1e7d4f8547647972cdbdf
 DIST libfwbuilder-2.1.13.tar.gz 322604 RMD160 f25af700baad839bb15f3a05f7313fe60d504dbe SHA1 4be5e36c216fc073a2c01f030d2c85693cfb5269 SHA256 febe02af63000c7b3e1fc0ffc0b2076e2d19d3bf747b758204d7372c693bdd06
 EBUILD libfwbuilder-2.0.12.ebuild 825 RMD160 e7622ab96f012a04c35315dab42615fe28085591 SHA1 05503ea8203fb20d047dbe4fec1cbd049186b1ab SHA256 00b565180eea71123d0fbf5633e5b9078a1b17ba1121415784346ee38e113618
 MD5 c749f890bbcfad632ed474ce0c29fb65 libfwbuilder-2.0.12.ebuild 825
 RMD160 e7622ab96f012a04c35315dab42615fe28085591 libfwbuilder-2.0.12.ebuild 825
 SHA256 00b565180eea71123d0fbf5633e5b9078a1b17ba1121415784346ee38e113618 libfwbuilder-2.0.12.ebuild 825
-EBUILD libfwbuilder-2.1.13.ebuild 864 RMD160 dc7a30d03ba8e07168bccdac68f47db5ea817d63 SHA1 42789ed73974e6f0b6bf0cee3770ba4a39a0fd7f SHA256 103b859411522baa340a6f49e38e71e318b0017ece9f057f86210ee5d4d993b7
-MD5 d325b3c41cbbfa2c68d8d5085407e4d5 libfwbuilder-2.1.13.ebuild 864
-RMD160 dc7a30d03ba8e07168bccdac68f47db5ea817d63 libfwbuilder-2.1.13.ebuild 864
-SHA256 103b859411522baa340a6f49e38e71e318b0017ece9f057f86210ee5d4d993b7 libfwbuilder-2.1.13.ebuild 864
-MISC ChangeLog 10004 RMD160 88c891c8115f7f4f8bcae01bb38ba75a0dd42528 SHA1 5e244464dcc8ffcd38bed128ff0e2595a7b0dd01 SHA256 6c5d12b46dcba5cfd0e7e77e0c758872c9f1b777079ed7790cb3f78a9f03b823
-MD5 229432f54c3547326b34459e42a8e90e ChangeLog 10004
-RMD160 88c891c8115f7f4f8bcae01bb38ba75a0dd42528 ChangeLog 10004
-SHA256 6c5d12b46dcba5cfd0e7e77e0c758872c9f1b777079ed7790cb3f78a9f03b823 ChangeLog 10004
+EBUILD libfwbuilder-2.1.13-r1.ebuild 1022 RMD160 13ea06da0838fd9cb4e4b5f249dae4e3d4bbc5e0 SHA1 f1b384a0981aced57445f12ad3ddf3d11bbc1fde SHA256 f868b514577240bb6ab232722260a878c376838879c6bff581b929e92928b78a
+MD5 5678a9ba3cc2b6d4039a6e428c692895 libfwbuilder-2.1.13-r1.ebuild 1022
+RMD160 13ea06da0838fd9cb4e4b5f249dae4e3d4bbc5e0 libfwbuilder-2.1.13-r1.ebuild 1022
+SHA256 f868b514577240bb6ab232722260a878c376838879c6bff581b929e92928b78a libfwbuilder-2.1.13-r1.ebuild 1022
+MISC ChangeLog 10283 RMD160 eaf2d3cfa23603eb71dca9bffd754ca755eff6dc SHA1 a270ee113cdc94aadc3934dd4a25339236788cee SHA256 2e2b3c6d7231060bb4ea7dd34fae451e6b9e248c27a13c38e0514ec4e7aae510
+MD5 511e8cac633a25e9ed31d76b5a565675 ChangeLog 10283
+RMD160 eaf2d3cfa23603eb71dca9bffd754ca755eff6dc ChangeLog 10283
+SHA256 2e2b3c6d7231060bb4ea7dd34fae451e6b9e248c27a13c38e0514ec4e7aae510 ChangeLog 10283
 MISC metadata.xml 221 RMD160 53b8a5f1a719c020040bb39b48416c4358a3bcfd SHA1 c78a00e362d7c2e938a145e70a08f07bc307a533 SHA256 adc57871d27ab4e3aec6331df8fcd29661f0e00f6edb26915adb8db95610ec77
 MD5 78c1b34edd1399c24d7d9e59212bc17a metadata.xml 221
 RMD160 53b8a5f1a719c020040bb39b48416c4358a3bcfd metadata.xml 221
@@ -19,6 +23,6 @@ SHA256 adc57871d27ab4e3aec6331df8fcd29661f0e00f6edb26915adb8db95610ec77 metadata
 MD5 182a260aacc723f205982abc6b909894 files/digest-libfwbuilder-2.0.12 259
 RMD160 a0fbbcc28ca507d929ca5a397dfb80b72dbca024 files/digest-libfwbuilder-2.0.12 259
 SHA256 ef8f7da493d819f90a16f1a870683303b732470f2b05e3025f1033e53b5eedc8 files/digest-libfwbuilder-2.0.12 259
-MD5 7f8969e61f878f5a7a9123370f1a1a56 files/digest-libfwbuilder-2.1.13 259
-RMD160 f0669584a6891090154a50e843ecc11294dc92df files/digest-libfwbuilder-2.1.13 259
-SHA256 ae128111e8f472666cabd8d2ddfb8d1289c02d18aca02a3a5e02a5293360c5e2 files/digest-libfwbuilder-2.1.13 259
+MD5 7f8969e61f878f5a7a9123370f1a1a56 files/digest-libfwbuilder-2.1.13-r1 259
+RMD160 f0669584a6891090154a50e843ecc11294dc92df files/digest-libfwbuilder-2.1.13-r1 259
+SHA256 ae128111e8f472666cabd8d2ddfb8d1289c02d18aca02a3a5e02a5293360c5e2 files/digest-libfwbuilder-2.1.13-r1 259
diff --git a/net-libs/libfwbuilder/files/digest-libfwbuilder-2.1.13 b/net-libs/libfwbuilder/files/digest-libfwbuilder-2.1.13-r1
index 90435f59c38d..90435f59c38d 100644
--- a/net-libs/libfwbuilder/files/digest-libfwbuilder-2.1.13
+++ b/net-libs/libfwbuilder/files/digest-libfwbuilder-2.1.13-r1
diff --git a/net-libs/libfwbuilder/files/libfwbuilder-2.1.13-gcc42.patch b/net-libs/libfwbuilder/files/libfwbuilder-2.1.13-gcc42.patch
new file mode 100644
index 000000000000..10e73cc895eb
--- /dev/null
+++ b/net-libs/libfwbuilder/files/libfwbuilder-2.1.13-gcc42.patch
@@ -0,0 +1,366 @@
+diff -Naurdb libfwbuilder-2.1.13.orig/src/fwbuilder/BackgroundOp.cpp libfwbuilder-2.1.13/src/fwbuilder/BackgroundOp.cpp
+--- libfwbuilder-2.1.13.orig/src/fwbuilder/BackgroundOp.cpp	2007-07-26 17:33:28.000000000 +0200
++++ libfwbuilder-2.1.13/src/fwbuilder/BackgroundOp.cpp	2007-07-26 17:35:40.000000000 +0200
+@@ -142,7 +142,9 @@
+     stop_program->unlock();
+ }
+ 
+-void *libfwbuilder::background_thread(void *args)
++namespace libfwbuilder
++{
++void *background_thread(void *args)
+ {
+     void **void_pair=(void**)args;
+ 
+@@ -212,6 +214,7 @@
+     return(NULL);
+ }
+ 
++}
+ 
+ 
+ 
+diff -Naurdb libfwbuilder-2.1.13.orig/src/fwbuilder/crypto.cpp libfwbuilder-2.1.13/src/fwbuilder/crypto.cpp
+--- libfwbuilder-2.1.13.orig/src/fwbuilder/crypto.cpp	2007-07-26 17:33:28.000000000 +0200
++++ libfwbuilder-2.1.13/src/fwbuilder/crypto.cpp	2007-07-26 17:36:19.000000000 +0200
+@@ -35,7 +35,10 @@
+ // # warning "openssl library not present - all crypto code is disabled."
+ // #endif
+ 
+-void libfwbuilder::init_ssl()
++namespace libfwbuilder
++{
++
++void init_ssl()
+ {
+ #ifdef HAVE_LIBSSL
+     /* Initialize OpenSSL library */
+@@ -49,7 +52,7 @@
+  * This is quick and dirty implementation using OpenSSL BIO
+  * API.
+  */
+-int libfwbuilder::unbase64(const char *in, char **out) throw(libfwbuilder::FWException)
++int unbase64(const char *in, char **out) throw(libfwbuilder::FWException)
+ {
+ #ifdef HAVE_LIBSSL
+     char *ncin=cxx_strdup(in);
+@@ -80,6 +83,7 @@
+ #endif
+ }
+ 
++}
+ 
+ #ifdef HAVE_LIBSSL
+ 
+diff -Naurdb libfwbuilder-2.1.13.orig/src/fwbuilder/dns.cpp libfwbuilder-2.1.13/src/fwbuilder/dns.cpp
+--- libfwbuilder-2.1.13.orig/src/fwbuilder/dns.cpp	2007-07-26 17:33:28.000000000 +0200
++++ libfwbuilder-2.1.13/src/fwbuilder/dns.cpp	2007-07-26 17:47:12.000000000 +0200
+@@ -67,7 +67,10 @@
+ Mutex *DNS::gethostbyname_mutex;
+ Mutex *DNS::gethostbyaddr_mutex;
+ 
+-void libfwbuilder::init_dns() throw(FWException)
++namespace libfwbuilder

++{

++

++void init_dns() throw(FWException)

+ {
+     DNS::init();
+ 
+@@ -88,6 +91,8 @@
+ 
+ }
+ 
++}

++

+ void DNS::init()
+ {
+     gethostbyname_mutex = new Mutex();
+@@ -814,7 +819,10 @@
+     pthread_attr_destroy(&tattr);
+ }
+ 
+-void* libfwbuilder::DNS_bulkBackResolve_Thread(void *args)
++namespace libfwbuilder

++{

++

++void* DNS_bulkBackResolve_Thread(void *args)

+ {
+     std::ostringstream str;
+     void **void_pair=(void**)args;
+@@ -892,6 +900,8 @@
+     return NULL;
+ }
+ 
++}

++

+ void DNS_bulkBackResolve_query::run_impl(Logger *logger,SyncFlag *stop_program) throw(FWException)
+ {
+     queue_mutex.lock();
+diff -Naurdb libfwbuilder-2.1.13.orig/src/fwbuilder/IPAddress.cpp libfwbuilder-2.1.13/src/fwbuilder/IPAddress.cpp
+--- libfwbuilder-2.1.13.orig/src/fwbuilder/IPAddress.cpp	2007-07-26 17:33:28.000000000 +0200
++++ libfwbuilder-2.1.13/src/fwbuilder/IPAddress.cpp	2007-07-26 17:53:20.000000000 +0200
+@@ -100,7 +100,10 @@
+     return x;
+ }
+ 
+-bool libfwbuilder::operator<(const IPAddress &a, const IPAddress &b)
++namespace libfwbuilder

++{

++

++bool operator<(const IPAddress &a, const IPAddress &b)

+ {
+     guint32 a1=ntohl( a.to32BitInt() );
+     guint32 a2=ntohl( b.to32BitInt() );
+@@ -113,7 +116,7 @@
+ #endif
+ }
+ 
+-bool libfwbuilder::operator==(const IPAddress &a, const IPAddress &b)
++bool operator==(const IPAddress &a, const IPAddress &b)

+ {
+     for(int i=0;i<4;i++)
+         if(a.octets[i]!=b.octets[i])
+@@ -121,7 +124,7 @@
+     return true;
+ }
+ 
+-bool libfwbuilder::operator==(const Netmask &a, const Netmask &b)
++bool operator==(const Netmask &a, const Netmask &b)

+ {
+     for(int i=0;i<4;i++)
+         if(a.octets[i]!=b.octets[i])
+@@ -129,6 +132,7 @@
+     return true;
+ }
+ 
++}

+ 
+ IPAddress::IPAddress(const string &s) throw(FWException, FWNotSupportedException)
+ {
+@@ -147,8 +151,11 @@
+     return *this;
+ }
+ 
++namespace libfwbuilder

++{

++

+ /* TODO: use operator ulong() when it is fixed */
+-IPAddress libfwbuilder::operator+(const IPAddress &a,const IPAddress &b)
++IPAddress operator+(const IPAddress &a,const IPAddress &b)

+ {
+     guint32 x=0l;
+ 	int     i;

+@@ -165,7 +172,7 @@
+ }
+ 
+ /* TODO: use operator ulong() when it is fixed */
+-IPAddress libfwbuilder::operator-(const IPAddress &a,const IPAddress &b)
++IPAddress operator-(const IPAddress &a,const IPAddress &b)

+ {
+     guint32 x=0l;
+ 	int     i;

+@@ -181,7 +188,7 @@
+     return IPAddress(&na);
+ }
+ 
+-IPAddress libfwbuilder::operator+(const IPAddress &addr,int increment)
++IPAddress operator+(const IPAddress &addr,int increment)

+ {
+     guint32 a= ntohl( addr.to32BitInt() );
+     a++;
+@@ -191,7 +198,7 @@
+     return IPAddress(&na);
+ }
+ 
+-IPAddress libfwbuilder::operator-(const IPAddress &addr,int decrement)
++IPAddress operator-(const IPAddress &addr,int decrement)

+ {
+     guint32 a=ntohl( addr.to32BitInt() );
+     a--;
+@@ -201,6 +208,8 @@
+     return IPAddress(&na);
+ }
+ 
++}

++

+ IPAddress& IPAddress::addMask(const Netmask &nm)
+ {
+     for (int i=0; i<4; i++) 
+@@ -286,7 +295,10 @@
+     return *this;
+ }
+ 
+-Netmask libfwbuilder::operator~(const Netmask &nm)
++namespace libfwbuilder

++{

++

++Netmask operator~(const Netmask &nm)

+ {
+     Netmask res;
+     for (int i=0; i<4; i++)
+@@ -295,6 +307,8 @@
+     return res;
+ }
+ 
++}

++

+ Netmask::Netmask(const IPAddress &a)
+ {
+     octets[0]=255;
+@@ -409,18 +423,21 @@
+     return *this;
+ }
+ 
+-bool libfwbuilder::operator==(const IPNetwork &a, const IPNetwork &b)
++namespace libfwbuilder

++{

++

++bool operator==(const IPNetwork &a, const IPNetwork &b)

+ {
+     return a.getNetmask()==b.getNetmask() && a.getAddress()==b.getAddress();
+ }
+ 
+-bool libfwbuilder::operator<(const IPNetwork &a, const IPNetwork &b)
++bool operator<(const IPNetwork &a, const IPNetwork &b)

+ {
+     return a.getAddress()<b.getAddress();
+ }
+ 
+ /* this is just a better interface to _convert_range_to_networks */
+-vector<IPNetwork> libfwbuilder::convertAddressRange(const IPAddress &start,
++vector<IPNetwork> convertAddressRange(const IPAddress &start,

+                                                     const IPAddress &end)
+ {
+     vector<IPNetwork> res;
+@@ -428,6 +445,8 @@
+     return res;
+ }
+ 
++}

++

+ bool IPNetwork::_convert_range_to_networks(const IPAddress &start,
+ 					   const IPAddress &end,
+ 					   vector<IPNetwork> &res)
+@@ -512,8 +531,10 @@
+     return false;
+ }
+ 
++namespace libfwbuilder

++{

+ 
+-vector<IPNetwork> libfwbuilder::getOverlap(const IPNetwork &n1,const IPNetwork &n2)
++vector<IPNetwork> getOverlap(const IPNetwork &n1,const IPNetwork &n2)

+ {
+     IPAddress s1 = n1.getAddress();
+     IPAddress s2 = n2.getAddress();
+@@ -558,7 +579,7 @@
+     return res;
+ }
+ 
+-vector<IPNetwork> libfwbuilder::substract(const IPNetwork &n1,const IPNetwork &n2)
++vector<IPNetwork> substract(const IPNetwork &n1,const IPNetwork &n2)

+ {
+     IPAddress n1s = n1.getAddress();
+     IPAddress n2s = n2.getAddress();
+@@ -623,6 +644,8 @@
+     return res;
+ }
+ 
++}

++

+ IPRoute::IPRoute(const IPRoute &o)
+ {
+     nm     = o.nm     ;
+diff -Naurdb libfwbuilder-2.1.13.orig/src/fwbuilder/Tools.cpp libfwbuilder-2.1.13/src/fwbuilder/Tools.cpp
+--- libfwbuilder-2.1.13.orig/src/fwbuilder/Tools.cpp	2007-07-26 17:33:28.000000000 +0200
++++ libfwbuilder-2.1.13/src/fwbuilder/Tools.cpp	2007-07-26 17:48:41.000000000 +0200
+@@ -59,14 +59,17 @@
+ 
+ using namespace std;
+ 
+-char *libfwbuilder::cxx_strdup(const string &x)
++namespace libfwbuilder
++{
++
++char *cxx_strdup(const string &x)
+ {
+     char *res=new char[x.length()+1];
+     strcpy(res, x.c_str());
+     return res;
+ }
+ 
+-char *libfwbuilder::cxx_strdup(const char *x)
++char *cxx_strdup(const char *x)
+ {
+     if(!x)
+         return (char*)NULL;
+@@ -76,14 +79,14 @@
+     return res;
+ }
+ 
+-string libfwbuilder::int2string(int n)
++string int2string(int n)
+ {
+     char x[32];
+     sprintf(x,"%d", n);
+     return x;
+ }
+ 
+-string libfwbuilder::substituteMacros(const string &source, const map<string, string> &macros, bool strict) throw(libfwbuilder::FWException)
++string substituteMacros(const string &source, const map<string, string> &macros, bool strict) throw(libfwbuilder::FWException)
+ {
+     string name;
+     string res;
+@@ -141,7 +144,7 @@
+     return res;
+ }
+ 
+-char *libfwbuilder::cxx_strtok_r(char *s, const char *delim, char **save_ptr)
++char *cxx_strtok_r(char *s, const char *delim, char **save_ptr)
+ {
+ #ifndef HAVE_STRTOK_R
+     char *token;
+@@ -173,7 +176,7 @@
+ #endif
+ }
+ 
+-int  libfwbuilder::cxx_strcasecmp(const char *s1, const char *s2)
++int  cxx_strcasecmp(const char *s1, const char *s2)
+ {
+ #ifndef _WIN32
+ 	return ::strcasecmp(s1,s2);
+@@ -183,7 +186,7 @@
+ }
+ 
+ 
+-void libfwbuilder::init()
++void init()
+ {
+ #ifdef _WIN32
+     WORD wVersionRequested;
+@@ -230,7 +233,7 @@
+  *  dir - directory
+  *  ext - file extension mask, should be just "xml" rather than "*.xml"
+  */
+-list<string> libfwbuilder::getDirList(const std::string &dir,
++list<string> getDirList(const std::string &dir,
+                                       const std::string &ext)
+ {
+     list<string> res;
+@@ -273,7 +276,7 @@
+     return res;
+ }
+ 
+-unsigned int libfwbuilder::cxx_sleep(unsigned int seconds)
++unsigned int cxx_sleep(unsigned int seconds)
+ {
+ #ifndef _WIN32
+         return sleep(seconds);
+@@ -283,5 +286,4 @@
+ #endif
+ }
+ 
+-
+-
++}
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.1.13.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild
index e42f50f26018..b543750c4083 100644
--- a/net-libs/libfwbuilder/libfwbuilder-2.1.13.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.1.13.ebuild,v 1.1 2007/07/25 18:40:51 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.1.13-r1.ebuild,v 1.1 2007/07/30 21:34:10 r3pek Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Firewall Builder 2.1 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -19,13 +19,20 @@ DEPEND=">=dev-libs/libxml2-2.4.10
 	ssl? ( dev-libs/openssl )
 	=x11-libs/qt-3*"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-gcc42.patch
+}
+
 src_compile() {
 	export QMAKE="${QTDIR}/bin/qmake"
-	econf `use_with ssl openssl` `use_with snmp ucdsnmp` --without-stlport --without-lwres || die
-	emake || die
+	econf `use_with ssl openssl` `use_with snmp ucdsnmp` --without-stlport \
+		--without-lwres || die "Configuration failed"
+	emake || die "Compilation failed"
 }
 
 src_install() {
-	make DDIR="${D}" install || die
+	emake DDIR="${D}" install || die "Install failed"
 	prepalldocs
 }