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

["Sam James" <sam@gentoo.org>]

commit:     ce221961b75389749e2d7227221b5309c02be339
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  4 19:25:27 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar  4 19:40:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce221961

net-firewall/firewalld: drop 2.2.1-r1, 2.2.3

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

 net-firewall/firewalld/Manifest                  |   2 -
 net-firewall/firewalld/firewalld-2.2.1-r1.ebuild | 218 -----------------------
 net-firewall/firewalld/firewalld-2.2.3.ebuild    | 218 -----------------------
 3 files changed, 438 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 303a9b9e7af9..0a97ef18f020 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1 @@
-DIST firewalld-2.2.1.tar.bz2 1295501 BLAKE2B fc7bb401895bc39c34ec585468bdcc1b3c3f8eeb35c786c0cf7d886f456c99840107db73e8f611a7d7ab1db1408c6dc349a3d5eee2fbd1e624fe06dd8a558d91 SHA512 08117be01a25a8e263cf419d7b01a98c80b53108af68f6cfc1d900692e6124c37b9dd6feaf4bc3c6e3f27958a9ee45b9795c7f5a9250eb644b6e903f97672c8a
-DIST firewalld-2.2.3.tar.bz2 1310686 BLAKE2B dba517166e1588195ac76123503a2526ffa6c7bd884953ba7ec2806f9ef3a93a879936e48e0d5b638c6e3e888b558757989f8035106cc103eab92d72d8a077be SHA512 e1b1d5fc372359ecbbc074be15e8a9dc4e39836545d5a1364f05deb07eb6e43505eb37589a7b0fb5f3115e3ed3fbc58efe447e2d5b0dcc716a66903c63df824b
 DIST firewalld-2.3.0.tar.bz2 1307839 BLAKE2B f986af940841d7982c44ef5d7df9758f8b8f0e2bd511c61dc358d21e2d272ddc510571bcbdd6c7e47d0bd1ee6250240445094b30945c8de695007c1eb24ed642 SHA512 9a0fe1098c8bbb63bc4af04f56b7810d3d4e94be4247574daba64fb7a344488053f80426b7422c3a4620a54fee69a4264e1b0d66580757aac29aa65d723007c5

diff --git a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
deleted file mode 100644
index 5b38b6e28baa..000000000000
--- a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# 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
-}

diff --git a/net-firewall/firewalld/firewalld-2.2.3.ebuild b/net-firewall/firewalld/firewalld-2.2.3.ebuild
deleted file mode 100644
index 5b38b6e28baa..000000000000
--- a/net-firewall/firewalld/firewalld-2.2.3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# 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
-}