Upgrade fwbuilder and libfwbuilder to version 2.0.9.

Changes since version 2.0.6:

Version 2.0.9 -- This is a bug fix release

What's new:

* support for Cisco FWSM.
* Print comments on objects.
* Add "commit" menu item.
* Spanish translation has been added.

Bugs fixed in the GUI:

* bug #1254775: "RCS checkin fails on Windows when data file is too
  big".
* bug #1226069: "Segfault: Drag&Drop between two instances".
* bugs #1233165: "Illegal Logging-Limit string" and #1287755: "i18n is
  breaking iptables script".
* bug #1240205: "Iilegal --log-level Information".
* bug #1277129: "script is truncated when installed by the GUI running
  on Mac".

Bugs fixed in policy compiler for PF:

* bug #1276083: "Destination NAT rules". Old restriction on "rdr" rules.

Version 2.0.8 -- This is a bug fix release

What's new:

* Improvements in the GUI:

* Included updated German translation by Hans Peter Dittler.
* Print RCS Log".
* Code changes to make the code compile and work on Solaris.

* Improvements in policy compilers for pf, ipf, ipfw:

* implemented support for subnets for backup ssh access for
  pf,ipf,ipfw.

* Improvements in compiler for ipfw:

* using rule sets to atomically swap old and new rules.
* added "established" rule on top of the regular backup ssh access rule.

Bugs fixed in the Standard Objects library:

* bug #210518: 'Incorrect ending day in the standard object "weekends"'.

Bugs fixed in scripts and tools:

* bug #1200902: "fwb_compile_all does not work in 2.0".

Bugs fixed in GUI:

* bug #1072842: "fwbuilder: Solaris and forkpty".
* bug #1201406: "shutdown messages should be suppressed".
* bug #1204067: "incorrect timezone handling in RCS".
* bug #1207983: "incorrect size of "I" and "L" buttons in the group view
  dialog".
* bug #1212121: "sudo shutdown doesn't work".
* bug #1212123: "executing file below /tmp as root".
* bug #1212179: "tool tips for TCP services cuts off some services".
* bug #1213361: "PF on FreeBSD-5.4R".

Bugs fixed in policy compiler for iptables:

* bug #191423: "Weekend Time restriction not created correctly".
* bug #1205665: "Error with summer time when compiling script".
* bug #1215279: "rate limiting rule logs everything".

Bugs fixed in policy compiler for ipfw:

* bug #1155351: "Remote install of FW rulset fails due to race
  condition".
Version 2.0.7 -- This is a bug fix release

What's new:

* Improvements in the GUI:

* "Close" button should change is caption/title to "Install".
* "Search for IP Addresses".
* Support for SNMP operations has been added in Windows packages of
  Firewall Builder.

* Improvements in built-in installer:

User can specify additional command line parameters for ssh that
built-in installer runs to access firewall.

* Improvements in compiler for ipfilter fwb_ipf:

Added support for dynamic addresses in ipfilter.

* Improvements in compiler for iptables fwb_ipt:

Generated iptables script sets default policies to DROP in all ipv6
filter chains.

Bugs fixed in GUI:

* bug #1151052: "Not external interfaces marked as external".
* bug #1151212: "Collapsed sub-objects shouldn't be added if they are
  hidden".
* bug #1151243: "Maintain format of description text".
* bug #1155163: "print does not print group contents".
* bug #1172620: "Add tcp service object for icslap".
* bug #1184791: "can not copy/paste multiple objects into a group".

Bugs fixed in API:

* bug #1158870: "mutexes are not properly created on FreeBSD".
* bug #1151219: "New Host creation window is not well dimensioned".
* bug #1157976: "patches to make fwbuilder compile under NetBSD 1.6".
* bug #1173801: '"&" character in prolog/epilog'.

Bugs fixed in policy compiler for iptables fwb_ipt:

* bug #1123748: "busybox grep -E".
* bug #1160186: 'IPTables Compiler - Multiport Issue'.
* bug #1176890: "block IPv6".
* bug #1176890: "block IPv6".
* bug #1179103: 'compiled rules can not be installed'.
* bug #1181359: "Missing traling space in "INVALID state" syslog message".
* bug #1195201: "getaddr function return error ip address".

Bugs fixed in policy compiler for pf fwb_ipf:

* bug #1173067: "support for port ranges in NAT rules (ipfilter)".
* bug #1173064: "support for dynamic interfaces in ipfilter".

Bugs fixed in policy compiler for pf fwb_pf:

* bug #1176051: "incorrect rule generated for TCP service ftp-data".

12 files changed, 63 insertions, 81 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 71e8c1d75dc..914b8c17fd4 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:30 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/27 22:09:23 bad Exp $
 
-DISTNAME=	fwbuilder-2.0.6
+DISTNAME=	fwbuilder-2.0.9
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/fwbuilder/PLIST b/security/fwbuilder/PLIST
index fa3bdba8173..84b0eabbb64 100644
--- a/security/fwbuilder/PLIST
+++ b/security/fwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/26 11:52:23 bad Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/10/27 22:09:23 bad Exp $
 bin/fwb_install
 bin/fwbedit
 bin/fwblookup
@@ -31,16 +31,25 @@ share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.5.html
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.5.txt
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.6.html
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.6.txt
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.7.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.7.txt
+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}/PatchAcceptancePolicy.txt
 @dirrm share/doc/fwbuilder-${PKGVERSION}
+share/fwbuilder/locale/fwbuilder_de.qm
+share/fwbuilder/locale/fwbuilder_es.qm
 share/fwbuilder/locale/fwbuilder_fr.qm
-share/fwbuilder/locale/fwbuilder_ru.qm
 share/fwbuilder/locale/fwbuilder_ja.qm
+share/fwbuilder/locale/fwbuilder_ru.qm
 @dirrm share/fwbuilder/locale
 share/fwbuilder/objects_init.xml
 share/fwbuilder/templates.xml
 share/fwbuilder/resources.xml
 share/fwbuilder/os/freebsd.xml
+share/fwbuilder/os/fwsm_os.xml
 share/fwbuilder/os/linksys.xml
 share/fwbuilder/os/linux24.xml
 share/fwbuilder/os/macosx.xml
@@ -49,6 +58,7 @@ share/fwbuilder/os/pix_os.xml
 share/fwbuilder/os/solaris.xml
 share/fwbuilder/os/unknown_os.xml
 @dirrm share/fwbuilder/os
+share/fwbuilder/platform/fwsm.xml
 share/fwbuilder/platform/ipf.xml
 share/fwbuilder/platform/ipfw.xml
 share/fwbuilder/platform/iptables.xml
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 6f22081cc2e..cabd77183e7 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/26 11:52:23 bad Exp $
+$NetBSD: distinfo,v 1.4 2005/10/27 22:09:23 bad Exp $
 
-SHA1 (fwbuilder-2.0.6.tar.gz) = 854dd963de237ef3225d93dfbd429e4c5eaf705e
-RMD160 (fwbuilder-2.0.6.tar.gz) = 8cdfcf11a118169487692010b873743ef4c261e1
-Size (fwbuilder-2.0.6.tar.gz) = 1178100 bytes
+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) = b498c6132574bbf68a9b9ed9a1d9a69586ade1da
-SHA1 (patch-ad) = 621e4c6dc333dd42f5e1f20bfcd18eaef9c9bd86
-SHA1 (patch-ae) = ffc5ca23abae83c4b6bd447dbc661e78c2631442
-SHA1 (patch-af) = f389de1a5d0e25d455d8eb76d2deebfbd6455b94
+SHA1 (patch-ac) = c4984a78918a1a650c5fac06d225697d6f13204d
+SHA1 (patch-ad) = 2aa5ef3bd5c55d55af59f0f3b1ad0ffd305c5c31
diff --git a/security/fwbuilder/patches/patch-ac b/security/fwbuilder/patches/patch-ac
index d7a72de097d..e8974b1bafc 100644
--- a/security/fwbuilder/patches/patch-ac
+++ b/security/fwbuilder/patches/patch-ac
@@ -1,20 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
+$NetBSD: patch-ac,v 1.2 2005/10/27 22:09:23 bad Exp $
 
---- src/gui/utils.cpp.orig	Fri Dec  3 05:42:09 2004
-+++ src/gui/utils.cpp	Thu Feb 24 00:25:02 2005
-@@ -244,7 +244,15 @@
-     int sn1  = file.findRev('/',-1);
-     int sn2  = file.findRev('\\',-1);
-     int sn   = (sn1>=0)?sn1:sn2;
-+#if 0
-     QString dir = (sn<0) ? "./" : file.left( sn );
-+#else
-+    QString dir;
-+    if(sn<0)
-+	dir = "./";
-+    else
-+	dir = file.left( sn );
-+#endif
+--- 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();
  
- #ifdef _WIN32
- /* on windows, if directory is in the root of the drive (like "c:"),
+             QStringList ll=QStringList::split(',', lst);
diff --git a/security/fwbuilder/patches/patch-ad b/security/fwbuilder/patches/patch-ad
index 39d776eaeae..177f8e61cb3 100644
--- a/security/fwbuilder/patches/patch-ad
+++ b/security/fwbuilder/patches/patch-ad
@@ -1,12 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
+$NetBSD: patch-ad,v 1.2 2005/10/27 22:09:23 bad Exp $
 
---- src/gui/FWBTree.cpp.orig	Sun Dec 12 09:38:29 2004
-+++ src/gui/FWBTree.cpp	Thu Feb 24 00:31:41 2005
-@@ -51,6 +51,7 @@
- #include "fwbuilder/IntervalGroup.h"
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
+--- 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/fwbuilder/patches/patch-ae b/security/fwbuilder/patches/patch-ae
deleted file mode 100644
index aace702cc80..00000000000
--- a/security/fwbuilder/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
-
---- src/gui/ObjectManipulator.cpp.orig	Mon Dec 20 09:04:05 2004
-+++ src/gui/ObjectManipulator.cpp	Thu Feb 24 00:36:48 2005
-@@ -97,6 +97,7 @@
- #include "fwbuilder/IntervalGroup.h"
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder/patches/patch-af b/security/fwbuilder/patches/patch-af
deleted file mode 100644
index 0f1af7dbc5b..00000000000
--- a/security/fwbuilder/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/02/24 11:03:22 bad Exp $
-
---- src/gui/listOfLibraries.cpp.orig	Sat Dec 11 08:54:30 2004
-+++ src/gui/listOfLibraries.cpp	Thu Feb 24 00:46:08 2005
-@@ -41,6 +41,7 @@
- #include <qfile.h>
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 835f187a21f..d8065ee9532 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/10/27 22:09:23 bad Exp $
 
-DISTNAME=	libfwbuilder-2.0.6
+DISTNAME=	libfwbuilder-2.0.9
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/libfwbuilder/PLIST b/security/libfwbuilder/PLIST
index a110811bddb..8446589cdf1 100644
--- a/security/libfwbuilder/PLIST
+++ b/security/libfwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/03/07 20:49:24 bad Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/10/27 22:09:23 bad Exp $
 bin/libfwbuilder-config-2
 include/fwb-2.0/fwbuilder/Address.h
 include/fwb-2.0/fwbuilder/AddressRange.h
@@ -61,6 +61,8 @@ include/fwb-2.0/fwcompiler/RuleProcessor.h
 @dirrm include/fwb-2.0
 lib/libfwbuilder.la
 lib/libfwcompiler.la
+lib/libfwbuilder.so.6.3
+lib/libfwcompiler.so.6.3
 share/doc/libfwbuilder-${PKGVERSION}/AUTHORS
 share/doc/libfwbuilder-${PKGVERSION}/COPYING
 share/doc/libfwbuilder-${PKGVERSION}/ChangeLog
@@ -100,5 +102,8 @@ share/libfwbuilder/migration/FWObjectDatabase_2.0.2.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.3.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.4.xslt
 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
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index 4ce63899771..5931d13d918 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/02/26 11:52:04 bad Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/10/27 22:09:23 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.6
+BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.9
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 .endif	# LIBFWBUILDER_BUILDLINK3_MK
 
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index b4cd2618a40..e9ce46b129c 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/26 11:52:04 bad Exp $
+$NetBSD: distinfo,v 1.6 2005/10/27 22:09:23 bad Exp $
 
-SHA1 (libfwbuilder-2.0.6.tar.gz) = 532c668d25e166b4da2f9a202ebad014f6385b3b
-RMD160 (libfwbuilder-2.0.6.tar.gz) = ea8cb352a34d495614ba41445e2062b09f0574d4
-Size (libfwbuilder-2.0.6.tar.gz) = 281256 bytes
-SHA1 (patch-ab) = dc7270976ccf09cefdca11cdba60b20b9cfe1b55
+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 (patch-ab) = 19fa206f433cec8dbd4a8cd1cb78415b5413536d
diff --git a/security/libfwbuilder/patches/patch-ab b/security/libfwbuilder/patches/patch-ab
index 10aa71523ed..70fb65d0790 100644
--- a/security/libfwbuilder/patches/patch-ab
+++ b/security/libfwbuilder/patches/patch-ab
@@ -1,18 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2005/02/24 10:59:56 bad Exp $
+$NetBSD: patch-ab,v 1.3 2005/10/27 22:09:23 bad Exp $
 
---- qmake.inc.in.orig	Wed Sep  8 07:34:44 2004
-+++ qmake.inc.in	Wed Dec 15 17:36:00 2004
-@@ -43,12 +43,10 @@
+--- qmake.inc.in.orig	2005-04-26 09:16:02.000000000 +0200
++++ qmake.inc.in	2005-10-27 21:59:46.000000000 +0200
+@@ -27,11 +27,9 @@
  	migration.path          =$(DDIR)@TEMPLATE_DIR@/migration
  	doc.path                =$(DDIR)@DOCDIR@
  
 -	CONFIG                 += warn_on debug
 +	CONFIG                 += warn_on
- 	INCLUDEPATH            += /usr/include @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ @PTHREAD_CFLAGS_Q@ @OPENSSL_CFLAGS_Q@ @LWRES_CFLAGS_Q@
  	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
 -	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
  	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter
 -	QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
- 	LIBS                   += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @OPENSSL_LIBS@ @LIBSNMP_LIBS@ @LWRES_LIBS@ @LIBS@
+ }
  }