On 19 January 2011 г. 22:12:04 Jasper Lievisse Adriaanse wrote:
> Hey,
>
> Since it's that time of the year again, time to slow down.
> So, no more imports from now on.
>
> We'll lock in a few days, so updates/diffs/fixes should be OK'd by AT LEAST
> one of the following people: ajacoutot@ espie@ landry@ naddy@ sthen@ jasper@
>
> And this doesn't mean that it's time to get updates in that have no real added
> value for 4.9...there's still life after the lock ;-)
I hope then this update from 09.01 will have opportunity to go in...
From: Vadim Zhukov <[email protected]>
Date: Sun, 9 Jan 2011 21:53:39 +0300 (MSK)
To: [email protected]
Subject: UPDATE: security/libfwbuilder and security/fwbuilder
Hello all.
This updates security/libfwbuilder and security/fwbuilder to 4.1.3.
Contains a bunch of small fixes, also some our patches commited
upstream. Next version will have those two packages merged, but
author says it will not come early, so it's better to update now.
Tested on i386. Has problems with cheking in RCS, but looks like
it's Qt fault, to be investigated later. Other stuff works fine.
Testing on !i386, OKing and commiting being welcome. :)
(patches should applied in ${PORTSDIR}/security directory)
Index: libfwbuilder/Makefile
===================================================================
RCS file: /cvs/ports/security/libfwbuilder/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- libfwbuilder/Makefile 20 Nov 2010 17:22:43 -0000 1.18
+++ libfwbuilder/Makefile 9 Jan 2011 18:46:24 -0000
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2010/11/20 17:22:43 espie Exp $
COMMENT= libraries for fwbuilder
-DISTNAME= libfwbuilder-4.1.2
+DISTNAME= libfwbuilder-4.1.3
CATEGORIES= net security
-SHARED_LIBS= fwbuilder 15.0 \
- fwcompiler 15.0
+SHARED_LIBS= fwbuilder 16.0 \
+ fwcompiler 16.0
HOMEPAGE= http://www.fwbuilder.org/
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
-WANTLIB= m netsnmp stdc++ xml2 xslt z
+WANTLIB= crypto m netsnmp stdc++ xml2 xslt z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
Index: libfwbuilder/distinfo
===================================================================
RCS file: /cvs/ports/security/libfwbuilder/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- libfwbuilder/distinfo 11 Oct 2010 20:19:11 -0000 1.10
+++ libfwbuilder/distinfo 9 Jan 2011 18:46:24 -0000
@@ -1,5 +1,5 @@
-MD5 (libfwbuilder-4.1.2.tar.gz) = qi99d86o0pSjWULkeve5bg==
-RMD160 (libfwbuilder-4.1.2.tar.gz) = Ijvp5IfBkhRl8BnfVrbet/ABw5Y=
-SHA1 (libfwbuilder-4.1.2.tar.gz) = YuntnUmCicOombCdULfi0S1qZKc=
-SHA256 (libfwbuilder-4.1.2.tar.gz) =
E0Qt9gGVJhEKtWWjUxlpvwUUy8u1RAidAS84bnn4Azc=
-SIZE (libfwbuilder-4.1.2.tar.gz) = 378748
+MD5 (libfwbuilder-4.1.3.tar.gz) = gQ6DKjytxiWRdAP0sZH9og==
+RMD160 (libfwbuilder-4.1.3.tar.gz) = 7I0miYaFQtBepYSjmt3MITFVWnw=
+SHA1 (libfwbuilder-4.1.3.tar.gz) = TGseW67l5Lo2Pej3nIvMJyoGibw=
+SHA256 (libfwbuilder-4.1.3.tar.gz) =
oWV+XOnK7w4Xi5n1dgB2i0/kfK4RWEAMSTO21BrRPxY=
+SIZE (libfwbuilder-4.1.3.tar.gz) = 363194
Index: libfwbuilder/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/libfwbuilder/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- libfwbuilder/pkg/PLIST 11 Oct 2010 20:19:11 -0000 1.7
+++ libfwbuilder/pkg/PLIST 9 Jan 2011 18:46:24 -0000
@@ -75,6 +75,7 @@ include/fwb-4/fwbuilder/libfwbuilder-con
include/fwb-4/fwbuilder/libfwbuilder-version.h
include/fwb-4/fwbuilder/physAddress.h
include/fwb-4/fwbuilder/snmp.h
+include/fwb-4/fwbuilder/uint128.h
include/fwb-4/fwcompiler/
include/fwb-4/fwcompiler/BaseCompiler.h
include/fwb-4/fwcompiler/Compiler.h
Index: fwbuilder/Makefile
===================================================================
RCS file: /cvs/ports/security/fwbuilder/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- fwbuilder/Makefile 20 Nov 2010 17:22:43 -0000 1.23
+++ fwbuilder/Makefile 9 Jan 2011 18:46:24 -0000
@@ -3,7 +3,7 @@
# Consumes more than 512MB on at least i386 when building qrc_MainRes.o
VMEM_WARNING = Yes
-V = 4.1.2
+V = 4.1.3
COMMENT = firewall GUI
DISTNAME = fwbuilder-$V
CATEGORIES = net security
@@ -46,9 +46,9 @@ LIB_DEPENDS = libfwbuilder-$V:security/l
REGRESS_TARGET =tests
USE_GROFF = Yes
-WANTLIB += c m netsnmp
+WANTLIB += c crypto m netsnmp
WANTLIB += pthread stdc++ util xml2 xslt z
-WANTLIB += QtGui QtNetwork
+WANTLIB += QtDBus QtGui QtNetwork QtXml
WANTLIB += fwcompiler>=14 fwbuilder>=14
FAKE_FLAGS = INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
@@ -61,11 +61,16 @@ post-patch:
sh autogen.sh
post-install:
- ${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
+ cd ${WRKSRC}/src/res/Icons && find . -type d -mindepth 1 -maxdepth 1 | \
+ while read D; do \
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/$$D; \
+ ${INSTALL_DATA_DIR}
${PREFIX}/share/icons/hicolor/$$D/apps; \
+ done
+
+ cd ${WRKSRC}/src/res/Icons && find . -name '*.png' | \
+ while read F; do \
+ ${INSTALL_DATA} $$F \
+ ${PREFIX}/share/icons/hicolor/`dirname
$$F`/apps/`basename $$F`; \
+ done
.include <bsd.port.mk>
Index: fwbuilder/distinfo
===================================================================
RCS file: /cvs/ports/security/fwbuilder/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- fwbuilder/distinfo 11 Oct 2010 20:19:11 -0000 1.10
+++ fwbuilder/distinfo 9 Jan 2011 18:46:24 -0000
@@ -1,5 +1,5 @@
-MD5 (fwbuilder-4.1.2.tar.gz) = m6daUVdFMEJH31vhiFteDw==
-RMD160 (fwbuilder-4.1.2.tar.gz) = R5GJBeNvWHGU0M/uJ8XX/Q4cMCM=
-SHA1 (fwbuilder-4.1.2.tar.gz) = gjweewlH23vXE+B2u0fdnPgWylg=
-SHA256 (fwbuilder-4.1.2.tar.gz) = Pq5gewa8R/hSQdlSw8m85CJiWq/37B1jLKD64cl3sVw=
-SIZE (fwbuilder-4.1.2.tar.gz) = 5872728
+MD5 (fwbuilder-4.1.3.tar.gz) = fLbVDObwK0hVJUBb0A2MMw==
+RMD160 (fwbuilder-4.1.3.tar.gz) = mjP9FFtFsdEmou9MGYx5f0ZhtAE=
+SHA1 (fwbuilder-4.1.3.tar.gz) = YS2/181mnC74iJFXrj+PANKFN/4=
+SHA256 (fwbuilder-4.1.3.tar.gz) = +K9JC8OgkSTrWsbOEVc2ZTDLUWz4VqOYtuzoGbbmZD4=
+SIZE (fwbuilder-4.1.3.tar.gz) = 5683404
Index: fwbuilder/patches/patch-src_gui_unit_tests_unit_tests_sh
===================================================================
RCS file: fwbuilder/patches/patch-src_gui_unit_tests_unit_tests_sh
diff -N fwbuilder/patches/patch-src_gui_unit_tests_unit_tests_sh
--- fwbuilder/patches/patch-src_gui_unit_tests_unit_tests_sh 14 Jul 2010
08:46:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_gui_unit_tests_unit_tests_sh,v 1.1 2010/07/14 08:46:35
sthen Exp $
---- src/gui/unit_tests/unit_tests.sh.orig Tue Jul 13 22:53:37 2010
-+++ src/gui/unit_tests/unit_tests.sh Tue Jul 13 22:53:57 2010
-@@ -1,11 +1,11 @@
--#!/bin/bash
-+#!/bin/sh
-
- commands=$@
-
--for directory in `find . -maxdepth 1 -name '*[tT]est' -type d -regex
'\./[A-Za-z0-9\-\_]*'`
-+for directory in `find . -maxdepth 1 -name '*[tT]est' -type d -name
'[A-Za-z0-9_-]*'`
- do
- cd $directory
-- [ ! -e Makefile ] && qmake -spec $QMAKESPEC
-+ [ ! -e Makefile ] && ${QMAKE} -spec $QMAKESPEC
- $commands || exit 1
- cd -
- done
Index: fwbuilder/patches/patch-src_iptlib_unit_tests_unit_tests_sh
===================================================================
RCS file: fwbuilder/patches/patch-src_iptlib_unit_tests_unit_tests_sh
diff -N fwbuilder/patches/patch-src_iptlib_unit_tests_unit_tests_sh
--- fwbuilder/patches/patch-src_iptlib_unit_tests_unit_tests_sh 14 Jul 2010
08:46:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_iptlib_unit_tests_unit_tests_sh,v 1.1 2010/07/14 08:46:35
sthen Exp $
---- src/iptlib/unit_tests/unit_tests.sh.orig Tue Jul 13 22:54:05 2010
-+++ src/iptlib/unit_tests/unit_tests.sh Tue Jul 13 22:54:22 2010
-@@ -1,11 +1,11 @@
--#!/bin/bash
-+#!/bin/sh
-
- commands=$@
-
--for directory in `find . -maxdepth 1 -type d -regex '\./[A-Za-z0-9\-\_]*'`
-+for directory in `find . -maxdepth 1 -type d -name '[A-Za-z0-9_-]*'`
- do
- cd $directory
-- [ ! -e Makefile ] && qmake -spec $QMAKESPEC
-+ [ ! -e Makefile ] && ${QMAKE} -spec $QMAKESPEC
- $commands || exit 1;
- cd -
- done
Index: fwbuilder/patches/patch-unit_tests_sh
===================================================================
RCS file: fwbuilder/patches/patch-unit_tests_sh
diff -N fwbuilder/patches/patch-unit_tests_sh
--- fwbuilder/patches/patch-unit_tests_sh 14 Jul 2010 08:46:35 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-unit_tests_sh,v 1.1 2010/07/14 08:46:35 sthen Exp $
---- unit_tests.sh.orig Tue Jul 13 22:53:21 2010
-+++ unit_tests.sh Tue Jul 13 22:53:31 2010
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- action=$@
-
-@@ -6,7 +6,7 @@ for directory in $(find . -name unit_tests)
- do
- home=`pwd`
- cd $directory
-- qmake -spec $QMAKESPEC || exit 1
-+ ${QMAKE} -spec $QMAKESPEC || exit 1
- $action || exit 1
- cd $home
--done
-\ No newline at end of file
-+done
Index: fwbuilder/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/fwbuilder/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- fwbuilder/pkg/PLIST 11 Oct 2010 20:19:11 -0000 1.10
+++ fwbuilder/pkg/PLIST 9 Jan 2011 18:46:24 -0000
@@ -48,14 +48,15 @@ share/fwbuilder/configlets/bsd/update_ad
share/fwbuilder/configlets/bsd/update_carp
share/fwbuilder/configlets/bsd/update_pfsync
share/fwbuilder/configlets/bsd/update_vlans
-share/fwbuilder/configlets/cisco/
share/fwbuilder/configlets/dd-wrt-jffs/
+share/fwbuilder/configlets/dd-wrt-jffs/check_utilities
share/fwbuilder/configlets/dd-wrt-jffs/installer_commands_reg_user
share/fwbuilder/configlets/dd-wrt-jffs/installer_commands_root
share/fwbuilder/configlets/dd-wrt-jffs/routing_functions
share/fwbuilder/configlets/dd-wrt-jffs/script_skeleton
share/fwbuilder/configlets/dd-wrt-jffs/top_comment
share/fwbuilder/configlets/dd-wrt-nvram/
+share/fwbuilder/configlets/dd-wrt-nvram/check_utilities
share/fwbuilder/configlets/dd-wrt-nvram/installer_commands_reg_user
share/fwbuilder/configlets/dd-wrt-nvram/installer_commands_root
share/fwbuilder/configlets/dd-wrt-nvram/routing_functions
@@ -213,8 +214,8 @@ share/fwbuilder/help/en_US/release_notes
share/fwbuilder/help/en_US/release_notes_4.1.0.html
share/fwbuilder/help/en_US/release_notes_4.1.1.html
share/fwbuilder/help/en_US/release_notes_4.1.2.html
+share/fwbuilder/help/en_US/release_notes_4.1.3.html
share/fwbuilder/help/en_US/state_sync_configuration.png
-share/fwbuilder/help/en_US/summary.html
share/fwbuilder/help/en_US/tip01.html
share/fwbuilder/help/en_US/tip02.html
share/fwbuilder/help/en_US/tip03.html
@@ -263,11 +264,29 @@ share/fwbuilder/resources.xml
share/fwbuilder/templates.xml
share/icons/
share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
+share/icons/hicolor/128x128/apps/fwbuilder.png
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
+share/icons/hicolor/24x24/
+share/icons/hicolor/24x24/apps/
+share/icons/hicolor/24x24/apps/fwbuilder.png
+share/icons/hicolor/256x256/
+share/icons/hicolor/256x256/apps/
+share/icons/hicolor/256x256/apps/fwbuilder.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/fwbuilder.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/fwbuilder.png
+share/icons/hicolor/512x512/
+share/icons/hicolor/512x512/apps/
+share/icons/hicolor/512x512/apps/fwbuilder.png
+share/icons/hicolor/72x72/
+share/icons/hicolor/72x72/apps/
+share/icons/hicolor/72x72/apps/fwbuilder.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
