Changes 4.1.3:

This version comes with the following usability enhancements:
* Added checkbox to the Preferences dialog, this checkbox turns off some
  tooltips that can be annoying for users who are sufficiently familiar with
  the GUI.
* Added a tab "Policy Rule" to the "Objects" page of the global preferences
  dialog; checkbox in this tab allows the user to choose whether new policy
  rules should be created with logging turned on or off.
The major bug fixes in this release include:
* Fixed installer issue for Windows users that use Putty sessions. Built-in
  policy installer can use putty session on Windows when it runs pscp.exe
  utility to copy generated script to the firewall
* Fixed bug in the generated iptables script that made it to not configure
  broadcast address when it added ip addresses to interfaces.
* Several bugs that affected cluster configurations were fixed.

6 files changed, 59 insertions, 67 deletions

diff --git a/security/libfwbuilder/patches/patch-aa b/security/libfwbuilder/patches/patch-aa
index 93706b097cb..947cc8461ab 100644
--- a/security/libfwbuilder/patches/patch-aa
+++ b/security/libfwbuilder/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.4 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2011/04/12 13:41:17 adam Exp $
 
---- etc/etc.pro.orig	2004-09-08 05:34:46.000000000 +0000
+--- etc/etc.pro.orig	2011-04-11 18:36:15.000000000 +0000
 +++ etc/etc.pro
-@@ -8,6 +8,7 @@ TEMPLATE = app
- QMAKE_RUN_CC  = @echo
+@@ -13,6 +13,7 @@ QMAKE_RUN_CC = @echo
  QMAKE_RUN_CXX = @echo
- QMAKE_LINK    = @echo
+ QMAKE_LINK = @echo
+ QMAKE_LIB = @echo
 +QMAKE_LIBTOOL = @echo
  
- TARGET        = etc
+ TARGET = etc
  
diff --git a/security/libfwbuilder/patches/patch-ab b/security/libfwbuilder/patches/patch-ab
index a00d874d33f..c442246b7dc 100644
--- a/security/libfwbuilder/patches/patch-ab
+++ b/security/libfwbuilder/patches/patch-ab
@@ -1,24 +1,34 @@
-$NetBSD: patch-ab,v 1.4 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: patch-ab,v 1.5 2011/04/12 13:41:17 adam Exp $
 
---- qmake.inc.in.orig	2005-04-26 07:16:02.000000000 +0000
+--- qmake.inc.in.orig	2010-11-17 05:18:12.000000000 +0000
 +++ qmake.inc.in
-@@ -27,11 +27,9 @@ unix {
- 	migration.path          =$(DDIR)@TEMPLATE_DIR@/migration
- 	doc.path                =$(DDIR)@DOCDIR@
+@@ -22,7 +22,6 @@ unix {
+     LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ \
+         @LIB_RESOLV@ @LIBS@
  
--	CONFIG                 += warn_on debug
-+	CONFIG                 += warn_on
- 	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
--	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
- 	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter
--	QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
- }
+-    !macx {
+          UI_DIR = .ui
+          MOC_DIR = .moc
+          OBJECTS_DIR = .obj
+@@ -35,12 +34,10 @@ unix {
+          migration.path = @TEMPLATE_DIR@/migration
+          doc.path = @DOCDIR@
+ 
+-         CONFIG += warn_on debug
++         CONFIG += warn_on
+          QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+-         QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+          QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+-         QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
+-    }
++         QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
  }
  
-@@ -45,5 +43,6 @@ exists(qmake2.inc) {
+ exists(qmake2.inc) {
+@@ -48,5 +45,6 @@ exists(qmake2.inc) {
  }
  
- CONFIG     -= qt
-+CONFIG     += thread
+ CONFIG -= qt
++CONFIG += thread
  
- INSTALLS   += target
+ INSTALLS += target
diff --git a/security/libfwbuilder/patches/patch-ac b/security/libfwbuilder/patches/patch-ac
index fa47bce1719..a61f2325a83 100644
--- a/security/libfwbuilder/patches/patch-ac
+++ b/security/libfwbuilder/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: patch-ac,v 1.4 2011/04/12 13:41:17 adam Exp $
 
---- doc/doc.pro.orig	2004-09-08 05:34:46.000000000 +0000
+--- doc/doc.pro.orig	2010-11-17 05:18:12.000000000 +0000
 +++ doc/doc.pro
-@@ -8,6 +8,7 @@ TEMPLATE = app
- QMAKE_RUN_CC  = @echo
- QMAKE_RUN_CXX = @echo
- QMAKE_LINK    = @echo
-+QMAKE_LIBTOOL = @echo
+@@ -10,6 +10,7 @@ CONFIG -= embed_manifest_exe
+ QMAKE_RUN_CC  = echo
+ QMAKE_RUN_CXX = echo
+ QMAKE_LINK    = echo
++QMAKE_LIBTOOL = echo
  
- TARGET        = 
+ TARGET = 
  
diff --git a/security/libfwbuilder/patches/patch-ad b/security/libfwbuilder/patches/patch-ad
index 0d624fb6168..227c7237eea 100644
--- a/security/libfwbuilder/patches/patch-ad
+++ b/security/libfwbuilder/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.3 2006/03/12 06:56:30 minskim Exp $
+$NetBSD: patch-ad,v 1.4 2011/04/12 13:41:17 adam Exp $
 
---- migration/migration.pro.orig	2005-10-23 06:21:55.000000000 +0000
+--- migration/migration.pro.orig	2010-11-17 05:18:12.000000000 +0000
 +++ migration/migration.pro
-@@ -8,6 +8,7 @@ TEMPLATE = app
- QMAKE_RUN_CC  = @echo
- QMAKE_RUN_CXX = @echo
- QMAKE_LINK    = @echo
-+QMAKE_LIBTOOL = @echo
+@@ -14,6 +14,7 @@ win32 {
+ QMAKE_RUN_CC  = "@echo"
+ QMAKE_RUN_CXX = "@echo"
+ QMAKE_LINK = "@echo"
++QMAKE_LIBTOOL = "@echo"
  
- TARGET        = etc
+ target.path = $${migration.path}
  
diff --git a/security/libfwbuilder/patches/patch-ae b/security/libfwbuilder/patches/patch-ae
index 6cf7d9a500c..93a5ef1d0cf 100644
--- a/security/libfwbuilder/patches/patch-ae
+++ b/security/libfwbuilder/patches/patch-ae
@@ -1,15 +1,12 @@
-$NetBSD: patch-ae,v 1.1 2006/10/14 01:42:51 rillig Exp $
+$NetBSD: patch-ae,v 1.2 2011/04/12 13:41:17 adam Exp $
 
---- configure.orig	2006-10-14 03:36:59.000000000 +0200
-+++ configure	2006-10-14 03:38:22.000000000 +0200
-@@ -10091,8 +10091,8 @@ fi
- if test "Z$ac_cv_gethostbyaddr_args" != "Z"; then
-   echo "Function gethostbyaddr_r takes $ac_cv_gethostbyaddr_args arguments"
-   echo -n "First argument for gethostbyaddr_r is "
--  if   test "Z$ac_cv_gethostbyaddr_first_arg" == "Zcharptr"; then echo "const char *"
--  elif test "Z$ac_cv_gethostbyaddr_first_arg" == "Zvoidptr"; then echo "const void *"
-+  if   test "Z$ac_cv_gethostbyaddr_first_arg" = "Zcharptr"; then echo "const char *"
-+  elif test "Z$ac_cv_gethostbyaddr_first_arg" = "Zvoidptr"; then echo "const void *"
-   else echo
-   fi
- else
+--- src/confscript/confscript.pro.orig	2011-04-11 18:34:55.000000000 +0000
++++ src/confscript/confscript.pro
+@@ -13,6 +13,7 @@ QMAKE_RUN_CC = @echo
+ QMAKE_RUN_CXX = @echo
+ QMAKE_LINK = @echo
+ QMAKE_LIB = @echo
++QMAKE_LIBTOOL = @echo
+ 
+ TARGET = confscript
+ 
diff --git a/security/libfwbuilder/patches/patch-af b/security/libfwbuilder/patches/patch-af
deleted file mode 100644
index dad926e440b..00000000000
--- a/security/libfwbuilder/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/10/14 01:42:51 rillig Exp $
-
---- configure.in.orig	2005-10-25 08:10:32.000000000 +0200
-+++ configure.in	2006-10-14 03:38:05.000000000 +0200
-@@ -822,8 +822,8 @@ fi
- if test "Z$ac_cv_gethostbyaddr_args" != "Z"; then
-   echo "Function gethostbyaddr_r takes $ac_cv_gethostbyaddr_args arguments"
-   echo -n "First argument for gethostbyaddr_r is "
--  if   test "Z$ac_cv_gethostbyaddr_first_arg" == "Zcharptr"; then echo "const char *"
--  elif test "Z$ac_cv_gethostbyaddr_first_arg" == "Zvoidptr"; then echo "const void *"
-+  if   test "Z$ac_cv_gethostbyaddr_first_arg" = "Zcharptr"; then echo "const char *"
-+  elif test "Z$ac_cv_gethostbyaddr_first_arg" = "Zvoidptr"; then echo "const void *"
-   else echo 
-   fi
- else