Welcome fwbuilder and libfwbuilder 3.0.0, replacing 2.1.19. The old version

is deprecated and scheduled for deletion as it is no longer supported by its
author.

6 files changed, 120 insertions, 48 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index ca1ea6a92ef9..efca04e79e84 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.1.19
-PORTREVISION=	1
+PORTVERSION=	3.0.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -16,11 +15,10 @@ MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS=	fwbuilder.7:${PORTSDIR}/security/libfwbuilder
+LIB_DEPENDS=	fwbuilder.8:${PORTSDIR}/security/libfwbuilder
 
-BUILD_VERSION=	21
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-USE_QT_VER=	3
+PLIST_SUB=	BUILD_VERSION=${PORTVERSION}
+USE_QT_VER=	4
 
 QTDIR?=		${QT_PREFIX}
 
@@ -37,7 +35,6 @@ USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 MAN1=		fwbuilder.1 \
-		fwblookup.1 \
 		fwbedit.1 \
 		fwb_iosacl.1 \
 		fwb_ipt.1 \
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index df2d3b0036c9..0630bda6b1a1 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-2.1.19.tar.gz) = 285e6f364733b6aabead143db87b309b
-SHA256 (fwbuilder-2.1.19.tar.gz) = aaa93b8e74798ce5f49007fb7ea52aa377e4d0fbcead7e57173431e966e09ce4
-SIZE (fwbuilder-2.1.19.tar.gz) = 1970471
+MD5 (fwbuilder-3.0.0.tar.gz) = f1032f4ebc8263224d7e829a204e8d5e
+SHA256 (fwbuilder-3.0.0.tar.gz) = 03036d8a56bb729589ffe9fc4800a491e13d55b8f177fee78e7ee43305a93185
+SIZE (fwbuilder-3.0.0.tar.gz) = 2130909
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
index 5a52a1a5bd17..7b02dcef3a4f 100644
--- a/security/fwbuilder/files/patch-aa
+++ b/security/fwbuilder/files/patch-aa
@@ -1,9 +1,9 @@
---- qmake.inc.in.linux	2006-06-22 08:36:05.000000000 -0700
-+++ qmake.inc.in	2006-06-22 08:36:27.000000000 -0700
-@@ -34,10 +34,8 @@
- 
- 	PKGLOCALEDIR            = $$res.path/locale
+--- qmake.inc.in.orig	2008-08-27 22:44:07.000000000 -0700
++++ qmake.inc.in	2008-08-29 16:04:11.000000000 -0700
+@@ -66,10 +66,8 @@
+ 	PKGLOCALEDIR			= $$res.path/locale
  
+ 	CONFIG                 += warn_on debug
 -	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
 -	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
 -	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter @CXXFLAGS@
diff --git a/security/fwbuilder/files/patch-src-gui-ipfAdvancedDialog.cpp b/security/fwbuilder/files/patch-src-gui-ipfAdvancedDialog.cpp
new file mode 100644
index 000000000000..17a27be76ba5
--- /dev/null
+++ b/security/fwbuilder/files/patch-src-gui-ipfAdvancedDialog.cpp
@@ -0,0 +1,11 @@
+--- src/gui/ipfAdvancedDialog.cpp.orig	2008-09-01 00:45:50.000000000 -0700
++++ src/gui/ipfAdvancedDialog.cpp	2008-09-02 11:23:23.533839864 -0700
+@@ -97,6 +97,8 @@
+     data.registerOption( m_dialog->ipf_nat_irc_proxy        ,fwopt, "ipf_nat_irc_proxy");
+     data.registerOption( m_dialog->ipf_nat_ftp_proxy        ,fwopt, "ipf_nat_ftp_proxy");
+     data.registerOption( m_dialog->ipf_nat_rcmd_proxy       ,fwopt, "ipf_nat_rcmd_proxy");
++    data.registerOption( m_dialog->ipf_nat_krcmd_proxy       ,fwopt, "ipf_nat_krcmd_proxy");
++    data.registerOption( m_dialog->ipf_nat_ekshell_proxy       ,fwopt, "ipf_nat_ekshell_proxy");
+     data.registerOption( m_dialog->ipf_fw_dir               ,fwopt, "firewall_dir"      );
+     data.registerOption( m_dialog->ipf_user                 ,fwopt, "admUser"           );
+     data.registerOption( m_dialog->altAddress               ,fwopt, "altAddress"        );
diff --git a/security/fwbuilder/files/patch-src-gui-ipfadvanceddialog_q.ui b/security/fwbuilder/files/patch-src-gui-ipfadvanceddialog_q.ui
new file mode 100644
index 000000000000..0b7dd82a8956
--- /dev/null
+++ b/security/fwbuilder/files/patch-src-gui-ipfadvanceddialog_q.ui
@@ -0,0 +1,67 @@
+--- src/gui/ipfadvanceddialog_q.ui.orig	2008-09-01 00:45:50.000000000 -0700
++++ src/gui/ipfadvanceddialog_q.ui	2008-09-02 11:31:37.027058950 -0700
+@@ -142,21 +142,21 @@
+          </property>
+         </spacer>
+        </item>
+-       <item row="4" column="1" >
++       <item row="6" column="1" >
+         <widget class="QCheckBox" name="ipf_nat_raudio_proxy" >
+          <property name="text" >
+           <string>Use raudio proxy in NAT rules</string>
+          </property>
+         </widget>
+        </item>
+-       <item row="5" column="1" >
++       <item row="7" column="1" >
+         <widget class="QCheckBox" name="ipf_nat_h323_proxy" >
+          <property name="text" >
+           <string>Use h323 proxy in NAT rules</string>
+          </property>
+         </widget>
+        </item>
+-       <item row="6" column="1" >
++       <item row="8" column="1" >
+         <widget class="QCheckBox" name="ipf_nat_ipsec_proxy" >
+          <property name="text" >
+           <string>Use ipsec proxy in NAT rules</string>
+@@ -193,7 +193,21 @@
+          </property>
+         </widget>
+        </item>
+-       <item row="9" column="1" >
++       <item row="4" column="1" >
++        <widget class="QCheckBox" name="ipf_nat_krcmd_proxy" >
++         <property name="text" >
++          <string>Use Kerberos rcmd proxy in NAT rules</string>
++         </property>
++        </widget>
++       </item>
++       <item row="5" column="1" >
++        <widget class="QCheckBox" name="ipf_nat_ekshell_proxy" >
++         <property name="text" >
++          <string>Use Kerberos ekshell proxy in NAT rules</string>
++         </property>
++        </widget>
++       </item>
++       <item row="11" column="1" >
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+@@ -209,14 +223,14 @@
+          </property>
+         </spacer>
+        </item>
+-       <item row="7" column="1" >
++       <item row="9" column="1" >
+         <widget class="QCheckBox" name="ipf_nat_pptp_proxy" >
+          <property name="text" >
+           <string>Use PPTP proxy in NAT rules</string>
+          </property>
+         </widget>
+        </item>
+-       <item row="8" column="1" >
++       <item row="10" column="1" >
+         <widget class="QCheckBox" name="ipf_nat_irc_proxy" >
+          <property name="text" >
+           <string>Use IRC proxy in NAT rules for DCC</string>
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index e83ba57a447a..4b2c3ead0522 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -5,37 +5,34 @@ bin/fwb_ipt
 bin/fwb_pf
 bin/fwb_pix
 bin/fwbedit
-bin/fwblookup
 bin/fwbuilder
-share/fwbuilder%%BUILD_VERSION%%/objects_init.xml
-share/fwbuilder%%BUILD_VERSION%%/templates.xml
-share/fwbuilder%%BUILD_VERSION%%/resources.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/iosacl.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/iptables.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/ipf.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/pf.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/ipfw.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/fwsm.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/pix.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/unknown.xml
-share/fwbuilder%%BUILD_VERSION%%/os/ios.xml
-share/fwbuilder%%BUILD_VERSION%%/os/linux24.xml
-share/fwbuilder%%BUILD_VERSION%%/os/linksys.xml
-share/fwbuilder%%BUILD_VERSION%%/os/macosx.xml
-share/fwbuilder%%BUILD_VERSION%%/os/freebsd.xml
-share/fwbuilder%%BUILD_VERSION%%/os/openbsd.xml
-share/fwbuilder%%BUILD_VERSION%%/os/solaris.xml
-share/fwbuilder%%BUILD_VERSION%%/os/pix_os.xml
-share/fwbuilder%%BUILD_VERSION%%/os/fwsm_os.xml
-share/fwbuilder%%BUILD_VERSION%%/os/unknown_os.xml
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_de.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_es.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_fr.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_pt_BR.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_sv.qm
-@dirrm share/fwbuilder%%BUILD_VERSION%%/platform
-@dirrm share/fwbuilder%%BUILD_VERSION%%/os
-@dirrm share/fwbuilder%%BUILD_VERSION%%/locale
-@dirrm share/fwbuilder%%BUILD_VERSION%%
+share/applications/fwbuilder.desktop
+share/fwbuilder-%%BUILD_VERSION%%/objects_init.xml
+share/fwbuilder-%%BUILD_VERSION%%/templates.xml
+share/fwbuilder-%%BUILD_VERSION%%/resources.xml
+share/fwbuilder-%%BUILD_VERSION%%/help/iptAdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/linux24AdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/pfAdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/platform/iosacl.xml
+share/fwbuilder-%%BUILD_VERSION%%/platform/iptables.xml
+share/fwbuilder-%%BUILD_VERSION%%/platform/ipf.xml
+share/fwbuilder-%%BUILD_VERSION%%/platform/pf.xml
+share/fwbuilder-%%BUILD_VERSION%%/platform/ipfw.xml
+share/fwbuilder-%%BUILD_VERSION%%/platform/fwsm.xml
+share/fwbuilder-%%BUILD_VERSION%%/platform/pix.xml
+share/fwbuilder-%%BUILD_VERSION%%/platform/unknown.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/ios.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/linux24.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/linksys.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/macosx.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/freebsd.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/openbsd.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/solaris.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/pix_os.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/fwsm_os.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/unknown_os.xml
+@dirrm share/fwbuilder-%%BUILD_VERSION%%/platform
+@dirrm share/fwbuilder-%%BUILD_VERSION%%/os
+@dirrm share/fwbuilder-%%BUILD_VERSION%%/locale
+@dirrm share/fwbuilder-%%BUILD_VERSION%%/help
+@dirrm share/fwbuilder-%%BUILD_VERSION%%