From 02814fd00146251691678aa18d9937665c677086 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Jan 2024 12:53:51 +0000 Subject: gentoo auto-resync : 07:01:2024 - 12:53:51 --- net-firewall/Manifest.gz | Bin 4392 -> 4394 bytes net-firewall/firewalld/Manifest | 4 +- net-firewall/firewalld/firewalld-2.0.2.ebuild | 4 +- net-firewall/firewalld/firewalld-2.1.0.ebuild | 223 ++++++++++++++++++++++++++ 4 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 net-firewall/firewalld/firewalld-2.1.0.ebuild (limited to 'net-firewall') diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz index 9fcc137c6788..014b3d4e1465 100644 Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest index c3f8ac51ac8a..94f1cf43f4fa 100644 --- a/net-firewall/firewalld/Manifest +++ b/net-firewall/firewalld/Manifest @@ -2,6 +2,8 @@ AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d AUX firewalld.service 581 BLAKE2B b4eb7549305da68bc53f913d5d0a3ff2595e8e482ed2a474ede645f33b8192e142cd1aa964c5c1dcf8a7c336c68d494ee13421ec7566312a4f89330c236cab9c SHA512 b81fb8414619b3661985cbac001a47c76d76b13eebe421919a838fa0396e6470a3109e0d20d88f423ff43b6e48c0537467125a85bf8939ef0ab6ded4d4829b03 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 EBUILD firewalld-2.0.1.ebuild 5302 BLAKE2B fdf5cc70bfa92850dc4cd9c50e58d4788dd9a3eb8a4b16640692bc2ecb4d3def741b694fb29bf60eb825c895b2bdc210e26475bf2cca4bbfe26f949d4b091c40 SHA512 70f80a9ee29a2470433734e21aa92f3713fe4eacc978f4d43d86810f09ec0494c21611d2a0dbeb113fa59026796f0709f1c0ca269d0c937ae4466a71cf1d282b -EBUILD firewalld-2.0.2.ebuild 5305 BLAKE2B 703a8cffaa05e7ba70d87b68586d99c0a12a300cd2a06ec14fb2281d38798270c02a97792cb24b073efdb0cffee3f4360fa0e410d5f3e26eb94650307ef25421 SHA512 a0e095b1d9635556f2ccb9a016f3f5ea4a835ba240300e80511d94f4bb257879ed8e385bcc7f1273a268c5acdb27770aa8584179f0adb8d55c9ee0dc439c87d3 +EBUILD firewalld-2.0.2.ebuild 5303 BLAKE2B 7a18892c87d0fcf652b4f69d5dca525c8244c4fb68228855f4705d2b390dcad3b069cb0cdf8bdd78a88137f1e2e6aaa8630d8a3cec71ae5890baa8169b3c0c03 SHA512 61594ff67703b0cf56b5391738c5c404f8d0235570451d9cbb7fa3dfe37087a0fd46064f1fda581cfec342d061bd4eefa1c31b440aaa24464daff12a6c91c21a +EBUILD firewalld-2.1.0.ebuild 5311 BLAKE2B eb44f2244e6354caef54101355396cb082578105cb1c7c6b16f05db2064ada650858b46c55f9ee36ed36fec78a6406bc7a7a732e64a363300fcb231e8b75ca0b SHA512 3c4eee1ccb09207b9c338d2973cdce4e3e6d3e99dfb9b3d187e53760a9ba585fe9a72f15a7d9f8c73c24a74b60ab5ce3bec62691f5e6401eabba336c2976595d MISC metadata.xml 671 BLAKE2B 69c4bda7cc74a243aa1738bed90d16a3bc2c2085f6c0718becc7797a68da63035ef4d4f5e59c0583987d54032c163df6052d012fb7ca49026ca7259088793d33 SHA512 dd2d482251a4e33cb12ba324e1a21b4758f82de83c0cf83d5fa6259444c272360b47c5666e596103eba4703183fc9864a6bbb07a254aba67146b89d9870e9bbe diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild index 9ba2a7936667..e4073eeb71f9 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" 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 +} -- cgit v1.2.3