Update fwbuilder and libfwbuilder to 2.0.10.

Bugs fixed since 2.0.9:

    * bug #1349326 "ulogd option does not work". There was a typo in the
      class iptAdvancedDialog ( 'useULOG' instead of 'use_ULOG' )
    * bug #1315892: "fwbuilder crashes on missing OS template" The GUI
      crashed if user added new hostOS or firewall platform template under
      resources/os or resources/platforms, then reinstalled the package (and
      therefore lost their custom template files), then tried to open
      firewall or host OS settings dialog for the object using new template.
    * bug #1305933: "fwbuilder/Solaris: compilation errors". Another case of
      implicit type conversion QString->string which does not compile on
      systems with QT built w/o STL support.
    * bug #1304878: fwbuilder: signal.h required (Solaris). Using
      'AC_CHECK_HEADERS([signal.h])' in configure.in to check for the
      appropriate #include.
    * bug #1304764: "configure script: Sun make check fails". Need to use
      ${MAKE-make} instead of $ac_make when checking for GNU make.
    * bug #1304785: "fwbuilder - Solaris has no libutil". Using better way
      to check whether we need to link with libutil.



Bugs fixed in policy compiler for iptables since 2.0.9:

    * bug #1342495: "SNAT with address range". Compiler used to print
      warning "Adding virtual addresses for NAT is not supported for
      address range" even if adding virtual addresses for NAT was turned off.
    * bug #1313420: "OUTPUT chain is built wrong under certain conditions."
      Rules that have firewall in SRC and DST, while DST has negation,
      should be split so that the second generated rule goes into OUTPUT
      chain rather than FORWARD

10 files changed, 26 insertions, 51 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 29979cf5347..af6cc8e998f 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/12 20:25:09 bad Exp $
 
-DISTNAME=	fwbuilder-2.0.9
+DISTNAME=	fwbuilder-2.0.10
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/fwbuilder/PLIST b/security/fwbuilder/PLIST
index 84b0eabbb64..7b7abf4d972 100644
--- a/security/fwbuilder/PLIST
+++ b/security/fwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/27 22:09:23 bad Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/12/12 20:25:09 bad Exp $
 bin/fwb_install
 bin/fwbedit
 bin/fwblookup
@@ -37,6 +37,8 @@ share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.8.html
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.8.txt
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.9.html
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.9.txt
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.10.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.10.txt
 share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
 @dirrm share/doc/fwbuilder-${PKGVERSION}
 share/fwbuilder/locale/fwbuilder_de.qm
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index cabd77183e7..c9c93f198b4 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/10/27 22:09:23 bad Exp $
+$NetBSD: distinfo,v 1.5 2005/12/12 20:25:09 bad Exp $
 
-SHA1 (fwbuilder-2.0.9.tar.gz) = 8bedaad21cbd3203dd7ef2940ebd19ef9f4747b3
-RMD160 (fwbuilder-2.0.9.tar.gz) = 84c1626f357c2004b35e9675d0776db775f40ebc
-Size (fwbuilder-2.0.9.tar.gz) = 1383715 bytes
-SHA1 (patch-ab) = 368aaf5707f897d033e4513d13e4038df1cadf81
-SHA1 (patch-ac) = c4984a78918a1a650c5fac06d225697d6f13204d
-SHA1 (patch-ad) = 2aa5ef3bd5c55d55af59f0f3b1ad0ffd305c5c31
+SHA1 (fwbuilder-2.0.10.tar.gz) = da0114e712e541b763de33a9d5146e3b9f733b34
+RMD160 (fwbuilder-2.0.10.tar.gz) = 8f17ab4d7271dee54c56ef89161ede6ea108ee58
+Size (fwbuilder-2.0.10.tar.gz) = 1385925 bytes
+SHA1 (patch-ab) = 19a0c4801785536b0e95e328fe7569c155308ce6
diff --git a/security/fwbuilder/patches/patch-ab b/security/fwbuilder/patches/patch-ab
index d17c2c477fc..ea65c72c78a 100644
--- a/security/fwbuilder/patches/patch-ab
+++ b/security/fwbuilder/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/12 20:25:09 bad Exp $
 
---- qmake.inc.in.orig	Mon Dec 13 04:08:36 2004
-+++ qmake.inc.in	Thu Feb 24 00:13:52 2005
-@@ -30,7 +30,7 @@
+--- qmake.inc.in.orig	2005-10-25 08:11:26.000000000 +0200
++++ qmake.inc.in	2005-12-12 13:03:13.000000000 +0100
+@@ -27,7 +27,7 @@
  	res_os.path             = $(DDIR)@RES_DIR@/os
  	res_platform.path       = $(DDIR)@RES_DIR@/platform
  
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
 +	CONFIG                 += qt thread rtti stl warn_on
  	INCLUDEPATH            += @LIBFWBUILDER_INCLUDEPATH@
  
- 	LIBS                   += $$LIBS_FWBUILDER
-@@ -38,9 +38,7 @@
+ 	LIBS                   += $$LIBS_FWBUILDER @LIBS@
+@@ -35,9 +35,7 @@
  	PKGLOCALEDIR            = $$res.path/locale
  
  	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
diff --git a/security/fwbuilder/patches/patch-ac b/security/fwbuilder/patches/patch-ac
deleted file mode 100644
index e8974b1bafc..00000000000
--- a/security/fwbuilder/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/10/27 22:09:23 bad Exp $
-
---- src/gui/platforms.cpp.orig	2005-09-13 06:55:41.000000000 +0200
-+++ src/gui/platforms.cpp	2005-10-27 22:56:42.000000000 +0200
-@@ -132,7 +132,7 @@
-     {
-         if (platform=="pix" || platform=="fwsm") 
-         {
--            QString lst=Resources::platform_res[platform]->getResourceStr(
-+            QString lst=Resources::platform_res[(std::string)platform]->getResourceStr(
-                 "/FWBuilderResources/Target/versions").c_str();
- 
-             QStringList ll=QStringList::split(',', lst);
diff --git a/security/fwbuilder/patches/patch-ad b/security/fwbuilder/patches/patch-ad
deleted file mode 100644
index 177f8e61cb3..00000000000
--- a/security/fwbuilder/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/10/27 22:09:23 bad Exp $
-
---- src/gui/RuleOptionsDialog.cpp.orig	2005-09-13 06:55:41.000000000 +0200
-+++ src/gui/RuleOptionsDialog.cpp	2005-10-27 23:16:08.000000000 +0200
-@@ -157,7 +157,7 @@
-     if (platform=="pix" || platform=="fwsm")
-     {
-         string vers="version_"+p->getStr("version");
--        if ( Resources::platform_res[platform]->getResourceBool(
-+        if ( Resources::platform_res[(std::string)platform]->getResourceBool(
-               "/FWBuilderResources/Target/options/"+vers+"/pix_rule_syslog_settings"))
-         {
-             pix_disable_rule_log->setEnabled(true);
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index d8065ee9532..35915473681 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2005/10/27 22:09:23 bad Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/12 20:25:09 bad Exp $
 
-DISTNAME=	libfwbuilder-2.0.9
+DISTNAME=	libfwbuilder-2.0.10
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/libfwbuilder/PLIST b/security/libfwbuilder/PLIST
index 8446589cdf1..320bbe64170 100644
--- a/security/libfwbuilder/PLIST
+++ b/security/libfwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/10/27 22:09:23 bad Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/12/12 20:25:09 bad Exp $
 bin/libfwbuilder-config-2
 include/fwb-2.0/fwbuilder/Address.h
 include/fwb-2.0/fwbuilder/AddressRange.h
@@ -105,5 +105,6 @@ share/libfwbuilder/migration/FWObjectDatabase_2.0.5.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.6.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.7.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.8.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.9.xslt
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index 5931d13d918..262a88326d9 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/10/27 22:09:23 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/12/12 20:25:09 bad Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFWBUILDER_BUILDLINK3_MK:=	${LIBFWBUILDER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfwbuilder}
 BUILDLINK_PACKAGES+=	libfwbuilder
 
 .if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.9
+BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.10
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 .endif	# LIBFWBUILDER_BUILDLINK3_MK
 
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index e9ce46b129c..b0d6041b161 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/10/27 22:09:23 bad Exp $
+$NetBSD: distinfo,v 1.7 2005/12/12 20:25:09 bad Exp $
 
-SHA1 (libfwbuilder-2.0.9.tar.gz) = ec7bfb94df7e75f74fba56db0777c452cff730db
-RMD160 (libfwbuilder-2.0.9.tar.gz) = 21f61b0ef24e993c7f78157b95d17de605836570
-Size (libfwbuilder-2.0.9.tar.gz) = 281637 bytes
+SHA1 (libfwbuilder-2.0.10.tar.gz) = 8c275bcfc7c04bcb34aa818c5c8116f24407f974
+RMD160 (libfwbuilder-2.0.10.tar.gz) = 52421549d403785421a667c0dd4238d2cecf6b16
+Size (libfwbuilder-2.0.10.tar.gz) = 281849 bytes
 SHA1 (patch-ab) = 19fa206f433cec8dbd4a8cd1cb78415b5413536d