[gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-10-31 16:38 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2022-10-31 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     ea380ee0c680a04bebd341ebee3eadb1bea659bc
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 16:37:45 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 16:37:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea380ee0

net-firewall/firewalld: Stabilize 1.1.3 amd64, #878565

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.3.ebuild b/net-firewall/firewalld/firewalld-1.1.3.ebuild
index f6c1d184a4b3..3b0fa270fbcd 100644
--- a/net-firewall/firewalld/firewalld-1.1.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-11-23 17:31 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2024-11-23 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     1246927a365ecd46481524fce699c44d93cd558b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 14:12:45 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 17:31:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1246927a

net-firewall/firewalld: drop 2.1.1-r5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-firewall/firewalld/Manifest                  |   1 -
 net-firewall/firewalld/firewalld-2.1.1-r5.ebuild | 228 -----------------------
 net-firewall/firewalld/metadata.xml              |   4 -
 3 files changed, 233 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index c4e167cba6f3..be9715a172f5 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,2 @@
-DIST firewalld-2.1.1.tar.bz2 1315222 BLAKE2B 064abfae1f2f1c5a63bbbbbec3357aa6e63936818fa2020ca882d1b834736b3735a32b0ab318e6de78b6f785cb4da0ee4e299956c922d9dbf6e7bd442e9bb2d6 SHA512 383e5ea3d451a28241e5a76f8d0efeeb8319663bdc5f680b68c5156ddb5145fac766a9ee9521c4af27b1df82861ca6f68ee81c0588b1dd6c4f6d4e4f5ca8fee1
 DIST firewalld-2.2.1.tar.bz2 1295501 BLAKE2B fc7bb401895bc39c34ec585468bdcc1b3c3f8eeb35c786c0cf7d886f456c99840107db73e8f611a7d7ab1db1408c6dc349a3d5eee2fbd1e624fe06dd8a558d91 SHA512 08117be01a25a8e263cf419d7b01a98c80b53108af68f6cfc1d900692e6124c37b9dd6feaf4bc3c6e3f27958a9ee45b9795c7f5a9250eb644b6e903f97672c8a
 DIST firewalld-2.2.3.tar.bz2 1310686 BLAKE2B dba517166e1588195ac76123503a2526ffa6c7bd884953ba7ec2806f9ef3a93a879936e48e0d5b638c6e3e888b558757989f8035106cc103eab92d72d8a077be SHA512 e1b1d5fc372359ecbbc074be15e8a9dc4e39836545d5a1364f05deb07eb6e43505eb37589a7b0fb5f3115e3ed3fbc58efe447e2d5b0dcc716a66903c63df824b

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r5.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r5.ebuild
deleted file mode 100644
index c9d763c5edce..000000000000
--- a/net-firewall/firewalld/firewalld-2.1.1-r5.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables 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}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
-	')
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( 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 sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-systemd-service.patch
-)
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	# bug #926685
-	if kernel_is -le 6 1 ; then
-		CONFIG_CHECK+=" ~NFT_OBJREF"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 79917d81993e..d9b61b18aba8 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -9,10 +9,6 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<use>
-		<flag name="nftables">Add support for <pkg>net-firewall/nftables</pkg> as firewall backend</flag>
-		<flag name="iptables">Add support for <pkg>net-firewall/iptables</pkg> as firewall backend</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">firewalld/firewalld</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-10-29  2:45 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-10-29  2:45 UTC (permalink / raw
  To: gentoo-commits

commit:     4153091073934b67e7ef91d3c0150d2650c65f6f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 02:35:06 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:35:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41530910

net-firewall/firewalld: add 2.2.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-2.2.3.ebuild | 218 ++++++++++++++++++++++++++
 2 files changed, 219 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 6d68316717a7..c4e167cba6f3 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-2.1.1.tar.bz2 1315222 BLAKE2B 064abfae1f2f1c5a63bbbbbec3357aa6e63936818fa2020ca882d1b834736b3735a32b0ab318e6de78b6f785cb4da0ee4e299956c922d9dbf6e7bd442e9bb2d6 SHA512 383e5ea3d451a28241e5a76f8d0efeeb8319663bdc5f680b68c5156ddb5145fac766a9ee9521c4af27b1df82861ca6f68ee81c0588b1dd6c4f6d4e4f5ca8fee1
 DIST firewalld-2.2.1.tar.bz2 1295501 BLAKE2B fc7bb401895bc39c34ec585468bdcc1b3c3f8eeb35c786c0cf7d886f456c99840107db73e8f611a7d7ab1db1408c6dc349a3d5eee2fbd1e624fe06dd8a558d91 SHA512 08117be01a25a8e263cf419d7b01a98c80b53108af68f6cfc1d900692e6124c37b9dd6feaf4bc3c6e3f27958a9ee45b9795c7f5a9250eb644b6e903f97672c8a
+DIST firewalld-2.2.3.tar.bz2 1310686 BLAKE2B dba517166e1588195ac76123503a2526ffa6c7bd884953ba7ec2806f9ef3a93a879936e48e0d5b638c6e3e888b558757989f8035106cc103eab92d72d8a077be SHA512 e1b1d5fc372359ecbbc074be15e8a9dc4e39836545d5a1364f05deb07eb6e43505eb37589a7b0fb5f3115e3ed3fbc58efe447e2d5b0dcc716a66903c63df824b

diff --git a/net-firewall/firewalld/firewalld-2.2.3.ebuild b/net-firewall/firewalld/firewalld-2.2.3.ebuild
new file mode 100644
index 000000000000..d08a06d0215c
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-2.2.3.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..13} )
+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 ~x86"
+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,${PYTHON_USEDEP}]
+		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 sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-systemd-service.patch
+)
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="
+		~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+		~NETFILTER
+		~NETFILTER_ADVANCED
+		~NETFILTER_INGRESS
+		~NF_NAT_MASQUERADE
+		~NF_NAT_REDIRECT
+		~NF_TABLES_INET
+		~NF_TABLES_IPV4
+		~NF_TABLES_IPV6
+		~NF_CONNTRACK
+		~NF_CONNTRACK_BROADCAST
+		~NF_CONNTRACK_NETBIOS_NS
+		~NF_CONNTRACK_TFTP
+		~NF_CT_NETLINK
+		~NF_CT_NETLINK_HELPER
+		~NF_DEFRAG_IPV4
+		~NF_DEFRAG_IPV6
+		~NF_NAT
+		~NF_NAT_TFTP
+		~NF_REJECT_IPV4
+		~NF_REJECT_IPV6
+		~NF_SOCKET_IPV4
+		~NF_SOCKET_IPV6
+		~NF_TABLES
+		~NF_TPROXY_IPV4
+		~NF_TPROXY_IPV6
+		~IP_NF_FILTER
+		~IP_NF_IPTABLES
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_RAW
+		~IP_NF_SECURITY
+		~IP_NF_TARGET_MASQUERADE
+		~IP_NF_TARGET_REJECT
+		~IP6_NF_FILTER
+		~IP6_NF_IPTABLES
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT
+		~IP6_NF_RAW
+		~IP6_NF_SECURITY
+		~IP6_NF_TARGET_MASQUERADE
+		~IP6_NF_TARGET_REJECT
+		~IP_SET
+		~NETFILTER_CONNCOUNT
+		~NETFILTER_NETLINK
+		~NETFILTER_NETLINK_OSF
+		~NETFILTER_NETLINK_QUEUE
+		~NETFILTER_SYNPROXY
+		~NETFILTER_XTABLES
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NETFILTER_XT_MATCH_MULTIPORT
+		~NETFILTER_XT_MATCH_STATE
+		~NETFILTER_XT_NAT
+		~NETFILTER_XT_TARGET_MASQUERADE
+		~NFT_COMPAT
+		~NFT_CT
+		~NFT_FIB
+		~NFT_FIB_INET
+		~NFT_FIB_IPV4
+		~NFT_FIB_IPV6
+		~NFT_HASH
+		~NFT_LIMIT
+		~NFT_LOG
+		~NFT_MASQ
+		~NFT_NAT
+		~NFT_QUEUE
+		~NFT_QUOTA
+		~NFT_REDIR
+		~NFT_REJECT
+		~NFT_REJECT_INET
+		~NFT_REJECT_IPV4
+		~NFT_REJECT_IPV6
+		~NFT_SOCKET
+		~NFT_SYNPROXY
+		~NFT_TPROXY
+		~NFT_TUNNEL
+		~NFT_XFRM
+	"
+
+	# kernel >= 4.19 has a unified NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${ED}"/etc/sysconfig/ || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${ED}"/etc/xdg/autostart || die
+		rm -f "${ED}"/usr/bin/firewall-applet || die
+		rm -f "${ED}"/usr/bin/firewall-config || die
+		rm -rf "${ED}"/usr/share/applications || die
+		rm -rf "${ED}"/usr/share/icons || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-10-05 11:12 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-10-05 11:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d250a4dccc83332a0006cbfbe6d542519d021d7a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  5 11:10:52 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  5 11:10:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d250a4dc

net-firewall/firewalld: Stabilize 2.2.1-r1 ppc64, #940857

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
index d08a06d0215c..3f75af694ca2 100644
--- a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
 IUSE="gui selinux test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-10-05  1:14 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-10-05  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     29f564bb3f3c93dbb3e03f07019f462b94728467
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  5 01:14:03 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  5 01:14:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f564bb

net-firewall/firewalld: enable py3.13

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
index 5aeaca95a3b0..d08a06d0215c 100644
--- a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit bash-completion-r1 gnome2-utils linux-info optfeature
 inherit plocale python-single-r1 systemd xdg-utils
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-09-18  8:10 Jakov Smolić
  0 siblings, 0 replies; 178+ messages in thread
From: Jakov Smolić @ 2024-09-18  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3d9a8fe7d1bcac8874be1dda5011d1987fd6cc45
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 08:09:57 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 08:09:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d9a8fe7

net-firewall/firewalld: Keyword 2.2.1-r1 x86, #938899

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
index f017a3287621..5aeaca95a3b0 100644
--- a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gui selinux test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-08-26 11:51 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-08-26 11:51 UTC (permalink / raw
  To: gentoo-commits

commit:     724dfd69f25f74aefaf44bb52859b5ea7caf9ef0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 11:50:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 11:50:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724dfd69

net-firewall/firewalld: fix nftables[python] dep

This has been wrong for quite some time.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../firewalld/{firewalld-2.2.1.ebuild => firewalld-2.2.1-r1.ebuild}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.2.1.ebuild b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
similarity index 98%
rename from net-firewall/firewalld/firewalld-2.2.1.ebuild
rename to net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
index b0101d14758f..f017a3287621 100644
--- a/net-firewall/firewalld/firewalld-2.2.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		>=net-firewall/nftables-0.9.4[python,json]
+		>=net-firewall/nftables-0.9.4[python,json,${PYTHON_USEDEP}]
 		gui? (
 			x11-libs/gtk+:3
 			dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-07-24 11:53 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-07-24 11:53 UTC (permalink / raw
  To: gentoo-commits

commit:     32fe4e6bb8935e43dfc0b595c35e54450c9eb16b
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Wed Jul 24 09:07:28 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 11:53:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fe4e6b

net-firewall/firewalld: remove nftables limit

Breaking change reverted upstream. So backport revert and mask the
broken version instead.

Reverts: 7475c28f33a99a5a6bd74e294bb17a3a1ce8ac02
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37700
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../firewalld/{firewalld-2.1.1-r4.ebuild => firewalld-2.1.1-r5.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r4.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r5.ebuild
similarity index 97%
rename from net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
rename to net-firewall/firewalld/firewalld-2.1.1-r5.ebuild
index 5c6d72725da4..e1ff652b6c61 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r5.ebuild
@@ -19,7 +19,6 @@ IUSE="gui +nftables +iptables selinux test"
 RESTRICT="!test? ( test ) test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-# <nftables-1.1.0: https://github.com/firewalld/firewalld/issues/1366
 RDEPEND="
 	${PYTHON_DEPS}
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/openrc-navi sys-apps/systemd )
@@ -36,7 +35,7 @@ RDEPEND="
 		net-firewall/iptables[ipv6(+)]
 		net-firewall/ebtables
 		net-firewall/ipset
-		nftables? ( <net-firewall/nftables-1.1.0[xtables(+)] )
+		nftables? ( net-firewall/nftables[xtables(+)] )
 	)
 	selinux? ( sec-policy/selinux-firewalld )
 "


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-07-21  2:17 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-07-21  2:17 UTC (permalink / raw
  To: gentoo-commits

commit:     7475c28f33a99a5a6bd74e294bb17a3a1ce8ac02
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sat Jul 20 13:31:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 02:16:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7475c28f

net-firewall/firewalld: limit nftables dependency due to incompatibility

Bug: https://github.com/firewalld/firewalld/issues/1366
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37634
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../firewalld/{firewalld-2.1.1-r3.ebuild => firewalld-2.1.1-r4.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r3.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
similarity index 97%
rename from net-firewall/firewalld/firewalld-2.1.1-r3.ebuild
rename to net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
index e1ff652b6c61..5c6d72725da4 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r4.ebuild
@@ -19,6 +19,7 @@ IUSE="gui +nftables +iptables selinux test"
 RESTRICT="!test? ( test ) test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# <nftables-1.1.0: https://github.com/firewalld/firewalld/issues/1366
 RDEPEND="
 	${PYTHON_DEPS}
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/openrc-navi sys-apps/systemd )
@@ -35,7 +36,7 @@ RDEPEND="
 		net-firewall/iptables[ipv6(+)]
 		net-firewall/ebtables
 		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
+		nftables? ( <net-firewall/nftables-1.1.0[xtables(+)] )
 	)
 	selinux? ( sec-policy/selinux-firewalld )
 "


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-07-21  0:31 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-07-21  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     09902d8b54ae1289d2d98897d111686014cfea6b
Author:     Anna (navi) Figueiredo Gomes <navi <AT> vlhl <DOT> dev>
AuthorDate: Sun Jul 21 00:12:45 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 00:29:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09902d8b

net-firewall/firewalld: add sys-apps/openrc-navi dependency

Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../firewalld/{firewalld-2.1.1-r2.ebuild => firewalld-2.1.1-r3.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r3.ebuild
similarity index 98%
rename from net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
rename to net-firewall/firewalld/firewalld-2.1.1-r3.ebuild
index 5bad13603297..e1ff652b6c61 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r3.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	|| ( >=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}]


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-07-21  0:31 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-07-21  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     4989e1393e983f4427e2af85dbd0f422557c80b3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 00:27:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 00:29:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4989e139

net-firewall/firewalld: drop 2.1.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1.ebuild | 228 --------------------------
 1 file changed, 228 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
deleted file mode 100644
index 86bba732e341..000000000000
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables 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/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] )
-	')
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( 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 sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	# bug #926685
-	if kernel_is -le 6 1 ; then
-		CONFIG_CHECK+=" ~NFT_OBJREF"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-06-24 17:34 Kenton Groombridge
  0 siblings, 0 replies; 178+ messages in thread
From: Kenton Groombridge @ 2024-06-24 17:34 UTC (permalink / raw
  To: gentoo-commits

commit:     188485d2a7b8af8b0c1c58447450067d29a83ffd
Author:     Kenton Groombridge <concord <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 17:32:26 2024 +0000
Commit:     Kenton Groombridge <concord <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 17:32:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=188485d2

net-firewall/firewalld: add USE=selinux

Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1-r2.ebuild | 3 ++-
 net-firewall/firewalld/firewalld-2.1.1.ebuild    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
index 518816e8e8b3..5bad13603297 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
+IUSE="gui +nftables +iptables selinux test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -37,6 +37,7 @@ RDEPEND="
 		net-firewall/ipset
 		nftables? ( net-firewall/nftables[xtables(+)] )
 	)
+	selinux? ( sec-policy/selinux-firewalld )
 "
 DEPEND="
 	${RDEPEND}

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index d30735b4523c..86bba732e341 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
+IUSE="gui +nftables +iptables selinux test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -37,6 +37,7 @@ RDEPEND="
 		net-firewall/ipset
 		nftables? ( net-firewall/nftables[xtables(+)] )
 	)
+	selinux? ( sec-policy/selinux-firewalld )
 "
 DEPEND="
 	${RDEPEND}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-04-29 21:48 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-04-29 21:48 UTC (permalink / raw
  To: gentoo-commits

commit:     e4dab61425758ff1501362938b8e29a769c4f0d6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 21:46:34 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 21:46:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4dab614

net-firewall/firewalld: enable py3.12

Closes: https://bugs.gentoo.org/929690
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1-r2.ebuild | 2 +-
 net-firewall/firewalld/firewalld-2.1.1.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
index 01a36e209bf1..518816e8e8b3 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 gnome2-utils linux-info optfeature
 inherit plocale python-single-r1 systemd xdg-utils
 

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index 34c0630c75a7..d30735b4523c 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 gnome2-utils linux-info optfeature
 inherit plocale python-single-r1 systemd xdg-utils
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-04-29 10:38 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2024-04-29 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     42415439ed263c93d60657a46049385c953ea2ee
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 10:37:26 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 10:37:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42415439

net-firewall/firewalld: Stabilize 2.1.1-r2 x86, #930864

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
index dfb2d0da8069..01a36e209bf1 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-04-29 10:36 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2024-04-29 10:36 UTC (permalink / raw
  To: gentoo-commits

commit:     2f5e09b459f08e8b256688a0706005461f51a1ef
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 10:30:28 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 10:30:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5e09b4

net-firewall/firewalld: Stabilize 2.1.1-r2 amd64, #930864

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
index 91270f98a591..dfb2d0da8069 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-04-29  1:01 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-04-29  1:01 UTC (permalink / raw
  To: gentoo-commits

commit:     deeac3d1a19528917fd9622b45969141f155b3b3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 00:57:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 00:59:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deeac3d1

net-firewall/firewalld: drop 2.0.1, 2.0.2, 2.1.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   3 -
 net-firewall/firewalld/firewalld-2.0.1.ebuild | 227 --------------------------
 net-firewall/firewalld/firewalld-2.0.2.ebuild | 227 --------------------------
 net-firewall/firewalld/firewalld-2.1.0.ebuild | 227 --------------------------
 4 files changed, 684 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index bf0242a0009d..58ee0e06b095 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1 @@
-DIST firewalld-2.0.1.tar.bz2 1257251 BLAKE2B a78ff5c1d733897024c33fe74ae8723c97253498ba55957420c66ccdfe4dcf64265336c5ee0cf120c4450d9c4da492e64c4fe01a3ea974d2992f6cf5879ef88d SHA512 31b18b74af4d731f6259915fd86d6551968eea563deba211b6d304d961747662085a02c7c185c0d7d8916693f53a5dca581b0877bce59c634e99a9f20de2f3e1
-DIST firewalld-2.0.2.tar.bz2 1276527 BLAKE2B 194f8b738a37b329f11a47fa9cf01f9cadc16d9f9dc7c8ace13b56f81bbb7d999b4a15cc156f89b14ecf794d4d6ef92f307600e298552779aed936d5b196c433 SHA512 fdcf4937e337bce4bca07d904efe2b775c8a69d4c7c9ca55c42752cfcf37f637f1cf1125bc1ca2c35a8980c995d90ea4e3afb5712f1666734e90e78e26888196
-DIST firewalld-2.1.0.tar.bz2 1310431 BLAKE2B e25941f16f5a2b0803c78d45f7b4beafdd1587106daefd009ac34a906c4604fa1c8d84a179e50d005433eadae982dcd0718e753c0627725918f2b6f5b8674146 SHA512 0f0e56a5397ea43801f0abfd3c50854340159804c95b920c3d4a22e2c211861b0d147fce879e9ddd58f6e89a805ccd5f828e8ffa2782a077c091c56dac97ee5b
 DIST firewalld-2.1.1.tar.bz2 1315222 BLAKE2B 064abfae1f2f1c5a63bbbbbec3357aa6e63936818fa2020ca882d1b834736b3735a32b0ab318e6de78b6f785cb4da0ee4e299956c922d9dbf6e7bd442e9bb2d6 SHA512 383e5ea3d451a28241e5a76f8d0efeeb8319663bdc5f680b68c5156ddb5145fac766a9ee9521c4af27b1df82861ca6f68ee81c0588b1dd6c4f6d4e4f5ca8fee1

diff --git a/net-firewall/firewalld/firewalld-2.0.1.ebuild b/net-firewall/firewalld/firewalld-2.0.1.ebuild
deleted file mode 100644
index 47bd3faa6dc2..000000000000
--- a/net-firewall/firewalld/firewalld-2.0.1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables 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/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] )
-	')
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-"
-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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	# bug #926685
-	if kernel_is -le 6 1 ; then
-		CONFIG_CHECK+=" ~NFT_OBJREF"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
deleted file mode 100644
index ce1a6e8dd6b7..000000000000
--- a/net-firewall/firewalld/firewalld-2.0.2.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables 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/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] )
-	')
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-"
-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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	# bug #926685
-	if kernel_is -le 6 1 ; then
-		CONFIG_CHECK+=" ~NFT_OBJREF"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-2.1.0.ebuild b/net-firewall/firewalld/firewalld-2.1.0.ebuild
deleted file mode 100644
index 34c0630c75a7..000000000000
--- a/net-firewall/firewalld/firewalld-2.1.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables 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/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] )
-	')
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-"
-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 sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	# bug #926685
-	if kernel_is -le 6 1 ; then
-		CONFIG_CHECK+=" ~NFT_OBJREF"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-03-21  2:41 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-03-21  2:41 UTC (permalink / raw
  To: gentoo-commits

commit:     1149e8e7f329caa0e62f88566d005ccbf11ecec5
Author:     Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Fri Mar 15 22:08:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 02:25:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1149e8e7

net-firewall/firewalld: CONFIG_NFT_OBJREF removed for kernels > 6.1

Closes: https://bugs.gentoo.org/926685
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Closes: https://github.com/gentoo/gentoo/pull/35774
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.1.ebuild    | 8 ++++++--
 net-firewall/firewalld/firewalld-2.0.2.ebuild    | 6 +++++-
 net-firewall/firewalld/firewalld-2.1.0.ebuild    | 6 +++++-
 net-firewall/firewalld/firewalld-2.1.1-r1.ebuild | 6 +++++-
 net-firewall/firewalld/firewalld-2.1.1.ebuild    | 6 +++++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.1.ebuild b/net-firewall/firewalld/firewalld-2.0.1.ebuild
index 59e47ff9b089..47bd3faa6dc2 100644
--- a/net-firewall/firewalld/firewalld-2.0.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 

diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
index 020c5b0d43ae..ce1a6e8dd6b7 100644
--- a/net-firewall/firewalld/firewalld-2.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 

diff --git a/net-firewall/firewalld/firewalld-2.1.0.ebuild b/net-firewall/firewalld/firewalld-2.1.0.ebuild
index be78261c1989..34c0630c75a7 100644
--- a/net-firewall/firewalld/firewalld-2.1.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.0.ebuild
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild
index 3470957cccc8..aac81d88bbee 100644
--- a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index be78261c1989..34c0630c75a7 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -124,7 +124,6 @@ pkg_setup() {
 	~NFT_LOG
 	~NFT_MASQ
 	~NFT_NAT
-	~NFT_OBJREF
 	~NFT_QUEUE
 	~NFT_QUOTA
 	~NFT_REDIR
@@ -153,6 +152,11 @@ pkg_setup() {
 		CONFIG_CHECK+=" ~NFT_COUNTER"
 	fi
 
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
 	linux-info_pkg_setup
 }
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-03-14 21:44 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-03-14 21:44 UTC (permalink / raw
  To: gentoo-commits

commit:     e08aa99ca5741d3118ba2978cef4ddcdadf3a9fe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 21:44:06 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 21:44:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08aa99c

net-firewall/firewalld: Stabilize 2.1.1 ppc64, #926971

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index ab2c9df950f0..be78261c1989 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-03-14  7:06 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2024-03-14  7:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8f3b21abc9f656acfe5c0027d744ac99baa26ee1
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 07:06:33 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 07:06:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f3b21ab

net-firewall/firewalld: Stabilize 2.1.1 amd64, #926971

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index 7b048345552a..ab2c9df950f0 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-03-14  6:13 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-03-14  6:13 UTC (permalink / raw
  To: gentoo-commits

commit:     cc50196f6bf9c9d02d7a8bc6626e7b701bc2d185
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 06:13:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 06:13:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc50196f

net-firewall/firewalld: Stabilize 2.1.1 x86, #926971

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index adbcaad944da..7b048345552a 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-03-14  6:11 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-03-14  6:11 UTC (permalink / raw
  To: gentoo-commits

commit:     123d08178e6fab3537e86166f518b4b938b2c8d4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 06:11:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 06:11:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123d0817

net-firewall/firewalld: Stabilize 2.1.1 arm64, #926971

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index 9e7df0246932..8b097e8aa8bf 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-03-14  6:11 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-03-14  6:11 UTC (permalink / raw
  To: gentoo-commits

commit:     40859cc1d777317ef9ef2bd3beae1191389acec0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 06:11:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 06:11:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40859cc1

net-firewall/firewalld: Stabilize 2.1.1 arm, #926971

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild
index 8b097e8aa8bf..adbcaad944da 100644
--- a/net-firewall/firewalld/firewalld-2.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-03-02 14:55 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2024-03-02 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     89486711ffc4ae3cfd35e6923d057e51b8b9b2e0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 14:55:30 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 14:55:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89486711

net-firewall/firewalld: Stabilize 2.1.0 ppc64, #924917

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.0.ebuild b/net-firewall/firewalld/firewalld-2.1.0.ebuild
index ab2c9df950f0..be78261c1989 100644
--- a/net-firewall/firewalld/firewalld-2.1.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-03-02 13:59 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2024-03-02 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     80e9f890f204071302e50b9cbe165893cd779296
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 13:59:49 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 13:59:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e9f890

net-firewall/firewalld: Stabilize 2.1.0 arm, #924917

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.0.ebuild b/net-firewall/firewalld/firewalld-2.1.0.ebuild
index fa8484311450..ab2c9df950f0 100644
--- a/net-firewall/firewalld/firewalld-2.1.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-02-19 19:53 Dennis Lamm
  0 siblings, 0 replies; 178+ messages in thread
From: Dennis Lamm @ 2024-02-19 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     0e53cae1c182d776445c3dbb8a3b5de32adbf261
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 11:17:47 2024 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 19:53:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e53cae1

net-firewall/firewalld: improved systemd service

removed undesired EnvironmentFile from service
use upstream service file instead of own maintained one

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/35389
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.1-r1.ebuild | 226 +++++++++++++++++++++++
 1 file changed, 226 insertions(+)

diff --git a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..3470957cccc8
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+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 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables 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/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] )
+	')
+	iptables? (
+		net-firewall/iptables[ipv6(+)]
+		net-firewall/ebtables
+		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+"
+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 sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	sed -i \
+	-e "/Conflicts=iptables.service ip6tables.service ebtables.service ipset.service nftables.service/d" \
+	-e "/EnvironmentFile=-\/etc\/sysconfig\/firewalld/d" \
+	config/firewalld.service.in || die
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-02-18 13:31 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-02-18 13:31 UTC (permalink / raw
  To: gentoo-commits

commit:     521b5e068a16fd95d3b6b128aa1fb6e7c0b26ff2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 13:30:31 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 13:30:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521b5e06

net-firewall/firewalld: Stabilize 2.1.0 arm64, #924917

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.1.0.ebuild b/net-firewall/firewalld/firewalld-2.1.0.ebuild
index 9e7df0246932..8b097e8aa8bf 100644
--- a/net-firewall/firewalld/firewalld-2.1.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-01-23  6:14 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-01-23  6:14 UTC (permalink / raw
  To: gentoo-commits

commit:     12368d19131a38053c7c0d3fb559d81c98079481
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 06:13:15 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 06:13:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12368d19

net-firewall/firewalld: Stabilize 2.0.2 ppc64, #921544

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
index fd28afab923f..020c5b0d43ae 100644
--- a/net-firewall/firewalld/firewalld-2.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-01-07 13:26 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-01-07 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     e89d110c09993902d999aa6ecab19b4fd5f4ab5e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 13:25:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 13:25:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89d110c

net-firewall/firewalld: Stabilize 2.0.2 x86, #921544

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
index bfa0846cf89e..fd28afab923f 100644
--- a/net-firewall/firewalld/firewalld-2.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-01-07 13:26 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-01-07 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     4aff17140ad638e9dde7dc25e37aacc1b5f45f14
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 13:25:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 13:25:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aff1714

net-firewall/firewalld: Stabilize 2.0.2 amd64, #921544

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
index e4073eeb71f9..bfa0846cf89e 100644
--- a/net-firewall/firewalld/firewalld-2.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-01-07  9:31 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-01-07  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     625c520161ec35b09bab6a6a7903ba274c1f5aaf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 09:31:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 09:31:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625c5201

net-firewall/firewalld: Stabilize 2.0.2 arm64, #921544

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
index 713e240bb177..e4073eeb71f9 100644
--- a/net-firewall/firewalld/firewalld-2.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-01-07  9:31 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-01-07  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     79de90a70533080a273fb1c140ac3c6e8e576fd9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 09:31:25 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 09:31:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79de90a7

net-firewall/firewalld: Stabilize 2.0.2 arm, #921544

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
index 9ba2a7936667..713e240bb177 100644
--- a/net-firewall/firewalld/firewalld-2.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2024-01-07  9:05 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2024-01-07  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c59da30141e796d573f4a7ee734d88a554e1b41a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 08:44:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 08:44:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59da301

net-firewall/firewalld: add 2.1.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-2.1.0.ebuild | 223 ++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 9d89b5ce8e4f..7e67bfc852b9 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-2.0.1.tar.bz2 1257251 BLAKE2B a78ff5c1d733897024c33fe74ae8723c97253498ba55957420c66ccdfe4dcf64265336c5ee0cf120c4450d9c4da492e64c4fe01a3ea974d2992f6cf5879ef88d SHA512 31b18b74af4d731f6259915fd86d6551968eea563deba211b6d304d961747662085a02c7c185c0d7d8916693f53a5dca581b0877bce59c634e99a9f20de2f3e1
 DIST firewalld-2.0.2.tar.bz2 1276527 BLAKE2B 194f8b738a37b329f11a47fa9cf01f9cadc16d9f9dc7c8ace13b56f81bbb7d999b4a15cc156f89b14ecf794d4d6ef92f307600e298552779aed936d5b196c433 SHA512 fdcf4937e337bce4bca07d904efe2b775c8a69d4c7c9ca55c42752cfcf37f637f1cf1125bc1ca2c35a8980c995d90ea4e3afb5712f1666734e90e78e26888196
+DIST firewalld-2.1.0.tar.bz2 1310431 BLAKE2B e25941f16f5a2b0803c78d45f7b4beafdd1587106daefd009ac34a906c4604fa1c8d84a179e50d005433eadae982dcd0718e753c0627725918f2b6f5b8674146 SHA512 0f0e56a5397ea43801f0abfd3c50854340159804c95b920c3d4a22e2c211861b0d147fce879e9ddd58f6e89a805ccd5f828e8ffa2782a077c091c56dac97ee5b

diff --git a/net-firewall/firewalld/firewalld-2.1.0.ebuild b/net-firewall/firewalld/firewalld-2.1.0.ebuild
new file mode 100644
index 000000000000..9e7df0246932
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-2.1.0.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+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 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables 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/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] )
+	')
+	iptables? (
+		net-firewall/iptables[ipv6(+)]
+		net-firewall/ebtables
+		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+"
+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 sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-11-30  3:07 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-11-30  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     08b9d8c4e81021af798cbc80359e66954255b7ca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 02:20:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 02:22:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08b9d8c4

net-firewall/firewalld: add 2.0.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-2.0.2.ebuild | 223 ++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index fe35fe668bf2..9d89b5ce8e4f 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
 DIST firewalld-2.0.1.tar.bz2 1257251 BLAKE2B a78ff5c1d733897024c33fe74ae8723c97253498ba55957420c66ccdfe4dcf64265336c5ee0cf120c4450d9c4da492e64c4fe01a3ea974d2992f6cf5879ef88d SHA512 31b18b74af4d731f6259915fd86d6551968eea563deba211b6d304d961747662085a02c7c185c0d7d8916693f53a5dca581b0877bce59c634e99a9f20de2f3e1
+DIST firewalld-2.0.2.tar.bz2 1276527 BLAKE2B 194f8b738a37b329f11a47fa9cf01f9cadc16d9f9dc7c8ace13b56f81bbb7d999b4a15cc156f89b14ecf794d4d6ef92f307600e298552779aed936d5b196c433 SHA512 fdcf4937e337bce4bca07d904efe2b775c8a69d4c7c9ca55c42752cfcf37f637f1cf1125bc1ca2c35a8980c995d90ea4e3afb5712f1666734e90e78e26888196

diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild
new file mode 100644
index 000000000000..9ba2a7936667
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+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 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables 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/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] )
+	')
+	iptables? (
+		net-firewall/iptables[ipv6(+)]
+		net-firewall/ebtables
+		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+"
+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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-11-25  5:28 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-11-25  5:28 UTC (permalink / raw
  To: gentoo-commits

commit:     bedfd131d5244b2d4257f71caa8fec245bd123a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 05:26:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 05:27:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bedfd131

net-firewall/firewalld: drop 1.3.2, 1.3.3, 2.0.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   3 -
 net-firewall/firewalld/firewalld-1.3.2.ebuild | 216 -------------------------
 net-firewall/firewalld/firewalld-1.3.3.ebuild | 223 --------------------------
 net-firewall/firewalld/firewalld-2.0.0.ebuild | 223 --------------------------
 4 files changed, 665 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 9e5235143a84..fe35fe668bf2 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1 @@
-DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a SHA512 06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695
-DIST firewalld-1.3.3.tar.bz2 1218890 BLAKE2B 79ececc0c547e4e06edced53909e9e68c6a5781c15af1d722e2247c28206e19a92349e33be31cbdec5281de6052be2718da09ab18065cfa49999e94acafb0338 SHA512 b6bbec0dd9810a48c397bc6cfcf1339e0fff5a80df893917eddee266e48f70ae0af31a9c474d5c78fe2990433c8f84d70fd46f227ac29e4f5b7c209ca73b9e3c
-DIST firewalld-2.0.0.tar.bz2 1260018 BLAKE2B 18b57d5692d0e8a78af590e22010f7926d65a648bffbaf49e46c2e4156a923235e0cef00df1468ad36425050b1f7f5cceacbc6189d12602f592b3b4f3f9ec6de SHA512 a43e2e625d5d11cf1b740230213a44adbfe99243f2b87dc21b1698ea80a8da4af3b974e381980cc3c8d0bd3f08e5561eb2c3a393da5f5fbee4518879ae0b21a8
 DIST firewalld-2.0.1.tar.bz2 1257251 BLAKE2B a78ff5c1d733897024c33fe74ae8723c97253498ba55957420c66ccdfe4dcf64265336c5ee0cf120c4450d9c4da492e64c4fe01a3ea974d2992f6cf5879ef88d SHA512 31b18b74af4d731f6259915fd86d6551968eea563deba211b6d304d961747662085a02c7c185c0d7d8916693f53a5dca581b0877bce59c634e99a9f20de2f3e1

diff --git a/net-firewall/firewalld/firewalld-1.3.2.ebuild b/net-firewall/firewalld/firewalld-1.3.2.ebuild
deleted file mode 100644
index 9dc2f9060000..000000000000
--- a/net-firewall/firewalld/firewalld-1.3.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
-# Tests are too unreliable in sandbox environment
-RESTRICT="!test? ( test ) test"
-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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-1.3.3.ebuild b/net-firewall/firewalld/firewalld-1.3.3.ebuild
deleted file mode 100644
index 9cdc72532067..000000000000
--- a/net-firewall/firewalld/firewalld-1.3.3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="gui +nftables +iptables 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/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] )
-	')
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-"
-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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-2.0.0.ebuild b/net-firewall/firewalld/firewalld-2.0.0.ebuild
deleted file mode 100644
index 59e47ff9b089..000000000000
--- a/net-firewall/firewalld/firewalld-2.0.0.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables 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/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] )
-	')
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-"
-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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-10-03 23:38 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-10-03 23:38 UTC (permalink / raw
  To: gentoo-commits

commit:     63b26e42b52c1d50154be49ec7a4f8a92d8905b4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 23:37:54 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 23:37:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b26e42

net-firewall/firewalld: add 2.0.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-2.0.1.ebuild | 223 ++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 6bca6b849584..9e5235143a84 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,4 @@
 DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a SHA512 06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695
 DIST firewalld-1.3.3.tar.bz2 1218890 BLAKE2B 79ececc0c547e4e06edced53909e9e68c6a5781c15af1d722e2247c28206e19a92349e33be31cbdec5281de6052be2718da09ab18065cfa49999e94acafb0338 SHA512 b6bbec0dd9810a48c397bc6cfcf1339e0fff5a80df893917eddee266e48f70ae0af31a9c474d5c78fe2990433c8f84d70fd46f227ac29e4f5b7c209ca73b9e3c
 DIST firewalld-2.0.0.tar.bz2 1260018 BLAKE2B 18b57d5692d0e8a78af590e22010f7926d65a648bffbaf49e46c2e4156a923235e0cef00df1468ad36425050b1f7f5cceacbc6189d12602f592b3b4f3f9ec6de SHA512 a43e2e625d5d11cf1b740230213a44adbfe99243f2b87dc21b1698ea80a8da4af3b974e381980cc3c8d0bd3f08e5561eb2c3a393da5f5fbee4518879ae0b21a8
+DIST firewalld-2.0.1.tar.bz2 1257251 BLAKE2B a78ff5c1d733897024c33fe74ae8723c97253498ba55957420c66ccdfe4dcf64265336c5ee0cf120c4450d9c4da492e64c4fe01a3ea974d2992f6cf5879ef88d SHA512 31b18b74af4d731f6259915fd86d6551968eea563deba211b6d304d961747662085a02c7c185c0d7d8916693f53a5dca581b0877bce59c634e99a9f20de2f3e1

diff --git a/net-firewall/firewalld/firewalld-2.0.1.ebuild b/net-firewall/firewalld/firewalld-2.0.1.ebuild
new file mode 100644
index 000000000000..9cdc72532067
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-2.0.1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 gnome2-utils linux-info optfeature
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables 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/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] )
+	')
+	iptables? (
+		net-firewall/iptables[ipv6(+)]
+		net-firewall/ebtables
+		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+"
+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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-08-17  2:55 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-08-17  2:55 UTC (permalink / raw
  To: gentoo-commits

commit:     39855f596e2af6af259f2203ac8baa969c83d587
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 02:55:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 02:55:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39855f59

net-firewall/firewalld: Stabilize 2.0.0 arm64, #910958

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.0.ebuild b/net-firewall/firewalld/firewalld-2.0.0.ebuild
index ce6d5c66ffb5..59e47ff9b089 100644
--- a/net-firewall/firewalld/firewalld-2.0.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-07-24  3:59 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-07-24  3:59 UTC (permalink / raw
  To: gentoo-commits

commit:     dcab81d3f268d263759cd5a666adaa16bb783f11
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 03:58:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 03:58:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcab81d3

net-firewall/firewalld: Stabilize 2.0.0 ppc64, #910958

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.0.ebuild b/net-firewall/firewalld/firewalld-2.0.0.ebuild
index 564046265073..ce6d5c66ffb5 100644
--- a/net-firewall/firewalld/firewalld-2.0.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-07-24  3:57 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-07-24  3:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b7c917cf114b1db6a76d29220ec20cab01aba991
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 03:55:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 03:55:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c917cf

net-firewall/firewalld: Stabilize 2.0.0 amd64, #910958

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.0.ebuild b/net-firewall/firewalld/firewalld-2.0.0.ebuild
index a977b0e8d46c..564046265073 100644
--- a/net-firewall/firewalld/firewalld-2.0.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-07-24  3:57 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-07-24  3:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9515735c835b1b5cf9ee7fab73be4a5d045bc9c5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 03:55:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 03:55:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9515735c

net-firewall/firewalld: Stabilize 2.0.0 x86, #910958

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.0.ebuild b/net-firewall/firewalld/firewalld-2.0.0.ebuild
index a1e410d18061..a977b0e8d46c 100644
--- a/net-firewall/firewalld/firewalld-2.0.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-07-24  3:21 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-07-24  3:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a235f5f1f4f0a0d6fc1ec1015842f06bec126ea6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 03:21:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 03:21:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a235f5f1

net-firewall/firewalld: Stabilize 2.0.0 arm, #910958

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-2.0.0.ebuild b/net-firewall/firewalld/firewalld-2.0.0.ebuild
index 9cdc72532067..a1e410d18061 100644
--- a/net-firewall/firewalld/firewalld-2.0.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-06-23 20:28 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-06-23 20:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1b0144e3fc75d2273c3864aad11346cf39dca20d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 20:23:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 20:23:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0144e3

net-firewall/firewalld: add 2.0.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-2.0.0.ebuild | 223 ++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 304796dd0b2e..6bca6b849584 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a SHA512 06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695
 DIST firewalld-1.3.3.tar.bz2 1218890 BLAKE2B 79ececc0c547e4e06edced53909e9e68c6a5781c15af1d722e2247c28206e19a92349e33be31cbdec5281de6052be2718da09ab18065cfa49999e94acafb0338 SHA512 b6bbec0dd9810a48c397bc6cfcf1339e0fff5a80df893917eddee266e48f70ae0af31a9c474d5c78fe2990433c8f84d70fd46f227ac29e4f5b7c209ca73b9e3c
+DIST firewalld-2.0.0.tar.bz2 1260018 BLAKE2B 18b57d5692d0e8a78af590e22010f7926d65a648bffbaf49e46c2e4156a923235e0cef00df1468ad36425050b1f7f5cceacbc6189d12602f592b3b4f3f9ec6de SHA512 a43e2e625d5d11cf1b740230213a44adbfe99243f2b87dc21b1698ea80a8da4af3b974e381980cc3c8d0bd3f08e5561eb2c3a393da5f5fbee4518879ae0b21a8

diff --git a/net-firewall/firewalld/firewalld-2.0.0.ebuild b/net-firewall/firewalld/firewalld-2.0.0.ebuild
new file mode 100644
index 000000000000..9cdc72532067
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-2.0.0.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 gnome2-utils linux-info optfeature
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables 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/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] )
+	')
+	iptables? (
+		net-firewall/iptables[ipv6(+)]
+		net-firewall/ebtables
+		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+"
+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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-06-15 22:06 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-06-15 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     0b0aaf271bcba0c6bf19bc9d56986d72d45979ff
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 22:06:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 22:06:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0aaf27

net-firewall/firewalld: add 1.3.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.3.3.ebuild | 223 ++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 5243b7f7c53f..304796dd0b2e 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
 DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a SHA512 06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695
+DIST firewalld-1.3.3.tar.bz2 1218890 BLAKE2B 79ececc0c547e4e06edced53909e9e68c6a5781c15af1d722e2247c28206e19a92349e33be31cbdec5281de6052be2718da09ab18065cfa49999e94acafb0338 SHA512 b6bbec0dd9810a48c397bc6cfcf1339e0fff5a80df893917eddee266e48f70ae0af31a9c474d5c78fe2990433c8f84d70fd46f227ac29e4f5b7c209ca73b9e3c

diff --git a/net-firewall/firewalld/firewalld-1.3.3.ebuild b/net-firewall/firewalld/firewalld-1.3.3.ebuild
new file mode 100644
index 000000000000..9cdc72532067
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.3.3.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 gnome2-utils linux-info optfeature
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables 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/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] )
+	')
+	iptables? (
+		net-firewall/iptables[ipv6(+)]
+		net-firewall/ebtables
+		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+"
+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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-05-01 13:36 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-05-01 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     ade5a04bab4e8d37ebed596dfb5377e1378ecb7a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 13:32:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 13:32:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade5a04b

net-firewall/firewalld: drop 1.3.0, 1.3.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   2 -
 net-firewall/firewalld/firewalld-1.3.0.ebuild | 216 --------------------------
 net-firewall/firewalld/firewalld-1.3.1.ebuild | 216 --------------------------
 3 files changed, 434 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index d61b351f728c..5243b7f7c53f 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1 @@
-DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c SHA512 e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68
-DIST firewalld-1.3.1.tar.bz2 1229285 BLAKE2B cd3c42f90700ab9076b2bcf51f4a863adf6909072bd3c6a0439e1a37af4cfca7b4bcf323e0609ec22bb98f5669145636d70b394e37bf8e4641590f431d0167eb SHA512 98fb8a3fed2fa02aef2fe4940e044839693daa7a040d38e6ad5ff636e6cb60647917b80340858b28a9f3e3a4a736d7e4e6fdfe00356c072308d0c22277015574
 DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a SHA512 06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695

diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild b/net-firewall/firewalld/firewalld-1.3.0.ebuild
deleted file mode 100644
index 79d062f3b4ae..000000000000
--- a/net-firewall/firewalld/firewalld-1.3.0.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
-# Tests are too unreliable in sandbox environment
-RESTRICT="!test? ( test ) test"
-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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-1.3.1.ebuild b/net-firewall/firewalld/firewalld-1.3.1.ebuild
deleted file mode 100644
index 779a8dfedba5..000000000000
--- a/net-firewall/firewalld/firewalld-1.3.1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="gui +nftables +iptables test"
-# Tests are too unreliable in sandbox environment
-RESTRICT="!test? ( test ) test"
-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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-04-25  6:10 Jakov Smolić
  0 siblings, 0 replies; 178+ messages in thread
From: Jakov Smolić @ 2023-04-25  6:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2727781fb820d7add6b4d99ae18823e23a0b23dc
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 06:05:37 2023 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 06:05:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2727781f

net-firewall/firewalld: Stabilize 1.3.2 amd64, #904854

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.2.ebuild b/net-firewall/firewalld/firewalld-1.3.2.ebuild
index d41bf9ea3714..9dc2f9060000 100644
--- a/net-firewall/firewalld/firewalld-1.3.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-04-23 21:45 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-04-23 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9de91bea6edfb1693c484fd84c5becf9e5a8dd86
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 21:45:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 21:45:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9de91bea

net-firewall/firewalld: Stabilize 1.3.2 arm, #904854

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.2.ebuild b/net-firewall/firewalld/firewalld-1.3.2.ebuild
index 8b87c6bc94c2..d41bf9ea3714 100644
--- a/net-firewall/firewalld/firewalld-1.3.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-04-23  8:02 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-04-23  8:02 UTC (permalink / raw
  To: gentoo-commits

commit:     04458eca379383e1bcede208567cae4defadbcdb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 08:02:17 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 08:02:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04458eca

net-firewall/firewalld: Stabilize 1.3.2 ppc64, #904854

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.2.ebuild b/net-firewall/firewalld/firewalld-1.3.2.ebuild
index 28a9fb935638..8b87c6bc94c2 100644
--- a/net-firewall/firewalld/firewalld-1.3.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-04-23  8:02 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-04-23  8:02 UTC (permalink / raw
  To: gentoo-commits

commit:     39e0eafdc6c0c0ded44777f6db5daf8818672006
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 08:02:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 08:02:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e0eafd

net-firewall/firewalld: Stabilize 1.3.2 x86, #904854

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.2.ebuild b/net-firewall/firewalld/firewalld-1.3.2.ebuild
index 779a8dfedba5..29de27fd9ee6 100644
--- a/net-firewall/firewalld/firewalld-1.3.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-04-23  8:02 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-04-23  8:02 UTC (permalink / raw
  To: gentoo-commits

commit:     a52225f9e9fe6e602a1771724592c2bf37370c1b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 08:02:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 08:02:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52225f9

net-firewall/firewalld: Stabilize 1.3.2 arm64, #904854

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.2.ebuild b/net-firewall/firewalld/firewalld-1.3.2.ebuild
index 29de27fd9ee6..28a9fb935638 100644
--- a/net-firewall/firewalld/firewalld-1.3.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-04-23  6:06 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-04-23  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     dc9fa6e123659a73241d4e8acb2f22d7709a51e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 05:41:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 05:41:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9fa6e1

net-firewall/firewalld: add 1.3.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.3.2.ebuild | 216 ++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 89bbfa544de9..d61b351f728c 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c SHA512 e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68
 DIST firewalld-1.3.1.tar.bz2 1229285 BLAKE2B cd3c42f90700ab9076b2bcf51f4a863adf6909072bd3c6a0439e1a37af4cfca7b4bcf323e0609ec22bb98f5669145636d70b394e37bf8e4641590f431d0167eb SHA512 98fb8a3fed2fa02aef2fe4940e044839693daa7a040d38e6ad5ff636e6cb60647917b80340858b28a9f3e3a4a736d7e4e6fdfe00356c072308d0c22277015574
+DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a SHA512 06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695

diff --git a/net-firewall/firewalld/firewalld-1.3.2.ebuild b/net-firewall/firewalld/firewalld-1.3.2.ebuild
new file mode 100644
index 000000000000..779a8dfedba5
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.3.2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests are too unreliable in sandbox environment
+RESTRICT="!test? ( test ) test"
+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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-04-13 19:07 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-04-13 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     f233a9986e1068882580ffd164b9e48ddbd9a4cc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 19:05:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 19:05:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f233a998

net-firewall/firewalld: drop 1.2.1, 1.2.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   2 -
 net-firewall/firewalld/firewalld-1.2.1.ebuild | 212 -------------------------
 net-firewall/firewalld/firewalld-1.2.2.ebuild | 216 --------------------------
 3 files changed, 430 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 4cfbbaf44d32..82a07859233a 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1 @@
-DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a
-DIST firewalld-1.2.2.tar.gz 2145443 BLAKE2B 495bbd79fdab6f84e97533654b1d2b378841f14a60052a816d399d0ac8c2e2fe588486fae00dceeab5a13f7e03b030ae6db71c27208da415773ad033f0ea4ea2 SHA512 1b37b2daedb818afa6fe9d1512bdeebe48e39c39f94926d8aa93837816c211e30760706f536d63f51407a493a17927568c47118218d935949e22a78f7821441c
 DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c SHA512 e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68

diff --git a/net-firewall/firewalld/firewalld-1.2.1.ebuild b/net-firewall/firewalld/firewalld-1.2.1.ebuild
deleted file mode 100644
index bffb92c8782e..000000000000
--- a/net-firewall/firewalld/firewalld-1.2.1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv ) test"
-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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
deleted file mode 100644
index fc5a953a5642..000000000000
--- a/net-firewall/firewalld/firewalld-1.2.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv ) test"
-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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-04-13 19:07 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-04-13 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1b099624a206b39209897c13dc2c42173aa8cfb8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 19:06:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 19:06:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b099624

net-firewall/firewalld: add 1.3.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.3.1.ebuild | 216 ++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 82a07859233a..89bbfa544de9 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
 DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c SHA512 e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68
+DIST firewalld-1.3.1.tar.bz2 1229285 BLAKE2B cd3c42f90700ab9076b2bcf51f4a863adf6909072bd3c6a0439e1a37af4cfca7b4bcf323e0609ec22bb98f5669145636d70b394e37bf8e4641590f431d0167eb SHA512 98fb8a3fed2fa02aef2fe4940e044839693daa7a040d38e6ad5ff636e6cb60647917b80340858b28a9f3e3a4a736d7e4e6fdfe00356c072308d0c22277015574

diff --git a/net-firewall/firewalld/firewalld-1.3.1.ebuild b/net-firewall/firewalld/firewalld-1.3.1.ebuild
new file mode 100644
index 000000000000..779a8dfedba5
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.3.1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests are too unreliable in sandbox environment
+RESTRICT="!test? ( test ) test"
+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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-03-04 11:56 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2023-03-04 11:56 UTC (permalink / raw
  To: gentoo-commits

commit:     ebf0766f0c5c515c691ef81c4ddc58a3d3ca560e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 11:55:56 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 11:55:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf0766f

net-firewall/firewalld: Stabilize 1.3.0 ppc64, #899228

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild b/net-firewall/firewalld/firewalld-1.3.0.ebuild
index e09a8446fbeb..79d062f3b4ae 100644
--- a/net-firewall/firewalld/firewalld-1.3.0.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-03-04  7:47 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2023-03-04  7:47 UTC (permalink / raw
  To: gentoo-commits

commit:     149b0c95a23ad9ad6185a2129f3fe9f55db382dd
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 07:47:40 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 07:47:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149b0c95

net-firewall/firewalld: Stabilize 1.3.0 amd64, #899228

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild b/net-firewall/firewalld/firewalld-1.3.0.ebuild
index 82b1f082c2c7..e09a8446fbeb 100644
--- a/net-firewall/firewalld/firewalld-1.3.0.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-03-04  7:42 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2023-03-04  7:42 UTC (permalink / raw
  To: gentoo-commits

commit:     29b1258c6dca911b391b4d226c9774fedb2e1834
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 07:42:46 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 07:42:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b1258c

net-firewall/firewalld: Stabilize 1.3.0 x86, #899228

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild b/net-firewall/firewalld/firewalld-1.3.0.ebuild
index 96dd8ec56ccb..82b1f082c2c7 100644
--- a/net-firewall/firewalld/firewalld-1.3.0.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-03-04  6:27 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2023-03-04  6:27 UTC (permalink / raw
  To: gentoo-commits

commit:     9d9c660c75d1c5770748eb7b9fbe616399d47746
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 06:27:26 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 06:27:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9c660c

net-firewall/firewalld: Stabilize 1.3.0 arm64, #899228

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild b/net-firewall/firewalld/firewalld-1.3.0.ebuild
index 60e52db8050d..96dd8ec56ccb 100644
--- a/net-firewall/firewalld/firewalld-1.3.0.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-03-04  5:34 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2023-03-04  5:34 UTC (permalink / raw
  To: gentoo-commits

commit:     79c0272047cab8220f42eb35e04baa47f166cca5
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 05:34:26 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 05:34:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c02720

net-firewall/firewalld: Stabilize 1.3.0 arm, #899228

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild b/net-firewall/firewalld/firewalld-1.3.0.ebuild
index 767e6571400d..60e52db8050d 100644
--- a/net-firewall/firewalld/firewalld-1.3.0.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-01-13 17:32 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2023-01-13 17:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f540e6ed659e87672130bbfc8449b1e6b0fd01b8
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 17:32:48 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 17:32:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f540e6ed

net-firewall/firewalld: Stabilize 1.2.2 ppc64, #885129

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
index da74df809732..3e9fdae3194f 100644
--- a/net-firewall/firewalld/firewalld-1.2.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-01-13 13:37 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2023-01-13 13:37 UTC (permalink / raw
  To: gentoo-commits

commit:     23daf17989674c6f6e7c98fc499140bb73b72e97
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 13:36:58 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 13:36:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23daf179

net-firewall/firewalld: Stabilize 1.2.2 arm, #885129

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
index 5a0d110c1cc4..da74df809732 100644
--- a/net-firewall/firewalld/firewalld-1.2.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-01-13 12:17 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     894f1b38179567ea0125808cd9eba3a07092a39f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:17:37 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:17:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894f1b38

net-firewall/firewalld: Stabilize 1.2.2 arm64, #885129

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
index b7dc80712142..5a0d110c1cc4 100644
--- a/net-firewall/firewalld/firewalld-1.2.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv ) test"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-01-06  1:27 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-01-06  1:27 UTC (permalink / raw
  To: gentoo-commits

commit:     532bd2680789b8156a070da9b1d7380564aa2a2e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 01:26:22 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 01:26:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532bd268

net-firewall/firewalld: disable tests

I've tried but they're too unreliable in sandbox.

Closes: https://bugs.gentoo.org/856073
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.1.ebuild | 4 ++--
 net-firewall/firewalld/firewalld-1.2.2.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.1.ebuild b/net-firewall/firewalld/firewalld-1.2.1.ebuild
index 6cf64efd0d08..28ce38680879 100644
--- a/net-firewall/firewalld/firewalld-1.2.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
+RESTRICT="!test? ( test ) test? ( userpriv ) test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
index 211e78011f53..b7dc80712142 100644
--- a/net-firewall/firewalld/firewalld-1.2.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
+RESTRICT="!test? ( test ) test? ( userpriv ) test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2023-01-06  1:27 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2023-01-06  1:27 UTC (permalink / raw
  To: gentoo-commits

commit:     dc65b7145a5fea6707b5bd73ca5ad7cbaca2c4ab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 01:25:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 01:25:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc65b714

net-firewall/firewalld: add 1.3.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.3.0.ebuild | 216 ++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 0a4ee8383b84..4cfbbaf44d32 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a
 DIST firewalld-1.2.2.tar.gz 2145443 BLAKE2B 495bbd79fdab6f84e97533654b1d2b378841f14a60052a816d399d0ac8c2e2fe588486fae00dceeab5a13f7e03b030ae6db71c27208da415773ad033f0ea4ea2 SHA512 1b37b2daedb818afa6fe9d1512bdeebe48e39c39f94926d8aa93837816c211e30760706f536d63f51407a493a17927568c47118218d935949e22a78f7821441c
+DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c SHA512 e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68

diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild b/net-firewall/firewalld/firewalld-1.3.0.ebuild
new file mode 100644
index 000000000000..5dc1a36cec96
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.3.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests are too unreliable in sandbox environment
+RESTRICT="!test? ( test ) test"
+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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-12-10  8:58 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2022-12-10  8:58 UTC (permalink / raw
  To: gentoo-commits

commit:     abc25478ada6de6582ee6005b721b1cdfdb08884
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 08:58:12 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 08:58:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc25478

net-firewall/firewalld: Stabilize 1.2.2 x86, #885129

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
index 32a3cfcbb025..211e78011f53 100644
--- a/net-firewall/firewalld/firewalld-1.2.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-12-10  8:49 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2022-12-10  8:49 UTC (permalink / raw
  To: gentoo-commits

commit:     071ffbf2cf2c0e2dbd8f86a9b89cead12bf040cb
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 08:49:01 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 08:49:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071ffbf2

net-firewall/firewalld: Stabilize 1.2.2 amd64, #885129

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
index 28dbe5e00764..32a3cfcbb025 100644
--- a/net-firewall/firewalld/firewalld-1.2.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-12-10  4:36 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-12-10  4:36 UTC (permalink / raw
  To: gentoo-commits

commit:     bb033f0eb0b172d2ab352523ef4052c28afa827a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 04:33:22 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 04:35:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb033f0e

net-firewall/firewalld: drop 1.1.1, 1.1.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   2 -
 net-firewall/firewalld/firewalld-1.1.1.ebuild | 214 -------------------------
 net-firewall/firewalld/firewalld-1.1.3.ebuild | 219 --------------------------
 3 files changed, 435 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 3d406f33b826..0a4ee8383b84 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1,2 @@
-DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
-DIST firewalld-1.1.3.tar.gz 2124653 BLAKE2B 178afc1c76538abbc2927819f35a81a642aabe5d9139a7dde69c50e061e59ae9f362374cc0bbfb4e8ad25c99caf8e45ddd92f1709478afb109d700b16bf84e38 SHA512 5108b363017b947907f104fb361bcc85443fc1b523718d8e0883932cb212a447391c9cea8b1e3f69bb9cc1c3a05b9042a8b9d91798d1dd09d4d4a224c9ce9d71
 DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a
 DIST firewalld-1.2.2.tar.gz 2145443 BLAKE2B 495bbd79fdab6f84e97533654b1d2b378841f14a60052a816d399d0ac8c2e2fe588486fae00dceeab5a13f7e03b030ae6db71c27208da415773ad033f0ea4ea2 SHA512 1b37b2daedb818afa6fe9d1512bdeebe48e39c39f94926d8aa93837816c211e30760706f536d63f51407a493a17927568c47118218d935949e22a78f7821441c

diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
deleted file mode 100644
index 44aacd0abb81..000000000000
--- a/net-firewall/firewalld/firewalld-1.1.1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="app-text/docbook-xml-dtd
-	>=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 hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-1.1.3.ebuild b/net-firewall/firewalld/firewalld-1.1.3.ebuild
deleted file mode 100644
index 8c5ed2edc597..000000000000
--- a/net-firewall/firewalld/firewalld-1.1.3.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| ( >=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? (
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3
-		)
-		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
-	')
-	iptables? (
-		net-firewall/ebtables
-		net-firewall/ipset
-		net-firewall/iptables[ipv6(+)]
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/glib:2
-"
-BDEPEND="
-	app-text/docbook-xml-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	test? ( net-firewall/nftables )
-"
-
-# 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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-12-04  9:23 WANG Xuerui
  0 siblings, 0 replies; 178+ messages in thread
From: WANG Xuerui @ 2022-12-04  9:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9f8a2d241f35451ffa3cc88154d7b25d0e434c7e
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 09:00:46 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 09:22:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8a2d24

net-firewall/firewalld: keyword 1.2.2 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
index 13ed0ef9832e..28dbe5e00764 100644
--- a/net-firewall/firewalld/firewalld-1.2.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-11-30  4:14 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-11-30  4:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e891cc7cc5a17f7fd4cbcb668fabcacc3549bff6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 04:12:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 04:13:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e891cc7c

net-firewall/firewalld: add 1.2.2

Closes: https://bugs.gentoo.org/853055
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.2.2.ebuild | 216 ++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 148b643488f6..3d406f33b826 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,4 @@
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
 DIST firewalld-1.1.3.tar.gz 2124653 BLAKE2B 178afc1c76538abbc2927819f35a81a642aabe5d9139a7dde69c50e061e59ae9f362374cc0bbfb4e8ad25c99caf8e45ddd92f1709478afb109d700b16bf84e38 SHA512 5108b363017b947907f104fb361bcc85443fc1b523718d8e0883932cb212a447391c9cea8b1e3f69bb9cc1c3a05b9042a8b9d91798d1dd09d4d4a224c9ce9d71
 DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a
+DIST firewalld-1.2.2.tar.gz 2145443 BLAKE2B 495bbd79fdab6f84e97533654b1d2b378841f14a60052a816d399d0ac8c2e2fe588486fae00dceeab5a13f7e03b030ae6db71c27208da415773ad033f0ea4ea2 SHA512 1b37b2daedb818afa6fe9d1512bdeebe48e39c39f94926d8aa93837816c211e30760706f536d63f51407a493a17927568c47118218d935949e22a78f7821441c

diff --git a/net-firewall/firewalld/firewalld-1.2.2.ebuild b/net-firewall/firewalld/firewalld-1.2.2.ebuild
new file mode 100644
index 000000000000..13ed0ef9832e
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.2.2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests previously restricted for bug #650760
+RESTRICT="!test? ( test ) test? ( userpriv )"
+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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-11-19 10:34 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     90786231f7ee70948f9b5a7811657d6cfd047a0c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:33:27 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:33:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90786231

net-firewall/firewalld: Stabilize 1.2.1 ppc64, #866638

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.1.ebuild b/net-firewall/firewalld/firewalld-1.2.1.ebuild
index 90ee46626a2d..05dba56de655 100644
--- a/net-firewall/firewalld/firewalld-1.2.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-11-19 10:34 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6277fd7b2563206718aa0ecd5849fae8ee4a4dff
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:33:24 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:33:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6277fd7b

net-firewall/firewalld: Stabilize 1.2.1 arm64, #866638

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.1.ebuild b/net-firewall/firewalld/firewalld-1.2.1.ebuild
index 43ba3546df1f..90ee46626a2d 100644
--- a/net-firewall/firewalld/firewalld-1.2.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-11-19 10:34 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     854f639a9295bba1b388a7f9919dac12fc8cd12a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:33:21 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:33:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854f639a

net-firewall/firewalld: Stabilize 1.2.1 arm, #866638

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.1.ebuild b/net-firewall/firewalld/firewalld-1.2.1.ebuild
index 4bfd0c2d9541..43ba3546df1f 100644
--- a/net-firewall/firewalld/firewalld-1.2.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-10-31 16:41 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2022-10-31 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     af1a0e74155be7d67cf7e0d7109c795e276fa78f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 16:40:57 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 16:41:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1a0e74

net-firewall/firewalld: Stabilize 1.1.3 x86, #878565

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.3.ebuild b/net-firewall/firewalld/firewalld-1.1.3.ebuild
index 3b0fa270fbcd..8c5ed2edc597 100644
--- a/net-firewall/firewalld/firewalld-1.1.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-10-29  5:47 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-10-29  5:47 UTC (permalink / raw
  To: gentoo-commits

commit:     8b0e0b9279d6844d0d5f6611801e05b6f7a23514
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 05:47:16 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 05:47:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0e0b92

net-firewall/firewalld: Stabilize 1.1.3 arm64, #878565

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.3.ebuild b/net-firewall/firewalld/firewalld-1.1.3.ebuild
index 2c57d8e4b340..f6c1d184a4b3 100644
--- a/net-firewall/firewalld/firewalld-1.1.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-10-29  5:47 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-10-29  5:47 UTC (permalink / raw
  To: gentoo-commits

commit:     c95138d493bf13984e1a33e474841f84070b3603
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 05:47:08 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 05:47:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95138d4

net-firewall/firewalld: Stabilize 1.1.3 ppc64, #878565

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.3.ebuild b/net-firewall/firewalld/firewalld-1.1.3.ebuild
index ec48585ff072..c5e06914c2f9 100644
--- a/net-firewall/firewalld/firewalld-1.1.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-10-29  5:47 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-10-29  5:47 UTC (permalink / raw
  To: gentoo-commits

commit:     03912b0d727a9880dfab2e984f7ae09494c7a458
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 05:47:13 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 05:47:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03912b0d

net-firewall/firewalld: Stabilize 1.1.3 arm, #878565

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.3.ebuild b/net-firewall/firewalld/firewalld-1.1.3.ebuild
index c5e06914c2f9..2c57d8e4b340 100644
--- a/net-firewall/firewalld/firewalld-1.1.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-10-28 19:53 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-10-28 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d0e5ee08fefb505f06199c77dc8ed65be0f94a32
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 19:30:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 19:50:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e5ee08

net-firewall/firewalld: drop 1.1.2, 1.2.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   2 -
 net-firewall/firewalld/firewalld-1.1.2.ebuild | 212 --------------------------
 net-firewall/firewalld/firewalld-1.2.0.ebuild | 212 --------------------------
 3 files changed, 426 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index c92bd3fd4b47..148b643488f6 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,5 +1,3 @@
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
-DIST firewalld-1.1.2.tar.gz 2099245 BLAKE2B ea1e73cf96908ca4981deb86d4c0fad75f36ef321a37bba6d789b3de90b1cbb818f1eda713f41567c2125265b2e19707d411e1b51ab35c6f1af8b6040528f150 SHA512 a82a57d77c2fb5e9758218516912057bfbfb5549b341bcaaa8d40f3c39b8af67a01ca146a3aa09495ca38b315fa09a5d3d32597c40de10ca2da370b81d5598b0
 DIST firewalld-1.1.3.tar.gz 2124653 BLAKE2B 178afc1c76538abbc2927819f35a81a642aabe5d9139a7dde69c50e061e59ae9f362374cc0bbfb4e8ad25c99caf8e45ddd92f1709478afb109d700b16bf84e38 SHA512 5108b363017b947907f104fb361bcc85443fc1b523718d8e0883932cb212a447391c9cea8b1e3f69bb9cc1c3a05b9042a8b9d91798d1dd09d4d4a224c9ce9d71
-DIST firewalld-1.2.0.tar.gz 2120379 BLAKE2B 8c09e9a5e08e9f4dc2b3bfeda35d9078bd464956a30d7fdb5700329755fc307f0664f6a20ff5e941026785f28940b1eeebe747e2b2b3eed150725e014d05f870 SHA512 739ef7e4b85f2f00656434f6b37fb8116b9a93595390667d212820bc30a3e3cfaf5a60be7b18ec1f72be720d35a76224f3ce28856a9ff72557b8a8ae8e83f0a8
 DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a

diff --git a/net-firewall/firewalld/firewalld-1.1.2.ebuild b/net-firewall/firewalld/firewalld-1.1.2.ebuild
deleted file mode 100644
index a1e5b3069d0d..000000000000
--- a/net-firewall/firewalld/firewalld-1.1.2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
-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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-1.2.0.ebuild b/net-firewall/firewalld/firewalld-1.2.0.ebuild
deleted file mode 100644
index a1e5b3069d0d..000000000000
--- a/net-firewall/firewalld/firewalld-1.2.0.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
-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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-10-11  7:45 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2022-10-11  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     6d6151278e18172b5e7b922376bdbfd426871497
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 07:44:12 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 07:44:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d615127

net-firewall/firewalld: Stabilize 1.2.1 amd64, #866638

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.1.ebuild b/net-firewall/firewalld/firewalld-1.2.1.ebuild
index a1e5b3069d0d..257c7c82042c 100644
--- a/net-firewall/firewalld/firewalld-1.2.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-10-11  7:45 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2022-10-11  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9e060d06195cb135dbc74bb72950b20a674045c4
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 07:44:45 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 07:44:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e060d06

net-firewall/firewalld: Stabilize 1.2.1 x86, #866638

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.2.1.ebuild b/net-firewall/firewalld/firewalld-1.2.1.ebuild
index 257c7c82042c..4bfd0c2d9541 100644
--- a/net-firewall/firewalld/firewalld-1.2.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests previously restricted for bug #650760
 RESTRICT="!test? ( test ) test? ( userpriv )"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-09-28 23:35 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-09-28 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     cc06401da0480e0cceed79bd1eea8a88a120545f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 21:55:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 22:54:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc06401d

net-firewall/firewalld: add 1.1.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.1.3.ebuild | 219 ++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 0a9506eac4f6..8d405da0806a 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,4 @@
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
 DIST firewalld-1.1.2.tar.gz 2099245 BLAKE2B ea1e73cf96908ca4981deb86d4c0fad75f36ef321a37bba6d789b3de90b1cbb818f1eda713f41567c2125265b2e19707d411e1b51ab35c6f1af8b6040528f150 SHA512 a82a57d77c2fb5e9758218516912057bfbfb5549b341bcaaa8d40f3c39b8af67a01ca146a3aa09495ca38b315fa09a5d3d32597c40de10ca2da370b81d5598b0
+DIST firewalld-1.1.3.tar.gz 2124653 BLAKE2B 178afc1c76538abbc2927819f35a81a642aabe5d9139a7dde69c50e061e59ae9f362374cc0bbfb4e8ad25c99caf8e45ddd92f1709478afb109d700b16bf84e38 SHA512 5108b363017b947907f104fb361bcc85443fc1b523718d8e0883932cb212a447391c9cea8b1e3f69bb9cc1c3a05b9042a8b9d91798d1dd09d4d4a224c9ce9d71
 DIST firewalld-1.2.0.tar.gz 2120379 BLAKE2B 8c09e9a5e08e9f4dc2b3bfeda35d9078bd464956a30d7fdb5700329755fc307f0664f6a20ff5e941026785f28940b1eeebe747e2b2b3eed150725e014d05f870 SHA512 739ef7e4b85f2f00656434f6b37fb8116b9a93595390667d212820bc30a3e3cfaf5a60be7b18ec1f72be720d35a76224f3ce28856a9ff72557b8a8ae8e83f0a8

diff --git a/net-firewall/firewalld/firewalld-1.1.3.ebuild b/net-firewall/firewalld/firewalld-1.1.3.ebuild
new file mode 100644
index 000000000000..ec48585ff072
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.1.3.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests previously restricted for bug #650760
+RESTRICT="!test? ( test ) test? ( userpriv )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| ( >=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? (
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+			x11-libs/gtk+:3
+		)
+		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
+	')
+	iptables? (
+		net-firewall/ebtables
+		net-firewall/ipset
+		net-firewall/iptables[ipv6(+)]
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/glib:2
+"
+BDEPEND="
+	app-text/docbook-xml-dtd
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	test? ( net-firewall/nftables )
+"
+
+# 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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_COUNTER
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-09-28 23:35 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-09-28 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     a34647a3dfdd756d028d41f57aa43ae02ef19076
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 22:03:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 23:15:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34647a3

net-firewall/firewalld: add 1.2.1

Upstream dropped the conflicting Kodi rules.

Closes: https://bugs.gentoo.org/860249
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.2.1.ebuild | 212 ++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 8d405da0806a..c92bd3fd4b47 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -2,3 +2,4 @@ DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116
 DIST firewalld-1.1.2.tar.gz 2099245 BLAKE2B ea1e73cf96908ca4981deb86d4c0fad75f36ef321a37bba6d789b3de90b1cbb818f1eda713f41567c2125265b2e19707d411e1b51ab35c6f1af8b6040528f150 SHA512 a82a57d77c2fb5e9758218516912057bfbfb5549b341bcaaa8d40f3c39b8af67a01ca146a3aa09495ca38b315fa09a5d3d32597c40de10ca2da370b81d5598b0
 DIST firewalld-1.1.3.tar.gz 2124653 BLAKE2B 178afc1c76538abbc2927819f35a81a642aabe5d9139a7dde69c50e061e59ae9f362374cc0bbfb4e8ad25c99caf8e45ddd92f1709478afb109d700b16bf84e38 SHA512 5108b363017b947907f104fb361bcc85443fc1b523718d8e0883932cb212a447391c9cea8b1e3f69bb9cc1c3a05b9042a8b9d91798d1dd09d4d4a224c9ce9d71
 DIST firewalld-1.2.0.tar.gz 2120379 BLAKE2B 8c09e9a5e08e9f4dc2b3bfeda35d9078bd464956a30d7fdb5700329755fc307f0664f6a20ff5e941026785f28940b1eeebe747e2b2b3eed150725e014d05f870 SHA512 739ef7e4b85f2f00656434f6b37fb8116b9a93595390667d212820bc30a3e3cfaf5a60be7b18ec1f72be720d35a76224f3ce28856a9ff72557b8a8ae8e83f0a8
+DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a

diff --git a/net-firewall/firewalld/firewalld-1.2.1.ebuild b/net-firewall/firewalld/firewalld-1.2.1.ebuild
new file mode 100644
index 000000000000..a1e5b3069d0d
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.2.1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests previously restricted for bug #650760
+RESTRICT="!test? ( test ) test? ( userpriv )"
+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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_COUNTER
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-07-02 20:31 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-07-02 20:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7e1c6b5f7a77e4935739f255953cd90876065ab0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 20:23:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 20:30:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1c6b5f

net-firewall/firewalld: add 1.2.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.2.0.ebuild | 212 ++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 43d03f05036d..0a9506eac4f6 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
 DIST firewalld-1.1.2.tar.gz 2099245 BLAKE2B ea1e73cf96908ca4981deb86d4c0fad75f36ef321a37bba6d789b3de90b1cbb818f1eda713f41567c2125265b2e19707d411e1b51ab35c6f1af8b6040528f150 SHA512 a82a57d77c2fb5e9758218516912057bfbfb5549b341bcaaa8d40f3c39b8af67a01ca146a3aa09495ca38b315fa09a5d3d32597c40de10ca2da370b81d5598b0
+DIST firewalld-1.2.0.tar.gz 2120379 BLAKE2B 8c09e9a5e08e9f4dc2b3bfeda35d9078bd464956a30d7fdb5700329755fc307f0664f6a20ff5e941026785f28940b1eeebe747e2b2b3eed150725e014d05f870 SHA512 739ef7e4b85f2f00656434f6b37fb8116b9a93595390667d212820bc30a3e3cfaf5a60be7b18ec1f72be720d35a76224f3ce28856a9ff72557b8a8ae8e83f0a8

diff --git a/net-firewall/firewalld/firewalld-1.2.0.ebuild b/net-firewall/firewalld/firewalld-1.2.0.ebuild
new file mode 100644
index 000000000000..a1e5b3069d0d
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.2.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests previously restricted for bug #650760
+RESTRICT="!test? ( test ) test? ( userpriv )"
+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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_COUNTER
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-07-02 20:31 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-07-02 20:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7eb4e62e89da0cadb31848eaacee6a29eafb89db
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 20:09:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 20:30:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb4e62e

net-firewall/firewalld: add 1.1.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.1.2.ebuild | 212 ++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 0a4195ec4f64..43d03f05036d 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
+DIST firewalld-1.1.2.tar.gz 2099245 BLAKE2B ea1e73cf96908ca4981deb86d4c0fad75f36ef321a37bba6d789b3de90b1cbb818f1eda713f41567c2125265b2e19707d411e1b51ab35c6f1af8b6040528f150 SHA512 a82a57d77c2fb5e9758218516912057bfbfb5549b341bcaaa8d40f3c39b8af67a01ca146a3aa09495ca38b315fa09a5d3d32597c40de10ca2da370b81d5598b0

diff --git a/net-firewall/firewalld/firewalld-1.1.2.ebuild b/net-firewall/firewalld/firewalld-1.1.2.ebuild
new file mode 100644
index 000000000000..a1e5b3069d0d
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.1.2.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit 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/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables test"
+# Tests previously restricted for bug #650760
+RESTRICT="!test? ( test ) test? ( userpriv )"
+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="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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_COUNTER
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-05-04 23:28 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-05-04 23:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c8bcc8b8e49198db7465767883a2482f3cff8d2d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 05:44:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  4 23:28:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8bcc8b8

net-firewall/firewalld: drop 1.1.0-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest                  |   1 -
 net-firewall/firewalld/firewalld-1.1.0-r1.ebuild | 213 -----------------------
 2 files changed, 214 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 0980ae878f0d..0a4195ec4f64 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1 @@
-DIST firewalld-1.1.0.tar.gz 1324519 BLAKE2B d9f97c88a1ed44b325bb95616770c0aff6e0088bccd08d062b3be686964d3d36003c1e13809a8802af2062ff7544b2a1fd870c1e933952a9b77af989ec0f9b54 SHA512 4cb8b0d6387de72827d06c19019e5608e36f647a70aef04879f9225795571638758abd5ff6333bd9db816b6de40d7e8df04c402556c2402e85ad34633d337091
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479

diff --git a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
deleted file mode 100644
index 85cf40f8f02f..000000000000
--- a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# 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 hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-05-03 18:11 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-05-03 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     2cb33693f357e8e7047a5eb1de037ee2f262c2d9
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 18:11:42 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue May  3 18:11:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb33693

net-firewall/firewalld: Stabilize 1.1.1 arm64, #841530

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
index 91c080d26bce..44aacd0abb81 100644
--- a/net-firewall/firewalld/firewalld-1.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-05-03 17:52 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-05-03 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     6e70f7dba44f4c2967669b3ea44f275d4f25ef93
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 17:52:23 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue May  3 17:52:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e70f7db

net-firewall/firewalld: Stabilize 1.1.1 arm, #841530

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
index d23808f26f71..91c080d26bce 100644
--- a/net-firewall/firewalld/firewalld-1.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-29 19:21 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-04-29 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     f781374b7417c814491a9606bc5899ed67105d24
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 19:20:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 19:20:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f781374b

net-firewall/firewalld: Stabilize 1.1.1 ppc64, #841530

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
index 9e30e72f763f..d23808f26f71 100644
--- a/net-firewall/firewalld/firewalld-1.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-29  7:41 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2022-04-29  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     d3f8c144f341fab99b9a9271b0f66a854158afb3
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 07:35:46 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:41:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f8c144

net-firewall/firewalld: add a missing bdep docbook-xml-dtd

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
index 93efaebbee7e..dbbe5dc8371c 100644
--- a/net-firewall/firewalld/firewalld-1.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.1.ebuild
@@ -35,7 +35,8 @@ RDEPEND="${PYTHON_DEPS}
 	')"
 DEPEND="${RDEPEND}
 	dev-libs/glib:2"
-BDEPEND=">=dev-util/intltool-0.35
+BDEPEND="app-text/docbook-xml-dtd
+	>=dev-util/intltool-0.35
 	sys-devel/gettext"
 
 RESTRICT="test" # bug 650760


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-29  7:41 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2022-04-29  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     52b95cd87cf690f2600e83f66766123ffb696cca
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 07:40:47 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:41:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b95cd8

net-firewall/firewalld: Stabilize 1.1.1 amd64, #841530

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
index 390f886fa029..9e30e72f763f 100644
--- a/net-firewall/firewalld/firewalld-1.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-29  7:41 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2022-04-29  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     ed935bc3aa48f61d870e0a7be82c647f28aacb9d
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 07:40:03 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:41:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed935bc3

net-firewall/firewalld: Stabilize 1.1.1 x86, #841530

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
index dbbe5dc8371c..390f886fa029 100644
--- a/net-firewall/firewalld/firewalld-1.1.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-17 16:44 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-04-17 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     329a129d3eae69efe0e0eca9902a62ed4826eddf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 16:40:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 16:40:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329a129d

net-firewall/firewalld: drop 1.0.2-r1, 1.0.3-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest                  |   2 -
 net-firewall/firewalld/firewalld-1.0.2-r1.ebuild | 203 -----------------------
 net-firewall/firewalld/firewalld-1.0.3-r1.ebuild | 203 -----------------------
 3 files changed, 408 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 6ef8dd026dee..0980ae878f0d 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1,2 @@
-DIST firewalld-1.0.2.tar.gz 1307963 BLAKE2B 11a7710981ba39f4bcb8431558e5b558a60d77fb1aa3fe4c5febc37f2eab754a6608e4820b6318c963bb6290a9b26ae9e162d9e46277c34dfdacac46ba938b21 SHA512 fbb60a6f52e5be26051303769b6521a6c775d450ab6704f2d63fe38dc6194976ad36f1d924380d09012f41ab6dab1f6f78c5a859fbfe00c52cdff40d82e62283
-DIST firewalld-1.0.3.tar.gz 1310433 BLAKE2B c414a347ca1008e010bf8393e45ffff38b5845fde7cc53b810276e46d67c6302cfe93a59665ad6ebc533b3ae04908f9089546b109888f60f0c798f3cac62a30d SHA512 0ba423e8c294d143f31bbdac13553e58cd0a3429812b555829c34f411478c26cffcc40095218539155e9ed7fe7e360fb8dd85a572a8ad9d5650b0cc206fe42a1
 DIST firewalld-1.1.0.tar.gz 1324519 BLAKE2B d9f97c88a1ed44b325bb95616770c0aff6e0088bccd08d062b3be686964d3d36003c1e13809a8802af2062ff7544b2a1fd870c1e933952a9b77af989ec0f9b54 SHA512 4cb8b0d6387de72827d06c19019e5608e36f647a70aef04879f9225795571638758abd5ff6333bd9db816b6de40d7e8df04c402556c2402e85ad34633d337091
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479

diff --git a/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild b/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild
deleted file mode 100644
index 36b30b91cc4e..000000000000
--- a/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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 plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://www.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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TABLES_SET
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_NET
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po"
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild b/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
deleted file mode 100644
index 44c9ba18b636..000000000000
--- a/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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 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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TABLES_SET
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_NET
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po"
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-09 19:52 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-04-09 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     4a07d8bd8046491d2492920b59488757ec77c2d3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 19:52:28 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 19:52:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a07d8bd

net-firewall/firewalld: Stabilize 1.1.0-r1 arm, #836678

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
index 3629b8d3ff47..85cf40f8f02f 100644
--- a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-05  2:37 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-04-05  2:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2fe0dc4eefc24172d660aae197f585271b746f74
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 02:36:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 02:36:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe0dc4e

net-firewall/firewalld: Stabilize 1.1.0-r1 ppc64, #836678

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
index 12cd825374cf..3629b8d3ff47 100644
--- a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-04 18:28 Jakov Smolić
  0 siblings, 0 replies; 178+ messages in thread
From: Jakov Smolić @ 2022-04-04 18:28 UTC (permalink / raw
  To: gentoo-commits

commit:     6a988f59e07c1aa60f351fd7672ff16ec0c943e2
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 18:28:40 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 18:28:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a988f59

net-firewall/firewalld: Stabilize 1.1.0-r1 arm64, #836678

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
index 4303ecc75824..12cd825374cf 100644
--- a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-04  6:37 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2022-04-04  6:37 UTC (permalink / raw
  To: gentoo-commits

commit:     8572b3b6d6646769d85063d215d4bef62d7ae86c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 06:37:49 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 06:37:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8572b3b6

net-firewall/firewalld: x86 stable wrt bug #836678

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
index 2cbc8dea5cf8..4303ecc75824 100644
--- a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-04-04  6:37 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2022-04-04  6:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3dd03b898844604563376a8caad8dca756edaa65
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 06:37:03 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 06:37:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd03b89

net-firewall/firewalld: amd64 stable wrt bug #836678

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
index 9b7cca65163e..2cbc8dea5cf8 100644
--- a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-03-26 21:21 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-03-26 21:21 UTC (permalink / raw
  To: gentoo-commits

commit:     b6d2bef61b69df7c6c193fd3fd6434ebfbb66eca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 21:00:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 21:21:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d2bef6

net-firewall/firewalld: add 1.1.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.1.1.ebuild | 213 ++++++++++++++++++++++++++
 2 files changed, 214 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index eb1690b0d69a..6ef8dd026dee 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,4 @@
 DIST firewalld-1.0.2.tar.gz 1307963 BLAKE2B 11a7710981ba39f4bcb8431558e5b558a60d77fb1aa3fe4c5febc37f2eab754a6608e4820b6318c963bb6290a9b26ae9e162d9e46277c34dfdacac46ba938b21 SHA512 fbb60a6f52e5be26051303769b6521a6c775d450ab6704f2d63fe38dc6194976ad36f1d924380d09012f41ab6dab1f6f78c5a859fbfe00c52cdff40d82e62283
 DIST firewalld-1.0.3.tar.gz 1310433 BLAKE2B c414a347ca1008e010bf8393e45ffff38b5845fde7cc53b810276e46d67c6302cfe93a59665ad6ebc533b3ae04908f9089546b109888f60f0c798f3cac62a30d SHA512 0ba423e8c294d143f31bbdac13553e58cd0a3429812b555829c34f411478c26cffcc40095218539155e9ed7fe7e360fb8dd85a572a8ad9d5650b0cc206fe42a1
 DIST firewalld-1.1.0.tar.gz 1324519 BLAKE2B d9f97c88a1ed44b325bb95616770c0aff6e0088bccd08d062b3be686964d3d36003c1e13809a8802af2062ff7544b2a1fd870c1e933952a9b77af989ec0f9b54 SHA512 4cb8b0d6387de72827d06c19019e5608e36f647a70aef04879f9225795571638758abd5ff6333bd9db816b6de40d7e8df04c402556c2402e85ad34633d337091
+DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479

diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
new file mode 100644
index 000000000000..93efaebbee7e
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.1.1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_COUNTER
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-03-12 12:31 Arthur Zamarin
  0 siblings, 0 replies; 178+ messages in thread
From: Arthur Zamarin @ 2022-03-12 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     1d935c97bcd026be8c418c1ee291c2b432e6532b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 12:31:44 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 12:31:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d935c97

net-firewall/firewalld: Stabilize 1.0.3-r1 arm, #834933

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild b/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
index 034a4540dfdf..44c9ba18b636 100644
--- a/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-26  5:35 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-26  5:35 UTC (permalink / raw
  To: gentoo-commits

commit:     a91485744aea2e2eea9eed3f39071e53f0007514
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 05:35:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 05:35:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9148574

net-firewall/firewalld: tweak optfeature phasing

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
index 273fdfa6a807..9b7cca65163e 100644
--- a/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
@@ -204,7 +204,7 @@ pkg_postinst() {
 	gnome2_schemas_update
 
 	# bug #833569
-	optfeature "Change zones with NetworkManager" gnome-extra/nm-applet
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
 }
 
 pkg_postrm() {


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-26  5:34 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-26  5:34 UTC (permalink / raw
  To: gentoo-commits

commit:     0dde7837c0b46c0a4f52e7229038d8452b4f11a5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 05:33:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 05:34:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dde7837

net-firewall/firewalld: update plocale list

... and add || die to the check-for-changes call.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../firewalld/{firewalld-1.1.0.ebuild => firewalld-1.1.0-r1.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-1.1.0.ebuild b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
similarity index 96%
rename from net-firewall/firewalld/firewalld-1.1.0.ebuild
rename to net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
index 467c6bd41651..273fdfa6a807 100644
--- a/net-firewall/firewalld/firewalld-1.1.0.ebuild
+++ b/net-firewall/firewalld/firewalld-1.1.0-r1.ebuild
@@ -45,7 +45,7 @@ RESTRICT="test" # bug 650760
 # 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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+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 ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
 
 pkg_setup() {
 	# See bug #830132 for the huge list
@@ -149,7 +149,7 @@ src_prepare() {
 
 	eautoreconf
 
-	plocale_find_changes "po" "" ".po"
+	plocale_find_changes "po" "" ".po" || die
 	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-20  5:51 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-20  5:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9d0a7009bb2840e08e305f68d63b1f4349b0748c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 05:36:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 05:36:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0a7009

net-firewall/firewalld: drop OutdatedBlocker

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.2-r1.ebuild | 1 -
 net-firewall/firewalld/firewalld-1.0.3-r1.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild b/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild
index d4ea370c416e..36b30b91cc4e 100644
--- a/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild
@@ -17,7 +17,6 @@ IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
 	iptables? (
 		net-firewall/iptables[ipv6(+)]
 		net-firewall/ebtables

diff --git a/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild b/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
index ccb386137cd9..034a4540dfdf 100644
--- a/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
@@ -17,7 +17,6 @@ IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
 	iptables? (
 		net-firewall/iptables[ipv6(+)]
 		net-firewall/ebtables


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-18  2:44 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-18  2:44 UTC (permalink / raw
  To: gentoo-commits

commit:     62b2651a590693f437d3eb5fa43194f32204f0a7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 16:11:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 02:40:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b2651a

net-firewall/firewalld: Use (+) for ipv6 flag deps

At this point, it is reasonable to assume that packages will be enabling
IPv6 unconditionally rather than dropping it altogether.  Update the USE
dependencies to (+) to account for that, in preparation for removal
of the flag in iproute2 and iputils.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../firewalld/{firewalld-1.0.2.ebuild => firewalld-1.0.2-r1.ebuild}     | 2 +-
 .../firewalld/{firewalld-1.0.3.ebuild => firewalld-1.0.3-r1.ebuild}     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.2.ebuild b/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild
similarity index 99%
rename from net-firewall/firewalld/firewalld-1.0.2.ebuild
rename to net-firewall/firewalld/firewalld-1.0.2-r1.ebuild
index 88351db686f2..d4ea370c416e 100644
--- a/net-firewall/firewalld/firewalld-1.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.2-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	!!net-firewall/gshield
 	iptables? (
-		net-firewall/iptables[ipv6]
+		net-firewall/iptables[ipv6(+)]
 		net-firewall/ebtables
 		net-firewall/ipset
 		nftables? ( net-firewall/nftables[xtables(+)] )

diff --git a/net-firewall/firewalld/firewalld-1.0.3.ebuild b/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
similarity index 99%
rename from net-firewall/firewalld/firewalld-1.0.3.ebuild
rename to net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
index 55fe049bd7ec..ccb386137cd9 100644
--- a/net-firewall/firewalld/firewalld-1.0.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.3-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	!!net-firewall/gshield
 	iptables? (
-		net-firewall/iptables[ipv6]
+		net-firewall/iptables[ipv6(+)]
 		net-firewall/ebtables
 		net-firewall/ipset
 		nftables? ( net-firewall/nftables[xtables(+)] )


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-11 12:25 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-11 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     5633525f11aa8b163b63b55fc96f234e1ebc5937
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 12:23:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 12:23:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5633525f

net-firewall/firewalld: Stabilize 1.0.3 arm64, #833032

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.3.ebuild b/net-firewall/firewalld/firewalld-1.0.3.ebuild
index f903ade02ff9..55fe049bd7ec 100644
--- a/net-firewall/firewalld/firewalld-1.0.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-10  7:51 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-10  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     762881d287847010b7222652c01098321e8e9476
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 07:51:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 07:51:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762881d2

net-firewall/firewalld: Stabilize 1.0.3 ppc64, #833032

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.3.ebuild b/net-firewall/firewalld/firewalld-1.0.3.ebuild
index 6de78e2c8e4e..f903ade02ff9 100644
--- a/net-firewall/firewalld/firewalld-1.0.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-10  7:51 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-10  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     49bc9e2031f46c59f7536ae790416633dbb7fcda
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 07:51:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 07:51:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49bc9e20

net-firewall/firewalld: Stabilize 1.0.3 x86, #833032

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.3.ebuild b/net-firewall/firewalld/firewalld-1.0.3.ebuild
index 35c17afac569..6de78e2c8e4e 100644
--- a/net-firewall/firewalld/firewalld-1.0.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-10  7:51 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-10  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     d487cad50cf79bb7473c8e4e731a5f01a6e70b73
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 07:50:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 07:50:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d487cad5

net-firewall/firewalld: Stabilize 1.0.3 amd64, #833032

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.3.ebuild b/net-firewall/firewalld/firewalld-1.0.3.ebuild
index 510d602c75ab..35c17afac569 100644
--- a/net-firewall/firewalld/firewalld-1.0.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-02-04 18:48 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-02-04 18:48 UTC (permalink / raw
  To: gentoo-commits

commit:     1dc5cd0b073751d1d739f58bdbf95fe09d5f8022
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 18:47:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 18:47:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc5cd0b

net-firewall/firewalld: Stabilize 1.0.2 ppc64, #831835

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.2.ebuild b/net-firewall/firewalld/firewalld-1.0.2.ebuild
index a5b813717e90..88351db686f2 100644
--- a/net-firewall/firewalld/firewalld-1.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-01-10 22:53 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-01-10 22:53 UTC (permalink / raw
  To: gentoo-commits

commit:     569e654ce49fd8756dcffd1fd01644e54dcbbb1e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 10 22:53:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 22:53:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569e654c

net-firewall/firewalld: update HOMEPAGE

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.3.ebuild b/net-firewall/firewalld/firewalld-1.0.3.ebuild
index 2bf06009d02d..510d602c75ab 100644
--- a/net-firewall/firewalld/firewalld-1.0.3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8,9,10} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://www.firewalld.org/"
+HOMEPAGE="https://firewalld.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2022-01-10 22:52 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2022-01-10 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     26e9b66291419aaf7f458a9ed972da92ea27dffc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 10 22:51:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 22:51:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26e9b662

net-firewall/firewalld: add 1.0.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.0.3.ebuild | 204 ++++++++++++++++++++++++++
 2 files changed, 205 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index df3e7246dc75..b33424011e4d 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
 DIST firewalld-1.0.2.tar.gz 1307963 BLAKE2B 11a7710981ba39f4bcb8431558e5b558a60d77fb1aa3fe4c5febc37f2eab754a6608e4820b6318c963bb6290a9b26ae9e162d9e46277c34dfdacac46ba938b21 SHA512 fbb60a6f52e5be26051303769b6521a6c775d450ab6704f2d63fe38dc6194976ad36f1d924380d09012f41ab6dab1f6f78c5a859fbfe00c52cdff40d82e62283
+DIST firewalld-1.0.3.tar.gz 1310433 BLAKE2B c414a347ca1008e010bf8393e45ffff38b5845fde7cc53b810276e46d67c6302cfe93a59665ad6ebc533b3ae04908f9089546b109888f60f0c798f3cac62a30d SHA512 0ba423e8c294d143f31bbdac13553e58cd0a3429812b555829c34f411478c26cffcc40095218539155e9ed7fe7e360fb8dd85a572a8ad9d5650b0cc206fe42a1

diff --git a/net-firewall/firewalld/firewalld-1.0.3.ebuild b/net-firewall/firewalld/firewalld-1.0.3.ebuild
new file mode 100644
index 000000000000..2bf06009d02d
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.0.3.ebuild
@@ -0,0 +1,204 @@
+# 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 plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://www.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}
+	!!net-firewall/gshield
+	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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TABLES_SET
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_COUNTER
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_NET
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-12-28  1:55 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-12-28  1:55 UTC (permalink / raw
  To: gentoo-commits

commit:     0d0e5ab741f884b4061749b4b00aba9a4736afb3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 01:54:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 01:54:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0e5ab7

net-firewall/firewalld: drop 0.9.3-r1, 0.9.5, 1.0.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest                  |   3 -
 net-firewall/firewalld/firewalld-0.9.3-r1.ebuild | 117 ----------------------
 net-firewall/firewalld/firewalld-0.9.5.ebuild    | 117 ----------------------
 net-firewall/firewalld/firewalld-1.0.1.ebuild    | 121 -----------------------
 4 files changed, 358 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 45ebd490af73..df3e7246dc75 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1 @@
-DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
-DIST firewalld-0.9.5.tar.gz 1317089 BLAKE2B 7c4fbd1f4fcd941247bb474d6436101e8da97805d6eedaa02f957a041abe4d262bd6f2dab0e94fea34ebc8dc4361bc59eb6c7a9c9536553f7fce370fa47defd1 SHA512 5a5f91ff4aaa24ab9e4727b5b3b9f4fa252da28070e3eb62e2880618f6976df0eee626593efedc8c21a615df65f89f34d1a7e9b3aaf970e6290a35b9363bab4b
-DIST firewalld-1.0.1.tar.gz 1306854 BLAKE2B 6dd68ed4219eb7d266e6bfa4d626dec51dcf28aae84609c9b87afa8e397179b0565bc8144c106c8ae8770293b371552b930679ec8a1204b2c9cb1f75e39c7013 SHA512 875af09caface324f7b5cfb0a87df5d309ff2e9e51d6d3a797f46f951ba95f4e1bc9f9f046f5191fafdef878dc65baf1b77a25a17f5aaf2f32bb1e1f782f1f8c
 DIST firewalld-1.0.2.tar.gz 1307963 BLAKE2B 11a7710981ba39f4bcb8431558e5b558a60d77fb1aa3fe4c5febc37f2eab754a6608e4820b6318c963bb6290a9b26ae9e162d9e46277c34dfdacac46ba938b21 SHA512 fbb60a6f52e5be26051303769b6521a6c775d450ab6704f2d63fe38dc6194976ad36f1d924380d09012f41ab6dab1f6f78c5a859fbfe00c52cdff40d82e62283

diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
deleted file mode 100644
index 298f34bb09cd..000000000000
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://www.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}
-	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables[python,json] )
-	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/decorator[${PYTHON_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-	')"
-
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po"
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-0.9.5.ebuild b/net-firewall/firewalld/firewalld-0.9.5.ebuild
deleted file mode 100644
index 078f2eb7f7d5..000000000000
--- a/net-firewall/firewalld/firewalld-0.9.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://www.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}
-	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables[python,json] )
-	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/decorator[${PYTHON_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-	')"
-
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po"
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-1.0.1.ebuild b/net-firewall/firewalld/firewalld-1.0.1.ebuild
deleted file mode 100644
index 9b7974c1591e..000000000000
--- a/net-firewall/firewalld/firewalld-1.0.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 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 plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://www.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}
-	!!net-firewall/gshield
-	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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po"
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-12-28  1:51 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-12-28  1:51 UTC (permalink / raw
  To: gentoo-commits

commit:     85a2ad3a6c88096412ac023c83eb0a896c1746d5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 01:51:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 01:51:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a2ad3a

net-firewall/firewalld: update HOMEPAGE (HTTPS), DESCRIPTION

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.3-r1.ebuild | 4 ++--
 net-firewall/firewalld/firewalld-0.9.5.ebuild    | 4 ++--
 net-firewall/firewalld/firewalld-1.0.1.ebuild    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index 11fe3cc84dd2..298f34bb09cd 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://www.firewalld.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"

diff --git a/net-firewall/firewalld/firewalld-0.9.5.ebuild b/net-firewall/firewalld/firewalld-0.9.5.ebuild
index 59c6dff62994..078f2eb7f7d5 100644
--- a/net-firewall/firewalld/firewalld-0.9.5.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.5.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://www.firewalld.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"

diff --git a/net-firewall/firewalld/firewalld-1.0.1.ebuild b/net-firewall/firewalld/firewalld-1.0.1.ebuild
index d99dc6ac2166..9b7974c1591e 100644
--- a/net-firewall/firewalld/firewalld-1.0.1.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://www.firewalld.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-12-28  1:51 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-12-28  1:51 UTC (permalink / raw
  To: gentoo-commits

commit:     b1630545b0a0b1d71775a2c7ec89025be32c3f49
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 01:50:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 01:50:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1630545

net-firewall/firewalld: update needed kernel options/modules

See: https://zigford.org/firewalld-kernel-requirements.html
Thanks-to: Jessie Harris <jesse <AT> zigford.org>
Thanks-to: Stijn Tintel <stijn+gentoo <AT> linux-ipv6.be>
Thanks-to: genr8eofl_
Closes: https://bugs.gentoo.org/830132
Closes: https://bugs.gentoo.org/703322
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.2.ebuild | 89 ++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 3 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.2.ebuild b/net-firewall/firewalld/firewalld-1.0.2.ebuild
index d3413dec38c9..a5b813717e90 100644
--- a/net-firewall/firewalld/firewalld-1.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.2.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://www.firewalld.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -49,7 +49,90 @@ 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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
 
 pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TABLES_SET
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_COUNTER
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_NET
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
 
 	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
 	if kernel_is -lt 4 19; then


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-11-17 22:47 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-11-17 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     4d1c5c0f3c3e25281a4e8aa0ee5f2eb4caf5429a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 17 22:45:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 22:45:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d1c5c0f

net-firewall/firewalld: Stabilize 1.0.2 arm64, #823683

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.2.ebuild b/net-firewall/firewalld/firewalld-1.0.2.ebuild
index 4bd28d9e3eb0..d3413dec38c9 100644
--- a/net-firewall/firewalld/firewalld-1.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.2.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-11-14 20:29 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-11-14 20:29 UTC (permalink / raw
  To: gentoo-commits

commit:     2cc0e882be34be985d5dcb498ca463ab9df852ae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 20:29:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 20:29:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc0e882

net-firewall/firewalld: Stabilize 1.0.2 x86, #823683

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.2.ebuild b/net-firewall/firewalld/firewalld-1.0.2.ebuild
index bcf1948023ce..4bd28d9e3eb0 100644
--- a/net-firewall/firewalld/firewalld-1.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.2.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-11-14  8:38 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-11-14  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     b61d81def61b604a93a54a5dc37149d506c17018
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 08:37:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 08:37:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61d81de

net-firewall/firewalld: Stabilize 1.0.2 amd64, #823683

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-1.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-1.0.2.ebuild b/net-firewall/firewalld/firewalld-1.0.2.ebuild
index d99dc6ac2166..bcf1948023ce 100644
--- a/net-firewall/firewalld/firewalld-1.0.2.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.2.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-11-04 16:14 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-11-04 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     d866866f50d767f018c4328eac69d829f6973974
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 16:14:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 16:14:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d866866f

net-firewall/firewalld: add myself as a maintainer

As discussed with tamiko a little while ago.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 1d13392ec6a..8173b9a770b 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -5,6 +5,10 @@
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="nftables">Add support for <pkg>net-firewall/nftables</pkg> as firewall backend</flag>
 		<flag name="iptables">Add support for <pkg>net-firewall/iptables</pkg> as firewall backend</flag>


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-11-04 16:13 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-11-04 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     df459508336a0eb65736a3c48923337446a18290
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 16:13:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 16:13:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df459508

net-firewall/firewalld: drop 0.9.1-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest                  |   1 -
 net-firewall/firewalld/firewalld-0.9.1-r1.ebuild | 117 -----------------------
 2 files changed, 118 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 0c189dffd06..45ebd490af7 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1,3 @@
-DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
 DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
 DIST firewalld-0.9.5.tar.gz 1317089 BLAKE2B 7c4fbd1f4fcd941247bb474d6436101e8da97805d6eedaa02f957a041abe4d262bd6f2dab0e94fea34ebc8dc4361bc59eb6c7a9c9536553f7fce370fa47defd1 SHA512 5a5f91ff4aaa24ab9e4727b5b3b9f4fa252da28070e3eb62e2880618f6976df0eee626593efedc8c21a615df65f89f34d1a7e9b3aaf970e6290a35b9363bab4b
 DIST firewalld-1.0.1.tar.gz 1306854 BLAKE2B 6dd68ed4219eb7d266e6bfa4d626dec51dcf28aae84609c9b87afa8e397179b0565bc8144c106c8ae8770293b371552b930679ec8a1204b2c9cb1f75e39c7013 SHA512 875af09caface324f7b5cfb0a87df5d309ff2e9e51d6d3a797f46f951ba95f4e1bc9f9f046f5191fafdef878dc65baf1b77a25a17f5aaf2f32bb1e1f782f1f8c

diff --git a/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
deleted file mode 100644
index eece123f46f..00000000000
--- a/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.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 x86"
-IUSE="gui +nftables +iptables"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables[python,json] )
-	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/decorator[${PYTHON_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-	')"
-
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po"
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-11-04 16:12 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-11-04 16:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e9ace49170066c01ed8c72dd406e100b0d80fde2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 16:06:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 16:06:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ace491

net-firewall/firewalld: add 1.0.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.0.2.ebuild | 121 ++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 76fa85cc4ad..0c189dffd06 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -2,3 +2,4 @@ DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9
 DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
 DIST firewalld-0.9.5.tar.gz 1317089 BLAKE2B 7c4fbd1f4fcd941247bb474d6436101e8da97805d6eedaa02f957a041abe4d262bd6f2dab0e94fea34ebc8dc4361bc59eb6c7a9c9536553f7fce370fa47defd1 SHA512 5a5f91ff4aaa24ab9e4727b5b3b9f4fa252da28070e3eb62e2880618f6976df0eee626593efedc8c21a615df65f89f34d1a7e9b3aaf970e6290a35b9363bab4b
 DIST firewalld-1.0.1.tar.gz 1306854 BLAKE2B 6dd68ed4219eb7d266e6bfa4d626dec51dcf28aae84609c9b87afa8e397179b0565bc8144c106c8ae8770293b371552b930679ec8a1204b2c9cb1f75e39c7013 SHA512 875af09caface324f7b5cfb0a87df5d309ff2e9e51d6d3a797f46f951ba95f4e1bc9f9f046f5191fafdef878dc65baf1b77a25a17f5aaf2f32bb1e1f782f1f8c
+DIST firewalld-1.0.2.tar.gz 1307963 BLAKE2B 11a7710981ba39f4bcb8431558e5b558a60d77fb1aa3fe4c5febc37f2eab754a6608e4820b6318c963bb6290a9b26ae9e162d9e46277c34dfdacac46ba938b21 SHA512 fbb60a6f52e5be26051303769b6521a6c775d450ab6704f2d63fe38dc6194976ad36f1d924380d09012f41ab6dab1f6f78c5a859fbfe00c52cdff40d82e62283

diff --git a/net-firewall/firewalld/firewalld-1.0.2.ebuild b/net-firewall/firewalld/firewalld-1.0.2.ebuild
new file mode 100644
index 00000000000..d99dc6ac216
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.0.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 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 plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.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}
+	!!net-firewall/gshield
+	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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-10-22  2:47 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-10-22  2:47 UTC (permalink / raw
  To: gentoo-commits

commit:     1bbc63361052d95be5d44429c0331dda452a42b5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 22 01:22:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 22 02:47:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbc6336

net-firewall/firewalld: add 0.9.5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-0.9.5.ebuild | 117 ++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 4e27cc4b4e8..76fa85cc4ad 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,4 @@
 DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
 DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
+DIST firewalld-0.9.5.tar.gz 1317089 BLAKE2B 7c4fbd1f4fcd941247bb474d6436101e8da97805d6eedaa02f957a041abe4d262bd6f2dab0e94fea34ebc8dc4361bc59eb6c7a9c9536553f7fce370fa47defd1 SHA512 5a5f91ff4aaa24ab9e4727b5b3b9f4fa252da28070e3eb62e2880618f6976df0eee626593efedc8c21a615df65f89f34d1a7e9b3aaf970e6290a35b9363bab4b
 DIST firewalld-1.0.1.tar.gz 1306854 BLAKE2B 6dd68ed4219eb7d266e6bfa4d626dec51dcf28aae84609c9b87afa8e397179b0565bc8144c106c8ae8770293b371552b930679ec8a1204b2c9cb1f75e39c7013 SHA512 875af09caface324f7b5cfb0a87df5d309ff2e9e51d6d3a797f46f951ba95f4e1bc9f9f046f5191fafdef878dc65baf1b77a25a17f5aaf2f32bb1e1f782f1f8c

diff --git a/net-firewall/firewalld/firewalld-0.9.5.ebuild b/net-firewall/firewalld/firewalld-0.9.5.ebuild
new file mode 100644
index 00000000000..59c6dff6299
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.9.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.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}
+	!!net-firewall/gshield
+	nftables? ( net-firewall/nftables[python,json] )
+	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/decorator[${PYTHON_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		)
+	')"
+
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-09-04 21:39 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-09-04 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     0e37c2ef75158de4c76b986a7f2176b225851603
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  4 21:34:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  4 21:39:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e37c2ef

net-firewall/firewalld: Stabilize 0.9.3-r1 arm64, #811057

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index 6149f472b74..11fe3cc84dd 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-09-03  6:40 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2021-09-03  6:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f9bd9fe7cbc9c733666f3f62fb6ea0b47f5b3a4e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  3 06:37:34 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Sep  3 06:39:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9bd9fe7

net-firewall/firewalld: x86 stable wrt bug #811057

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index dd8b0116ad7..6149f472b74 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-08-30  7:26 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2021-08-30  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     863713f5d95178e2a156fdcf4cd4ef6290458ade
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 07:26:07 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 07:26:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=863713f5

net-firewall/firewalld: amd64 stable wrt bug #811057

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index 59c6dff6299..dd8b0116ad7 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-08-29 23:24 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-08-29 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     b9cab9d21eaba6ae665b6a07081dec3acb470824
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 23:24:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 23:24:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9cab9d2

net-firewall/firewalld: drop 0.7.1-r3, 0.7.3-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest                  |   2 -
 net-firewall/firewalld/firewalld-0.7.1-r3.ebuild | 118 -----------------------
 net-firewall/firewalld/firewalld-0.7.3-r1.ebuild | 118 -----------------------
 3 files changed, 238 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index ede989b0123..4e27cc4b4e8 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,5 +1,3 @@
-DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
-DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
 DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
 DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
 DIST firewalld-1.0.1.tar.gz 1306854 BLAKE2B 6dd68ed4219eb7d266e6bfa4d626dec51dcf28aae84609c9b87afa8e397179b0565bc8144c106c8ae8770293b371552b930679ec8a1204b2c9cb1f75e39c7013 SHA512 875af09caface324f7b5cfb0a87df5d309ff2e9e51d6d3a797f46f951ba95f4e1bc9f9f046f5191fafdef878dc65baf1b77a25a17f5aaf2f32bb1e1f782f1f8c

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
deleted file mode 100644
index 05546297f4b..00000000000
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="gui +nftables +iptables"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables )
-	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/decorator[${PYTHON_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-	')"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po"
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with nftables nft "${EPREFIX}/sbin/nft")
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/" || die
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
deleted file mode 100644
index d926073fdf7..00000000000
--- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="gui +nftables +iptables"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables )
-	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/decorator[${PYTHON_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-	')"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po"
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with nftables nft "${EPREFIX}/sbin/nft")
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/" || die
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-08-29 23:22 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-08-29 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     f4bec3f9f1cc452fb387b7e7a540e7454080b4c5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 23:22:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 23:22:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bec3f9

net-firewall/firewalld: fix USE=iptables description in metadata.xml

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 96b274a47c9..fa3460c2a57 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="nftables">Add support for <pkg>net-firewall/nftables</pkg> as firewall backend</flag>
-		<flag name="iptables">Add support for <pkg>net-firewall/nftables</pkg> as firewall backend</flag>
+		<flag name="iptables">Add support for <pkg>net-firewall/iptables</pkg> as firewall backend</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-08-29 23:21 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-08-29 23:21 UTC (permalink / raw
  To: gentoo-commits

commit:     d93d65c65a0116ca8a292ba7ab77aa725ce8fd2a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 23:16:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 23:21:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93d65c6

net-firewall/firewalld: add 1.0.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-1.0.1.ebuild | 121 ++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index f695b67b7c1..ede989b0123 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -2,3 +2,4 @@ DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f
 DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
 DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
 DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
+DIST firewalld-1.0.1.tar.gz 1306854 BLAKE2B 6dd68ed4219eb7d266e6bfa4d626dec51dcf28aae84609c9b87afa8e397179b0565bc8144c106c8ae8770293b371552b930679ec8a1204b2c9cb1f75e39c7013 SHA512 875af09caface324f7b5cfb0a87df5d309ff2e9e51d6d3a797f46f951ba95f4e1bc9f9f046f5191fafdef878dc65baf1b77a25a17f5aaf2f32bb1e1f782f1f8c

diff --git a/net-firewall/firewalld/firewalld-1.0.1.ebuild b/net-firewall/firewalld/firewalld-1.0.1.ebuild
new file mode 100644
index 00000000000..d99dc6ac216
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.0.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 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 plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.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}
+	!!net-firewall/gshield
+	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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-08-23 11:41 Marek Szuba
  0 siblings, 0 replies; 178+ messages in thread
From: Marek Szuba @ 2021-08-23 11:41 UTC (permalink / raw
  To: gentoo-commits

commit:     88058898da36e04067238fe0a25b7f236a4a0dd6
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 23 11:34:39 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Aug 23 11:34:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88058898

net-firewall/firewalld: keyword 0.9.3-r1 for ~riscv

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index 527e4ba823e..59c6dff6299 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -12,7 +12,7 @@ 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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-07-04 14:03 Ulrich Müller
  0 siblings, 0 replies; 178+ messages in thread
From: Ulrich Müller @ 2021-07-04 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     2ab8a1d6a6e7d94a863482d31bcdea251c073984
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 15:45:59 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 14:01:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab8a1d6

net-firewall/firewalld: Update from l10n.eclass to plocale.eclass

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r3.ebuild | 8 ++++----
 net-firewall/firewalld/firewalld-0.7.3-r1.ebuild | 8 ++++----
 net-firewall/firewalld/firewalld-0.9.1-r1.ebuild | 6 +++---
 net-firewall/firewalld/firewalld-0.9.3-r1.ebuild | 6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
index ef390e5c45b..0803ec72a63 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -60,8 +60,8 @@ src_prepare() {
 	default
 	eautoreconf
 
-	l10n_find_plocales_changes "po" "" ".po"
-	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 
 src_configure() {

diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
index 994dfa68b67..4c32e1152ae 100644
--- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -60,8 +60,8 @@ src_prepare() {
 	default
 	eautoreconf
 
-	l10n_find_plocales_changes "po" "" ".po"
-	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 
 src_configure() {

diff --git a/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
index 2d6922f4a9e..571c2e6a669 100644
--- a/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -61,8 +61,8 @@ src_prepare() {
 	default
 	eautoreconf
 
-	l10n_find_plocales_changes "po" "" ".po"
-	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 
 src_configure() {

diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index f9fdccdb8a1..10845818f9b 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -61,8 +61,8 @@ src_prepare() {
 	default
 	eautoreconf
 
-	l10n_find_plocales_changes "po" "" ".po"
-	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-06-03  7:19 Joonas Niilola
  0 siblings, 0 replies; 178+ messages in thread
From: Joonas Niilola @ 2021-06-03  7:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c4433b1441b030066611680d67e78bcfeefa2653
Author:     Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com>
AuthorDate: Sat May 15 17:49:05 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 07:19:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4433b14

net-firewall/firewalld: Updates PLOCALES for 0.9.1-r1 and 0.9.3-r1

Closes: https://bugs.gentoo.org/790635
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com>
Closes: https://github.com/gentoo/gentoo/pull/20824
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../firewalld/{firewalld-0.9.1.ebuild => firewalld-0.9.1-r1.ebuild}     | 2 +-
 .../firewalld/{firewalld-0.9.3.ebuild => firewalld-0.9.3-r1.ebuild}     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.1.ebuild b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
similarity index 94%
rename from net-firewall/firewalld/firewalld-0.9.1.ebuild
rename to net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
index a203735b1c4..2d6922f4a9e 100644
--- a/net-firewall/firewalld/firewalld-0.9.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test" # bug 650760
 
-PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
 
 pkg_setup() {
 	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"

diff --git a/net-firewall/firewalld/firewalld-0.9.3.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
similarity index 94%
rename from net-firewall/firewalld/firewalld-0.9.3.ebuild
rename to net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index 03a747cb130..f9fdccdb8a1 100644
--- a/net-firewall/firewalld/firewalld-0.9.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test" # bug 650760
 
-PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+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 ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
 
 pkg_setup() {
 	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-05-16 12:45 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-05-16 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     ada5e7dec2cde205522d0527fe5cbaec11a5268d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 12:40:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 16 12:44:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada5e7de

net-firewall/firewalld: Stabilize 0.9.1 arm64, #770313

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.1.ebuild b/net-firewall/firewalld/firewalld-0.9.1.ebuild
index d63a0f1e4b9..a203735b1c4 100644
--- a/net-firewall/firewalld/firewalld-0.9.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1.ebuild
@@ -12,7 +12,7 @@ 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 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-05-14 18:23 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2021-05-14 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     dd56e9647e2552cf57e452fe17af38b65525b89f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 18:23:32 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 14 18:23:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd56e964

net-firewall/firewalld: amd64 stable wrt bug #770313

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.1.ebuild b/net-firewall/firewalld/firewalld-0.9.1.ebuild
index 4d43de77508..d63a0f1e4b9 100644
--- a/net-firewall/firewalld/firewalld-0.9.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1.ebuild
@@ -12,7 +12,7 @@ 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 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-05-13 20:26 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2021-05-13 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     d458e1c111772ab50f57bc817dc43a1e65dcb82f
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 20:25:37 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu May 13 20:26:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d458e1c1

net-firewall/firewalld: version bump to 0.9.3

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-0.9.3.ebuild | 117 ++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index d30f9b0bc22..f695b67b7c1 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,4 @@
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
 DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
 DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
+DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4

diff --git a/net-firewall/firewalld/firewalld-0.9.3.ebuild b/net-firewall/firewalld/firewalld-0.9.3.ebuild
new file mode 100644
index 00000000000..03a747cb130
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.9.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.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 ~x86"
+IUSE="gui +nftables +iptables"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	nftables? ( net-firewall/nftables[python,json] )
+	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_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	l10n_find_plocales_changes "po" "" ".po"
+	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-05-13 20:26 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2021-05-13 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     a1e09353443165511ed54eb023aaa831ac6b271c
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 20:24:33 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu May 13 20:26:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e09353

net-firewall/firewalld: remove obsolete configuration option

The firewalld binary does not need to know the location of the nft
binary any more because it now uses python-nftables exclusively.

Closes: https://bugs.gentoo.org/758416
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.1.ebuild b/net-firewall/firewalld/firewalld-0.9.1.ebuild
index 67e8ae56467..4d43de77508 100644
--- a/net-firewall/firewalld/firewalld-0.9.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1.ebuild
@@ -70,7 +70,6 @@ src_configure() {
 
 	local econf_args=(
 		--enable-systemd
-		$(use_with nftables nft "${EPREFIX}/sbin/nft")
 		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
 		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
 		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-03-30 16:17 Thomas Deutschmann
  0 siblings, 0 replies; 178+ messages in thread
From: Thomas Deutschmann @ 2021-03-30 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b9b93f09fda88a2955c4c215d5eed08d3e23e2b0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 16:17:07 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 16:17:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b93f09

net-firewall/firewalld: x86 stable (bug #770313)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.1.ebuild b/net-firewall/firewalld/firewalld-0.9.1.ebuild
index 967648ea7ce..67e8ae56467 100644
--- a/net-firewall/firewalld/firewalld-0.9.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1.ebuild
@@ -12,7 +12,7 @@ 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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2021-02-22  7:12 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2021-02-22  7:12 UTC (permalink / raw
  To: gentoo-commits

commit:     9d9e8f2203f75e2fe2ae70b1788aef15e20552e3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 07:11:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 07:11:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9e8f22

net-firewall/firewalld: Keyword 0.9.1 arm, #770952

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.9.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.9.1.ebuild b/net-firewall/firewalld/firewalld-0.9.1.ebuild
index d66081508f7..967648ea7ce 100644
--- a/net-firewall/firewalld/firewalld-0.9.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-12-04  5:37 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2020-12-04  5:37 UTC (permalink / raw
  To: gentoo-commits

commit:     ba31905a88b5492e002b3831f9cec03527e5fe8b
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 05:12:12 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 05:37:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba31905a

net-firewall/firewalld: update PYTHON_COMPAT

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r3.ebuild | 2 +-
 net-firewall/firewalld/firewalld-0.7.3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
index 07ebb20f023..60185c26700 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"

diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
index 2b79e871a7b..4d65eda4407 100644
--- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-12-04  5:37 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2020-12-04  5:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9fd10504c2bb0a28a11e43de2d5b443e687ef5c1
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 05:26:41 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 05:37:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd10504

net-firewall/firewalld: version bump to 0.9.1

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-0.9.1.ebuild | 118 ++++++++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index e07f1e31102..d30f9b0bc22 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
 DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
+DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6

diff --git a/net-firewall/firewalld/firewalld-0.9.1.ebuild b/net-firewall/firewalld/firewalld-0.9.1.ebuild
new file mode 100644
index 00000000000..628ad37631f
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.9.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gui +nftables +iptables"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	nftables? ( net-firewall/nftables[python,json] )
+	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_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	l10n_find_plocales_changes "po" "" ".po"
+	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with nftables nft "${EPREFIX}/sbin/nft")
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-08-20 13:20 Sam James
  0 siblings, 0 replies; 178+ messages in thread
From: Sam James @ 2020-08-20 13:20 UTC (permalink / raw
  To: gentoo-commits

commit:     99be6e56f6e70e4b831821408159dffbe3b3574d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 13:16:47 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 13:20:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99be6e56

net-firewall/firewalld: Stabilize 0.7.1-r3 arm64, #738076

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
index f3dffe12669..07ebb20f023 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-08-01 23:20 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2020-08-01 23:20 UTC (permalink / raw
  To: gentoo-commits

commit:     a2c26c5f84de2837eb10dcbe300d22b6e6bc3599
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 18:45:57 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 23:19:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c26c5f

net-firewall/firewalld: Drop python2_7

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r3.ebuild | 2 +-
 net-firewall/firewalld/firewalld-0.7.3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
index 28feae85d15..f3dffe12669 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"

diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
index 8f68175271d..2b79e871a7b 100644
--- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-03-21 14:44 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2020-03-21 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     47c7b978fde49799a24ebc0872c820caacb0dd45
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 14:43:33 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 14:44:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c7b978

net-firewall/firewalld: fix ipset path

Closes: https://bugs.gentoo.org/713658
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/Manifest                    |   1 -
 net-firewall/firewalld/firewalld-0.6.3-r1.ebuild   | 102 ---------------------
 net-firewall/firewalld/firewalld-0.7.1-r1.ebuild   | 101 --------------------
 ...d-0.7.1-r2.ebuild => firewalld-0.7.1-r3.ebuild} |   2 +-
 ...alld-0.7.3.ebuild => firewalld-0.7.3-r1.ebuild} |   2 +-
 5 files changed, 2 insertions(+), 206 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index a8be639b1e7..e07f1e31102 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,2 @@
-DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
 DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f

diff --git a/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
deleted file mode 100644
index 3035cef8c28..00000000000
--- a/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	|| ( net-firewall/ebtables net-firewall/iptables[nftables] )
-	net-firewall/iptables[ipv6]
-	net-firewall/ipset
-	net-firewall/nftables
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
-		)
-	')"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		--with-nft="${EPREFIX}/sbin/nft" \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/" || die
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
deleted file mode 100644
index af7ce3dfdc2..00000000000
--- a/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit autotools bash-completion-r1 gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	net-firewall/iptables[ipv6]
-	|| ( net-firewall/iptables[nftables] net-firewall/ebtables )
-	net-firewall/ipset
-	net-firewall/nftables
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
-		)
-	')"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		--with-nft="${EPREFIX}/sbin/nft" \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/" || die
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
similarity index 98%
rename from net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
rename to net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
index fef6cc88e2a..28feae85d15 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
@@ -76,7 +76,7 @@ src_configure() {
 		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
 		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
 		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/sbin/ipset")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
 		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
 		--with-bashcompletiondir="$(get_bashcompdir)"
 	)

diff --git a/net-firewall/firewalld/firewalld-0.7.3.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
similarity index 98%
rename from net-firewall/firewalld/firewalld-0.7.3.ebuild
rename to net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
index ff392560d7c..8f68175271d 100644
--- a/net-firewall/firewalld/firewalld-0.7.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
@@ -76,7 +76,7 @@ src_configure() {
 		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
 		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
 		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/sbin/ipset")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
 		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
 		--with-bashcompletiondir="$(get_bashcompdir)"
 	)


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-03-18 11:04 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2020-03-18 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     175fd848ef43cedff9340ad436a24c0456c4545d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 11:03:25 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 11:03:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175fd848

net-firewall/firewalld: x86 stable wrt bug #713066

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
index 9c27a3bc493..fef6cc88e2a 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-03-18 11:00 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2020-03-18 11:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e1109294956562ca308ee35881d7fde872cb9647
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 11:00:03 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 11:00:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1109294

net-firewall/firewalld: amd64 stable wrt bug #713066

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
index ff392560d7c..9c27a3bc493 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="gui +nftables +iptables"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-03-18  0:12 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2020-03-18  0:12 UTC (permalink / raw
  To: gentoo-commits

commit:     c28e2fc3e92ec0b5f40ad58b14ee1860e87cb78e
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 00:10:38 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 00:12:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28e2fc3

net-firewall/firewalld: fix QA warnings

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r2.ebuild | 2 +-
 net-firewall/firewalld/firewalld-0.7.3.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
index 6d61ab3a74f..ff392560d7c 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
 		net-firewall/iptables[ipv6]
 		net-firewall/ebtables
 		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables] )
+		nftables? ( net-firewall/nftables[xtables(+)] )
 	)
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	$(python_gen_cond_dep '

diff --git a/net-firewall/firewalld/firewalld-0.7.3.ebuild b/net-firewall/firewalld/firewalld-0.7.3.ebuild
index 6d61ab3a74f..ff392560d7c 100644
--- a/net-firewall/firewalld/firewalld-0.7.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
 		net-firewall/iptables[ipv6]
 		net-firewall/ebtables
 		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables] )
+		nftables? ( net-firewall/nftables[xtables(+)] )
 	)
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	$(python_gen_cond_dep '


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-03-17 21:11 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2020-03-17 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b880c642d5eb94346b4d92c246a9ea727697e382
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 21:11:34 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 21:11:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b880c642

net-firewall/firewalld: fix refactoring screwup

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r2.ebuild | 3 ++-
 net-firewall/firewalld/firewalld-0.7.3.ebuild    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
index 2c9f20c7fd3..6d61ab3a74f 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
@@ -18,11 +18,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables[iptables?] )
+	nftables? ( net-firewall/nftables )
 	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 '

diff --git a/net-firewall/firewalld/firewalld-0.7.3.ebuild b/net-firewall/firewalld/firewalld-0.7.3.ebuild
index 2c9f20c7fd3..6d61ab3a74f 100644
--- a/net-firewall/firewalld/firewalld-0.7.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3.ebuild
@@ -18,11 +18,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	!!net-firewall/gshield
-	nftables? ( net-firewall/nftables[iptables?] )
+	nftables? ( net-firewall/nftables )
 	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 '


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-03-17 21:08 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2020-03-17 21:08 UTC (permalink / raw
  To: gentoo-commits

commit:     fd6a1c15738d05473d1c90adc04f89ec3ffe1543
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 19:12:36 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 21:07:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6a1c15

net-firewall/firewalld: update 0.7.1 package as well

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r2.ebuild | 111 +++++++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
new file mode 100644
index 00000000000..6e94cdf1e28
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gui +nftables +iptables"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	nftables? ( net-firewall/nftables[iptables?] )
+	iptables? (
+		net-firewall/iptables[ipv6]
+		net-firewall/ebtables
+		net-firewall/ipset
+	)
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	l10n_find_plocales_changes "po" "" ".po"
+	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with nftables nft "${EPREFIX}/sbin/nft")
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/" || die
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-03-17 21:08 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2020-03-17 21:08 UTC (permalink / raw
  To: gentoo-commits

commit:     b9221764772881ddd13f5fb603a2187041f8b8f7
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 19:40:06 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 21:07:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9221764

net-firewall/firewalld: remove superfluous kernel checks

Closes: https://bugs.gentoo.org/692944
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1-r2.ebuild | 8 +++++++-
 net-firewall/firewalld/firewalld-0.7.3.ebuild    | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
index 6e94cdf1e28..2c9f20c7fd3 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild
@@ -45,7 +45,13 @@ RESTRICT="test" # bug 650760
 PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
 
 pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
 	linux-info_pkg_setup
 }
 

diff --git a/net-firewall/firewalld/firewalld-0.7.3.ebuild b/net-firewall/firewalld/firewalld-0.7.3.ebuild
index 6e94cdf1e28..2c9f20c7fd3 100644
--- a/net-firewall/firewalld/firewalld-0.7.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3.ebuild
@@ -45,7 +45,13 @@ RESTRICT="test" # bug 650760
 PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
 
 pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
 	linux-info_pkg_setup
 }
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-03-17 21:08 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2020-03-17 21:08 UTC (permalink / raw
  To: gentoo-commits

commit:     18bfd37decfb73f79f113fdb70b010f263625843
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 18:44:53 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 21:07:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18bfd37d

net-firewall/firewalld: version bump to 0.73

Also fix dependencies and add USE=+nftables

 - The iptables (ip6tables, ebtables, ipset) backend for firewalld is
   nowadays entirely optional. Thus add a use flags to control which
   backend is used and configured at compile time.

   This allows to drop iptables from the set of installed packages
   alltogether.

 - In case both, xtables and nftables are set also depend on
   nftables[xtables].

 - install locales

Closes: https://bugs.gentoo.org/670932
Closes: https://bugs.gentoo.org/709856
Bug: https://bugs.gentoo.org/703322
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-0.7.3.ebuild | 111 ++++++++++++++++++++++++++
 net-firewall/firewalld/metadata.xml           |   4 +
 3 files changed, 116 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 7d22e200d99..a8be639b1e7 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
+DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f

diff --git a/net-firewall/firewalld/firewalld-0.7.3.ebuild b/net-firewall/firewalld/firewalld-0.7.3.ebuild
new file mode 100644
index 00000000000..6e94cdf1e28
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.7.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gui +nftables +iptables"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	nftables? ( net-firewall/nftables[iptables?] )
+	iptables? (
+		net-firewall/iptables[ipv6]
+		net-firewall/ebtables
+		net-firewall/ipset
+	)
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	l10n_find_plocales_changes "po" "" ".po"
+	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with nftables nft "${EPREFIX}/sbin/nft")
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/" || die
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}

diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 121cd46cb5e..96b274a47c9 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -5,4 +5,8 @@
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
+	<use>
+		<flag name="nftables">Add support for <pkg>net-firewall/nftables</pkg> as firewall backend</flag>
+		<flag name="iptables">Add support for <pkg>net-firewall/nftables</pkg> as firewall backend</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2020-01-12 11:14 David Seifert
  0 siblings, 0 replies; 178+ messages in thread
From: David Seifert @ 2020-01-12 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     918024f0f99600c8ea9282f81e2324bcee88382d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 11:13:29 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 11:13:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918024f0

net-firewall/firewalld: Remove local USE="gui"

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-firewall/firewalld/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 1d49811fa2b..121cd46cb5e 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -5,7 +5,4 @@
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
-	<use>
-		<flag name="gui">Builds and installs GUI configurator and GTK+ applet</flag>
-	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2019-12-28 21:32 Georgy Yakovlev
  0 siblings, 0 replies; 178+ messages in thread
From: Georgy Yakovlev @ 2019-12-28 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     643a66446d9d7f2dd237f371d28816641fcb6a32
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 21:16:17 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 21:32:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643a6644

net-firewall/firewalld: keyword 0.7.1 on ~ppc64

Bug: https://bugs.gentoo.org/679888
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.7.1.ebuild b/net-firewall/firewalld/firewalld-0.7.1.ebuild
index 275e832e380..58b06e8a4a9 100644
--- a/net-firewall/firewalld/firewalld-0.7.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2019-07-28 19:39 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2019-07-28 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     3e4b9b6680b970cf56332db7564a50188060c43c
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 19:16:49 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 19:38:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4b9b66

net-firewall/firewalld: drop old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/Manifest                  |   1 -
 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 107 -----------------------
 2 files changed, 108 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index e3eec6989bf..7d22e200d99 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,2 @@
-DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68

diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
deleted file mode 100644
index 7f2c39160ee..00000000000
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit autotools gnome2-utils python-r1 systemd bash-completion-r1
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	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]
-	net-firewall/ipset
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-PATCHES=( "${FILESDIR}"/${P}-errorcodes{1,2}.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	# manually split up the installation to avoid "file already exists" errors
-	emake -C config DESTDIR="${D}" install
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/" || die
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2019-07-28 19:39 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2019-07-28 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     462148526c28d28f20a393b30adf565d9c91308a
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 19:14:44 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 19:37:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46214852

net-firewall/firewalld: version bump to 0.7.1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |  1 +
 net-firewall/firewalld/firewalld-0.7.1.ebuild | 99 +++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index ab80ac82657..e3eec6989bf 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
+DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68

diff --git a/net-firewall/firewalld/firewalld-0.7.1.ebuild b/net-firewall/firewalld/firewalld-0.7.1.ebuild
new file mode 100644
index 00000000000..275e832e380
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.7.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools bash-completion-r1 gnome2-utils linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	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/iptables[ipv6]
+	|| ( net-firewall/iptables[nftables] net-firewall/ebtables )
+	net-firewall/ipset
+	net-firewall/nftables
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	gui? (
+		x11-libs/gtk+:3
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EPREFIX}/sbin/iptables" \
+		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+		--with-ebtables="${EPREFIX}/sbin/ebtables" \
+		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-nft="${EPREFIX}/sbin/nft" \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/" || die
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2019-07-28 19:39 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2019-07-28 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     6d8a9c901755ad38c1fdd98116a9104fdfc15d78
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 19:16:20 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 19:37:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d8a9c90

net-firewall/firewalld: fix dependency deadlock

Let's relax the dependency on ebtables a bit

Closes: https://bugs.gentoo.org/679760
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index 6b6f2a4cd0b..cd1dbb2e527 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="${PYTHON_DEPS}
 	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/ebtables net-firewall/iptables[nftables] )
 	net-firewall/iptables[ipv6]
 	net-firewall/ipset
 	net-firewall/nftables


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2019-05-26 22:27 Thomas Deutschmann
  0 siblings, 0 replies; 178+ messages in thread
From: Thomas Deutschmann @ 2019-05-26 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     87cde6c3e076d36914241df7362293d6d4b78fff
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 22:19:27 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 26 22:26:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87cde6c3

net-firewall/firewalld: x86 stable (bug #686026)

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index 54ebdf788ba..6b6f2a4cd0b 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2019-05-20 11:07 Mikle Kolyada
  0 siblings, 0 replies; 178+ messages in thread
From: Mikle Kolyada @ 2019-05-20 11:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1298f7a92e2ada706f75e453e83922d23a3c7f9b
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 11:06:58 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 20 11:06:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1298f7a9

net-firewall/firewalld: amd64 stable wrt bug #686026

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-firewall/firewalld/firewalld-0.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index fad09052c3b..54ebdf788ba 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2019-04-08 20:21 Aaron Bauman
  0 siblings, 0 replies; 178+ messages in thread
From: Aaron Bauman @ 2019-04-08 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     9178d6d8b7fcfed7156f73513c6d7d209c05919f
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 20:16:57 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 20:16:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9178d6d8

net-firewall/firewalld: arm64 keyworded (bug #668906)

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-firewall/firewalld/firewalld-0.6.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index f652630c3f4..886b3829604 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-10-18 16:09 Matt Turner
  0 siblings, 0 replies; 178+ messages in thread
From: Matt Turner @ 2018-10-18 16:09 UTC (permalink / raw
  To: gentoo-commits

commit:     0c01b1416b517375835368eb4db0a06ea4e47a16
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 18 16:08:50 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 18 16:09:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c01b141

Revert "net-firewall/firewalld: Remove python3_7 support"

This reverts commit 9e929dfee2a7f4dd517531bb0e166c72dd11abf4.

I raced with Whissi who was adding python3.7 support to python-slip.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index 121172f7b67..f652630c3f4 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-10-18 16:07 Matt Turner
  0 siblings, 0 replies; 178+ messages in thread
From: Matt Turner @ 2018-10-18 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     9e929dfee2a7f4dd517531bb0e166c72dd11abf4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 18 16:06:06 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 18 16:07:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e929dfe

net-firewall/firewalld: Remove python3_7 support

I missed that a dependency (dev-python/python-slip) does not have
python3.7 support.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index f652630c3f4..121172f7b67 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-10-18  6:06 Matt Turner
  0 siblings, 0 replies; 178+ messages in thread
From: Matt Turner @ 2018-10-18  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     9bc30404e33094bb86191bf9ed3fccc04f41db6c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 18 06:05:39 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 18 06:06:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bc30404

net-firewall/firewalld-0.6.3: drop arm64 keywords

arm64 doesn't have a keyword on the new dependency,
net-firewall/nftables.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index fc1c2cde788..f652630c3f4 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-05-29 12:32 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2018-05-29 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     62cdd07e7918b9e3cd2468a2baf356f02c6ee0c3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 11:44:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 29 12:31:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62cdd07e

net-firewall/firewalld: Drop 0.4.3.3 (Qt4-based)

Closes: https://bugs.gentoo.org/649122
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-firewall/firewalld/Manifest                 |   1 -
 net-firewall/firewalld/firewalld-0.4.3.3.ebuild | 108 ------------------------
 2 files changed, 109 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index f07683c2650..867d62e1570 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1 @@
-DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be

diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
deleted file mode 100644
index 566a084ed4b..00000000000
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-#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://www.firewalld.org/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2
-	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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]
-	net-firewall/ipset
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-	)"
-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_user
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		"$(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
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart"
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/applications"
-		rm -rf "${D}/usr/share/icons"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-05-29 11:17 Thomas Deutschmann
  0 siblings, 0 replies; 178+ messages in thread
From: Thomas Deutschmann @ 2018-05-29 11:17 UTC (permalink / raw
  To: gentoo-commits

commit:     6dc5fbf8ac7e4c92fbebf297dcc43bc770a9a39b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 11:04:18 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue May 29 11:04:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc5fbf8

net-firewall/firewalld: x86 stable (bug #649122)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index 40e93d003c6..40994d87e22 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-05-27 19:54 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2018-05-27 19:54 UTC (permalink / raw
  To: gentoo-commits

commit:     9d82dbe0d0eeeb2c1c9859fefe7ce01f59426b2d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 19:16:22 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 27 19:53:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d82dbe0

net-firewall/firewalld: The only test run is broken w/o root access

Closes: https://bugs.gentoo.org/650760
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index fbfa9af7d4e..40e93d003c6 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext"
 
+RESTRICT="test" # bug 650760
+
 PATCHES=( "${FILESDIR}"/${P}-errorcodes{1,2}.patch )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-03-17 10:45 Mikle Kolyada
  0 siblings, 0 replies; 178+ messages in thread
From: Mikle Kolyada @ 2018-03-17 10:45 UTC (permalink / raw
  To: gentoo-commits

commit:     c233acaf154b2c24533c129c7de56360f6e61571
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 10:44:56 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 10:44:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c233acaf

net-firewall/firewalld: amd64 stable wrt bug #649122

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index d4c0320ae0b..fbfa9af7d4e 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-02-28 23:03 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2018-02-28 23:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b3b858110724cc3bf88b1048de07e56246f01033
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 23:02:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 23:02:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b85811

net-firewall/firewalld: Re-add current stable

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/firewalld/Manifest                 |   1 +
 net-firewall/firewalld/firewalld-0.4.3.3.ebuild | 108 ++++++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 867d62e1570..f07683c2650 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
+DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be

diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
new file mode 100644
index 00000000000..566a084ed4b
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+#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://www.firewalld.org/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2
+	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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]
+	net-firewall/ipset
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	gui? (
+		x11-libs/gtk+:3
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+	)"
+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_user
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EPREFIX}/sbin/iptables" \
+		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+		--with-ebtables="${EPREFIX}/sbin/ebtables" \
+		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		"$(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
+	emake -C po DESTDIR="${D}" install
+	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+
+	install_python() {
+		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${D}/usr/sbin/firewalld"
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/"
+	rm -rf "${D}/etc/sysconfig/"
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart"
+		rm -f "${D}/usr/bin/firewall-applet"
+		rm -f "${D}/usr/bin/firewall-config"
+		rm -rf "${D}/usr/share/applications"
+		rm -rf "${D}/usr/share/icons"
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-02-28 22:21 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2018-02-28 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     132f3e63776ee78036fbe6f2485e5c6d5e8e7f87
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 21:36:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 22:20:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132f3e63

net-firewall/firewalld: Drop unnecessary eutils,multilib

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index 63f66354740..e5156d9770f 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1
+inherit autotools gnome2-utils python-r1 systemd bash-completion-r1
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-02-28 22:21 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2018-02-28 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     0b22104cee07531d5788fd97139dfa30a469a684
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 21:35:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 22:20:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b22104c

net-firewall/firewalld: Add missing || die

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index d0345b01e7c..63f66354740 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -72,16 +72,16 @@ src_install() {
 	python_replicate_script "${D}/usr/sbin/firewalld"
 
 	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
+	rm -rf "${D}/etc/rc.d/" || die
+	rm -rf "${D}/etc/sysconfig/" || die
 
 	# For non-gui installs we need to remove GUI bits
 	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart"
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/applications"
-		rm -rf "${D}/usr/share/icons"
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
 	fi
 
 	newinitd "${FILESDIR}"/firewalld.init firewalld


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-02-28 22:21 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2018-02-28 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     e42d52e1c1f4d13ef9689667f2ee280cbc2fb45a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 21:34:48 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 22:20:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42d52e1

net-firewall/firewalld: Depends on dev-python/PyQt5 not 4

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/firewalld/firewalld-0.5.1-r2.ebuild | 103 +++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
new file mode 100644
index 00000000000..d0345b01e7c
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+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://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	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]
+	net-firewall/ipset
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	gui? (
+		x11-libs/gtk+:3
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EPREFIX}/sbin/iptables" \
+		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+		--with-ebtables="${EPREFIX}/sbin/ebtables" \
+		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+	# manually split up the installation to avoid "file already exists" errors
+	emake -C config DESTDIR="${D}" install
+	emake -C po DESTDIR="${D}" install
+	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+
+	install_python() {
+		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${D}/usr/sbin/firewalld"
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/"
+	rm -rf "${D}/etc/sysconfig/"
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart"
+		rm -f "${D}/usr/bin/firewall-applet"
+		rm -f "${D}/usr/bin/firewall-config"
+		rm -rf "${D}/usr/share/applications"
+		rm -rf "${D}/usr/share/icons"
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-02-28 22:21 Andreas Sturmlechner
  0 siblings, 0 replies; 178+ messages in thread
From: Andreas Sturmlechner @ 2018-02-28 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     38f8fa95b10b471388121559841eddfa09415a9f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 21:40:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 22:20:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f8fa95

net-firewall/firewalld: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/firewalld/Manifest                  |   1 -
 net-firewall/firewalld/firewalld-0.4.3.3.ebuild  | 108 -----------------------
 net-firewall/firewalld/firewalld-0.5.1-r1.ebuild | 103 ---------------------
 3 files changed, 212 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index f07683c2650..867d62e1570 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1 @@
-DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be

diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
deleted file mode 100644
index e270b3f02b3..00000000000
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-#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://www.firewalld.org/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2
-	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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]
-	net-firewall/ipset
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-	)"
-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_user
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		"$(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
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart"
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/applications"
-		rm -rf "${D}/usr/share/icons"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild
deleted file mode 100644
index 516a0ba3d63..00000000000
--- a/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-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://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	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]
-	net-firewall/ipset
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	# manually split up the installation to avoid "file already exists" errors
-	emake -C config DESTDIR="${D}" install
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart"
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/applications"
-		rm -rf "${D}/usr/share/icons"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-02-12 17:05 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2018-02-12 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     f0e2f6d6e4e595d136355da429a1ea560d72a17c
Author:     Luigi 'Comio' Mantellini <luigi.mantellini <AT> gmail <DOT> com>
AuthorDate: Mon Feb 12 10:16:48 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 17:05:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e2f6d6

net-firewall/firewalld: Store sources file as ${P}.tar.gz

Closes: https://bugs.gentoo.org/647400
Closes: https://github.com/gentoo/gentoo/pull/7162
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-firewall/firewalld/Manifest                                         | 2 +-
 .../firewalld/{firewalld-0.5.1.ebuild => firewalld-0.5.1-r1.ebuild}     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 5ef4b8972e4..f07683c2650 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,2 @@
 DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
-DIST v0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
+DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be

diff --git a/net-firewall/firewalld/firewalld-0.5.1.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild
similarity index 97%
rename from net-firewall/firewalld/firewalld-0.5.1.ebuild
rename to net-firewall/firewalld/firewalld-0.5.1-r1.ebuild
index b7ec698900e..516a0ba3d63 100644
--- a/net-firewall/firewalld/firewalld-0.5.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2018-02-12  3:05 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2018-02-12  3:05 UTC (permalink / raw
  To: gentoo-commits

commit:     2a63cd0274d0e9bd4fc1ff444eb2b9e3c34865d3
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 02:50:02 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 03:05:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a63cd02

net-firewall/firewalld: version bump to 0.5.1

Closes: https://bugs.gentoo.org/616146
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-0.5.1.ebuild | 103 ++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 8efc9fdfc9b..5ef4b8972e4 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
 DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
+DIST v0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be

diff --git a/net-firewall/firewalld/firewalld-0.5.1.ebuild b/net-firewall/firewalld/firewalld-0.5.1.ebuild
new file mode 100644
index 00000000000..b7ec698900e
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.5.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+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://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	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]
+	net-firewall/ipset
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	gui? (
+		x11-libs/gtk+:3
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EPREFIX}/sbin/iptables" \
+		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+		--with-ebtables="${EPREFIX}/sbin/ebtables" \
+		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+	# manually split up the installation to avoid "file already exists" errors
+	emake -C config DESTDIR="${D}" install
+	emake -C po DESTDIR="${D}" install
+	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+
+	install_python() {
+		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${D}/usr/sbin/firewalld"
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/"
+	rm -rf "${D}/etc/sysconfig/"
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart"
+		rm -f "${D}/usr/bin/firewall-applet"
+		rm -f "${D}/usr/bin/firewall-config"
+		rm -rf "${D}/usr/share/applications"
+		rm -rf "${D}/usr/share/icons"
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2017-07-12 14:43 Pacho Ramos
  0 siblings, 0 replies; 178+ messages in thread
From: Pacho Ramos @ 2017-07-12 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2e5b5af95be7bb852a6b5c8f4e4cd0b0be980471
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 13:58:40 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 14:42:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5b5af9

net-firewall/firewalld: Support newer python

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-firewall/firewalld/firewalld-0.4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
index 20fda9981aa..e270b3f02b3 100644
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 #BACKPORTS=
 
 inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2017-07-08 13:19 Alexis Ballier
  0 siblings, 0 replies; 178+ messages in thread
From: Alexis Ballier @ 2017-07-08 13:19 UTC (permalink / raw
  To: gentoo-commits

commit:     1aef8e323e8c4f6ed38b21860efaf2adad7b471c
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 12:57:43 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 13:19:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aef8e32

net-firewall/firewalld: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-firewall/firewalld/firewalld-0.4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
index 9256aa6700a..20fda9981aa 100644
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-09-29  8:40 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2016-09-29  8:40 UTC (permalink / raw
  To: gentoo-commits

commit:     9c70071a11dbabbcbc43f067e73793fff3e6cc69
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 08:39:33 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 08:39:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c70071a

net-firewall/firewalld: x86 stable wrt bug #591458

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
index 680d705..9bf9047 100644
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gui"
 
 RDEPEND="${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-08-18 14:53 Agostino Sarubbo
  0 siblings, 0 replies; 178+ messages in thread
From: Agostino Sarubbo @ 2016-08-18 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     0704be90a7d62bab143dff18f9e828163cd1f044
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 14:53:33 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 14:53:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0704be90

net-firewall/firewalld: amd64 stable wrt bug #591458

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/firewalld/firewalld-0.4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
index ced9890..680d705 100644
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gui"
 
 RDEPEND="${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-08-17 13:52 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2016-08-17 13:52 UTC (permalink / raw
  To: gentoo-commits

commit:     fa9ddf5093c3c25d62058128b868307b04dfe059
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:43:47 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 13:52:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9ddf50

net-firewall/firewalld: version bump to 0.4.3.3 (CVE-2016-5410), bug #591458

Version 0.4.3.3 contains upstream fixes for CVE-2016-5410

Package-Manager: portage-2.2.28

 net-firewall/firewalld/Manifest                 |   1 +
 net-firewall/firewalld/firewalld-0.4.3.3.ebuild | 108 ++++++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 8619bd5..d63f2bd 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1,3 @@
 DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
 DIST firewalld-0.4.2.tar.bz2 649581 SHA256 329e44b7d8de2400222d602d6c87c368865531ffe4004c392803dbe55717068e SHA512 4e1ad32878393beaec70f91f462785c99464ce3ec610b68b20862af2bbb631b1bcffd0e68cff441944d5e272d63051dc783a7f5c0256c7a191e2340dab8f29a2 WHIRLPOOL 01b8928d9b570b70a358c68a2220712b329aace9c52905cc5420e9881575660c44b395d1b5f1ffc2550d74bcf42939db0a66fa9bdc02cb1d95959ab7a50072cd
+DIST firewalld-0.4.3.3.tar.bz2 679617 SHA256 e57d851e4f1aa65927e055d3e73b7a29a5ae37de51671ce1885e030fe6e0b6d4 SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a WHIRLPOOL 89077aefa28752e51472510bc5080c61e1f6051062efd4aaac08c8a60879b1c3d00db9d9ad7c33d8a49d8868fb9796c0bf945c869a470380f9e2ab017c45ab41

diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
new file mode 100644
index 0000000..ced9890
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 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://www.firewalld.org/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${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]
+	net-firewall/ipset
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	gui? (
+		x11-libs/gtk+:3
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+	)"
+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_user
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EROOT}/sbin/iptables" \
+		--with-ip6tables="${EROOT}/sbin/ip6tables" \
+		--with-iptables_restore="${EROOT}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EROOT}/sbin/ip6tables-restore" \
+		--with-ebtables="${EROOT}/sbin/ebtables" \
+		--with-ebtables_restore="${EROOT}/sbin/ebtables-restore" \
+		"$(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
+	emake -C po DESTDIR="${D}" install
+	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+
+	install_python() {
+		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${D}/usr/sbin/firewalld"
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/"
+	rm -rf "${D}/etc/sysconfig/"
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart"
+		rm -f "${D}/usr/bin/firewall-applet"
+		rm -f "${D}/usr/bin/firewall-config"
+		rm -rf "${D}/usr/share/applications"
+		rm -rf "${D}/usr/share/icons"
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-08-17 13:52 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2016-08-17 13:52 UTC (permalink / raw
  To: gentoo-commits

commit:     997165cd4bf00585c5579a29997d2246786c8dfd
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:44:32 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 13:52:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=997165cd

net-firewall/firewalld: drop vulnerable 0.4.2-r1, bug #591458

Package-Manager: portage-2.2.28

 net-firewall/firewalld/Manifest                  |   1 -
 net-firewall/firewalld/firewalld-0.4.2-r1.ebuild | 108 -----------------------
 2 files changed, 109 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index d63f2bd..9e5426e 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,2 @@
 DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
-DIST firewalld-0.4.2.tar.bz2 649581 SHA256 329e44b7d8de2400222d602d6c87c368865531ffe4004c392803dbe55717068e SHA512 4e1ad32878393beaec70f91f462785c99464ce3ec610b68b20862af2bbb631b1bcffd0e68cff441944d5e272d63051dc783a7f5c0256c7a191e2340dab8f29a2 WHIRLPOOL 01b8928d9b570b70a358c68a2220712b329aace9c52905cc5420e9881575660c44b395d1b5f1ffc2550d74bcf42939db0a66fa9bdc02cb1d95959ab7a50072cd
 DIST firewalld-0.4.3.3.tar.bz2 679617 SHA256 e57d851e4f1aa65927e055d3e73b7a29a5ae37de51671ce1885e030fe6e0b6d4 SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a WHIRLPOOL 89077aefa28752e51472510bc5080c61e1f6051062efd4aaac08c8a60879b1c3d00db9d9ad7c33d8a49d8868fb9796c0bf945c869a470380f9e2ab017c45ab41

diff --git a/net-firewall/firewalld/firewalld-0.4.2-r1.ebuild b/net-firewall/firewalld/firewalld-0.4.2-r1.ebuild
deleted file mode 100644
index ced9890..0000000
--- a/net-firewall/firewalld/firewalld-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 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://www.firewalld.org/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${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]
-	net-firewall/ipset
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-	)"
-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_user
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EROOT}/sbin/iptables" \
-		--with-ip6tables="${EROOT}/sbin/ip6tables" \
-		--with-iptables_restore="${EROOT}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EROOT}/sbin/ip6tables-restore" \
-		--with-ebtables="${EROOT}/sbin/ebtables" \
-		--with-ebtables_restore="${EROOT}/sbin/ebtables-restore" \
-		"$(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
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart"
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/applications"
-		rm -rf "${D}/usr/share/icons"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-07-28  2:31 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2016-07-28  2:31 UTC (permalink / raw
  To: gentoo-commits

commit:     bdbdb25690ae686cdb5316b5cf572389f8ba6e34
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 02:30:07 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 02:31:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbdb256

net-firewall/firewalld: Do not install /etc/xdg/autostart/* for -gui; #568844

Package-Manager: portage-2.2.28

 net-firewall/firewalld/firewalld-0.3.13.ebuild                         | 1 +
 .../firewalld/{firewalld-0.4.2.ebuild => firewalld-0.4.2-r1.ebuild}    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.3.13.ebuild b/net-firewall/firewalld/firewalld-0.3.13.ebuild
index ac99242..091ee2c 100644
--- a/net-firewall/firewalld/firewalld-0.3.13.ebuild
+++ b/net-firewall/firewalld/firewalld-0.3.13.ebuild
@@ -73,6 +73,7 @@ src_install() {
 
 	# For non-gui installs we need to remove GUI bits
 	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart"
 		rm -f "${D}/usr/bin/firewall-applet"
 		rm -f "${D}/usr/bin/firewall-config"
 		rm -rf "${D}/usr/share/icons"

diff --git a/net-firewall/firewalld/firewalld-0.4.2.ebuild b/net-firewall/firewalld/firewalld-0.4.2-r1.ebuild
similarity index 98%
rename from net-firewall/firewalld/firewalld-0.4.2.ebuild
rename to net-firewall/firewalld/firewalld-0.4.2-r1.ebuild
index 7fa5f1d..ced9890 100644
--- a/net-firewall/firewalld/firewalld-0.4.2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.4.2-r1.ebuild
@@ -82,10 +82,11 @@ src_install() {
 
 	# For non-gui installs we need to remove GUI bits
 	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart"
 		rm -f "${D}/usr/bin/firewall-applet"
 		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/icons"
 		rm -rf "${D}/usr/share/applications"
+		rm -rf "${D}/usr/share/icons"
 	fi
 
 	newinitd "${FILESDIR}"/firewalld.init firewalld


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-06-01 16:45 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2016-06-01 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f054a0b1177c87639d9eeb84db3f1660fe45ee2f
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 16:45:21 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 16:45:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f054a0b1

net-firewall/firewalld: remove old versions 0.3.14.2, and 0.4.0

Package-Manager: portage-2.2.28

 net-firewall/firewalld/Manifest                  |  2 -
 net-firewall/firewalld/firewalld-0.3.14.2.ebuild | 97 ------------------------
 net-firewall/firewalld/firewalld-0.4.0.ebuild    | 97 ------------------------
 3 files changed, 196 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index d211a6f..8619bd5 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1,2 @@
 DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
-DIST firewalld-0.3.14.2.tar.bz2 617592 SHA256 4b6c3e1deab41b6002b8dc25639e466085941c98a6c14a56bef4f621a5651567 SHA512 18d57ca4501101b217b0854851f6bf18b5bd036e1e143ef1b3c2b97ef06e0cbb7399249f4904576381c9839a82ff51296f44f4520c7b221568c9e4518e593d8c WHIRLPOOL a00930a63dab654f64caac0deb5c24a28f5aa7c9882ca40bde642b9b765c9eeb81a582dcf015885b989543d4c85f6da6dc792c6532a844d87110bda2aa9a598f
-DIST firewalld-0.4.0.tar.bz2 603881 SHA256 858dca878c65853dec9044e3531a7ee4cd00a1766c268c354eb3480fe6e14914 SHA512 7ebb220e919619927c72faa04f1831ff679fdaecec3dd66ba58222a83c235f53acdaf7ec5bb6fe17d782e5e22a2525abbe27a3e6c7d4e32b16be15dd5bca2b7e WHIRLPOOL c189c26f49798f623699583a1a7470834491ca36d79a7fb5e9e6affb1f98c83edc362fcb6ecef46a25bf24b4bcd5336963e2ff4b2c643d0ed7cf876991711d8c
 DIST firewalld-0.4.2.tar.bz2 649581 SHA256 329e44b7d8de2400222d602d6c87c368865531ffe4004c392803dbe55717068e SHA512 4e1ad32878393beaec70f91f462785c99464ce3ec610b68b20862af2bbb631b1bcffd0e68cff441944d5e272d63051dc783a7f5c0256c7a191e2340dab8f29a2 WHIRLPOOL 01b8928d9b570b70a358c68a2220712b329aace9c52905cc5420e9881575660c44b395d1b5f1ffc2550d74bcf42939db0a66fa9bdc02cb1d95959ab7a50072cd

diff --git a/net-firewall/firewalld/firewalld-0.3.14.2.ebuild b/net-firewall/firewalld/firewalld-0.3.14.2.ebuild
deleted file mode 100644
index 30d8748..0000000
--- a/net-firewall/firewalld/firewalld-0.3.14.2.ebuild
+++ /dev/null
@@ -1,97 +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_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
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/icons"
-		rm -rf "${D}/usr/share/applications"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/net-firewall/firewalld/firewalld-0.4.0.ebuild b/net-firewall/firewalld/firewalld-0.4.0.ebuild
deleted file mode 100644
index c6348f6..0000000
--- a/net-firewall/firewalld/firewalld-0.4.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 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_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
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/icons"
-		rm -rf "${D}/usr/share/applications"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-06-01 16:45 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2016-06-01 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     491a398cc74ccf883132058d70138985a0a3ebf5
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 16:41:59 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 16:41:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491a398c

net-firewall/firewalld: add dependency on net-firewall/ipset, bug #576824

Package-Manager: portage-2.2.28

 net-firewall/firewalld/firewalld-0.4.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-firewall/firewalld/firewalld-0.4.2.ebuild b/net-firewall/firewalld/firewalld-0.4.2.ebuild
index 112ffe5..7fa5f1d 100644
--- a/net-firewall/firewalld/firewalld-0.4.2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.4.2.ebuild
@@ -25,6 +25,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	net-firewall/ebtables
 	net-firewall/iptables[ipv6]
+	net-firewall/ipset
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	gui? (
 		x11-libs/gtk+:3


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-05-31 22:09 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2016-05-31 22:09 UTC (permalink / raw
  To: gentoo-commits

commit:     b75ad60e79650e4db9e7f4fb6e1d78100409cdbb
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 21:32:40 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue May 31 22:09:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b75ad60e

net-firewall/firewalld: drop old

Package-Manager: portage-2.2.28

 net-firewall/firewalld/Manifest                |  1 -
 net-firewall/firewalld/firewalld-0.3.10.ebuild | 98 --------------------------
 2 files changed, 99 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 331a94c..3273e4a 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1,3 @@
-DIST firewalld-0.3.10.tar.bz2 548013 SHA256 0f5e051655fc06690f5ab72b1b38cb57b4368e49bd5ad98a27e2f88c79e82f2b SHA512 3fb3363959203d90d51b2c9b7b7819a4f3521a51a10a59d73d65054018e1fe90d0fdd2e31d0b83a3d38e2b2fd6e92fccd6dd2a30ec7f1be3f98a018a5a49aeac WHIRLPOOL fc6d1ceeb4e5ba91b072526ffa2dd7a790d883176104bec6e7e547b9035757ff22743746389f50edd32d646a07e9bf311b109f89b8c59acfa350e71176d0bd3c
 DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
 DIST firewalld-0.3.14.2.tar.bz2 617592 SHA256 4b6c3e1deab41b6002b8dc25639e466085941c98a6c14a56bef4f621a5651567 SHA512 18d57ca4501101b217b0854851f6bf18b5bd036e1e143ef1b3c2b97ef06e0cbb7399249f4904576381c9839a82ff51296f44f4520c7b221568c9e4518e593d8c WHIRLPOOL a00930a63dab654f64caac0deb5c24a28f5aa7c9882ca40bde642b9b765c9eeb81a582dcf015885b989543d4c85f6da6dc792c6532a844d87110bda2aa9a598f
 DIST firewalld-0.4.0.tar.bz2 603881 SHA256 858dca878c65853dec9044e3531a7ee4cd00a1766c268c354eb3480fe6e14914 SHA512 7ebb220e919619927c72faa04f1831ff679fdaecec3dd66ba58222a83c235f53acdaf7ec5bb6fe17d782e5e22a2525abbe27a3e6c7d4e32b16be15dd5bca2b7e WHIRLPOOL c189c26f49798f623699583a1a7470834491ca36d79a7fb5e9e6affb1f98c83edc362fcb6ecef46a25bf24b4bcd5336963e2ff4b2c643d0ed7cf876991711d8c

diff --git a/net-firewall/firewalld/firewalld-0.3.10.ebuild b/net-firewall/firewalld/firewalld-0.3.10.ebuild
deleted file mode 100644
index d5cd87f..0000000
--- a/net-firewall/firewalld/firewalld-0.3.10.ebuild
+++ /dev/null
@@ -1,98 +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=190680ba
-
-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}/${P}-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
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/icons"
-		rm -rf "${D}/usr/share/applications"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-05-31 22:09 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2016-05-31 22:09 UTC (permalink / raw
  To: gentoo-commits

commit:     51974284ae619ce2b1f1b64d86da5e752c9350ec
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 21:29:33 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue May 31 22:09:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51974284

net-firewall/firewalld: drop explicit maintainership

We will continue maintaining this package through the virtualization project.

Package-Manager: portage-2.2.28

 net-firewall/firewalld/metadata.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 53f7df8..1d49811 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-		<description>Please assign bugs to me</description>
-	</maintainer>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-05-31 22:09 Matthias Maier
  0 siblings, 0 replies; 178+ messages in thread
From: Matthias Maier @ 2016-05-31 22:09 UTC (permalink / raw
  To: gentoo-commits

commit:     793b24acc338d0ee04959bced8ccea400f3b6cf1
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 22:08:50 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue May 31 22:09:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793b24ac

net-firewall/firewalld: version bump to 0.42, multiple fixes

This commit also fixes

  - bug #573648: incorrect path to iptables and family
  - bug #581760: update homepage
  - bug #566772: missing dependency dev-python/PyQt4

Package-Manager: portage-2.2.28

 net-firewall/firewalld/Manifest               |   1 +
 net-firewall/firewalld/firewalld-0.4.2.ebuild | 106 ++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 3273e4a..d211a6f 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,4 @@
 DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
 DIST firewalld-0.3.14.2.tar.bz2 617592 SHA256 4b6c3e1deab41b6002b8dc25639e466085941c98a6c14a56bef4f621a5651567 SHA512 18d57ca4501101b217b0854851f6bf18b5bd036e1e143ef1b3c2b97ef06e0cbb7399249f4904576381c9839a82ff51296f44f4520c7b221568c9e4518e593d8c WHIRLPOOL a00930a63dab654f64caac0deb5c24a28f5aa7c9882ca40bde642b9b765c9eeb81a582dcf015885b989543d4c85f6da6dc792c6532a844d87110bda2aa9a598f
 DIST firewalld-0.4.0.tar.bz2 603881 SHA256 858dca878c65853dec9044e3531a7ee4cd00a1766c268c354eb3480fe6e14914 SHA512 7ebb220e919619927c72faa04f1831ff679fdaecec3dd66ba58222a83c235f53acdaf7ec5bb6fe17d782e5e22a2525abbe27a3e6c7d4e32b16be15dd5bca2b7e WHIRLPOOL c189c26f49798f623699583a1a7470834491ca36d79a7fb5e9e6affb1f98c83edc362fcb6ecef46a25bf24b4bcd5336963e2ff4b2c643d0ed7cf876991711d8c
+DIST firewalld-0.4.2.tar.bz2 649581 SHA256 329e44b7d8de2400222d602d6c87c368865531ffe4004c392803dbe55717068e SHA512 4e1ad32878393beaec70f91f462785c99464ce3ec610b68b20862af2bbb631b1bcffd0e68cff441944d5e272d63051dc783a7f5c0256c7a191e2340dab8f29a2 WHIRLPOOL 01b8928d9b570b70a358c68a2220712b329aace9c52905cc5420e9881575660c44b395d1b5f1ffc2550d74bcf42939db0a66fa9bdc02cb1d95959ab7a50072cd

diff --git a/net-firewall/firewalld/firewalld-0.4.2.ebuild b/net-firewall/firewalld/firewalld-0.4.2.ebuild
new file mode 100644
index 0000000..112ffe5
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.4.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 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://www.firewalld.org/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${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
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+	)"
+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_user
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EROOT}/sbin/iptables" \
+		--with-ip6tables="${EROOT}/sbin/ip6tables" \
+		--with-iptables_restore="${EROOT}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EROOT}/sbin/ip6tables-restore" \
+		--with-ebtables="${EROOT}/sbin/ebtables" \
+		--with-ebtables_restore="${EROOT}/sbin/ebtables-restore" \
+		"$(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
+	emake -C po DESTDIR="${D}" install
+	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+
+	install_python() {
+		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${D}/usr/sbin/firewalld"
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/"
+	rm -rf "${D}/etc/sysconfig/"
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -f "${D}/usr/bin/firewall-applet"
+		rm -f "${D}/usr/bin/firewall-config"
+		rm -rf "${D}/usr/share/icons"
+		rm -rf "${D}/usr/share/applications"
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
@ 2016-02-01 15:22 Doug Goldstein
  0 siblings, 0 replies; 178+ messages in thread
From: Doug Goldstein @ 2016-02-01 15:22 UTC (permalink / raw
  To: gentoo-commits

commit:     27cb1bf71ed7d2c6fe061bbb4ab798d1d1b527ba
Author:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 15:21:14 2016 +0000
Commit:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 15:22:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27cb1bf7

net-firewall/firewalld: version bump

Package-Manager: portage-2.2.26
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |  1 +
 net-firewall/firewalld/firewalld-0.4.0.ebuild | 97 +++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 0a1e1cf..331a94c 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1,4 @@
 DIST firewalld-0.3.10.tar.bz2 548013 SHA256 0f5e051655fc06690f5ab72b1b38cb57b4368e49bd5ad98a27e2f88c79e82f2b SHA512 3fb3363959203d90d51b2c9b7b7819a4f3521a51a10a59d73d65054018e1fe90d0fdd2e31d0b83a3d38e2b2fd6e92fccd6dd2a30ec7f1be3f98a018a5a49aeac WHIRLPOOL fc6d1ceeb4e5ba91b072526ffa2dd7a790d883176104bec6e7e547b9035757ff22743746389f50edd32d646a07e9bf311b109f89b8c59acfa350e71176d0bd3c
 DIST firewalld-0.3.13.tar.bz2 561948 SHA256 bca88cbce4290b6959b3c0eea560e7f19c7cf2f563caca585b7db5cd2fca8ac9 SHA512 987ea3e243f87b8ded2f9627b4efc9649a22d878d19b6b760ba1a281e9e7280abcda558feebe6bd30e1cd27e7277a8ec99a7da623c29f04ab290c1d7ac3d6789 WHIRLPOOL 795f63fa5415c37ea9c6a835860dca4eb71879d1d69fcd6fbb022d0c4b4ab507d74e0e17098724846bd97246be3a98fab1d25134df69c9ac25db2fb77508b159
 DIST firewalld-0.3.14.2.tar.bz2 617592 SHA256 4b6c3e1deab41b6002b8dc25639e466085941c98a6c14a56bef4f621a5651567 SHA512 18d57ca4501101b217b0854851f6bf18b5bd036e1e143ef1b3c2b97ef06e0cbb7399249f4904576381c9839a82ff51296f44f4520c7b221568c9e4518e593d8c WHIRLPOOL a00930a63dab654f64caac0deb5c24a28f5aa7c9882ca40bde642b9b765c9eeb81a582dcf015885b989543d4c85f6da6dc792c6532a844d87110bda2aa9a598f
+DIST firewalld-0.4.0.tar.bz2 603881 SHA256 858dca878c65853dec9044e3531a7ee4cd00a1766c268c354eb3480fe6e14914 SHA512 7ebb220e919619927c72faa04f1831ff679fdaecec3dd66ba58222a83c235f53acdaf7ec5bb6fe17d782e5e22a2525abbe27a3e6c7d4e32b16be15dd5bca2b7e WHIRLPOOL c189c26f49798f623699583a1a7470834491ca36d79a7fb5e9e6affb1f98c83edc362fcb6ecef46a25bf24b4bcd5336963e2ff4b2c643d0ed7cf876991711d8c

diff --git a/net-firewall/firewalld/firewalld-0.4.0.ebuild b/net-firewall/firewalld/firewalld-0.4.0.ebuild
new file mode 100644
index 0000000..c6348f6
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.4.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 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_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
+	emake -C po DESTDIR="${D}" install
+	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+
+	install_python() {
+		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${D}/usr/sbin/firewalld"
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/"
+	rm -rf "${D}/etc/sysconfig/"
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -f "${D}/usr/bin/firewall-applet"
+		rm -f "${D}/usr/bin/firewall-config"
+		rm -rf "${D}/usr/share/icons"
+		rm -rf "${D}/usr/share/applications"
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 178+ messages in thread

end of thread, other threads:[~2024-11-23 17:31 UTC | newest]

Thread overview: 178+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-31 16:38 [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/ Agostino Sarubbo
  -- strict thread matches above, loose matches on Subject: below --
2024-11-23 17:31 Andreas Sturmlechner
2024-10-29  2:45 Sam James
2024-10-05 11:12 Sam James
2024-10-05  1:14 Sam James
2024-09-18  8:10 Jakov Smolić
2024-08-26 11:51 Sam James
2024-07-24 11:53 Sam James
2024-07-21  2:17 Sam James
2024-07-21  0:31 Sam James
2024-07-21  0:31 Sam James
2024-06-24 17:34 Kenton Groombridge
2024-04-29 21:48 Sam James
2024-04-29 10:38 Joonas Niilola
2024-04-29 10:36 Joonas Niilola
2024-04-29  1:01 Sam James
2024-03-21  2:41 Sam James
2024-03-14 21:44 Sam James
2024-03-14  7:06 Joonas Niilola
2024-03-14  6:13 Sam James
2024-03-14  6:11 Sam James
2024-03-14  6:11 Sam James
2024-03-02 14:55 Arthur Zamarin
2024-03-02 13:59 Arthur Zamarin
2024-02-19 19:53 Dennis Lamm
2024-02-18 13:31 Sam James
2024-01-23  6:14 Sam James
2024-01-07 13:26 Sam James
2024-01-07 13:26 Sam James
2024-01-07  9:31 Sam James
2024-01-07  9:31 Sam James
2024-01-07  9:05 Sam James
2023-11-30  3:07 Sam James
2023-11-25  5:28 Sam James
2023-10-03 23:38 Sam James
2023-08-17  2:55 Sam James
2023-07-24  3:59 Sam James
2023-07-24  3:57 Sam James
2023-07-24  3:57 Sam James
2023-07-24  3:21 Sam James
2023-06-23 20:28 Sam James
2023-06-15 22:06 Sam James
2023-05-01 13:36 Sam James
2023-04-25  6:10 Jakov Smolić
2023-04-23 21:45 Sam James
2023-04-23  8:02 Sam James
2023-04-23  8:02 Sam James
2023-04-23  8:02 Sam James
2023-04-23  6:06 Sam James
2023-04-13 19:07 Sam James
2023-04-13 19:07 Sam James
2023-03-04 11:56 Arthur Zamarin
2023-03-04  7:47 Arthur Zamarin
2023-03-04  7:42 Arthur Zamarin
2023-03-04  6:27 Arthur Zamarin
2023-03-04  5:34 Arthur Zamarin
2023-01-13 17:32 Arthur Zamarin
2023-01-13 13:37 Arthur Zamarin
2023-01-13 12:17 Arthur Zamarin
2023-01-06  1:27 Sam James
2023-01-06  1:27 Sam James
2022-12-10  8:58 Joonas Niilola
2022-12-10  8:49 Joonas Niilola
2022-12-10  4:36 Sam James
2022-12-04  9:23 WANG Xuerui
2022-11-30  4:14 Sam James
2022-11-19 10:34 Arthur Zamarin
2022-11-19 10:34 Arthur Zamarin
2022-11-19 10:34 Arthur Zamarin
2022-10-31 16:41 Agostino Sarubbo
2022-10-29  5:47 Arthur Zamarin
2022-10-29  5:47 Arthur Zamarin
2022-10-29  5:47 Arthur Zamarin
2022-10-28 19:53 Sam James
2022-10-11  7:45 Joonas Niilola
2022-10-11  7:45 Joonas Niilola
2022-09-28 23:35 Sam James
2022-09-28 23:35 Sam James
2022-07-02 20:31 Sam James
2022-07-02 20:31 Sam James
2022-05-04 23:28 Sam James
2022-05-03 18:11 Arthur Zamarin
2022-05-03 17:52 Arthur Zamarin
2022-04-29 19:21 Sam James
2022-04-29  7:41 Joonas Niilola
2022-04-29  7:41 Joonas Niilola
2022-04-29  7:41 Joonas Niilola
2022-04-17 16:44 Sam James
2022-04-09 19:52 Arthur Zamarin
2022-04-05  2:37 Sam James
2022-04-04 18:28 Jakov Smolić
2022-04-04  6:37 Agostino Sarubbo
2022-04-04  6:37 Agostino Sarubbo
2022-03-26 21:21 Sam James
2022-03-12 12:31 Arthur Zamarin
2022-02-26  5:35 Sam James
2022-02-26  5:34 Sam James
2022-02-20  5:51 Sam James
2022-02-18  2:44 Sam James
2022-02-11 12:25 Sam James
2022-02-10  7:51 Sam James
2022-02-10  7:51 Sam James
2022-02-10  7:51 Sam James
2022-02-04 18:48 Sam James
2022-01-10 22:53 Sam James
2022-01-10 22:52 Sam James
2021-12-28  1:55 Sam James
2021-12-28  1:51 Sam James
2021-12-28  1:51 Sam James
2021-11-17 22:47 Sam James
2021-11-14 20:29 Sam James
2021-11-14  8:38 Sam James
2021-11-04 16:14 Sam James
2021-11-04 16:13 Sam James
2021-11-04 16:12 Sam James
2021-10-22  2:47 Sam James
2021-09-04 21:39 Sam James
2021-09-03  6:40 Agostino Sarubbo
2021-08-30  7:26 Agostino Sarubbo
2021-08-29 23:24 Sam James
2021-08-29 23:22 Sam James
2021-08-29 23:21 Sam James
2021-08-23 11:41 Marek Szuba
2021-07-04 14:03 Ulrich Müller
2021-06-03  7:19 Joonas Niilola
2021-05-16 12:45 Sam James
2021-05-14 18:23 Agostino Sarubbo
2021-05-13 20:26 Matthias Maier
2021-05-13 20:26 Matthias Maier
2021-03-30 16:17 Thomas Deutschmann
2021-02-22  7:12 Sam James
2020-12-04  5:37 Matthias Maier
2020-12-04  5:37 Matthias Maier
2020-08-20 13:20 Sam James
2020-08-01 23:20 Andreas Sturmlechner
2020-03-21 14:44 Matthias Maier
2020-03-18 11:04 Agostino Sarubbo
2020-03-18 11:00 Agostino Sarubbo
2020-03-18  0:12 Matthias Maier
2020-03-17 21:11 Matthias Maier
2020-03-17 21:08 Matthias Maier
2020-03-17 21:08 Matthias Maier
2020-03-17 21:08 Matthias Maier
2020-01-12 11:14 David Seifert
2019-12-28 21:32 Georgy Yakovlev
2019-07-28 19:39 Matthias Maier
2019-07-28 19:39 Matthias Maier
2019-07-28 19:39 Matthias Maier
2019-05-26 22:27 Thomas Deutschmann
2019-05-20 11:07 Mikle Kolyada
2019-04-08 20:21 Aaron Bauman
2018-10-18 16:09 Matt Turner
2018-10-18 16:07 Matt Turner
2018-10-18  6:06 Matt Turner
2018-05-29 12:32 Andreas Sturmlechner
2018-05-29 11:17 Thomas Deutschmann
2018-05-27 19:54 Andreas Sturmlechner
2018-03-17 10:45 Mikle Kolyada
2018-02-28 23:03 Andreas Sturmlechner
2018-02-28 22:21 Andreas Sturmlechner
2018-02-28 22:21 Andreas Sturmlechner
2018-02-28 22:21 Andreas Sturmlechner
2018-02-28 22:21 Andreas Sturmlechner
2018-02-12 17:05 Matthias Maier
2018-02-12  3:05 Matthias Maier
2017-07-12 14:43 Pacho Ramos
2017-07-08 13:19 Alexis Ballier
2016-09-29  8:40 Agostino Sarubbo
2016-08-18 14:53 Agostino Sarubbo
2016-08-17 13:52 Matthias Maier
2016-08-17 13:52 Matthias Maier
2016-07-28  2:31 Matthias Maier
2016-06-01 16:45 Matthias Maier
2016-06-01 16:45 Matthias Maier
2016-05-31 22:09 Matthias Maier
2016-05-31 22:09 Matthias Maier
2016-05-31 22:09 Matthias Maier
2016-02-01 15:22 Doug Goldstein

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox