[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/files/, net-firewall/fwbuilder/

2023-01-27 Thread Andreas Sturmlechner 
commit: 70b497269b1aeaaba4d4796a5265288f5980221b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 27 20:56:24 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 27 22:33:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b49726

net-firewall/fwbuilder: drop 5.3.7

Closes: https://bugs.gentoo.org/814782
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-firewall/fwbuilder/Manifest|  1 -
 .../fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch | 57 -
 net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild  | 72 --
 3 files changed, 130 deletions(-)

diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 46c6d21729dd..970f61899036 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,2 +1 @@
-DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 
130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553
 SHA512 
d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
 DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 
4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e
 SHA512 
11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4

diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch 
b/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch
deleted file mode 100644
index 3ae4be71f24b..
--- a/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
 a/configure.in 2017-12-04 21:30:44.0 +0100
-+++ b/configure.in 2017-12-04 21:56:00.277286322 +0100
-@@ -45,44 +45,18 @@
- #define GENERATION   "$GENERATION"
- EOF
- 
--dnl try to find QT
--dnl
--AC_ARG_WITH(qtdir,[  --with-qtdir=DIRSpecify directory path for QT ])
--
--if test -n "$with_qtdir"; then
--   AC_MSG_CHECKING(Using QT in )
--   QTDIR="$with_qtdir";
--   export QTDIR
--   AC_MSG_RESULT($QTDIR)
--fi
--
--# TODO: do we need to add $QTDIR/bin to PATH to find qmake?
--EXTENDED_PATH="/usr/local/bin:$QTDIR/bin/:$PATH"
-+EXTENDED_PATH="/usr/local/bin:$PATH"
-+PKG_PROG_PKG_CONFIG
- 
--AC_ARG_WITH(qmake, [  --with-qmake=qmake Specify the qmake to be used 
(debian qmake-qt4) ])
--if test -n "$with_qmake"; then
--AC_PATH_PROG(QMAKE,  $with_qmake,  ,[$EXTENDED_PATH])
--if test -z "$QMAKE"; then
--AC_MSG_ERROR("Could not find qmake")
--fi
--else
--AC_PATH_PROG(QMAKE,  qmake,  ,[$EXTENDED_PATH])
--if test -z "$QMAKE"; then
--AC_PATH_PROG(QMAKE,  qmake-qt4,  ,[$EXTENDED_PATH])
--if test -z "$QMAKE"; then
--AC_MSG_ERROR("Could not find qmake")
--fi
--fi
--fi
--
--AC_MSG_CHECKING(checking version of QT this qmake is part of)
--qmake_version=`$QMAKE -v 2>&1 | awk '/Using Qt version/ { print $4;}'`
--case $qmake_version in
--4.*) AC_MSG_RESULT( $qmake_version ) ;;
--5.*) AC_MSG_RESULT( $qmake_version ) ;;
--  *) AC_MSG_ERROR( "$qmake_version -- v4.x or v5.x is required") ;;
--esac
-+dnl try to find Qt5
-+dnl
- 
-+PKG_CHECK_MODULES([QT5], [Qt5Core >= 5.1.0], [
-+QT_PATH="$( eval $PKG_CONFIG --variable=host_bins Qt5Core )"
-+AC_PATH_PROGS([QMAKE], [qmake-qt5 qmake], [qmake], [$QT_PATH])
-+], [
-+AC_MSG_ERROR([Qt5 not found])
-+])
- 
- 
- AC_ARG_WITH(templatedir, [  --with-templatedir=DIR  Specify directory path 
for fwbuilder template files ])

diff --git a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild 
b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
deleted file mode 100644
index 2e5604a324f7..
--- a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools qmake-utils xdg-utils
-
-DESCRIPTION="GUI management for iptables, PF, Cisco ASA/PIX/FWSM, Cisco router 
ACL and more"
-HOMEPAGE="https://github.com/fwbuilder/fwbuilder";
-SRC_URI="https://github.com/fwbuilder/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE=""
-
-DEPEND="
-   dev-libs/libxml2
-   dev-libs/libxslt
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
-
-src_prepare() {
-   default
-
-   # bug 398743
-   sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die
-
-   # we need to run qmake ourselves using eqmake5 in src_configure to
-   # ensure we respect CC, *FLAGS, etc.
-   sed -i -e "/runqmake.sh/d" c

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/files/, net-firewall/fwbuilder/

2021-08-26 Thread Sam James 
commit: 14d64497f2380e6bad8037e37fe2b546ee028a47
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 27 02:37:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 27 02:48:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d64497

net-firewall/fwbuilder: add 6.0.0_rc1

Closes: https://bugs.gentoo.org/806460
Signed-off-by: Sam James  gentoo.org>

 net-firewall/fwbuilder/Manifest|  1 +
 .../fwbuilder-6.0.0_rc1-automagic-ccache.patch | 28 +
 .../files/fwbuilder-6.0.0_rc1-fix_version.patch| 11 +
 net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild  | 48 ++
 4 files changed, 88 insertions(+)

diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 27e2dd6e2e8..974b8135433 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,2 +1,3 @@
 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 
130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553
 SHA512 
d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
 DIST fwbuilder-6.0.0_pre20200502.tar.gz 7278610 BLAKE2B 
9eabf34445f5dad4af4bf88ec717ad60d6010233d501151ae1e115adcba88c19d883eceb60ae9c9850f200e42eec5eca083be9330dc54b0b681c86e90f3ca581
 SHA512 
7fcc957ebc6dc3a198fdb857e11b3d29e25018c3107f2edffbfea3794fdd5fad2ba56d7a74209c6d7b30e4287dbb13ab3bf973c8aa3213cfd4a7317e43e713bb
+DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 
4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e
 SHA512 
11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4

diff --git 
a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch 
b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch
new file mode 100644
index 000..d7f2cfb7e11
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch
@@ -0,0 +1,28 @@
+From 6021c352a009121870107ed37f07ee520110d4c2 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 27 Aug 2021 03:24:26 +0100
+Subject: [PATCH] Drop automagic ccache usage
+
+---
+ CMakeLists.txt | 5 -
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 97477b0..cd17c6a 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -5,11 +5,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
+ CACHE STRING "Minimum macOS deployment version"
+ )
+ 
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+-set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ project(firewallbuilder LANGUAGES CXX C)
+ 
+ ### Version variables and include file
+-- 
+2.33.0
+

diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch 
b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch
new file mode 100644
index 000..cce544a58a0
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/VERSION.cmake
 b/cmake/VERSION.cmake
+@@ -3,7 +3,7 @@
+ set(PROJECT_VERSION_MAJOR "6")
+ set(PROJECT_VERSION_MINOR "0")
+ set(PROJECT_VERSION_PATCH "0")
+-set(PROJECT_VERSION_EXTRA "-rc1")
++set(PROJECT_VERSION_EXTRA "_rc1")
+ set(PROJECT_GENERATION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(PROJECT_GENERATION_SHORT 
"${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}")
+ set(PROJECT_VERSION 
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_EXTRA}")

diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild 
b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
new file mode 100644
index 000..f7a06413918
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and 
more"
+HOMEPAGE="https://github.com/fwbuilder/fwbuilder";
+SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/refs/tags/v${PV/_/-}.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-libs/libxml2
+   dev-libs/libxslt
+   dev-libs/openssl
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   net-analyzer/net-snmp
+"
+DEPEND="${RDEPEND}
+   test? ( dev-qt/qttest:5 )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch
+   "${FILESDIR}"/${PN}-6.0.0_rc1-automagic-ccache.patch
+   "${FILESDIR}"/${P}-fix_version.patch
+)
+
+src_configure() {
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/files/, net-firewall/fwbuilder/

2018-01-07 Thread Mikle Kolyada 
commit: f8619a05e4bb1290ccbb2233b1af4332ec2970c7
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jan  7 19:28:29 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jan  7 19:28:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8619a05

net-firewall/fwbuilder: Drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 net-firewall/fwbuilder/Manifest|  1 -
 .../files/fwbuilder-5.0.0.3568-ldflags.patch   | 11 -
 .../files/fwbuilder-5.0.1.3592-gcc47.patch | 11 -
 .../fwbuilder-5.0.1.3592-stdc-format-macros.patch  | 51 --
 .../fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild   | 50 -
 5 files changed, 124 deletions(-)

diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index e35680942c2..fe13e3b15d1 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,2 +1 @@
-DIST fwbuilder-5.0.1.3592.tar.gz 6733502 BLAKE2B 
eb234f0b3609c33527321c9589a1f229df7a7aaabaab8b254af4e560b19ed8f798c1b4e51590d8ef6c86b5f57c69ac0ba654adb0c09fb0fbb3085962470588b4
 SHA512 
aac34c97963819f0dca4a6bfa63987df45cdd6905164b49ae6f6a423f044fc52aeb09b15b2fc294e1aa3da97d3d31e75bdf9a690e383f579a2fb40ef656f4885
 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 
130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553
 SHA512 
d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b

diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch 
b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
deleted file mode 100644
index d9df8429d39..000
--- a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp fwbuilder-5.0.0.3568.orig//qmake.inc.in 
fwbuilder-5.0.0.3568//qmake.inc.in
 fwbuilder-5.0.0.3568.orig//qmake.inc.in2011-07-25 19:27:44.0 
-0400
-+++ fwbuilder-5.0.0.3568//qmake.inc.in 2011-08-19 17:00:41.259985388 -0400
-@@ -39,6 +39,7 @@ unix {
- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
-+QMAKE_LFLAGS = @LDFLAGS@
- 
- !macx {
- 

diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch 
b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
deleted file mode 100644
index 7849e2b6da9..000
--- a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-04 
15:02:55.909203733 -0400
-+++ b/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-04 
15:04:54.079198998 -0400
-@@ -31,7 +31,7 @@
- 
- #include  //for time_t definition
- #include 
--
-+#include 
- #include 
- #include 
- 

diff --git 
a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch 
b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
deleted file mode 100644
index 3658c10a3ee..000
--- a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Vadim Kurland 
-Date: Tue, 14 Feb 2012 04:59:26 + (-0800)
-Subject: fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
-X-Git-Url: 
http://fwbuilder.git.sourceforge.net/git/gitweb.cgi?p=fwbuilder%2Ffwbuilder;a=commitdiff_plain;h=f97a1b50ba51be5fa31cc54dba829a9e77609160;hp=15565ade5dc843e5fefe83568a023c37256c3c3c
-
-fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
-needs to be tested on all build machines.

-
-diff --git a/qmake.inc.in b/qmake.inc.in
-index 6bf27e0..3e31fd6 100644
 a/qmake.inc.in
-+++ b/qmake.inc.in
-@@ -67,6 +67,9 @@ unix {
- 
- CONFIG += warn_on
- 
-+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
-+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
-+
- }
- }
- 
-diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
-index b4f15bb..a8114cf 100644
 a/src/libfwbuilder/qmake.inc.in
-+++ b/src/libfwbuilder/qmake.inc.in
-@@ -34,6 +34,9 @@ unix {
- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
- 
-+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
-+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
-+
- exec_prefix = @EXEC_PREFIX@
- DESTDIR =
- 
-diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h 
b/src/libfwbuilder/src/fwbuilder/uint128.h
-index 0a2e7a4..b00ab47 100644
 a/src/libfwbuilder/src/fwbuilder/uint128.h
-+++ b/src/libfwbuilder/src/fwbuilder/uint128.h
-@@ -36,7 +36,7 @@
- 
- #include 
- 
--#define __STDC_FORMAT_MACROS
-+// #define __STDC_FORMAT_MACROS
- #include// for sprintf formats for "long long"
- 
- // convinience macro
-