From 19a808581ca18addf4b12d09f7e440b7244679e5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Jan 2023 06:10:37 +0000 Subject: gentoo auto-resync : 06:01:2023 - 06:10:36 --- net-firewall/Manifest.gz | Bin 4530 -> 4533 bytes net-firewall/firewalld/Manifest | 6 +- net-firewall/firewalld/firewalld-1.2.1.ebuild | 4 +- net-firewall/firewalld/firewalld-1.2.2.ebuild | 4 +- net-firewall/firewalld/firewalld-1.3.0.ebuild | 216 ++++++++++++++++++++++++++ 5 files changed, 224 insertions(+), 6 deletions(-) create mode 100644 net-firewall/firewalld/firewalld-1.3.0.ebuild (limited to 'net-firewall') diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz index 9455b9a1536a..aeb59f602dc2 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 8b8be89288d5..626e436b3c8b 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-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a DIST firewalld-1.2.2.tar.gz 2145443 BLAKE2B 495bbd79fdab6f84e97533654b1d2b378841f14a60052a816d399d0ac8c2e2fe588486fae00dceeab5a13f7e03b030ae6db71c27208da415773ad033f0ea4ea2 SHA512 1b37b2daedb818afa6fe9d1512bdeebe48e39c39f94926d8aa93837816c211e30760706f536d63f51407a493a17927568c47118218d935949e22a78f7821441c -EBUILD firewalld-1.2.1.ebuild 5225 BLAKE2B 8c65782c6d4e0b1a36e5c81ad906a6d37cfa18f3903547b67cbf2537de3bf28ae7aa180583509059014125193acb3dde20836edb64e00b94080f4a8b5db6ef79 SHA512 23dc50770913de141cad9a4efdfe0bb2fb2c554926f4d4451f7d144d5102b0101fac61251260c47025dd33d69769e5786679f571138d9463ba38014f9fbf465c -EBUILD firewalld-1.2.2.ebuild 5296 BLAKE2B 55ffa081d097cc561f9011ad9a642e31fd038f95f6d90267392b493bcbe932bbb2abfa332dcda004f69b9ed2bc01a8614eb9b79525f9bc1b87d1eef8992dadbc SHA512 599d233db4d61d4c0f15d74b1edc4b1954725dee5d31f21c2191d31623f5ebec45df3259e1616760d12b9a3bd212af4d9631e4f62fb0a663e0e6684ede52c258 +DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c SHA512 e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68 +EBUILD firewalld-1.2.1.ebuild 5230 BLAKE2B 9367d4aa99e0fe53723c8fe06ba5bea2f6dd130636aa1fd1215fb455b02f5572f211bd50da64d36241b10e8c9fa5059cd0a2344bb4a4663bb3a8740b03983fdf SHA512 081c456cd787bfc4310d3af06c880ff3cd3ff0360e2640dfb944b029654ea7d068a654daafcb9667eb2d25c7886a886c1b5f2f38ae606400ca7aa265fe64a30d +EBUILD firewalld-1.2.2.ebuild 5301 BLAKE2B 368569f396c9b8e2f388379632a979916a7d6acc0438a7e43f0a2f7256f77dd8e7870848b2d018217c5ff5f6fe7fc677d9b072233c23599b799236ebd020db7d SHA512 10e5c5f84b3c10f1e984c55fe1ee602470ceb872fa026a32d756a19214fd2ebae14d2787b14403fe9515d60b48d3a4c52def68d60ddaf44c97b63a1e1c161fe0 +EBUILD firewalld-1.3.0.ebuild 5288 BLAKE2B d1972c351866da3e4cbdc97a4a4db317946fe0df1346b186c4e54dde6146b321b283a8b148310a8f568eb9802adcd15018758b9b3d4eb3266a2b4b9afe2a095c SHA512 8bb7763b54530915905683f3bfe5b7fcb731c3ba1258d67de0458ad915becd3f3875f97ce09170f69d2be7d6e3b5ec9538c6ddd0b73510654bdd82869b49b8b0 MISC metadata.xml 671 BLAKE2B 69c4bda7cc74a243aa1738bed90d16a3bc2c2085f6c0718becc7797a68da63035ef4d4f5e59c0583987d54032c163df6052d012fb7ca49026ca7259088793d33 SHA512 dd2d482251a4e33cb12ba324e1a21b4758f82de83c0cf83d5fa6259444c272360b47c5666e596103eba4703183fc9864a6bbb07a254aba67146b89d9870e9bbe 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} 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 +} -- cgit v1.2.3