Many fixes, including fixing GUI crashes (but not all of them yet,
see patches). Tested on i386.
--
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 19 Sep 2009 18:08:55 -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.7
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 19 Sep 2009 18:08:55 -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.7.tar.gz) = cGMq+58nasJIsTsI8G24Wg==
+RMD160 (libfwbuilder-3.0.7.tar.gz) = kbeY81LXtCSQ8vZFg+1oF7qeQcc=
+SHA1 (libfwbuilder-3.0.7.tar.gz) = 2SNUHlLRkZ6qVldb3qarAegas2o=
+SHA256 (libfwbuilder-3.0.7.tar.gz) =
tt7dpa955FlNWhP6JMhh2jat8zY2wOlYatV0Sictb94=
+SIZE (libfwbuilder-3.0.7.tar.gz) = 540834
Index: libfwbuilder/patches/patch-qmake_inc_in
===================================================================
RCS file: /cvs/ports/security/libfwbuilder/patches/patch-qmake_inc_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qmake_inc_in
--- libfwbuilder/patches/patch-qmake_inc_in 21 May 2005 09:35:19 -0000
1.1
+++ libfwbuilder/patches/patch-qmake_inc_in 19 Sep 2009 18:08:55 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-qmake_inc_in,v 1.1 2005/05/21 09:35:19 espie Exp $
---- qmake.inc.in.orig Wed May 18 16:10:42 2005
-+++ qmake.inc.in Wed May 18 16:10:51 2005
-@@ -27,7 +27,7 @@ unix {
- migration.path =$(DDIR)@TEMPLATE_DIR@/migration
- doc.path =$(DDIR)@DOCDIR@
+$OpenBSD$
+--- qmake.inc.in.orig Sat Sep 19 17:45:17 2009
++++ qmake.inc.in Sat Sep 19 17:45:30 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
+- 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@
? fwbuilder/fwbuilder.core
Index: fwbuilder/Makefile
===================================================================
RCS file: /cvs/ports/security/fwbuilder/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- fwbuilder/Makefile 19 Jun 2009 11:12:14 -0000 1.14
+++ fwbuilder/Makefile 19 Sep 2009 18:10:29 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.14 2009/06/19 11:12:14 sthen Exp $
COMMENT= firewall GUI
-DISTNAME= fwbuilder-3.0.4
-PKGNAME= ${DISTNAME}p0
+DISTNAME= fwbuilder-3.0.7
CATEGORIES= net security
HOMEPAGE= http://www.fwbuilder.org/
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 19 Sep 2009 18:10:29 -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.7.tar.gz) = A64FXaGuocigm4zlH7+NfQ==
+RMD160 (fwbuilder-3.0.7.tar.gz) = xXFQo94Tat0opI+8O3mqEAa0aWM=
+SHA1 (fwbuilder-3.0.7.tar.gz) = wIQRvPW2hu+G4dpvCVTYaFv0nWE=
+SHA256 (fwbuilder-3.0.7.tar.gz) = u4J/VKd8D4qbRxIA7aOAHJ/z8qV2ZHympXblRuIKwlQ=
+SIZE (fwbuilder-3.0.7.tar.gz) = 2486382
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 19 Sep 2009 18:10:29 -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 Fri Sep 18 23:28:40 2009
++++ qmake.inc.in Sat Sep 19 17:55:30 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_ObjectIconView_cpp
===================================================================
RCS file:
/cvs/ports/security/fwbuilder/patches/patch-src_gui_ObjectIconView_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_gui_ObjectIconView_cpp
--- fwbuilder/patches/patch-src_gui_ObjectIconView_cpp 13 Apr 2009 14:12:02
-0000 1.1
+++ fwbuilder/patches/patch-src_gui_ObjectIconView_cpp 19 Sep 2009 18:10:29
-0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_gui_ObjectIconView_cpp,v 1.1 2009/04/13 14:12:02 steven
Exp $
---- src/gui/ObjectIconView.cpp.orig Tue Apr 7 15:14:52 2009
-+++ src/gui/ObjectIconView.cpp Tue Apr 7 15:15:27 2009
-@@ -119,6 +119,8 @@ bool ObjectIconView::event(QEvent *event)
- QDrag* ObjectIconView::dragObject()
- {
- QListWidgetItem *ivi = currentItem();
-+ if (ivi == NULL)
-+ return NULL;
- int obj_id = ivi->data(Qt::UserRole).toInt();
- FWObject *obj = mw->db()->findInIndex(obj_id);
- QString icn =
-@@ -189,7 +191,7 @@ void ObjectIconView::mouseMoveEvent ( QMouseEvent * ev
- startingDrag = false;
- QDrag *dr = dragObject();
-
-- if (dr)
-+ if (dr != NULL)
- dr->start();
- }
- QListWidget::mouseMoveEvent(event);
Index: fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp
===================================================================
RCS file: fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp
diff -N fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp 19 Sep 2009
18:10:29 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/gui/ObjectManipulator.cpp.orig Fri Sep 18 23:28:37 2009
++++ src/gui/ObjectManipulator.cpp Sat Sep 19 19:08:47 2009
+@@ -3423,7 +3423,7 @@ void ObjectManipulator::reopenCurrentItemParent()
+ QTreeWidgetItem *itm = current_tree_view->currentItem();
+ if (itm)
+ itm = itm->parent();
+- if (!itm)
++ if (!itm || !itm->parent())
+ return;
+ itm->parent()->setExpanded(false);
+ itm->parent()->setExpanded(true);
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 19 Sep 2009 18:10:29
-0000
@@ -1,73 +0,0 @@
-$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>
- #include <QMdiArea>
- #include <QScrollBar>
-+
-+#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 "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"
-
- 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 19 Sep 2009 18:10:29 -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
