[gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/, net-firewall/firewalld/
commit: 033b982f33185124cd23e61727e15bb01bad4dbe
Author: Sam James gentoo org>
AuthorDate: Mon Aug 26 11:45:54 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 26 11:47:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033b982f
net-firewall/firewalld: add 2.2.1
* Switch from PyQt5 -> PyQt6 (this is long overdue)
* Drop iptables support as it's deprecated, will be removed upstream
in firewalld soon, but also, the USE didn't enforce the (default) chosen
in the backend anyway. See bug #930549 too where it further needed
nftables to be installed anyway.
Closes: https://bugs.gentoo.org/930549
Signed-off-by: Sam James gentoo.org>
net-firewall/firewalld/Manifest| 1 +
.../files/firewalld-2.2.1-systemd-service.patch| 19 ++
net-firewall/firewalld/firewalld-2.2.1.ebuild | 218 +
3 files changed, 238 insertions(+)
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 58ee0e06b095..6d68316717a7 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
DIST firewalld-2.1.1.tar.bz2 1315222 BLAKE2B
064abfae1f2f1c5a63bec3357aa6e63936818fa2020ca882d1b834736b3735a32b0ab318e6de78b6f785cb4da0ee4e299956c922d9dbf6e7bd442e9bb2d6
SHA512
383e5ea3d451a28241e5a76f8d0efeeb8319663bdc5f680b68c5156ddb5145fac766a9ee9521c4af27b1df82861ca6f68ee81c0588b1dd6c4f6d4e4f5ca8fee1
+DIST firewalld-2.2.1.tar.bz2 1295501 BLAKE2B
fc7bb401895bc39c34ec585468bdcc1b3c3f8eeb35c786c0cf7d886f456c99840107db73e8f611a7d7ab1db1408c6dc349a3d5eee2fbd1e624fe06dd8a558d91
SHA512
08117be01a25a8e263cf419d7b01a98c80b53108af68f6cfc1d900692e6124c37b9dd6feaf4bc3c6e3f27958a9ee45b9795c7f5a9250eb644b6e903f97672c8a
diff --git a/net-firewall/firewalld/files/firewalld-2.2.1-systemd-service.patch
b/net-firewall/firewalld/files/firewalld-2.2.1-systemd-service.patch
new file mode 100644
index ..461dec825c94
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-2.2.1-systemd-service.patch
@@ -0,0 +1,19 @@
+Drops the/an obsolete 'conflicts' line with old iptables services bug #833506
+Removes EnvironmentFile and FIREWALLD_ARGS variable
+===
+--- a/config/firewalld.service.in
b/config/firewalld.service.in
+@@ -4,12 +4,10 @@
+ Wants=network-pre.target
+ After=dbus.service
+ After=polkit.service
+-Conflicts=iptables.service ip6tables.service ebtables.service ipset.service
+ Documentation=man:firewalld(1)
+
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/firewalld
+-ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
++ExecStart=@sbindir@/firewalld --nofork --nopid
+ ExecReload=/bin/kill -HUP $MAINPID
+ # supress to log debug and error output also to /var/log/messages
+ StandardOutput=null
diff --git a/net-firewall/firewalld/firewalld-2.2.1.ebuild
b/net-firewall/firewalld/firewalld-2.2.1.ebuild
new file mode 100644
index ..b0101d14758f
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-2.2.1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 gnome2-utils linux-info optfeature
+inherit plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="Firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://firewalld.org/";
+SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+IUSE="gui selinux test"
+# Tests are too unreliable in sandbox environment
+RESTRICT="!test? ( test ) test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ || ( >=sys-apps/openrc-0.11.5 sys-apps/openrc-navi sys-apps/systemd )
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=net-firewall/nftables-0.9.4[python,json]
+ gui? (
+ x11-libs/gtk+:3
+ dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}]
+ )
+ ')
+ net-firewall/nftables[xtables(+)]
+ selinux? ( sec-policy/selinux-firewalld )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/glib:2
+"
+BDEPEND="
+ app-text/docbook-xml-dtd
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation:
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl
gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl
s
[gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/
commit: 29c10479c5ce2eb125dd526412e33e7207844e3d Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Aug 20 06:35:21 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 20 06:52:46 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c10479 net-firewall/firewalld: remove unused file Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Joonas Niilola gentoo.org> net-firewall/firewalld/files/firewalld.service | 22 -- 1 file changed, 22 deletions(-) diff --git a/net-firewall/firewalld/files/firewalld.service b/net-firewall/firewalld/files/firewalld.service deleted file mode 100644 index 708326f58fed.. --- a/net-firewall/firewalld/files/firewalld.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=firewalld - dynamic firewall daemon -Before=network-pre.target -Wants=network-pre.target -After=dbus.service -After=polkit.service -Documentation=man:firewalld(1) - -[Service] -EnvironmentFile=-/etc/sysconfig/firewalld -ExecStart=/usr/sbin/firewalld --nofork --nopid $FIREWALLD_ARGS -ExecReload=/bin/kill -HUP $MAINPID -# supress to log debug and error output also to /var/log/messages -StandardOutput=null -StandardError=null -Type=dbus -BusName=org.fedoraproject.FirewallD1 -KillMode=mixed - -[Install] -WantedBy=multi-user.target -Alias=dbus-org.fedoraproject.FirewallD1.service
[gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/, net-firewall/firewalld/
commit: eaf5a9d096bc19ea688b4cfb7612cab7fa5658ab
Author: Sam James gentoo org>
AuthorDate: Sat Feb 26 04:05:47 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 26 04:07:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf5a9d0
net-firewall/firewalld: add 1.1.0
- Add updated firewalld.service for systemd (drops Conflicts line w/ now-gone
iptables-and-friends unit files)
- Fix needed kernel config options
- Add optfeature for gnome-extra/nm-applet
Closes: https://bugs.gentoo.org/831259
Closes: https://bugs.gentoo.org/833506
Closes: https://bugs.gentoo.org/833569
Thanks-to: gmx.com>
Signed-off-by: Sam James gentoo.org>
net-firewall/firewalld/Manifest| 1 +
net-firewall/firewalld/files/firewalld.service | 22 +++
net-firewall/firewalld/firewalld-1.1.0.ebuild | 213 +
3 files changed, 236 insertions(+)
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index b33424011e4d..eb1690b0d69a 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
DIST firewalld-1.0.2.tar.gz 1307963 BLAKE2B
11a7710981ba39f4bcb8431558e5b558a60d77fb1aa3fe4c5febc37f2eab754a6608e4820b6318c963bb6290a9b26ae9e162d9e46277c34dfdacac46ba938b21
SHA512
fbb60a6f52e5be26051303769b6521a6c775d450ab6704f2d63fe38dc6194976ad36f1d924380d09012f41ab6dab1f6f78c5a859fbfe00c52cdff40d82e62283
DIST firewalld-1.0.3.tar.gz 1310433 BLAKE2B
c414a347ca1008e010bf8393e4538b5845fde7cc53b810276e46d67c6302cfe93a59665ad6ebc533b3ae04908f9089546b109888f60f0c798f3cac62a30d
SHA512
0ba423e8c294d143f31bbdac13553e58cd0a3429812b555829c34f411478c26cffcc40095218539155e9ed7fe7e360fb8dd85a572a8ad9d5650b0cc206fe42a1
+DIST firewalld-1.1.0.tar.gz 1324519 BLAKE2B
d9f97c88a1ed44b325bb95616770c0aff6e0088bccd08d062b3be686964d3d36003c1e13809a8802af2062ff7544b2a1fd870c1e933952a9b77af989ec0f9b54
SHA512
4cb8b0d6387de72827d06c19019e5608e36f647a70aef04879f9225795571638758abd5ff6333bd9db816b6de40d7e8df04c402556c2402e85ad34633d337091
diff --git a/net-firewall/firewalld/files/firewalld.service
b/net-firewall/firewalld/files/firewalld.service
new file mode 100644
index ..708326f58fed
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=firewalld - dynamic firewall daemon
+Before=network-pre.target
+Wants=network-pre.target
+After=dbus.service
+After=polkit.service
+Documentation=man:firewalld(1)
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/firewalld
+ExecStart=/usr/sbin/firewalld --nofork --nopid $FIREWALLD_ARGS
+ExecReload=/bin/kill -HUP $MAINPID
+# supress to log debug and error output also to /var/log/messages
+StandardOutput=null
+StandardError=null
+Type=dbus
+BusName=org.fedoraproject.FirewallD1
+KillMode=mixed
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-org.fedoraproject.FirewallD1.service
diff --git a/net-firewall/firewalld/firewalld-1.1.0.ebuild
b/net-firewall/firewalld/firewalld-1.1.0.ebuild
new file mode 100644
index ..467c6bd41651
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.1.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit autotools bash-completion-r1 gnome2-utils linux-info optfeature
plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic
firewall"
+HOMEPAGE="https://firewalld.org/";
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ iptables? (
+ net-firewall/iptables[ipv6(+)]
+ net-firewall/ebtables
+ net-firewall/ipset
+ nftables? ( net-firewall/nftables[xtables(+)] )
+ )
+ || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ gui? (
+ x11-libs/gtk+:3
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )
+ nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
+ ')"
+DEPEND="${RDEPEND}
+ dev-libs/glib:2"
+BDEPEND=">=dev-util/intltool-0.35
+ sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation:
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl
gu hi hu
[gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/
commit: 20ea859b3b58803d3236c270936ee11c658dbe6b Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Aug 8 19:13:04 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Sat Aug 10 14:44:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ea859b net-firewall/firewalld: remove unused patches Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12644 Signed-off-by: Aaron Bauman gentoo.org> .../files/firewalld-0.5.1-errorcodes1.patch| 48 -- .../files/firewalld-0.5.1-errorcodes2.patch| 40 -- 2 files changed, 88 deletions(-) diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch deleted file mode 100644 index 0bf8aacc839..000 --- a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7cf8dc935db45bc382930c6f2c9b11b5f9910283 Mon Sep 17 00:00:00 2001 -From: Eric Garver -Date: Mon, 5 Feb 2018 10:20:54 -0500 -Subject: [PATCH] doc/xml: remove errorcodes ENITITY inclusion from docs that - don't use it - - doc/xml/firewall-applet.xml | 1 - - doc/xml/firewall-config.xml | 1 - - doc/xml/firewall-offline-cmd.xml | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/doc/xml/firewall-applet.xml b/doc/xml/firewall-applet.xml -index 831ec320..b86a62ad 100644 a/doc/xml/firewall-applet.xml -+++ b/doc/xml/firewall-applet.xml -@@ -4,7 +4,6 @@ - - - -- - ]> - -
[gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/files/, net-firewall/firewalld/
commit: 19e332c3aca10d0c1693f50a4811bc07cef9fab6
Author: Matthias Maier gentoo org>
AuthorDate: Thu Sep 29 13:53:08 2016 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Sep 29 13:53:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e332c3
net-firewall/firewalld: drop vulnerable, bug #591458
Package-Manager: portage-2.3.0
net-firewall/firewalld/Manifest| 1 -
.../files/firewalld-0.3.10-py3k-compat.patch | 24 --
net-firewall/firewalld/firewalld-0.3.13.ebuild | 99 --
3 files changed, 124 deletions(-)
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 9e5426e..9778ea5 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1 @@
-DIST firewalld-0.3.13.tar.bz2 561948 SHA256
bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512
987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789
WHIRLPOOL
795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
DIST firewalld-0.4.3.3.tar.bz2 679617 SHA256
e57d851e4f1aa65927e055d3e73b7a29a5ae37de51671ce1885e030fe6e0b6d4 SHA512
21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
WHIRLPOOL
89077aefa28752e51472510bc5080c61e1f6051062efd4aaac08c8a60879b1c3d00db9d9ad7c33d8a49d8868fb9796c0bf945c869a470380f9e2ab017c45ab41
diff --git a/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch
b/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch
deleted file mode 100644
index e91590f..
--- a/net-firewall/firewalld/files/firewalld-0.3.10-py3k-compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/firewall/core/io/direct.py b/src/firewall/core/io/direct.py
-index b698e4c..6b80201 100644
a/src/firewall/core/io/direct.py
-+++ b/src/firewall/core/io/direct.py
-@@ -295,8 +295,8 @@ class Direct(IO_Object):
- if len(self.passthroughs[ipv]) == 0:
- del self.passthroughs[ipv]
- else:
--raise ValueError, "Passthrough '%s' for ipv '%s'" % \
--("',".join(args), ipv) + "not in list"
-+raise ValueError("Passthrough '%s' for ipv '%s'" % \
-+("',".join(args), ipv) + "not in list")
-
- def query_passthrough(self, ipv, args):
- return (ipv in self.passthroughs and args in self.passthroughs[ipv])
-@@ -305,7 +305,7 @@ class Direct(IO_Object):
- if ipv in self.passthroughs:
- return self.passthroughs[ipv]
- else:
--raise ValueError, "No passthroughs for ipv '%s'" % (ipv)
-+raise ValueError("No passthroughs for ipv '%s'" % (ipv))
-
- def get_all_passthroughs(self):
- return self.passthroughs
diff --git a/net-firewall/firewalld/firewalld-0.3.13.ebuild
b/net-firewall/firewalld/firewalld-0.3.13.ebuild
deleted file mode 100644
index 091ee2c..
--- a/net-firewall/firewalld/firewalld-0.3.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-#BACKPORTS=
-
-inherit autotools eutils gnome2-utils python-r1 systemd multilib
bash-completion-r1
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic
firewall"
-HOMEPAGE="http://fedorahosted.org/firewalld";
-SRC_URI="https://fedorahosted.org/released/firewalld/${P}.tar.bz2
-
${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gui"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- net-firewall/ebtables
- net-firewall/iptables[ipv6]
- || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? ( x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
- dev-libs/glib:2
- >=dev-util/intltool-0.35
- sys-devel/gettext"
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch"
EPATCH_SOURCE="${S}/patches" \
- epatch
-
- epatch "${FILESDIR}/${PN}-0.3.10-py3k-compat.patch"
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- python_setup
-
- econf \
- --enable-systemd \
- "$(systemd_with_unitdir 'systemd-unitdir')" \
- --with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
- # manually split up the installation to avoid "file already exists"
errors
- emake -C config DESTDIR="${D}" install
- ema
