On 26 November 2008 г. 23:32:21 Vadim Zhukov wrote: > Here is update to security/libfwbuilder and security/fwbuilder ports. > > This is bugfix and language improvement update. > > Tested on i386, other platforms are welcome (BTW, I'm looking for > purchasing one of those gumstix devices now;) ), as testing Linux > (iptables) and PIX rules... > > There is a small bug: when you create new firewall (may be some other > objects too, didn't test all of them) and specify interfaces "by > hand", you have to collaps and expand again new firewall tree item, or > you'll have to click twice on subitems to select them. No crashes > found there, though. > > Also I added "x11" to list of categories fwbuilder belongs to, as it, > surely, does.
Oops... Just realized I didn't manage to fix RCS tags. :( Now there is a correct version of diff. -- Best wishes, Vadim Zhukov Index: libfwbuilder/Makefile =================================================================== RCS file: /cvs/ports/security/libfwbuilder/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- libfwbuilder/Makefile 5 Nov 2008 20:37:48 -0000 1.9 +++ libfwbuilder/Makefile 27 Nov 2008 19:27:36 -0000 @@ -1,10 +1,10 @@ # $OpenBSD: Makefile,v 1.9 2008/11/05 20:37:48 steven Exp $ COMMENT= libraries for fwbuilder -DISTNAME= libfwbuilder-3.0.1 +DISTNAME= libfwbuilder-3.0.2 CATEGORIES= net security -SHARED_LIBS= fwbuilder 10.0 \ - fwcompiler 10.0 +SHARED_LIBS= fwbuilder 11.0 \ + fwcompiler 11.0 INCLUDE= include/fwb-3 SHARE= share/libfwbuilder Index: libfwbuilder/distinfo =================================================================== RCS file: /cvs/ports/security/libfwbuilder/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- libfwbuilder/distinfo 5 Nov 2008 20:37:48 -0000 1.5 +++ libfwbuilder/distinfo 27 Nov 2008 19:27:36 -0000 @@ -1,5 +1,5 @@ -MD5 (libfwbuilder-3.0.1.tar.gz) = nzfeYrfXwI7V6owec+jYJw== -RMD160 (libfwbuilder-3.0.1.tar.gz) = ZASSI+8RqARY2stHsP0ge9/anYo= -SHA1 (libfwbuilder-3.0.1.tar.gz) = zstD7yJgoo1SWZ5v8ILY7BaU5xs= -SHA256 (libfwbuilder-3.0.1.tar.gz) = O0uynGrxLkNbptoTdcguDHPOAmR3Dl31NZT/niiw4oY= -SIZE (libfwbuilder-3.0.1.tar.gz) = 525795 +MD5 (libfwbuilder-3.0.2.tar.gz) = 4VPaupKD/LA6RGlqA8GZ8g== +RMD160 (libfwbuilder-3.0.2.tar.gz) = nmq3KVQ3b5L5y1Av9oLip7sPGx0= +SHA1 (libfwbuilder-3.0.2.tar.gz) = pOD5aiDFXttVVLIgTaiL+lrzv18= +SHA256 (libfwbuilder-3.0.2.tar.gz) = kb2EzbQ1XjiT7rUUT7FuirgH2kjV8HYfQu8jEmf8VNY= +SIZE (libfwbuilder-3.0.2.tar.gz) = 529264 Index: fwbuilder/Makefile =================================================================== RCS file: /cvs/ports/security/fwbuilder/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- fwbuilder/Makefile 5 Nov 2008 20:38:50 -0000 1.10 +++ fwbuilder/Makefile 27 Nov 2008 19:27:36 -0000 @@ -1,8 +1,8 @@ # $OpenBSD: Makefile,v 1.10 2008/11/05 20:38:50 steven Exp $ COMMENT= firewall GUI -DISTNAME= fwbuilder-3.0.1 -CATEGORIES= net security +DISTNAME= fwbuilder-3.0.2 +CATEGORIES= net security x11 HOMEPAGE= http://www.fwbuilder.org/ @@ -35,15 +35,15 @@ COPTS= -g MODULES= x11/qt4 DESTDIRNAME= INSTALL_ROOT -LIB_DEPENDS= fwcompiler.>=10,fwbuilder.>=10::security/libfwbuilder \ +LIB_DEPENDS= fwcompiler.>=11,fwbuilder.>=11::security/libfwbuilder \ QtGui,QtNetwork::x11/qt4 NO_REGRESS= Yes USE_X11= Yes -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 +WANTLIB= ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender \ + c crypto fontconfig freetype glib-2.0 gthread-2.0 iconv intl \ + m netsnmp png pthread ssl stdc++ util xml2 xslt z post-install: chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/* Index: fwbuilder/distinfo =================================================================== RCS file: /cvs/ports/security/fwbuilder/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- fwbuilder/distinfo 5 Nov 2008 20:38:50 -0000 1.5 +++ fwbuilder/distinfo 27 Nov 2008 19:27:36 -0000 @@ -1,5 +1,5 @@ -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 +MD5 (fwbuilder-3.0.2.tar.gz) = WsImJfYuyZGUNYeZkgZSpQ== +RMD160 (fwbuilder-3.0.2.tar.gz) = Bj33nmwQkA4SmVUrT7bO0qJUHOw= +SHA1 (fwbuilder-3.0.2.tar.gz) = ITllNnxe7nlguHUoLmWKEMQc1dw= +SHA256 (fwbuilder-3.0.2.tar.gz) = 1EEcIq6jdt8xMUSgrMOkvpugz60ANADsorVi7eD4nfc= +SIZE (fwbuilder-3.0.2.tar.gz) = 2335951 Index: fwbuilder/patches/patch-src_gui_ProjectPanel_state_ops_cpp =================================================================== RCS file: /cvs/ports/security/fwbuilder/patches/patch-src_gui_ProjectPanel_state_ops_cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_gui_ProjectPanel_state_ops_cpp --- fwbuilder/patches/patch-src_gui_ProjectPanel_state_ops_cpp 5 Nov 2008 20:38:50 -0000 1.1 +++ fwbuilder/patches/patch-src_gui_ProjectPanel_state_ops_cpp 27 Nov 2008 19:27:36 -0000 @@ -1,30 +0,0 @@ -$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; Index: fwbuilder/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/fwbuilder/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- fwbuilder/pkg/PLIST 5 Nov 2008 20:38:50 -0000 1.4 +++ fwbuilder/pkg/PLIST 27 Nov 2008 19:27:36 -0000 @@ -37,8 +37,11 @@ ${SHARE}/ ${SHARE}/help/ ${SHARE}/help/iptAdvancedDialog_en_US.html ${SHARE}/help/linux24AdvancedDialog_en_US.html +${SHARE}/help/main_en_US.html ${SHARE}/help/pfAdvancedDialog_en_US.html ${SHARE}/locale/ +${SHARE}/locale/fwbuilder_ja.qm +${SHARE}/locale/fwbuilder_ru.qm ${SHARE}/objects_init.xml ${SHARE}/os/ ${SHARE}/os/freebsd.xml