From c057affc287cfbf98bb5540373e2cbd5b55fdeaa Mon Sep 17 00:00:00 2001 From: Daniel Ahlberg Date: Mon, 2 Aug 2004 16:54:10 +0000 Subject: Closing #58794 --- net-libs/libfwbuilder/ChangeLog | 8 +- net-libs/libfwbuilder/Manifest | 2 + .../files/digest-libfwbuilder-1.0.1-r1 | 1 - .../libfwbuilder/files/digest-libfwbuilder-2.0.0 | 1 + .../files/libfwbuilder-1.0.1-libxml2.patch | 134 --------------------- net-libs/libfwbuilder/libfwbuilder-1.0.1-r1.ebuild | 53 -------- net-libs/libfwbuilder/libfwbuilder-2.0.0.ebuild | 36 ++++++ 7 files changed, 46 insertions(+), 189 deletions(-) delete mode 100644 net-libs/libfwbuilder/files/digest-libfwbuilder-1.0.1-r1 create mode 100644 net-libs/libfwbuilder/files/digest-libfwbuilder-2.0.0 delete mode 100644 net-libs/libfwbuilder/files/libfwbuilder-1.0.1-libxml2.patch delete mode 100644 net-libs/libfwbuilder/libfwbuilder-1.0.1-r1.ebuild create mode 100644 net-libs/libfwbuilder/libfwbuilder-2.0.0.ebuild (limited to 'net-libs') diff --git a/net-libs/libfwbuilder/ChangeLog b/net-libs/libfwbuilder/ChangeLog index 80b396439e21..4a93a9136435 100644 --- a/net-libs/libfwbuilder/ChangeLog +++ b/net-libs/libfwbuilder/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/libfwbuilder # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.30 2004/06/24 23:12:22 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.31 2004/08/02 16:54:10 aliz Exp $ + +*libfwbuilder-2.0.0 (02 Aug 2004) + + 02 Aug 2004; Daniel Ahlberg libfwbuilder-2.0.0.ebuild: + Version bump, ebuild contributed by Carsten Lohrke in + #58794. 13 Jun 2004; Jason Wever libfwbuilder-1.0.2-r2.ebuild: Stable on sparc. diff --git a/net-libs/libfwbuilder/Manifest b/net-libs/libfwbuilder/Manifest index e06237d37611..f86bb4dc3f7b 100644 --- a/net-libs/libfwbuilder/Manifest +++ b/net-libs/libfwbuilder/Manifest @@ -1,4 +1,5 @@ MD5 6ce98acaed58cc7d61cc7840cfae3756 libfwbuilder-1.0.2-r1.ebuild 1023 +MD5 423278c4bef85fed9c729e64ce1cba18 libfwbuilder-2.0.0.ebuild 928 MD5 7e603b953eba8b1153cc350fa087d430 libfwbuilder-1.0.1-r1.ebuild 1184 MD5 ad71c889ab62b8e605c92c8c0b1e18b8 libfwbuilder-1.0.2-r2.ebuild 943 MD5 248e4f2368265ea087f947ad23c23d9e ChangeLog 4797 @@ -8,3 +9,4 @@ MD5 2cdda8f867cfe8664c4630fe62aa1099 files/digest-libfwbuilder-1.0.2-r1 72 MD5 18d017187b228dd614d7ae00283f788a files/digest-libfwbuilder-1.0.2-r2 72 MD5 a9d9970dd7849dd561d75ca0dc0466e0 files/libfwbuilder-1.0.1-libxml2.patch 4419 MD5 bd7f345d52b044e87b5cea9d1017f4bf files/libfwbuilder-1.0.2-libxml2.patch 2166 +MD5 8b6d58e88deb3ce4ebb8d89a8a87f71e files/digest-libfwbuilder-2.0.0 70 diff --git a/net-libs/libfwbuilder/files/digest-libfwbuilder-1.0.1-r1 b/net-libs/libfwbuilder/files/digest-libfwbuilder-1.0.1-r1 deleted file mode 100644 index 04f224205307..000000000000 --- a/net-libs/libfwbuilder/files/digest-libfwbuilder-1.0.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 e292937c9435c4717ccdd7f317a3cefe libfwbuilder-1.0.1.tar.gz 199512 diff --git a/net-libs/libfwbuilder/files/digest-libfwbuilder-2.0.0 b/net-libs/libfwbuilder/files/digest-libfwbuilder-2.0.0 new file mode 100644 index 000000000000..3d7520aeeb87 --- /dev/null +++ b/net-libs/libfwbuilder/files/digest-libfwbuilder-2.0.0 @@ -0,0 +1 @@ +MD5 e3518c3408b031fe17b2372d64683cc6 libfwbuilder-2.0.0.tar.gz 277491 diff --git a/net-libs/libfwbuilder/files/libfwbuilder-1.0.1-libxml2.patch b/net-libs/libfwbuilder/files/libfwbuilder-1.0.1-libxml2.patch deleted file mode 100644 index eacb068d4835..000000000000 --- a/net-libs/libfwbuilder/files/libfwbuilder-1.0.1-libxml2.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -u /var/tmp/portage/libfwbuilder-1.0.1/work/libfwbuilder-1.0.1/src/fwbuilder/Resources.cc ./Resources.cc ---- src/fwbuilder/Resources.cc 2003-03-03 08:18:03.000000000 +0000 -+++ src/fwbuilderResources.cc 2003-11-13 09:21:17.815706848 +0000 -@@ -117,18 +117,15 @@ - - void Resources::loadRes(const std::string &rfile ) throw(FWException) - { -- if(access(rfile.c_str() , R_OK )!=0) -- throw FWException("Could not load resources: "+rfile); - -- doc = xmlParseFile(rfile.c_str()); -- -- if(!doc) -- throw FWException("Error parsing "+rfile); -+// doc = xmlParseFile(rfile.c_str()); -+ doc = XMLTools::loadAndParseFile(rfile); -+ -+ if(!doc) throw FWException("Error parsing "+rfile); - - root=xmlDocGetRootElement(doc); -- -- if(!root || !root->name || -- strcmp(FROMXMLCAST(root->name), "FWBuilderResources")!=0) -+ -+ if(!root || !root->name || strcmp(FROMXMLCAST(root->name), "FWBuilderResources")!=0) - { - xmlFreeDoc(doc); - throw FWException("Invalid resources file "+rfile); -diff -u /var/tmp/portage/libfwbuilder-1.0.1/work/libfwbuilder-1.0.1/src/fwbuilder/XMLTools.cc ./XMLTools.cc ---- src/fwbuilder/XMLTools.cc 2003-07-06 06:12:20.000000000 +0000 -+++ src/fwbuilder/XMLTools.cc 2003-11-13 09:21:17.829704720 +0000 -@@ -31,6 +31,11 @@ - - #include - #include -+#include -+#include -+#include -+#include -+#include - - #ifdef HAVE_LIBXSLT_XSLTCONFIG_H - # include -@@ -43,8 +48,6 @@ - - #include - --#include -- - #include - - #undef FW_XMLTOOLS_VERBOSE -@@ -202,6 +205,41 @@ - xmlSetExternalEntityLoader(fwbExternalEntityLoader); - } - -+/* -+ * I use xmlParseMemory because libxml2 v2.6.2 broke xmlParseFile. If -+ * file name had a full path in it, it won't load and gave an error -+ * like this: -+ * -+ * I/O warning : failed to load external entity "/resources.xml" -+ * -+ * I do not check if xmlParseMemory succeeded in this method because -+ * I may need to throw different exceptions in different method using -+ * loadAndParseFile. loadAndParseFile just returns whatever -+ * xmlParseMemory returned, this works better in a sense that -+ * loadAndParseFile should be just a wrapper for xmlParseMemory and -+ * should replicate its behavior. -+ * -+ */ -+xmlDocPtr XMLTools::loadAndParseFile(const std::string &rfile) throw(FWException) -+{ -+ struct stat stt; -+ int fd; -+ -+ if (stat( rfile.c_str() , &stt )!=0 || (fd=open(rfile.c_str(),O_RDONLY))<0) -+ throw FWException("Could not read file "+rfile); -+ -+ char *buf=(char*)malloc(stt.st_size); -+ -+ read(fd,buf,stt.st_size); -+ close(fd); -+ -+ xmlDocPtr doc = xmlParseMemory(buf, stt.st_size); -+ memset(buf,0,stt.st_size); -+ free(buf); -+ -+ return doc; -+} -+ - xmlDocPtr XMLTools::parseFile(const string &file_name, - bool use_dtd, const string &template_dir) throw(FWException) - { -@@ -215,7 +253,8 @@ - - string errors; - xmlSetGenericErrorFunc (&errors, xslt_error_handler); -- xmlDocPtr doc = xmlParseFile(file_name.c_str()); -+// xmlDocPtr doc = xmlParseFile(file_name.c_str()); -+ xmlDocPtr doc = loadAndParseFile(file_name); - xmlSetGenericErrorFunc (NULL, NULL); - - g_mutex_unlock(xml_parser_mutex); -@@ -415,7 +454,9 @@ - } - - -- doc = xmlParseFile(src_file.c_str()); -+// doc = xmlParseFile(src_file.c_str()); -+ doc = loadAndParseFile(src_file); -+ - res = xsltApplyStylesheet(ss, doc, params); - xsltSaveResultToFilename(dst_file.c_str(), res, ss, 0); - -diff -u /var/tmp/portage/libfwbuilder-1.0.1/work/libfwbuilder-1.0.1/src/fwbuilder/XMLTools.hh ./XMLTools.hh ---- src/fwbuilder/XMLTools.hh 2003-07-06 06:12:20.000000000 +0000 -+++ src/fwbuilder/XMLTools.hh 2003-11-13 09:21:17.835703808 +0000 -@@ -64,6 +64,15 @@ - - static void initXMLTools(); - -+ /** -+ * a wrapper for xmlParseMemory. Returns a pointer to the document -+ * structure or NULL in case of failure. This wrapper allows us to -+ * use xmlParseFile or xmlParseMemory, whatever works. I used to -+ * use xmlParseFile just fine unitl libxml2 v2.6.2, in which it -+ * broke and I had to start using xmlParseMemory instead. -+ */ -+ static xmlDocPtr loadAndParseFile(const std::string &file_name) -+ throw(FWException); - - class UpgradePredicate - { diff --git a/net-libs/libfwbuilder/libfwbuilder-1.0.1-r1.ebuild b/net-libs/libfwbuilder/libfwbuilder-1.0.1-r1.ebuild deleted file mode 100644 index 498f1364946c..000000000000 --- a/net-libs/libfwbuilder/libfwbuilder-1.0.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-1.0.1-r1.ebuild,v 1.7 2004/07/15 00:51:08 agriffis Exp $ - -inherit eutils - -IUSE="snmp ssl static" - -DESCRIPTION="A firewall GUI (library functions)" -SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz" -HOMEPAGE="http://www.fwbuilder.org/" - -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() { - local myconf - - use static && myconf="${myconf} --disable-shared --enable-static=yes" - - ./autogen.sh \ - --prefix=/usr \ - --host=${CHOST} \ - `use_with ssl openssl` - ${myconf} || die "./configure failed" - - if use static ; then - emake LDFLAGS="-static" || die "emake LDFLAGS failed" - else - emake || die "emake failed" - fi -} - -src_install() { - emake DESTDIR=${D} install || die "emake install failed" - prepalldocs -} diff --git a/net-libs/libfwbuilder/libfwbuilder-2.0.0.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.0.0.ebuild new file mode 100644 index 000000000000..eb337706bc9d --- /dev/null +++ b/net-libs/libfwbuilder/libfwbuilder-2.0.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.0.ebuild,v 1.1 2004/08/02 16:54:10 aliz Exp $ + +DESCRIPTION="Firewall Builder 2.0 API library and compiler framework" +HOMEPAGE="http://www.fwbuilder.org/" +SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86 ~amd64" +IUSE="snmp ssl" + +RDEPEND=">=dev-libs/libxml2-2.4.10 + >=dev-libs/libxslt-1.0.7 + snmp? ( virtual/snmp ) + ssl? ( dev-libs/openssl ) + x11-libs/qt" + +DEPEND=${RDEPEND} + +src_compile() { + local myconf + + if has_version net-libs/ucd-snmp; then + myconf="use_with snmp ucdsnmp" + fi + + econf `use_with ssl openssl` ${myconf} || die "./configure failed" + emake || die "emake failed" +} + +src_install() { + make DDIR=${D} install || die "emake install failed" + prepalldocs +} -- cgit v1.2.3-65-gdbad