Re: UPDATE: security/fwbuilder

2009-04-07 Thread Vadim Zhukov
On 5 April 2009 г. 19:41:22 Vadim Zhukov wrote:
 On 5 April 2009 г. 18:25:45 Steven Mestdagh wrote:
  here is an update of fwbuilder. please test/comment.

 There is a crash when working with object groups, still
 investigating...

 BTW: Are there any Konqueror users which expirence any problems using
 SourceForge?

Here is a fixed one. Comments and commits welcome.

-- 
  Best wishes,
Vadim Zhukov

A: Because it messes up the way people read text.
Q: Why is a top-posting such a bad thing?


? fwbuilder.core
? w-fwbuilder-3.0.4
? w-fwbuilder-3.0.4-debug
Index: Makefile
===
RCS file: /cvs/ports/security/fwbuilder/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile12 Mar 2009 08:30:53 -  1.12
+++ Makefile7 Apr 2009 12:29:56 -
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.12 2009/03/12 08:30:53 sthen Exp $
 
 COMMENT=   firewall GUI
-DISTNAME=  fwbuilder-3.0.2
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  fwbuilder-3.0.4
 CATEGORIES=net security
 
 HOMEPAGE=  http://www.fwbuilder.org/
Index: distinfo
===
RCS file: /cvs/ports/security/fwbuilder/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo5 Dec 2008 21:50:57 -   1.6
+++ distinfo7 Apr 2009 12:29:56 -
@@ -1,5 +1,5 @@
-MD5 (fwbuilder-3.0.2.tar.gz) = 07wqpuxCWXGoWhdqqiQodQ==
-RMD160 (fwbuilder-3.0.2.tar.gz) = FCQckcs1kpSF2PIeCxeS6woiAEc=
-SHA1 (fwbuilder-3.0.2.tar.gz) = BSEwF4n8wFcBrso74yTsHHPBjyM=
-SHA256 (fwbuilder-3.0.2.tar.gz) = F6VHAKCgGsnlh+MOiG7yYf0vbkh8/DfY9TqCBYGm79I=
-SIZE (fwbuilder-3.0.2.tar.gz) = 2337853
+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
Index: patches/patch-src_gui_FWBSettings_h
===
RCS file: /cvs/ports/security/fwbuilder/patches/patch-src_gui_FWBSettings_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_gui_FWBSettings_h
--- patches/patch-src_gui_FWBSettings_h 5 Nov 2008 20:38:50 -   1.1
+++ patches/patch-src_gui_FWBSettings_h 7 Apr 2009 12:29:56 -
@@ -1,7 +1,7 @@
 $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 @@
+--- src/gui/FWBSettings.h.orig Sun Mar 29 22:08:37 2009
 src/gui/FWBSettings.h  Tue Mar 31 12:16:28 2009
+@@ -36,6 +36,8 @@
  
  #include set
  
Index: patches/patch-src_gui_HttpGet_cpp
===
RCS file: /cvs/ports/security/fwbuilder/patches/patch-src_gui_HttpGet_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_gui_HttpGet_cpp
--- patches/patch-src_gui_HttpGet_cpp   5 Nov 2008 20:38:50 -   1.1
+++ patches/patch-src_gui_HttpGet_cpp   7 Apr 2009 12:29:56 -
@@ -1,9 +1,9 @@
 $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.cppWed Oct  8 07:27:53 2008
-@@ -30,6 +30,8 @@
- #include QtNetwork
+--- src/gui/HttpGet.cpp.orig   Sun Mar 29 22:08:37 2009
 src/gui/HttpGet.cppTue Mar 31 12:16:28 2009
+@@ -31,6 +31,8 @@
  #include QHttpResponseHeader
+ #include QLocale
  
 +#include fwbuilder/FWObject.h
 +
Index: patches/patch-src_gui_ObjectIconView_cpp
===
RCS file: patches/patch-src_gui_ObjectIconView_cpp
diff -N patches/patch-src_gui_ObjectIconView_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_gui_ObjectIconView_cpp7 Apr 2009 12:29:56 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/gui/ObjectIconView.cpp.origTue 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: patches/patch-src_gui_RuleSetView_cpp
===
RCS file: /cvs/ports/security/fwbuilder/patches/patch-src_gui_RuleSetView_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_gui_RuleSetView_cpp

Re: UPDATE: security/fwbuilder

2009-04-07 Thread Vadim Zhukov
On 7 April 2009 г. 16:31:32 Vadim Zhukov wrote:
 On 5 April 2009 г. 19:41:22 Vadim Zhukov wrote:
  On 5 April 2009 г. 18:25:45 Steven Mestdagh wrote:
   here is an update of fwbuilder. please test/comment.
 
  There is a crash when working with object groups, still
  investigating...
 
  BTW: Are there any Konqueror users which expirence any problems
  using SourceForge?

 Here is a fixed one. Comments and commits welcome.

And here is forgotten security/libfwbuilder part (same as steven@ sent).

-- 
  Best wishes,
Vadim Zhukov

A: Because it messes up the way people read text.
Q: Why is a top-posting such a bad thing?


Index: Makefile
===
RCS file: /cvs/ports/security/libfwbuilder/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile5 Dec 2008 21:50:57 -   1.10
+++ Makefile7 Apr 2009 12:41:02 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.10 2008/12/05 21:50:57 steven Exp $
 
 COMMENT=   libraries for fwbuilder
-DISTNAME=  libfwbuilder-3.0.2
+DISTNAME=  libfwbuilder-3.0.4
 CATEGORIES=net security
-SHARED_LIBS=   fwbuilder   11.0 \
-   fwcompiler  11.0
+SHARED_LIBS=   fwbuilder   12.0 \
+   fwcompiler  12.0
 
 INCLUDE=   include/fwb-3
 SHARE= share/libfwbuilder
Index: distinfo
===
RCS file: /cvs/ports/security/libfwbuilder/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo5 Dec 2008 21:50:57 -   1.6
+++ distinfo7 Apr 2009 12:41:02 -
@@ -1,5 +1,5 @@
-MD5 (libfwbuilder-3.0.2.tar.gz) = IPRni/H6TzZvHAOGkXtkrQ==
-RMD160 (libfwbuilder-3.0.2.tar.gz) = 8heQ7VibCWJ8EuGbMoecO86DAoc=
-SHA1 (libfwbuilder-3.0.2.tar.gz) = rU+o3orWA5zKhWSvIoW9I/SPJ5Q=
-SHA256 (libfwbuilder-3.0.2.tar.gz) = 
cE90TcI42OD2nrBhXsIj1ciQ/D2RO8o6rFJp6ixgRps=
-SIZE (libfwbuilder-3.0.2.tar.gz) = 529955
+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
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/libfwbuilder/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   5 Nov 2008 20:37:48 -   1.4
+++ pkg/PLIST   7 Apr 2009 12:41:02 -
@@ -33,7 +33,6 @@ ${INCLUDE}/fwbuilder/InetAddr.h
 ${INCLUDE}/fwbuilder/InetAddrMask.h
 ${INCLUDE}/fwbuilder/Interface.h
 ${INCLUDE}/fwbuilder/InterfaceData.h
-${INCLUDE}/fwbuilder/InterfacePolicy.h
 ${INCLUDE}/fwbuilder/Interval.h
 ${INCLUDE}/fwbuilder/IntervalGroup.h
 ${INCLUDE}/fwbuilder/Library.h
@@ -44,6 +43,7 @@ ${INCLUDE}/fwbuilder/NAT.h
 ${INCLUDE}/fwbuilder/Network.h
 ${INCLUDE}/fwbuilder/NetworkIPv6.h
 ${INCLUDE}/fwbuilder/ObjectGroup.h
+${INCLUDE}/fwbuilder/ObjectMatcher.h
 ${INCLUDE}/fwbuilder/Policy.h
 ${INCLUDE}/fwbuilder/Pool.h
 ${INCLUDE}/fwbuilder/Resources.h



Re: UPDATE: security/fwbuilder

2009-04-05 Thread Vadim Zhukov
On 5 April 2009 г. 18:25:45 Steven Mestdagh wrote:
 here is an update of fwbuilder. please test/comment.

There is a crash when working with object groups, still investigating...

BTW: Are there any Konqueror users which expirence any problems using 
SourceForge?

 Index: libfwbuilder/Makefile
 ===
 RCS file: /cvs/ports/security/libfwbuilder/Makefile,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile
 --- libfwbuilder/Makefile 5 Dec 2008 21:50:57 -   1.10
 +++ libfwbuilder/Makefile 5 Apr 2009 14:12:07 -
 @@ -1,10 +1,10 @@
  # $OpenBSD: Makefile,v 1.10 2008/12/05 21:50:57 steven Exp $

  COMMENT= libraries for fwbuilder
 -DISTNAME=libfwbuilder-3.0.2
 +DISTNAME=libfwbuilder-3.0.4
  CATEGORIES=  net security
 -SHARED_LIBS= fwbuilder   11.0 \
 - fwcompiler  11.0
 +SHARED_LIBS= fwbuilder   12.0 \
 + fwcompiler  12.0

  INCLUDE= include/fwb-3
  SHARE=   share/libfwbuilder
 Index: libfwbuilder/distinfo
 ===
 RCS file: /cvs/ports/security/libfwbuilder/distinfo,v
 retrieving revision 1.6
 diff -u -r1.6 distinfo
 --- libfwbuilder/distinfo 5 Dec 2008 21:50:57 -   1.6
 +++ libfwbuilder/distinfo 5 Apr 2009 14:12:07 -
 @@ -1,5 +1,5 @@
 -MD5 (libfwbuilder-3.0.2.tar.gz) = IPRni/H6TzZvHAOGkXtkrQ==
 -RMD160 (libfwbuilder-3.0.2.tar.gz) = 8heQ7VibCWJ8EuGbMoecO86DAoc=
 -SHA1 (libfwbuilder-3.0.2.tar.gz) = rU+o3orWA5zKhWSvIoW9I/SPJ5Q=
 -SHA256 (libfwbuilder-3.0.2.tar.gz) =
 cE90TcI42OD2nrBhXsIj1ciQ/D2RO8o6rFJp6ixgRps= -SIZE
 (libfwbuilder-3.0.2.tar.gz) = 529955
 +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
 Index: libfwbuilder/pkg/PLIST
 ===
 RCS file: /cvs/ports/security/libfwbuilder/pkg/PLIST,v
 retrieving revision 1.4
 diff -u -r1.4 PLIST
 --- libfwbuilder/pkg/PLIST5 Nov 2008 20:37:48 -   1.4
 +++ libfwbuilder/pkg/PLIST5 Apr 2009 14:12:07 -
 @@ -33,7 +33,6 @@
  ${INCLUDE}/fwbuilder/InetAddrMask.h
  ${INCLUDE}/fwbuilder/Interface.h
  ${INCLUDE}/fwbuilder/InterfaceData.h
 -${INCLUDE}/fwbuilder/InterfacePolicy.h
  ${INCLUDE}/fwbuilder/Interval.h
  ${INCLUDE}/fwbuilder/IntervalGroup.h
  ${INCLUDE}/fwbuilder/Library.h
 @@ -44,6 +43,7 @@
  ${INCLUDE}/fwbuilder/Network.h
  ${INCLUDE}/fwbuilder/NetworkIPv6.h
  ${INCLUDE}/fwbuilder/ObjectGroup.h
 +${INCLUDE}/fwbuilder/ObjectMatcher.h
  ${INCLUDE}/fwbuilder/Policy.h
  ${INCLUDE}/fwbuilder/Pool.h
  ${INCLUDE}/fwbuilder/Resources.h
 Index: fwbuilder/Makefile
 ===
 RCS file: /cvs/ports/security/fwbuilder/Makefile,v
 retrieving revision 1.12
 diff -u -r1.12 Makefile
 --- fwbuilder/Makefile12 Mar 2009 08:30:53 -  1.12
 +++ fwbuilder/Makefile5 Apr 2009 14:12:07 -
 @@ -1,8 +1,7 @@
 -# $OpenBSD: Makefile,v 1.12 2009/03/12 08:30:53 sthen Exp $
 +# $OpenBSD: Makefile,v 1.11 2008/12/05 21:50:57 steven Exp $

  COMMENT= firewall GUI
 -DISTNAME=fwbuilder-3.0.2
 -PKGNAME= ${DISTNAME}p0
 +DISTNAME=fwbuilder-3.0.4
  CATEGORIES=  net security

  HOMEPAGE=http://www.fwbuilder.org/
 Index: fwbuilder/distinfo
 ===
 RCS file: /cvs/ports/security/fwbuilder/distinfo,v
 retrieving revision 1.6
 diff -u -r1.6 distinfo
 --- fwbuilder/distinfo5 Dec 2008 21:50:57 -   1.6
 +++ fwbuilder/distinfo5 Apr 2009 14:12:07 -
 @@ -1,5 +1,5 @@
 -MD5 (fwbuilder-3.0.2.tar.gz) = 07wqpuxCWXGoWhdqqiQodQ==
 -RMD160 (fwbuilder-3.0.2.tar.gz) = FCQckcs1kpSF2PIeCxeS6woiAEc=
 -SHA1 (fwbuilder-3.0.2.tar.gz) = BSEwF4n8wFcBrso74yTsHHPBjyM=
 -SHA256 (fwbuilder-3.0.2.tar.gz) =
 F6VHAKCgGsnlh+MOiG7yYf0vbkh8/DfY9TqCBYGm79I= -SIZE
 (fwbuilder-3.0.2.tar.gz) = 2337853
 +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
 Index: fwbuilder/patches/patch-src_gui_FWBSettings_h
 ===
 RCS file: fwbuilder/patches/patch-src_gui_FWBSettings_h
 diff -N fwbuilder/patches/patch-src_gui_FWBSettings_h
 --- fwbuilder/patches/patch-src_gui_FWBSettings_h 5 Nov 2008 20:38:50
 - 1.1 +++ /dev/null   1 Jan 1970 00:00:00 -
 @@ -1,12 +0,0 @@
 -$OpenBSD: patch-src_gui_FWBSettings_h,v 1.1 2008/11/05 20:38:50
 steven Exp $  

Re: UPDATE: security/fwbuilder

2008-10-01 Thread Steven Mestdagh
Steven Mestdagh [2008-09-09, 07:05:50]:
 here is an update to fwbuilder 3.0.0. please comment/give it a try.

has anyone tried this?