UPDATE: fwbuilder 3.0.2 (build 672)

2008-11-26 Thread Vadim Zhukov
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.

-- 
  Best wishes,
Vadim Zhukov


Index: libfwbuilder/Makefile
===
RCS file: /cvs/ports/security/libfwbuilder/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- libfwbuilder/Makefile   4 Jan 2008 17:48:37 -   1.8
+++ libfwbuilder/Makefile   26 Nov 2008 23:28:05 -
@@ -1,14 +1,13 @@
 # $OpenBSD: Makefile,v 1.8 2008/01/04 17:48:37 espie Exp $
 
 COMMENT=   libraries for fwbuilder
-DISTNAME=  libfwbuilder-2.1.8
-PKGNAME=   $(DISTNAME)
+DISTNAME=  libfwbuilder-3.0.2
 CATEGORIES=net security
-SHARED_LIBS=   fwbuilder   9.0 \
-   fwcompiler  9.0
+SHARED_LIBS=   fwbuilder   11.0 \
+   fwcompiler  11.0
 
-INCLUDE=   include/fwb-2.1
-SHARE= share/libfwbuilder21
+INCLUDE=   include/fwb-3
+SHARE= share/libfwbuilder
 SUBST_VARS=INCLUDE SHARE
 
 HOMEPAGE=  http://www.fwbuilder.org/
@@ -19,16 +18,20 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_DISTFILES_FTP=  Yes
 PERMIT_DISTFILES_CDROM=Yes
 
-WANTLIB=   m ssl crypto z xml2 iconv
+WANTLIB=   m z iconv
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
-MODULES=   x11/qt3
+MODULES=   x11/qt4
 LIB_DEPENDS+=  xslt::textproc/libxslt \
+   xml2::textproc/libxml \
netsnmp::net/net-snmp
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=   --with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder
+CONFIGURE_ARGS+=--with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder \
+   --with-templatedir=${TRUEPREFIX}/share/libfwbuilder \
+   --with-qtdir=${MODQT_QTDIR} \
+   QMAKE=${MODQT_QTDIR}/bin/qmake
 
 NO_REGRESS=Yes
 
Index: libfwbuilder/distinfo
===
RCS file: /cvs/ports/security/libfwbuilder/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- libfwbuilder/distinfo   5 Apr 2007 17:26:07 -   1.4
+++ libfwbuilder/distinfo   26 Nov 2008 23:28:05 -
@@ -1,5 +1,5 @@
-MD5 (libfwbuilder-2.1.8.tar.gz) = J3tRhZoj4+dZ4WnQh2RvNA==
-RMD160 (libfwbuilder-2.1.8.tar.gz) = 4rTJyJ91N+td/bFAOtn7O+PDnwY=
-SHA1 (libfwbuilder-2.1.8.tar.gz) = EA/WKInpUFKA5mXi/wT6AdTsjGo=
-SHA256 (libfwbuilder-2.1.8.tar.gz) = 
WRwPZ/Z6jlPVySvea9v//FfkPvdyFwTKztSsvKXQJ98=
-SIZE (libfwbuilder-2.1.8.tar.gz) = 318784
+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: libfwbuilder/patches/patch-qmake_inc_in
===
RCS file: /cvs/ports/security/libfwbuilder/patches/patch-qmake_inc_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qmake_inc_in
--- libfwbuilder/patches/patch-qmake_inc_in 29 Jan 2007 11:56:13 -  
1.2
+++ libfwbuilder/patches/patch-qmake_inc_in 26 Nov 2008 23:28:05 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-qmake_inc_in,v 1.2 2007/01/29 11:56:13 espie Exp $
 qmake.inc.in.orig  Thu Jun 22 06:50:45 2006
-+++ qmake.inc.in   Mon Jan 29 11:05:38 2007
+--- 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  =$(DDIR)@TEMPLATE_DIR@/migration
-   doc.path=$(DDIR)@DOCDIR@
+   migration.path = @TEMPLATE_DIR@/migration
+   doc.path = @DOCDIR@
  
 -  CONFIG += warn_on debug
 +  CONFIG += warn_on release
Index: libfwbuilder/pkg/PLIST
===
RCS file: /cvs/ports/security/libfwbuilder/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- libfwbuilder/pkg/PLIST  29 Jan 2007 11:56:13 -  1.3
+++ libfwbuilder/pkg/PLIST  26 Nov 2008 23:28:05 -
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.3 2007/01/29 11:56:13 espie Exp $
 %%SHARED%%
-bin/libfwbuilder-config-2.1
+bin/libfwbuilder-config-3
 ${INCLUDE}/
 ${INCLUDE}/fwbuilder/
 ${INCLUDE}/fwbuilder/Address.h
@@ -22,11 +22,17 @@ ${INCLUDE}/fwbuilder/Firewall.h
 ${INCLUDE

Re: UPDATE: fwbuilder 3.0.2 (build 672)

2008-11-27 Thread Vadim Zhukov
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 -   1.9
+++ libfwbuilder/Makefile   27 Nov 2008 19:27:36 -
@@ -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 -   1.5
+++ libfwbuilder/distinfo   27 Nov 2008 19:27:36 -
@@ -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 -   1.10
+++ fwbuilder/Makefile  27 Nov 2008 19:27:36 -
@@ -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 -   1.5
+++ fwbuilder/distinfo  27 Nov 2008 19:27:36 -
@@ -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/pat