cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 3.0.7

Browse Source 
from maintainer Vadim Zhukov
This commit is contained in:
steven 2009-10-12 11:16:51 +00:00
parent 026cf7b5d2
commit f49fb86e2b
10 changed files with 71 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/fwbuilder/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.15 2009/08/10 06:34:29 kili Exp $ # $OpenBSD: Makefile,v 1.16 2009/10/12 11:17:59 steven Exp $
COMMENT= firewall GUI COMMENT= firewall GUI
DISTNAME= fwbuilder-3.0.4 DISTNAME= fwbuilder-3.0.7
PKGNAME= ${DISTNAME}p1
CATEGORIES= net security CATEGORIES= net security
HOMEPAGE= http://www.fwbuilder.org/ HOMEPAGE= http://www.fwbuilder.org/

10
security/fwbuilder/distinfo
View File

@ -1,5 +1,5 @@
MD5 (fwbuilder-3.0.4.tar.gz) = pTrQNVEeaoprS4nm6s9EhQ== MD5 (fwbuilder-3.0.7.tar.gz) = A64FXaGuocigm4zlH7+NfQ==
RMD160 (fwbuilder-3.0.4.tar.gz) = pq+I9GDG9JacaiiCM2hpzq94HWo= RMD160 (fwbuilder-3.0.7.tar.gz) = xXFQo94Tat0opI+8O3mqEAa0aWM=
SHA1 (fwbuilder-3.0.4.tar.gz) = zvwx8MLwI2cRMFUfRUOrAk/s2PU= SHA1 (fwbuilder-3.0.7.tar.gz) = wIQRvPW2hu+G4dpvCVTYaFv0nWE=
SHA256 (fwbuilder-3.0.4.tar.gz) = TL/HhuLGmzaqeI+1XhkFCxt+cRmugXjWUoR14cybBYw= SHA256 (fwbuilder-3.0.7.tar.gz) = u4J/VKd8D4qbRxIA7aOAHJ/z8qV2ZHympXblRuIKwlQ=
SIZE (fwbuilder-3.0.4.tar.gz) = 2383070 SIZE (fwbuilder-3.0.7.tar.gz) = 2486382

20
security/fwbuilder/patches/patch-qmake_inc_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-qmake_inc_in,v 1.3 2008/11/05 20:38:50 steven Exp $ $OpenBSD: patch-qmake_inc_in,v 1.4 2009/10/12 11:17:59 steven Exp $
--- qmake.inc.in.orig Mon Sep 8 21:03:47 2008 --- qmake.inc.in.orig Fri Sep 18 23:28:40 2009
+++ qmake.inc.in Mon Sep 8 21:03:53 2008 +++ qmake.inc.in Sat Sep 19 17:55:30 2009
@@ -65,7 +65,7 @@ unix { @@ -58,7 +58,7 @@ unix {
PKGLOCALEDIR = $$res.path/locale PKGLOCALEDIR = $$res.path/locale
- CONFIG += warn_on debug - CONFIG += warn_on debug
+ CONFIG += warn_on release + CONFIG += warn_on release
QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@

21
security/fwbuilder/patches/patch-src_gui_ObjectIconView_cpp
View File

@ -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);

12
security/fwbuilder/patches/patch-src_gui_ObjectManipulator_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_gui_ObjectManipulator_cpp,v 1.1 2009/10/12 11:17:59 steven Exp $
--- 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);

73
security/fwbuilder/patches/patch-src_gui_RuleSetView_cpp
View File

@ -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;

23
security/fwbuilder/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2009/04/13 14:12:02 steven Exp $ @comment $OpenBSD: PLIST,v 1.7 2009/10/12 11:17:59 steven Exp $
@bin bin/fwb_iosacl @bin bin/fwb_iosacl
@bin bin/fwb_ipf @bin bin/fwb_ipf
@bin bin/fwb_ipfw @bin bin/fwb_ipfw
@ -36,10 +36,31 @@ share/doc/fwbuilder/README.policy_import
share/doc/fwbuilder/README.routing share/doc/fwbuilder/README.routing
${SHARE}/ ${SHARE}/
${SHARE}/help/ ${SHARE}/help/
${SHARE}/help/ipfw_Classify_en_US.html
${SHARE}/help/iptAdvancedDialog_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/linux24AdvancedDialog_en_US.html
${SHARE}/help/main_en_US.html ${SHARE}/help/main_en_US.html
${SHARE}/help/pfAdvancedDialog_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/
${SHARE}/locale/fwbuilder_ja.qm ${SHARE}/locale/fwbuilder_ja.qm
${SHARE}/locale/fwbuilder_ru.qm ${SHARE}/locale/fwbuilder_ru.qm

8
security/libfwbuilder/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2009/04/13 14:11:23 steven Exp $ # $OpenBSD: Makefile,v 1.12 2009/10/12 11:16:51 steven Exp $
COMMENT= libraries for fwbuilder COMMENT= libraries for fwbuilder
DISTNAME= libfwbuilder-3.0.4 DISTNAME= libfwbuilder-3.0.7
CATEGORIES= net security CATEGORIES= net security
SHARED_LIBS= fwbuilder 12.0 \ SHARED_LIBS= fwbuilder 13.0 \
fwcompiler 12.0 fwcompiler 13.0
INCLUDE= include/fwb-3 INCLUDE= include/fwb-3
SHARE= share/libfwbuilder SHARE= share/libfwbuilder

10
security/libfwbuilder/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libfwbuilder-3.0.4.tar.gz) = xNI7m3LJ0icqsaQeK8hpAw== MD5 (libfwbuilder-3.0.7.tar.gz) = cGMq+58nasJIsTsI8G24Wg==
RMD160 (libfwbuilder-3.0.4.tar.gz) = lyb4m2aC9lJN4vQEatuiro6APNU= RMD160 (libfwbuilder-3.0.7.tar.gz) = kbeY81LXtCSQ8vZFg+1oF7qeQcc=
SHA1 (libfwbuilder-3.0.4.tar.gz) = gQ1Pbci0wqmJY/xeU24mlfSsoC8= SHA1 (libfwbuilder-3.0.7.tar.gz) = 2SNUHlLRkZ6qVldb3qarAegas2o=
SHA256 (libfwbuilder-3.0.4.tar.gz) = zoHoZMxcn00wv0gpLMiyZ8QjVqh7PtpIbfvRFSZ51Ns= SHA256 (libfwbuilder-3.0.7.tar.gz) = tt7dpa955FlNWhP6JMhh2jat8zY2wOlYatV0Sictb94=
SIZE (libfwbuilder-3.0.4.tar.gz) = 543824 SIZE (libfwbuilder-3.0.7.tar.gz) = 540834

22
security/libfwbuilder/patches/patch-qmake_inc_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-qmake_inc_in,v 1.3 2008/11/05 20:37:48 steven Exp $ $OpenBSD: patch-qmake_inc_in,v 1.4 2009/10/12 11:16:51 steven Exp $
--- qmake.inc.in.orig Mon Sep 1 09:45:37 2008 --- qmake.inc.in.orig Fri Sep 18 21:28:03 2009
+++ qmake.inc.in Mon Sep 8 20:43:12 2008 +++ qmake.inc.in Mon Oct 12 11:14:50 2009
@@ -27,7 +27,7 @@ unix { @@ -29,7 +29,7 @@ unix {
migration.path = @TEMPLATE_DIR@/migration migration.path = @TEMPLATE_DIR@/migration
doc.path = @DOCDIR@ doc.path = @DOCDIR@
- CONFIG += warn_on debug - CONFIG += warn_on debug
+ CONFIG += warn_on release + CONFIG += warn_on release
QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@