Adding patch for libxml2. Also closing #34862

4 files changed, 120 insertions, 3 deletions

diff --git a/net-libs/libfwbuilder/Manifest b/net-libs/libfwbuilder/Manifest
index 7b296166e554..7760e8a4dda7 100644
--- a/net-libs/libfwbuilder/Manifest
+++ b/net-libs/libfwbuilder/Manifest
@@ -1,4 +1,4 @@
-MD5 9dd35dd21b2bb5ed0c8b936f2c631f57 libfwbuilder-1.0.2-r1.ebuild 1207
+MD5 62530aae5f6eed4b8a80ab1666139a05 libfwbuilder-1.0.2-r1.ebuild 998
 MD5 895f86129f0373f6092534540e5e3a70 libfwbuilder-1.0.0.ebuild 1113
 MD5 3e735683fbba54279cb1da237b38c428 libfwbuilder-0.10.11.ebuild 1060
 MD5 c933d1c737ff08f53d6713a8134dcfe8 libfwbuilder-1.0.1-r1.ebuild 1194
@@ -7,12 +7,12 @@ MD5 9233d87f4a15a69a07db0aae59a278bb libfwbuilder-0.10.13.ebuild 1052
 MD5 7be875350a5f6fd26be2d4bb5325277c libfwbuilder-0.10.10.ebuild 1060
 MD5 11bfaad3db7a4cbba500a8941db7929d libfwbuilder-1.0.1.ebuild 1109
 MD5 756d6f7f25f7cbdcaa370b7ec4db8eda libfwbuilder-0.10.12.ebuild 1052
-MD5 0a0f34642d3571cf80f4c50fbe2c99ca ChangeLog 3668
+MD5 119f026b9cc2fc05bf96566f31adc2c5 ChangeLog 3861
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 cc28aa8050183b43c259859a3ed0bdbc files/digest-libfwbuilder-1.0.1-r1 70
 MD5 1e629c9c3ca63f24ee2550a163ba89bd files/digest-libfwbuilder-1.0.2-r1 70
 MD5 a9d9970dd7849dd561d75ca0dc0466e0 files/libfwbuilder-1.0.1-libxml2.patch 4419
-MD5 723a6bc7b4b657b6fcb351c03690fbbc files/libfwbuilder-1.0.2-libxml2.patch 2726
+MD5 8c3e488a389aed473d7d1ac00d15eb6a files/libfwbuilder-1.0.2-libxml2.patch 2790
 MD5 608e23e9cf5c678692e850954088ab06 files/digest-libfwbuilder-0.10.10 72
 MD5 c0dd1aa7a50e79514abd40c73fe8c85c files/digest-libfwbuilder-0.10.11 72
 MD5 cbd2384867d6471fe70ad380109763df files/digest-libfwbuilder-0.10.12 72
diff --git a/net-libs/libfwbuilder/files/digest-libfwbuilder-1.0.2-r1 b/net-libs/libfwbuilder/files/digest-libfwbuilder-1.0.2-r1
new file mode 100644
index 000000000000..92200e0e076d
--- /dev/null
+++ b/net-libs/libfwbuilder/files/digest-libfwbuilder-1.0.2-r1
@@ -0,0 +1 @@
+MD5 bf814db35c53b17b5ef94e821993ba67 libfwbuilder-1.0.2.tar.gz 201414
diff --git a/net-libs/libfwbuilder/files/libfwbuilder-1.0.2-libxml2.patch b/net-libs/libfwbuilder/files/libfwbuilder-1.0.2-libxml2.patch
new file mode 100644
index 000000000000..2c612dc5e80f
--- /dev/null
+++ b/net-libs/libfwbuilder/files/libfwbuilder-1.0.2-libxml2.patch
@@ -0,0 +1,73 @@
+--- src/fwbuilder/XMLTools.cc	2003-11-12 06:04:04.000000000 +0000
++++ src/fwbuilder/XMLTools.cc	2004-01-13 08:16:32.790141976 +0000
+@@ -6,7 +6,7 @@
+ 
+   Author:  Vadim Kurland     vadim@vk.crocodile.org
+ 
+-  $Id: libfwbuilder-1.0.2-libxml2.patch,v 1.1 2004/01/13 08:31:23 aliz Exp $
++  $Id: libfwbuilder-1.0.2-libxml2.patch,v 1.1 2004/01/13 08:31:23 aliz Exp $
+ 
+ 
+   This program is free software which we release under the GNU General Public
+@@ -374,13 +374,24 @@
+ 
+     try
+     {
++/*
++ * This broke with libxml 2.6.4. Tests seem to rule out bug inside
++ * libxml2 (used their example program "tree2.c" and added similar
++ * fragment for validation, it worked), so it must be something in our
++ * code. I can't seem to find the problem though. 
++ *
++ * We recreate the tree from the objects in the memory, so doing
++ * validation here is mostly a double check. It should be relatively
++ * safe to just skip validation until I figure out what's wrong with
++ * it.
++
+         xmlValidCtxt vctxt;
+         vctxt.userData = &errors;
+         vctxt.error    = xslt_error_handler;
+         vctxt.warning  = xslt_error_handler;
+         if(xmlValidateDocument(&vctxt, doc)!=1)
+             throw FWException(string("DTD validation stage 2 failed with following errors:\n")+errors);
+-
++*/
+         xmlSetGenericErrorFunc (NULL, NULL);
+         g_mutex_unlock(xml_parser_mutex);    
+ 
+diff -ru /var/tmp/portage/libfwbuilder-1.0.2/work/libfwbuilder-1.0.2/src/fwbuilder/XMLTools.hh ./src/fwbuilder/XMLTools.hh
+--- src/fwbuilder/XMLTools.hh	2003-11-12 06:04:04.000000000 +0000
++++ src/fwbuilder/XMLTools.hh	2004-01-13 08:16:32.794141003 +0000
+@@ -6,7 +6,7 @@
+ 
+   Author:  Vadim Kurland     vadim@vk.crocodile.org
+ 
+-  $Id: libfwbuilder-1.0.2-libxml2.patch,v 1.1 2004/01/13 08:31:23 aliz Exp $
++  $Id: libfwbuilder-1.0.2-libxml2.patch,v 1.1 2004/01/13 08:31:23 aliz Exp $
+ 
+ 
+   This program is free software which we release under the GNU General Public
+@@ -51,7 +51,22 @@
+ #define FROMXMLCAST(x) ((const char *)x)
+ #define STRTOXMLCAST(x) ((xmlChar *)x.c_str())
+ #define TOXMLCAST(x) ((xmlChar *)x)
+-#define FREEXMLBUFF(x) (free((void*)(x)))
++
++/**
++ * this macro is used to free data chunks allocated by libxml2.
++ * Funtion xmlGetProp and the likes return data in the blocks of memory
++ * that they allocate internally using malloc. To prevent memory leaks
++ * these blocks need to be freed. Memory must be freed using xmlFree function.
++ *
++ * The problem though is that in the win32 version of libxml that I use,
++ * declarations of all memory handling functions are commented out. This is so
++ * as of Dec2003, ver. 2.6.3, see in include/libxml/xmlmemory.h
++ */
++#ifdef xmlFree
++#  define FREEXMLBUFF(x) (xmlFree((void*)(x)))
++#else
++#  define FREEXMLBUFF(x)   ;
++#endif
+ 
+ class XMLTools
+ {
diff --git a/net-libs/libfwbuilder/libfwbuilder-1.0.2-r1.ebuild b/net-libs/libfwbuilder/libfwbuilder-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..1307abe43c07
--- /dev/null
+++ b/net-libs/libfwbuilder/libfwbuilder-1.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-1.0.2-r1.ebuild,v 1.1 2004/01/13 08:31:23 aliz Exp $
+
+IUSE="ssl snmp"
+
+DESCRIPTION="A firewall GUI (library functions)"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+HOMEPAGE="http://www.fwbuilder.org/"
+S=${WORKDIR}/${P}
+
+KEYWORDS="~x86 ~sparc ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="sys-devel/libtool
+	sys-devel/autoconf
+	=dev-libs/glib-1.2*
+	>=dev-libs/libxml2-2.4.19
+	!=dev-libs/libxml2-2.4.25
+	>=dev-libs/libxslt-1.0.15
+	snmp? ( virtual/snmp )
+	ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-libxml2.patch
+}
+
+src_compile() {
+	./autogen.sh \
+		--prefix=/usr \
+		--host=${CHOST} \
+		`use_with ssl openssl` || die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "emake install failed"
+	prepalldocs
+}