diff options
Diffstat (limited to 'net-firewall/firewalld')
-rw-r--r-- | net-firewall/firewalld/Manifest | 8 | ||||
-rw-r--r-- | net-firewall/firewalld/firewalld-0.7.1-r3.ebuild (renamed from net-firewall/firewalld/firewalld-0.6.3-r1.ebuild) | 60 | ||||
-rw-r--r-- | net-firewall/firewalld/firewalld-0.7.3-r1.ebuild (renamed from net-firewall/firewalld/firewalld-0.7.1-r1.ebuild) | 51 | ||||
-rw-r--r-- | net-firewall/firewalld/metadata.xml | 4 |
4 files changed, 80 insertions, 43 deletions
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest index 1430feeceaf6..b54e5525a6ad 100644 --- a/net-firewall/firewalld/Manifest +++ b/net-firewall/firewalld/Manifest @@ -1,6 +1,6 @@ AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e -DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68 -EBUILD firewalld-0.6.3-r1.ebuild 2616 BLAKE2B 598544370854bed198fbc79d45c2b8160cfc382174bb2554e4f451f2fee8208461b7163be17ec0b5badb65de9644e68bb7e8d07735fa718d5bbecee2d1a96ab1 SHA512 6ee2e5f1433bd6fe021528188eabf5fccc1db7ea14c076c8951f22be85aaad67ba22530386517632297cef2f799bbe7d47c225223cf7d20198c9259c644097f0 -EBUILD firewalld-0.7.1-r1.ebuild 2607 BLAKE2B d1d08d05aca74180e838722fd7470316d13f6d34fddc02c612a1f26efac66851609d5ffb5d10817a262beea99f3e67798e17696bcaab1c7dbd29d1b0d2712af3 SHA512 0daf8e834f117c67f2f900a42c48b037febb53eaa4e17e485843f0340343bd5983c0167b4968a39197e6f8a0321a1365dcce56d6f851311be4ab7bace33ce810 -MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32 +DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f +EBUILD firewalld-0.7.1-r3.ebuild 3257 BLAKE2B 87d864ba1e9889806a42c0be2b4a91eb65c502100bf681adfbed5cef5f451a0e5bdd3223d6ee391fb177a041e46102767e03035e7b1dbd6c3e6d0a94a511e186 SHA512 b84a171f56147aa649c515c4986ca439d3e9203afd03280261b813f1c2708d814a0cc4fcd9e89ff397406ad7b83c93efcf9cb94c64fdff92c9c2abe08c8f10f5 +EBUILD firewalld-0.7.3-r1.ebuild 3259 BLAKE2B 400accbe443a5d1360261ff2d35062f8d316fef898283ed9253ecc9708892c3fbf95ebbd9c9e2101cd4f2b6a84aae0b99384eabc78f0b9f11449402cd5555f00 SHA512 70b573f0d912a4d964eaf11d8d6f7f6b5c1ec3fe12119b4d60445da819cd3abea58b356e6d310ff7a1abd1452eb91d953951dcef3050fefe6d72c0029b1809ee +MISC metadata.xml 486 BLAKE2B 0d1b9c530a7b7ac43414cda002e07cbc9b897164be53d9183dc50ba78bc8d29a40bfc364444f4253f903ac1698a459e6f7ca68431a22905a6f5aed02ca41bb61 SHA512 d4b20ffb819399bfc60760ec90bfaf60ffbe666a1c0b2117a8eae42db2f85c1f5274c8dee28fbfa7b66bea1d9720ad1dd8acb425c43eb71cf0c9b2557a1471a0 diff --git a/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild index 3035cef8c28a..28feae85d15a 100644 --- a/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild +++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_6,3_7} ) -inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1 +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/" @@ -12,16 +12,19 @@ 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" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" +IUSE="gui +nftables +iptables" 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 + 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_MULTI_USEDEP}] @@ -40,30 +43,44 @@ 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" + 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 } src_prepare() { default eautoreconf + + l10n_find_plocales_changes "po" "" ".po" + l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS } 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)" \ + 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() { @@ -87,16 +104,15 @@ src_install() { } pkg_preinst() { - gnome2_icon_savelist gnome2_schemas_savelist } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update gnome2_schemas_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_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.3-r1.ebuild index af7ce3dfdc23..8f68175271de 100644 --- a/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild +++ b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild @@ -4,7 +4,7 @@ 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 +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/" @@ -13,15 +13,18 @@ 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" +IUSE="gui +nftables +iptables" 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 + 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_MULTI_USEDEP}] @@ -40,30 +43,44 @@ 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" + 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 } src_prepare() { default eautoreconf + + l10n_find_plocales_changes "po" "" ".po" + l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS } 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)" \ + 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() { diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml index 121cd46cb5e1..96b274a47c90 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> |