Update libfwbuilder and fwbuilder to 2.0.12. Bugfixes only.

2.0.12:
Bugs fixed in this release:
bug #1455772: Implement more portable fix for converting UTF-8 in
comments. The previous one broke the Windows installer.

2.0.11:
Bugs fixed in this release:
* fixes to make code compile with g++ 4.1.
* bug #1455772: Properly convert comments to/from UTF-8 to ensure the
script is not corrupted when copied to the firewall
* bug #1455748: "make firewall script executable".

Bugs fixed in policy compiler for iptables:
* bug #1375432: avoid using '-m state' twice for stateless rules with
with custom services.
* bug#1364060: change shell pattern to match names of conntrack modules
in Linux 2.6.

Bugs fixed in policy compiler for ipfilter:
* bug #1386226: removed nat.conf when nat rules are removed.
* bug #1393004: use 'egrep -s' on Solaris.

7 files changed, 21 insertions, 19 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 2225b142a64..bc957adb73e 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2006/04/17 13:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/13 17:37:34 bad Exp $
 
-DISTNAME=	fwbuilder-2.0.10
-PKGREVISION=	4
+DISTNAME=	fwbuilder-2.0.12
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/fwbuilder/PLIST b/security/fwbuilder/PLIST
index 7b7abf4d972..796cc3c2bdb 100644
--- a/security/fwbuilder/PLIST
+++ b/security/fwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/12/12 20:25:09 bad Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/07/13 17:37:34 bad Exp $
 bin/fwb_install
 bin/fwbedit
 bin/fwblookup
@@ -39,6 +39,8 @@ 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}/ReleaseNotes_2.0.11.html
+share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.0.11.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 5fd72a03fd3..a1960319b50 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/03/12 06:58:42 minskim Exp $
+$NetBSD: distinfo,v 1.7 2006/07/13 17:37:34 bad Exp $
 
-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 (fwbuilder-2.0.12.tar.gz) = 5947236e365ef085ebebd4fec85935cb99b9b64c
+RMD160 (fwbuilder-2.0.12.tar.gz) = 7d3ae613ac015650333d2e9f980c8d688e320cd2
+Size (fwbuilder-2.0.12.tar.gz) = 1389953 bytes
 SHA1 (patch-aa) = dadac6310b0d27c326209867ee356610907f099c
 SHA1 (patch-ab) = 19a0c4801785536b0e95e328fe7569c155308ce6
 SHA1 (patch-ac) = 74f94531167bebc473299bbc8d636173de7a5e3a
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 495ab58db6f..77b8afaa137 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2006/04/17 13:46:05 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/13 17:37:34 bad Exp $
 
-DISTNAME=	libfwbuilder-2.0.10
-PKGREVISION=	6
+DISTNAME=	libfwbuilder-2.0.12
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
diff --git a/security/libfwbuilder/PLIST b/security/libfwbuilder/PLIST
index b37d4566085..129e760830a 100644
--- a/security/libfwbuilder/PLIST
+++ b/security/libfwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/03/12 06:56:30 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/07/13 17:37:34 bad Exp $
 bin/libfwbuilder-config-2
 include/fwb-2.0/fwbuilder/Address.h
 include/fwb-2.0/fwbuilder/AddressRange.h
@@ -104,5 +104,7 @@ 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
+share/libfwbuilder/migration/FWObjectDatabase_2.0.10.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.11.xslt
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index f40013325e1..25049355cf6 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/13 17:37:34 bad Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFWBUILDER_BUILDLINK3_MK:=	${LIBFWBUILDER_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libfwbuilder
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libfwbuilder
 
 .if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.10
-BUILDLINK_ABI_DEPENDS.libfwbuilder?=	libfwbuilder>=2.0.10nb6
+BUILDLINK_API_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.12
+BUILDLINK_ABI_DEPENDS.libfwbuilder?=	libfwbuilder>=2.0.12
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 .endif	# LIBFWBUILDER_BUILDLINK3_MK
 
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index 18c294eb7e3..877a60f111d 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: distinfo,v 1.9 2006/07/13 17:37:34 bad Exp $
 
-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 (libfwbuilder-2.0.12.tar.gz) = a287de04e81a4ee480d34e8f209718eb63da457a
+RMD160 (libfwbuilder-2.0.12.tar.gz) = 69f996659d30863e97340c52d814469a8e5173b7
+Size (libfwbuilder-2.0.12.tar.gz) = 282065 bytes
 SHA1 (patch-aa) = 05475a05f746fa05e6df5fc9d63cd3d344717a8d
 SHA1 (patch-ab) = fc285986f8c930ef7f46dbeaf3f26eab91bf5dda
 SHA1 (patch-ac) = 044c4d42df1dea1126dfba2af960d6f8ebeffd6d