Update fwbuilder and libfwbuilder to 2.1.10.

Changes since 2.1.7 are:

Version 2.1.10

Improvements and bug fixes in the GUI
     * fixed bug #1661140: "built-in installer broken in 2.1.9 for PF".
       Installer incorrectly set name for files it copied to the firewall if
       generated configuration consisted of several files. Affected platforms
       are PF and ipfilter because normally for these platforms compiler
       generates two files.
     * fixed bug #1659832: "No compile with QT without STL support"
     * a workaround for the bug 1629461: "Policy tabs do not scroll @ window
       extent on OSX". The tab widget used to show policy, nat, routing and
       policy branch rulesets does not switch to a "folded" mode on Mac OS X
       when it needs to show more tabs that fit in the window. Since I can't
       figure out a way to force it to do that, I am dropping "Policy/" from
       the tab titles for branches to make them shorter. This will help users
       with policies with many branches, however it does not solve the
       problem because as they keep adding branches, at some point they won't
       fit in the window again.
     * added an item "Where used" to the context menu associated with objects
       in rules

Version 2.1.9

Improvements and bug fixes in the GUI
     * New feature: new operation "Tools/Find Conflicting Objects in Two Data
       Files". This operation inspects two data files (either .fwb or .fwl)
       and finds conflicting objects. Conflicting objects have the same
       internal ID but different attributes. Two data files can not be
       merged, or one imported into another, if they contain such objects.
       This operation also helps identify changes made to objects in two
       copies of the same data file. This operation does not find objects
       present in one file but not in the other, such objects present no
       problem for merge or import operations. This operation works with two
       external files, neither of which needs to be opened in the program.
       Currently opened data file is not affected by this operation and
       objects in the tree do not change. In the process of this operation
       user is presented with series of dialogs showing conflicting objects
       side by side. In the end the program can generate report and write it
       to a text file.
     * installOptionsDialog was too large and did not fit on some laptop
       screens. Doing tricks to make sure the dialog properly resized after
       unused GUI elements are hidden.
     * bug #1629521: "can't delete empty chain/policy tab"
     * bug #1619842: "prolog "script editor" opens behind other windows"
     * bug #1620206: "RuleOptions' "Apply" button greyed-out until menu
       selection"
     * bug 1619930: "Prolog tab's ScriptEditor's import fails to overwrite"
     * bug #1617501:"Install fails after compile". The GUI got confused when
       user enter full path to the policy file in the "Output file name"
       input field in the "Compiler" tab of firewall object dialog. Making
       sure we always strip directory path from the file name if user
       specified full path for the policy file in the "Output file name"
       input field in the "Compiler" tab of firewall object dialog. Need to
       strip path when macro "%FWSCRIPT%" is substituted in installation
       scriptlets and in some other places.
     * "Apply" and "Close" buttons in the objct editor panel should be of
       fixed size horizontally
     * bug #1624577: "group window doesn't stay open on multiple-adds". Using
       special flag to tell ObjectTreeView that it should ignore
       MouseReleaseEvent it gets after d&d operation, so it wont switch
       object in the editor panel. Note the bug triggered only on Mac OS X.
     * bug (no num.): GUI used show fanthom 'Policy', 'NAT' and 'Routing'
       tabs when user deleted objects from the Deleted Objects library,
       provided some of these objects were previously deleted firewalls.
     * bug #1620284: "conflict when adding library to Preferences/Libraries".
       When the user tried to add a library to the list in
       Preferemces/Libraries when a data file with the same object library
       was loaded, the GUI detected the conflict and showed error dialog.
     * bug #1650369: "[patch] please add support for GNU/kFreeBSD". Applied
       patch to make code compile on kFreeBSD.

Compiler for iptables
     * bug #1623338: "Can not disable rules in a branch". Compiler for
       iptables ignored flag 'disabled' on rules in a branch.
     * bug #1623113: 'connlimit fails in compiled "address table" rules'
       Module connlimit can only be used in iptables rules matching TCP
       services. Such iptables commands have "-p tcp" and/or "-m tcp"
       options. If a rule in fwbuilder uses TCP Service and connlimit option
       and has multiple objects in src and dst, optimizer used to split it to
       minimize matches. It however preserved connlimit option in all
       subrules, even though some of them did not have TCP service after the
       split. This lead to generation of incorrect iptables commands.
     * bug #1620925: "compile-time AddressTable object with empty file".
       Compile-time AddressTable object that uses file with no addresses
       should be treated as an empty group according to the "Ignore empty
       groups" option.
     * bug #1618381: "CLASSIFY/MARK are non-terminating". This bug report in
       fact reported several problems.

          * For action Branch with option to add branching rule to the mangle
            table: we now generate rules in PREROUTING, POSTROUTING, INPUT,
            OUTPUT and FORWARD chains. This is because some targets can only
            work in PREROUTING or POSTROUTING chains but we do not know what
            rules will user put in the branch. So we need to branch in all
            chains
          * For rules in mangle table with direction set to Inbound or
            Outbound force chain to PREROUTING or POSTROUTING respectively
            early. This eliminates duplicates such as the same rule in
            PREROUTING and INPUT chains. Also since most (all?) targets that
            require mangle table go into either PREROUTING or POSTROUTING
            chains, it should be enough to use these two chains.
          * Non-terminating rules shadow each other "backwards", that is more
            general rule shadows other rules _above_ it. Added flag 'reverse'
            to the method find_more_general_rule and added new rule processor
            DetectShadowingForNonTerminatingRules that finds such cases of
            'reverse' shadowing. Using it for rules in the mangle table for
            iptables.
          * Adding iptables rule with target ACCEPT to emulate terminating
            behavior for Tag and Classify actions. Emulation is controlled by
            a global option in the "Compiler" tab of the firewall properties
            dialog (default is "off"). This means emulation can be turned on
            and off for all rules that might require it at once. It is
            impossible to mix such rules with terminating and
            non-termninating behavior. The reason for this is that shadowing
            detection algorithm can only work with either terminating or
            non-terminating rules, not with the mix.

     * bug #1628989: "run-time-loaded rules don't accept ";" as line comment"
     * bug #1632054: "Runtime AddressObjects FAIL to load if "Name:" contains
       "."". Compiler checks if the name of the run-time AddressTable object
       contains characters that have special meaning in sheel and relaces
       them with '_' when it generates the name of the temporary shell
       variable.
     * bug (no num.): data files used for run-time AddressTable objects can
       have empty lines, the script should skip them.
                         Firewall Builder Release Notes

Version 2.1.8

Installation
   Optinon poll ran on the fwbuilder-discussion mailing list showed that
   majority of users are not interested in ability to install and run both
   fwbuilder 2.0 and 2.1 on the same machine at the same time. Hence we are
   reverting to the old naming schema without suffix '21' for the binaries
   and man pages in this release.

Improvements and bug fixes in the GUI
     * The user can search for objects using regular expressions matching
       their names or attributes.
     * Fixed bug #1592130: "Policy Chaining Issues". The GUI should properly
       display nested branch rulesets. The user can create policy branches
       within other branches.

All compilers
     * Fixed bug #1590746 "problem with using "DNS Names" objects on MS
       Windows". Compiler failed to convert DNSName objects set to resolve at
       compile time into IP addresses.

Compiler for iptables
     * fixed bug #1593221: "iptables filtering bridge problem - PHYSDEV: no
       physdev opti..." Some times rules were generated with "-m physdev" but
       witout "--physdev-in" or "--physdev-out" options.

Compiler for Cisco PIX
     * fixed a bug (no num, support req. #1604103: "fwb_pix policy compiler
       dies when SNMP or NTP hosts defined". Compiler did not print error
       message when it could not find an interface with network zone matching
       IP address of NTP or SNMP server (it just printed the address without
       explanation of what went wrong)
     * Experimental utility fwb_pix_diff has been added to the package. This
       utility takes two PIX configurations on the command line and produces
       the 'diff' that consists of a set of commands that should bring the
       firewall from the state defined by the first config to the state
       defined by the second. Only PIX 7.0 is supported. This utility will be
       incorporated into policy installer in the future to make policy
       updates simpler and faster, especially when small changes are made to
       the large set of access lists and nat rules.

3 files changed, 28 insertions, 22 deletions

diff --git a/security/fwbuilder21/Makefile b/security/fwbuilder21/Makefile
index 883de470844..16a91161217 100644
--- a/security/fwbuilder21/Makefile
+++ b/security/fwbuilder21/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/09 19:07:56 bad Exp $
+# $NetBSD: Makefile,v 1.2 2007/03/24 18:37:20 bad Exp $
 
-DISTNAME=	fwbuilder-2.1.7
-PKGNAME=	fwbuilder21-2.1.7
+DISTNAME=	fwbuilder-2.1.10
+PKGNAME=	fwbuilder21-2.1.10
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/fwbuilder21/PLIST b/security/fwbuilder21/PLIST
index 01c696d7d15..0f9f1fa9152 100644
--- a/security/fwbuilder21/PLIST
+++ b/security/fwbuilder21/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/09 19:07:56 bad Exp $
-bin/fwbedit21
-bin/fwblookup21
-bin/fwbuilder21
-bin/fwb_ipt21
-bin/fwb_pf21
-bin/fwb_ipf21
-bin/fwb_ipfw21
+@comment $NetBSD: PLIST,v 1.2 2007/03/24 18:37:20 bad Exp $
+bin/fwbedit
+bin/fwblookup
+bin/fwbuilder
+bin/fwb_ipt
+bin/fwb_pf
+bin/fwb_ipf
+bin/fwb_ipfw
 share/doc/fwbuilder-${PKGVERSION}/AUTHORS
 share/doc/fwbuilder-${PKGVERSION}/ChangeLog
 share/doc/fwbuilder-${PKGVERSION}/COPYING
@@ -19,6 +19,12 @@ share/doc/fwbuilder-${PKGVERSION}/README.pf
 share/doc/fwbuilder-${PKGVERSION}/README.routing
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.7.txt
 share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.7.html
+share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.8.html
+share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.8.txt
+share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.9.html
+share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.9.txt
+share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.10.html
+share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.10.txt
 share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
 share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt
 @dirrm share/doc/fwbuilder-${PKGVERSION}
@@ -51,10 +57,10 @@ share/fwbuilder21/platform/pix.xml
 share/fwbuilder21/platform/unknown.xml
 @dirrm share/fwbuilder21/platform
 @dirrm share/fwbuilder21
-share/man/man1/fwbedit21.1
-share/man/man1/fwb_ipf21.1
-share/man/man1/fwb_ipfw21.1
-share/man/man1/fwb_ipt21.1
-share/man/man1/fwblookup21.1
-share/man/man1/fwb_pf21.1
-share/man/man1/fwbuilder21.1
+share/man/man1/fwbedit.1
+share/man/man1/fwb_ipf.1
+share/man/man1/fwb_ipfw.1
+share/man/man1/fwb_ipt.1
+share/man/man1/fwblookup.1
+share/man/man1/fwb_pf.1
+share/man/man1/fwbuilder.1
diff --git a/security/fwbuilder21/distinfo b/security/fwbuilder21/distinfo
index 6645f57aa6e..58459b08f67 100644
--- a/security/fwbuilder21/distinfo
+++ b/security/fwbuilder21/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/09 19:07:56 bad Exp $
+$NetBSD: distinfo,v 1.2 2007/03/24 18:37:20 bad Exp $
 
-SHA1 (fwbuilder-2.1.7.tar.gz) = 3f796a5a4fbb0f1d88c23c5bf2b8f649e8d8bfbc
-RMD160 (fwbuilder-2.1.7.tar.gz) = 3d28a86cd707f58719baadec06b357f465d4d579
-Size (fwbuilder-2.1.7.tar.gz) = 1518347 bytes
+SHA1 (fwbuilder-2.1.10.tar.gz) = 811c66eac219cf2cedd6a1c2676b83e34c1a144a
+RMD160 (fwbuilder-2.1.10.tar.gz) = 9a106acf18f032a35dd06587096d2bca172db7c3
+Size (fwbuilder-2.1.10.tar.gz) = 1539007 bytes
 SHA1 (patch-aa) = dadac6310b0d27c326209867ee356610907f099c
 SHA1 (patch-ab) = 2210d7c6813e19108004d491073b0c46ef56577d
 SHA1 (patch-ac) = 74f94531167bebc473299bbc8d636173de7a5e3a