Tested on i386. GUI still needs polishing but no crashes seen for me. -- Best wishes, Vadim Zhukov
A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail? Index: libfwbuilder/Makefile =================================================================== RCS file: /cvs/ports/security/libfwbuilder/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- libfwbuilder/Makefile 13 Apr 2009 14:11:23 -0000 1.11 +++ libfwbuilder/Makefile 29 Jun 2009 08:02:25 -0000 @@ -1,10 +1,10 @@ # $OpenBSD: Makefile,v 1.11 2009/04/13 14:11:23 steven Exp $ COMMENT= libraries for fwbuilder -DISTNAME= libfwbuilder-3.0.4 +DISTNAME= libfwbuilder-3.0.5 CATEGORIES= net security -SHARED_LIBS= fwbuilder 12.0 \ - fwcompiler 12.0 +SHARED_LIBS= fwbuilder 13.0 \ + fwcompiler 13.0 INCLUDE= include/fwb-3 SHARE= share/libfwbuilder Index: libfwbuilder/distinfo =================================================================== RCS file: /cvs/ports/security/libfwbuilder/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- libfwbuilder/distinfo 13 Apr 2009 14:11:23 -0000 1.7 +++ libfwbuilder/distinfo 29 Jun 2009 08:02:25 -0000 @@ -1,5 +1,5 @@ -MD5 (libfwbuilder-3.0.4.tar.gz) = xNI7m3LJ0icqsaQeK8hpAw== -RMD160 (libfwbuilder-3.0.4.tar.gz) = lyb4m2aC9lJN4vQEatuiro6APNU= -SHA1 (libfwbuilder-3.0.4.tar.gz) = gQ1Pbci0wqmJY/xeU24mlfSsoC8= -SHA256 (libfwbuilder-3.0.4.tar.gz) = zoHoZMxcn00wv0gpLMiyZ8QjVqh7PtpIbfvRFSZ51Ns= -SIZE (libfwbuilder-3.0.4.tar.gz) = 543824 +MD5 (libfwbuilder-3.0.5.tar.gz) = YoaX+4NLMMOuXPw32+o6PA== +RMD160 (libfwbuilder-3.0.5.tar.gz) = OOUF79MkaHqZv/sKwnRsOpCbetY= +SHA1 (libfwbuilder-3.0.5.tar.gz) = j1MhzFkBxTeDMczP8GANl29S67g= +SHA256 (libfwbuilder-3.0.5.tar.gz) = 4YP56gLM+dzLAWIB/cOyuQTraA1IiIw9q8XialyGuwI= +SIZE (libfwbuilder-3.0.5.tar.gz) = 542609 Index: libfwbuilder/patches/patch-qmake_inc_in =================================================================== RCS file: /cvs/ports/security/libfwbuilder/patches/patch-qmake_inc_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-qmake_inc_in --- libfwbuilder/patches/patch-qmake_inc_in 5 Nov 2008 20:37:48 -0000 1.3 +++ libfwbuilder/patches/patch-qmake_inc_in 29 Jun 2009 08:02:25 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-qmake_inc_in,v 1.3 2008/11/05 20:37:48 steven Exp $ ---- qmake.inc.in.orig Mon Sep 1 09:45:37 2008 -+++ qmake.inc.in Mon Sep 8 20:43:12 2008 -@@ -27,7 +27,7 @@ unix { - migration.path = @TEMPLATE_DIR@/migration - doc.path = @DOCDIR@ +--- qmake.inc.in.orig Tue Jun 16 02:06:56 2009 ++++ qmake.inc.in Wed Jun 17 20:47:44 2009 +@@ -29,7 +29,7 @@ unix { + migration.path = @TEMPLATE_DIR@/migration + doc.path = @DOCDIR@ -- CONFIG += warn_on debug -+ CONFIG += warn_on release - QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter - QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ +- CONFIG += warn_on debug ++ CONFIG += warn_on release + QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter + QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter + QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ Index: fwbuilder/Makefile =================================================================== RCS file: /cvs/ports/security/fwbuilder/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- fwbuilder/Makefile 13 Apr 2009 14:12:02 -0000 1.13 +++ fwbuilder/Makefile 29 Jun 2009 08:02:25 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.13 2009/04/13 14:12:02 steven Exp $ COMMENT= firewall GUI -DISTNAME= fwbuilder-3.0.4 +DISTNAME= fwbuilder-3.0.5 CATEGORIES= net security HOMEPAGE= http://www.fwbuilder.org/ @@ -35,7 +35,7 @@ COPTS= -g MODULES= x11/qt4 DESTDIRNAME= INSTALL_ROOT -LIB_DEPENDS= fwcompiler.>=11,fwbuilder.>=11::security/libfwbuilder \ +LIB_DEPENDS= fwcompiler.>=13,fwbuilder.>=13::security/libfwbuilder \ QtGui,QtNetwork::x11/qt4 NO_REGRESS= Yes Index: fwbuilder/distinfo =================================================================== RCS file: /cvs/ports/security/fwbuilder/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- fwbuilder/distinfo 13 Apr 2009 14:12:02 -0000 1.7 +++ fwbuilder/distinfo 29 Jun 2009 08:02:25 -0000 @@ -1,5 +1,5 @@ -MD5 (fwbuilder-3.0.4.tar.gz) = pTrQNVEeaoprS4nm6s9EhQ== -RMD160 (fwbuilder-3.0.4.tar.gz) = pq+I9GDG9JacaiiCM2hpzq94HWo= -SHA1 (fwbuilder-3.0.4.tar.gz) = zvwx8MLwI2cRMFUfRUOrAk/s2PU= -SHA256 (fwbuilder-3.0.4.tar.gz) = TL/HhuLGmzaqeI+1XhkFCxt+cRmugXjWUoR14cybBYw= -SIZE (fwbuilder-3.0.4.tar.gz) = 2383070 +MD5 (fwbuilder-3.0.5.tar.gz) = gmzX64Tb0/qp5PmfNZWZnA== +RMD160 (fwbuilder-3.0.5.tar.gz) = ffEtRRE5RF+dwIN3iPlEPnHRU1c= +SHA1 (fwbuilder-3.0.5.tar.gz) = cvI1zBtSKn6z1bPhW8yTp30XULU= +SHA256 (fwbuilder-3.0.5.tar.gz) = uO++wyeG8+IT9o/j151LxRkkqDqYFJeJ9VLGetWzPcw= +SIZE (fwbuilder-3.0.5.tar.gz) = 2466047 Index: fwbuilder/patches/patch-qmake_inc_in =================================================================== RCS file: /cvs/ports/security/fwbuilder/patches/patch-qmake_inc_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-qmake_inc_in --- fwbuilder/patches/patch-qmake_inc_in 5 Nov 2008 20:38:50 -0000 1.3 +++ fwbuilder/patches/patch-qmake_inc_in 29 Jun 2009 08:02:25 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-qmake_inc_in,v 1.3 2008/11/05 20:38:50 steven Exp $ ---- qmake.inc.in.orig Mon Sep 8 21:03:47 2008 -+++ qmake.inc.in Mon Sep 8 21:03:53 2008 -@@ -65,7 +65,7 @@ unix { +--- qmake.inc.in.orig Tue Jun 16 02:07:27 2009 ++++ qmake.inc.in Thu Jun 18 01:19:42 2009 +@@ -58,7 +58,7 @@ unix { - PKGLOCALEDIR = $$res.path/locale + PKGLOCALEDIR = $$res.path/locale -- CONFIG += warn_on debug -+ CONFIG += warn_on release - QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter - QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ +- CONFIG += warn_on debug ++ CONFIG += warn_on release + QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter + QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter + QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ Index: fwbuilder/patches/patch-src_gui_RuleSetView_cpp =================================================================== RCS file: /cvs/ports/security/fwbuilder/patches/patch-src_gui_RuleSetView_cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_gui_RuleSetView_cpp --- fwbuilder/patches/patch-src_gui_RuleSetView_cpp 13 Apr 2009 14:12:02 -0000 1.2 +++ fwbuilder/patches/patch-src_gui_RuleSetView_cpp 29 Jun 2009 08:02:25 -0000 @@ -1,49 +1,10 @@ -$OpenBSD: patch-src_gui_RuleSetView_cpp,v 1.2 2009/04/13 14:12:02 steven Exp $ ---- src/gui/RuleSetView.cpp.orig Sun Mar 29 22:08:37 2009 -+++ src/gui/RuleSetView.cpp Tue Mar 31 12:17:06 2009 -@@ -45,37 +45,12 @@ - #include "global.h" - #include "utils.h" - --#include "ActionsDialog.h" --#include "FWBSettings.h" --#include "FWObjectClipboard.h" --#include "FWObjectDrag.h" --#include "FWObjectPropertiesFactory.h" --#include "FWWindow.h" --#include "FindObjectWidget.h" --#include "ObjectEditor.h" --#include "ObjectTreeView.h" --#include "ProjectPanel.h" --#include "RuleRowInfo.h" --#include "RuleSetView.h" --#include "SimpleIntEditor.h" --#include "SimpleTextEditor.h" --#include "findDialog.h" --#include "platforms.h" -- - #include <ui_askrulenumberdialog_q.h> - - #include <iostream> - #include <sstream> - #include <list> - --#include "fwbuilder/Firewall.h" --#include "fwbuilder/Resources.h" --#include "fwbuilder/Policy.h" --#include "fwbuilder/NAT.h" --#include "fwbuilder/Routing.h" --#include "fwbuilder/RuleElement.h" --#include "fwbuilder/Interface.h" -- - #include <qapplication.h> - #include <qpainter.h> - #include <qrect.h> -@@ -99,6 +74,31 @@ - #include <QMdiSubWindow> +$OpenBSD$ +--- src/gui/RuleSetView.cpp.orig Tue Jun 16 02:07:25 2009 ++++ src/gui/RuleSetView.cpp Thu Jun 18 01:18:05 2009 +@@ -101,6 +101,31 @@ #include <QMdiArea> #include <QScrollBar> -+ + +#include <fwbuilder/Firewall.h> +#include <fwbuilder/Resources.h> +#include <fwbuilder/Policy.h> @@ -68,6 +29,7 @@ $OpenBSD: patch-src_gui_RuleSetView_cpp, +#include "SimpleTextEditor.h" +#include "findDialog.h" +#include "platforms.h" - ++ using namespace libfwbuilder; using namespace std; + Index: fwbuilder/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/fwbuilder/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- fwbuilder/pkg/PLIST 13 Apr 2009 14:12:02 -0000 1.6 +++ fwbuilder/pkg/PLIST 29 Jun 2009 08:02:25 -0000 @@ -36,10 +36,31 @@ share/doc/fwbuilder/README.policy_import share/doc/fwbuilder/README.routing ${SHARE}/ ${SHARE}/help/ +${SHARE}/help/ipfw_Classify_en_US.html ${SHARE}/help/iptAdvancedDialog_en_US.html +${SHARE}/help/iptables_Branch_en_US.html +${SHARE}/help/iptables_Classify_en_US.html +${SHARE}/help/iptables_Route_en_US.html +${SHARE}/help/iptables_Tag_en_US.html +${SHARE}/help/iptables_rule_options_en_US.html ${SHARE}/help/linux24AdvancedDialog_en_US.html ${SHARE}/help/main_en_US.html ${SHARE}/help/pfAdvancedDialog_en_US.html +${SHARE}/help/pf_Branch_en_US.html +${SHARE}/help/pf_Classify_en_US.html +${SHARE}/help/pf_Route_en_US.html +${SHARE}/help/pf_Tag_en_US.html +${SHARE}/help/pf_rule_options_en_US.html +${SHARE}/help/tip01_en_US.html +${SHARE}/help/tip02_en_US.html +${SHARE}/help/tip03_en_US.html +${SHARE}/help/tip04_en_US.html +${SHARE}/help/tip05_en_US.html +${SHARE}/help/tip06_en_US.html +${SHARE}/help/tip07_en_US.html +${SHARE}/help/tip08_en_US.html +${SHARE}/help/tip09_en_US.html +${SHARE}/help/tip10_en_US.html ${SHARE}/locale/ ${SHARE}/locale/fwbuilder_ja.qm ${SHARE}/locale/fwbuilder_ru.qm