From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- net-firewall/firewalld/Manifest | 6 +- net-firewall/firewalld/firewalld-0.9.1-r1.ebuild | 117 ---------------------- net-firewall/firewalld/firewalld-1.0.2.ebuild | 121 +++++++++++++++++++++++ net-firewall/firewalld/metadata.xml | 4 + 4 files changed, 128 insertions(+), 120 deletions(-) delete mode 100644 net-firewall/firewalld/firewalld-0.9.1-r1.ebuild create mode 100644 net-firewall/firewalld/firewalld-1.0.2.ebuild (limited to 'net-firewall/firewalld') diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest index 05190f599c73..226b9644ceed 100644 --- a/net-firewall/firewalld/Manifest +++ b/net-firewall/firewalld/Manifest @@ -1,10 +1,10 @@ AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e -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 -EBUILD firewalld-0.9.1-r1.ebuild 3165 BLAKE2B ee5f4f02f1dd911bd55b7f001ae416657cdb873205e916f7c5e16941699831f91918360ced1712d41153e7342f57a4f3f0362ed99e4ee4a5d07907b3da3b6cb1 SHA512 676409b0d329f4c9d5549819059141cad6fb99861bca58351e27ff5e44ac9d69b85d1ddba953658be319db7f5fdc43e8fbda7f2b093cfc21645ada32f095e10a +DIST firewalld-1.0.2.tar.gz 1307963 BLAKE2B 11a7710981ba39f4bcb8431558e5b558a60d77fb1aa3fe4c5febc37f2eab754a6608e4820b6318c963bb6290a9b26ae9e162d9e46277c34dfdacac46ba938b21 SHA512 fbb60a6f52e5be26051303769b6521a6c775d450ab6704f2d63fe38dc6194976ad36f1d924380d09012f41ab6dab1f6f78c5a859fbfe00c52cdff40d82e62283 EBUILD firewalld-0.9.3-r1.ebuild 3172 BLAKE2B ac30583713116413011d4945d64b0f23dbdf865611141fe00eba495198eba09e39326f4229a52440985fe48e8d124e58795cd3bdb014ed26c6d018bd4aee3ffc SHA512 a39bdedf0ea9cd38f180397b4d9a3030384eebda8fd4b94ebf583b9479738b92d71daea1e9da7d242aa2866cc48f5a6dbcf1b6fbd9fbeb37b779cd28b68c14fd EBUILD firewalld-0.9.5.ebuild 3175 BLAKE2B 1dd8c9aeb2d1085fdc823a5f5e44c6353f27e8a3584609290fff6a65a1f68961e1ceebeebf03f1e4bc70849f9f0245708f59f62379191201346b034338a2a84d SHA512 db6145418127778121313844a05c5ec772b8963fe3153e6efa5eecc3b8f67a91f2fabd0bbc88e66df2d89dd2ba53e46e1ae78e6ff2885c0cb7b78e4826b73936 EBUILD firewalld-1.0.1.ebuild 3394 BLAKE2B cba57bc88aa6fac6707244173b224daf20f5f6b03e4c1cf507d79b44d9ed9efeef998870e85035f98d73f54a3764da20fd2f638d3bb592e96e5718bc559357b8 SHA512 b2f0c1767167d5efcd448af6f909c01fa2f22e8e9fcd645081868e0ccb3dc24058e611664b8584ac8b46acd93db070632dd5dead04ef0ed2c4f69f66184e5804 -MISC metadata.xml 487 BLAKE2B 37d5e92588a8dc4c8fec6765a0d2be92ccfb6b131001c4fb663057855ecbc1c2a3e1692aa2dce450cd9fae0bbb9700599c2c0bb1edce1957e17b8eb867894333 SHA512 fa32381382ca7b064ff6e7896df324421392f48ab71cff818b7169f68042caaed6978c192db2e3519f375461911bf637007fef58b80c8744db767662e8f66cc4 +EBUILD firewalld-1.0.2.ebuild 3394 BLAKE2B cba57bc88aa6fac6707244173b224daf20f5f6b03e4c1cf507d79b44d9ed9efeef998870e85035f98d73f54a3764da20fd2f638d3bb592e96e5718bc559357b8 SHA512 b2f0c1767167d5efcd448af6f909c01fa2f22e8e9fcd645081868e0ccb3dc24058e611664b8584ac8b46acd93db070632dd5dead04ef0ed2c4f69f66184e5804 +MISC metadata.xml 587 BLAKE2B f4a873c64f1760c1d28f09886573b638053e23bc2562674b4c21b81414c66271ff8c168d3a98f402bb0d2a3f8982b29cbd77817f0eac346f0774b51ed014113d SHA512 47bd8f14d0eeae00a59fc0507dd178f4420381a8ba197535936acba3aae0344614f003647636c0361c5cc0ef86d2653d7ca175cdeb2d5fdbc8869c3e633df6ba 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 eece123f46f9..000000000000 --- 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 -} 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 000000000000..d99dc6ac2166 --- /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 +} diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml index 1d13392ec6a5..8173b9a770bc 100644 --- a/net-firewall/firewalld/metadata.xml +++ b/net-firewall/firewalld/metadata.xml @@ -5,6 +5,10 @@ virtualization@gentoo.org Gentoo Virtualization Project + + sam@gentoo.org + Sam James + Add support for net-firewall/nftables as firewall backend Add support for net-firewall/iptables as firewall backend -- cgit v1.2.3