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

update to 3.0.1

Browse Source 
from new maintainer Vadim Zhukov <persgray at gmail>

go ahead espie@
This commit is contained in:
steven 2008-11-05 20:38:50 +00:00
parent 267f6718d0
commit 609fbca5a5
9 changed files with 245 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
security/fwbuilder/Makefile
View File

@ -1,35 +1,57 @@
# $OpenBSD: Makefile,v 1.9 2008/01/04 17:48:37 espie Exp $
# $OpenBSD: Makefile,v 1.10 2008/11/05 20:38:50 steven Exp $
COMMENT=firewall gui
CATEGORIES=net security
COMMENT= firewall GUI
DISTNAME= fwbuilder-3.0.1
CATEGORIES= net security
# GPL
HOMEPAGE= http://www.fwbuilder.org/
MAINTAINER= Vadim Zhukov <persgray@gmail.com>
# GPL v2
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
HOMEPAGE= http://www.fwbuilder.org/
SHARE= share/fwbuilder21
SUBST_VARS= SHARE
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
DISTNAME= fwbuilder-2.1.8
PKGNAME= ${DISTNAME}
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder
MODULES= x11/qt3
SHARE= share/fwbuilder
SUBST_VARS= SHARE
FLAVORS= debug
FLAVOR?=
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--with-docdir=${TRUEPREFIX}/share/doc/fwbuilder \
--with-templatedir=${TRUEPREFIX}/share/fwbuilder \
--with-qtdir=${MODQT_QTDIR} \
QMAKE=${MODQT_QTDIR}/bin/qmake
.if ${FLAVOR:L:Mdebug}
CONFIGURE_ARGS+=--enable-debug
COPTS= -g
.endif
MODULES= x11/qt4
DESTDIRNAME= INSTALL_ROOT
LIB_DEPENDS= fwcompiler.>=9,fwbuilder.>=9::security/libfwbuilder
LIB_DEPENDS= fwcompiler.>=10,fwbuilder.>=10::security/libfwbuilder \
QtGui,QtNetwork::x11/qt4
NO_REGRESS= Yes
USE_X11= Yes
WANTLIB= stdc++ c util m X11 ssl z crypto Xext pthread iconv xslt xml2 netsnmp
# before qt 4, there is no distinction between INSTALL_FILE and INSTALL_PROGRAM
WANTLIB= ICE SM X11 Xext Xi Xinerama Xrandr Xrender \
c fontconfig freetype glib-2.0 gthread-2.0 iconv intl \
m netsnmp png pthread stdc++ util xml2 xslt z
post-install:
chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/*
${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/64x64/apps
${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/16x16/apps
${INSTALL_DATA} ${WRKSRC}/src/gui/Icons/firewall_64.png \
${PREFIX}/share/icons/hicolor/64x64/apps/fwbuilder.png
${INSTALL_DATA} ${WRKSRC}/src/gui/Icons/firewall_16.png \
${PREFIX}/share/icons/hicolor/16x16/apps/fwbuilder.png
.include <bsd.port.mk>

10
security/fwbuilder/distinfo
View File

@ -1,5 +1,5 @@
MD5 (fwbuilder-2.1.8.tar.gz) = +YcGocvkxHDjogoapxWNWA==
RMD160 (fwbuilder-2.1.8.tar.gz) = AL6+vE8OSVV76BzEmLcx2P/lL9A=
SHA1 (fwbuilder-2.1.8.tar.gz) = Lv+lgwzIuGaA22VG6aAIs2Dbtuw=
SHA256 (fwbuilder-2.1.8.tar.gz) = wZLGgrtn818l800ChOE5pMJ/3rPuOWfFfmvqAxClRd0=
SIZE (fwbuilder-2.1.8.tar.gz) = 1521885
MD5 (fwbuilder-3.0.1.tar.gz) = 598BSDLF2Apd/DT5PhCOzg==
RMD160 (fwbuilder-3.0.1.tar.gz) = f3UuZmmzRKlr+OemfCyeR7QXzxw=
SHA1 (fwbuilder-3.0.1.tar.gz) = X+bZ1jx48aN1BKvPAEoJ2KVQHCQ=
SHA256 (fwbuilder-3.0.1.tar.gz) = vJgLa8syveCUND02LFElVoBuWyFaXQTdShWKOycbnew=
SIZE (fwbuilder-3.0.1.tar.gz) = 2135842

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

@ -1,12 +1,12 @@
$OpenBSD: patch-qmake_inc_in,v 1.2 2006/04/17 14:46:09 espie Exp $
--- qmake.inc.in.orig Tue Oct 25 08:11:26 2005
+++ qmake.inc.in Mon Apr 17 14:40:39 2006
@@ -27,7 +27,7 @@ unix {
res_os.path = $(DDIR)@RES_DIR@/os
res_platform.path = $(DDIR)@RES_DIR@/platform
$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 {
- CONFIG += qt thread rtti stl warn_on debug
+ CONFIG += qt thread rtti stl warn_on release
INCLUDEPATH += @LIBFWBUILDER_INCLUDEPATH@
PKGLOCALEDIR = $$res.path/locale
LIBS += $$LIBS_FWBUILDER @LIBS@
- 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@

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

@ -0,0 +1,12 @@
$OpenBSD: patch-src_gui_FWBSettings_h,v 1.1 2008/11/05 20:38:50 steven Exp $
--- src/gui/FWBSettings.h.orig Sat Oct 4 18:46:16 2008
+++ src/gui/FWBSettings.h Wed Oct 8 07:39:28 2008
@@ -33,6 +33,8 @@
#include <set>
+#include <fwbuilder/FWObject.h>
+
class QWidget;
/*

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

@ -0,0 +1,12 @@
$OpenBSD: patch-src_gui_HttpGet_cpp,v 1.1 2008/11/05 20:38:50 steven Exp $
--- src/gui/HttpGet.cpp.orig Sat Oct 4 18:46:16 2008
+++ src/gui/HttpGet.cpp Wed Oct 8 07:27:53 2008
@@ -30,6 +30,8 @@
#include <QtNetwork>
#include <QHttpResponseHeader>
+#include <fwbuilder/FWObject.h>
+
#include "HttpGet.h"
#include "FWBSettings.h"

30
security/fwbuilder/patches/patch-src_gui_ProjectPanel_state_ops_cpp Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_gui_ProjectPanel_state_ops_cpp,v 1.1 2008/11/05 20:38:50 steven Exp $
--- src/gui/ProjectPanel_state_ops.cpp.orig Sat Oct 4 18:46:16 2008
+++ src/gui/ProjectPanel_state_ops.cpp Wed Oct 8 05:08:07 2008
@@ -29,15 +29,20 @@
#include "utils.h"
#include "utils_no_qt.h"
-#include "ProjectPanel.h"
-#include "FWBSettings.h"
-#include "RCS.h"
-#include "RuleSetView.h"
-
#include <QMdiSubWindow>
#include <QMdiArea>
-#include "fwbuilder/Library.h"
+#include <fwbuilder/RuleSet.h>
+#include <fwbuilder/Library.h>
+
+#include "ProjectPanel.h"
+
+#include <ui_rcsfilesavedialog_q.h>
+
+#include "FWWindow.h"
+#include "RCS.h"
+#include "FWBSettings.h"
+#include "RuleSetView.h"
using namespace Ui;

74
security/fwbuilder/patches/patch-src_gui_RuleSetView_cpp Normal file
View File

@ -0,0 +1,74 @@
$OpenBSD: patch-src_gui_RuleSetView_cpp,v 1.1 2008/11/05 20:38:50 steven Exp $
--- src/gui/RuleSetView.cpp.orig Sat Oct 4 18:46:16 2008
+++ src/gui/RuleSetView.cpp Wed Oct 8 07:21:00 2008
@@ -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,32 @@
#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 <fwbuilder/InterfacePolicy.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;

31
security/fwbuilder/patches/patch-src_gui_main_cpp Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-src_gui_main_cpp,v 1.1 2008/11/05 20:38:50 steven Exp $
--- src/gui/main.cpp.orig Sat Oct 4 18:46:16 2008
+++ src/gui/main.cpp Wed Oct 8 05:01:00 2008
@@ -58,6 +58,13 @@
#endif
*/
+#include <fwbuilder/FWObject.h>
+#include <fwbuilder/Tools.h>
+#include <fwbuilder/dns.h>
+#include <fwbuilder/XMLTools.h>
+#include <fwbuilder/Resources.h>
+#include <fwbuilder/FWException.h>
+
#include "FWBSettings.h"
#include "RCS.h"
#include "FWWindow.h"
@@ -68,13 +75,6 @@
#include "ObjectEditor.h"
#include "findDialog.h"
#include "ProjectPanel.h"
-
-#include "fwbuilder/FWObject.h"
-#include "fwbuilder/Tools.h"
-#include "fwbuilder/dns.h"
-#include "fwbuilder/XMLTools.h"
-#include "fwbuilder/Resources.h"
-#include "fwbuilder/FWException.h"
#ifndef _WIN32
# include <sys/wait.h>

51
security/fwbuilder/pkg/PLIST
View File

@ -1,18 +1,22 @@
@comment $OpenBSD: PLIST,v 1.3 2007/01/29 11:56:13 espie Exp $
bin/fwb_ipf
bin/fwb_ipfw
bin/fwb_ipt
bin/fwb_pf
bin/fwbedit
bin/fwblookup
bin/fwbuilder
@comment $OpenBSD: PLIST,v 1.4 2008/11/05 20:38:50 steven Exp $
@bin bin/fwb_iosacl
@bin bin/fwb_ipf
@bin bin/fwb_ipfw
@bin bin/fwb_ipt
@bin bin/fwb_pf
@bin bin/fwb_pix
@bin bin/fwbedit
@bin bin/fwbuilder
@man man/man1/fwb_iosacl.1
@man man/man1/fwb_ipf.1
@man man/man1/fwb_ipfw.1
@man man/man1/fwb_ipt.1
@man man/man1/fwb_pf.1
@man man/man1/fwb_pix.1
@man man/man1/fwbedit.1
@man man/man1/fwblookup.1
@man man/man1/fwbuilder.1
share/applications/
share/applications/fwbuilder.desktop
share/doc/fwbuilder/
share/doc/fwbuilder/AUTHORS
share/doc/fwbuilder/COPYING
@ -21,27 +25,25 @@ share/doc/fwbuilder/Credits
share/doc/fwbuilder/FWBuilder-Routing-LICENSE.txt
share/doc/fwbuilder/PatchAcceptancePolicy.txt
share/doc/fwbuilder/README.floppyfw
share/doc/fwbuilder/README.iosacl
share/doc/fwbuilder/README.ipf
share/doc/fwbuilder/README.ipfw
share/doc/fwbuilder/README.ipt
share/doc/fwbuilder/README.pf
share/doc/fwbuilder/README.pix
share/doc/fwbuilder/README.policy_import
share/doc/fwbuilder/README.routing
share/doc/fwbuilder/ReleaseNotes_2.1.7.html
share/doc/fwbuilder/ReleaseNotes_2.1.7.txt
share/doc/fwbuilder/ReleaseNotes_2.1.8.html
share/doc/fwbuilder/ReleaseNotes_2.1.8.txt
${SHARE}/
${SHARE}/help/
${SHARE}/help/iptAdvancedDialog_en_US.html
${SHARE}/help/linux24AdvancedDialog_en_US.html
${SHARE}/help/pfAdvancedDialog_en_US.html
${SHARE}/locale/
${SHARE}/locale/fwbuilder_de.qm
${SHARE}/locale/fwbuilder_es.qm
${SHARE}/locale/fwbuilder_fr.qm
${SHARE}/locale/fwbuilder_ja.qm
${SHARE}/locale/fwbuilder_ru.qm
${SHARE}/locale/fwbuilder_sv.qm
${SHARE}/objects_init.xml
${SHARE}/os/
${SHARE}/os/freebsd.xml
${SHARE}/os/fwsm_os.xml
${SHARE}/os/ios.xml
${SHARE}/os/linksys.xml
${SHARE}/os/linux24.xml
${SHARE}/os/macosx.xml
@ -51,6 +53,7 @@ ${SHARE}/os/solaris.xml
${SHARE}/os/unknown_os.xml
${SHARE}/platform/
${SHARE}/platform/fwsm.xml
${SHARE}/platform/iosacl.xml
${SHARE}/platform/ipf.xml
${SHARE}/platform/ipfw.xml
${SHARE}/platform/iptables.xml
@ -59,3 +62,13 @@ ${SHARE}/platform/pix.xml
${SHARE}/platform/unknown.xml
${SHARE}/resources.xml
${SHARE}/templates.xml
share/icons/
share/icons/hicolor/
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/fwbuilder.png
share/icons/hicolor/64x64/
share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/fwbuilder.png
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database