summaryrefslogtreecommitdiff
path: root/net-firewall
diff options
context:
space:
mode:
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/Manifest.gzbin4539 -> 4542 bytes
-rw-r--r--net-firewall/firewalld/Manifest10
-rw-r--r--net-firewall/firewalld/firewalld-0.7.3-r1.ebuild118
-rw-r--r--net-firewall/firewalld/firewalld-0.9.3-r1.ebuild2
-rw-r--r--net-firewall/firewalld/firewalld-1.0.1.ebuild (renamed from net-firewall/firewalld/firewalld-0.7.1-r3.ebuild)23
-rw-r--r--net-firewall/firewalld/metadata.xml2
-rw-r--r--net-firewall/fwbuilder/Manifest7
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch28
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch (renamed from net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch)8
-rw-r--r--net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild (renamed from net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild)22
10 files changed, 72 insertions, 148 deletions
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 400676e8e744..fd7e1eefc35f 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
Binary files differ
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index fa344d2dfe53..89e92ddad494 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,10 +1,8 @@
AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
-DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
-DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
-EBUILD firewalld-0.7.1-r3.ebuild 3220 BLAKE2B 3bc079c30540420da1f62aac363837eff13187c4b727dd47ee7f8512bb31ccfd2198a28226ef89abfdb6aa4aacecd75d618edeaa38836f6146034d77f007dc7b SHA512 77a9cf6d7ffade8bd151bdfa85d51c6962174faf63a5dbd5bc7bf1f610273a4044996ff93814845dbac9998d004973fcaa91fa9bbb38b21dcd5092aaa456cc2c
-EBUILD firewalld-0.7.3-r1.ebuild 3223 BLAKE2B 2409755e06f8b5def3fadc59f90bea9e9b9af57de0abd4ccbe5c65729b38c5f864f5d79e113b9289d553cd6f4f79fde47423c5acf1ab86542a4f51a9dcd52826 SHA512 99ac981b9d029ee17482d8299bd67005eab980ab41193d1cecf39c3fe17f9a73024ede67390ba86fbea631be82a7802772329e16d16a0c58394b2ace0fedb99b
+DIST firewalld-1.0.1.tar.gz 1306854 BLAKE2B 6dd68ed4219eb7d266e6bfa4d626dec51dcf28aae84609c9b87afa8e397179b0565bc8144c106c8ae8770293b371552b930679ec8a1204b2c9cb1f75e39c7013 SHA512 875af09caface324f7b5cfb0a87df5d309ff2e9e51d6d3a797f46f951ba95f4e1bc9f9f046f5191fafdef878dc65baf1b77a25a17f5aaf2f32bb1e1f782f1f8c
EBUILD firewalld-0.9.1-r1.ebuild 3165 BLAKE2B ee5f4f02f1dd911bd55b7f001ae416657cdb873205e916f7c5e16941699831f91918360ced1712d41153e7342f57a4f3f0362ed99e4ee4a5d07907b3da3b6cb1 SHA512 676409b0d329f4c9d5549819059141cad6fb99861bca58351e27ff5e44ac9d69b85d1ddba953658be319db7f5fdc43e8fbda7f2b093cfc21645ada32f095e10a
-EBUILD firewalld-0.9.3-r1.ebuild 3175 BLAKE2B 1dd8c9aeb2d1085fdc823a5f5e44c6353f27e8a3584609290fff6a65a1f68961e1ceebeebf03f1e4bc70849f9f0245708f59f62379191201346b034338a2a84d SHA512 db6145418127778121313844a05c5ec772b8963fe3153e6efa5eecc3b8f67a91f2fabd0bbc88e66df2d89dd2ba53e46e1ae78e6ff2885c0cb7b78e4826b73936
-MISC metadata.xml 486 BLAKE2B 0d1b9c530a7b7ac43414cda002e07cbc9b897164be53d9183dc50ba78bc8d29a40bfc364444f4253f903ac1698a459e6f7ca68431a22905a6f5aed02ca41bb61 SHA512 d4b20ffb819399bfc60760ec90bfaf60ffbe666a1c0b2117a8eae42db2f85c1f5274c8dee28fbfa7b66bea1d9720ad1dd8acb425c43eb71cf0c9b2557a1471a0
+EBUILD firewalld-0.9.3-r1.ebuild 3174 BLAKE2B 4847f5ede2a1eceaf43303955cc92c679478973797c3dc98a8183c4da3b919353432d02c0da087ea65ac1f3d0b6385d7d267251fc1e6ef2dfb0de1877b907e77 SHA512 63d387085902685c74875a8bd159fcffeed0690d3218c4628ace00dc51edef69ed4519c894f91a8c46bd7e0f6a30636c3fdcc009afc3fc840a41a024316584bf
+EBUILD firewalld-1.0.1.ebuild 3394 BLAKE2B cba57bc88aa6fac6707244173b224daf20f5f6b03e4c1cf507d79b44d9ed9efeef998870e85035f98d73f54a3764da20fd2f638d3bb592e96e5718bc559357b8 SHA512 b2f0c1767167d5efcd448af6f909c01fa2f22e8e9fcd645081868e0ccb3dc24058e611664b8584ac8b46acd93db070632dd5dead04ef0ed2c4f69f66184e5804
+MISC metadata.xml 486 BLAKE2B 3c513ced70bdb822a34c21e0779131b8ec855362bb9db9362527270f5f97ba9d81c01b99e8a34447e8327cb7c7383354cc0c7f2bdade780ad53d41965d91386a SHA512 ce5c4b8e91d29cf71fd7d121e73d169c96cb49b4585601b405178734bc98aa5063fa9a30b2b8d47c0783d6621352c690657ced5ce7e11fa0920f82d03192ac49
diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
deleted file mode 100644
index d926073fdf74..000000000000
--- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,118 +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 ~arm64 ~ppc64 ~x86"
-IUSE="gui +nftables +iptables"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- !!net-firewall/gshield
- 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_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 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 ~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 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() {
- default
- python_optimize
-
- # Get rid of junk
- rm -rf "${D}/etc/rc.d/" || die
- 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-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index 59c6dff62994..dd8b0116ad70 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="gui +nftables +iptables"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-1.0.1.ebuild
index 05546297f4b9..d99dc6ac2166 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-1.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+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"
@@ -12,13 +12,12 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="gui +nftables +iptables"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
!!net-firewall/gshield
- nftables? ( net-firewall/nftables )
iptables? (
net-firewall/iptables[ipv6]
net-firewall/ebtables
@@ -28,22 +27,26 @@ RDEPEND="${PYTHON_DEPS}
|| ( >=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}]
)
+ nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
')"
DEPEND="${RDEPEND}
- dev-libs/glib:2
- >=dev-util/intltool-0.35
+ dev-libs/glib:2"
+BDEPEND=">=dev-util/intltool-0.35
sys-devel/gettext"
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"
+# 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"
@@ -58,6 +61,7 @@ pkg_setup() {
src_prepare() {
default
+
eautoreconf
plocale_find_changes "po" "" ".po"
@@ -69,7 +73,6 @@ src_configure() {
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")
@@ -80,6 +83,7 @@ src_configure() {
--with-systemd-unitdir="$(systemd_get_systemunitdir)"
--with-bashcompletiondir="$(get_bashcompdir)"
)
+
econf "${econf_args[@]}"
}
@@ -88,7 +92,6 @@ src_install() {
python_optimize
# Get rid of junk
- rm -rf "${D}/etc/rc.d/" || die
rm -rf "${D}/etc/sysconfig/" || die
# For non-gui installs we need to remove GUI bits
diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 96b274a47c90..fa3460c2a574 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -7,6 +7,6 @@
</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>
+ <flag name="iptables">Add support for <pkg>net-firewall/iptables</pkg> as firewall backend</flag>
</use>
</pkgmetadata>
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 9403ca48740d..6aecf6ff2d77 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,8 +1,9 @@
AUX fwbuilder-5.3.7-qtbindir.patch 1833 BLAKE2B 715f3e218f2e1dd48a58b969da0035bc0caf228d928fc17b3035a57b2170f50efc29d9199193530894ccaae096a285a655093d63548d4a0450fb611833d642cc SHA512 926ea0ebd8fbb58e37c225d84b1e6674ee4e8838ebad35303045e982b689d9b511057d3bdbc93039ad9aa0cd58d875ddcf1717d83c77208bfd1aa125b7b7c2de
AUX fwbuilder-6.0.0_pre20200502-drop-Werror.patch 802 BLAKE2B e4c0c5668fe9b38e287fb5a49d62f6bc758671ef953757527acf8c70bba913c7790450f268ddec4b004cbc8d70e5375b34dbc08e998be5aefe4c8e97a2486230 SHA512 908c2b8f966612555a0cd3f74cb3ec2bc0e96f0596c99fa1709b6ae8f901df4ffffbbb55e4b3169d02d7be116006f035cfee9e82bda55f8d98ff375aae53ebce
-AUX fwbuilder-6.0.0_pre20200502-fix_version.patch 595 BLAKE2B 8bd44bf7980f2692f20b4f8f06fd1d161f4c9416985c2b01eb86170463fdd4dde7df603cd10f7638b12f88f3d02e94f2fd466462bb9ae3effdc184d419f7e240 SHA512 3e2a7d914957d4df56cadc5f2877d80be8cb85d9d1c8e9edcbe91ea3bb2932ee4e9eb68c773d2850b42d530dd887430de898fd9c844c7b4acdb3dff5ee89715f
+AUX fwbuilder-6.0.0_rc1-automagic-ccache.patch 721 BLAKE2B 0fd2d5b6e7b564993b92e56f1c16e2c3b0ef757f126e39f2a4103c7899961872f6938df45054809e6c90d73877b7f4c60e037ea7fed0da5944b3da579a55acd4 SHA512 dfbe1601c2721cb1f5bfb60e0e363d6efac03e7e57dfe58197b6a3c1df2ec24b32663468db6e616919e461dc6dbd2242b3492700274503beda715d4fdb6ecd32
+AUX fwbuilder-6.0.0_rc1-fix_version.patch 516 BLAKE2B e544ceceda6890f55a33eae0a1bef4fda23804a357b77cdc0ca79e129c6d16b738b391376dd8a43da1aeffe2f8c9a8ca174f53958f194a9e81998988ed2b7965 SHA512 b97198159c76030bf81ec7e86f48fa1da4cc982f614174d8baab431249ae45c19963765a5d101bc8e6cc4b75d8be13c918cd1f607a8d8e2dd4b544c6d57b95b6
DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
-DIST fwbuilder-6.0.0_pre20200502.tar.gz 7278610 BLAKE2B 9eabf34445f5dad4af4bf88ec717ad60d6010233d501151ae1e115adcba88c19d883eceb60ae9c9850f200e42eec5eca083be9330dc54b0b681c86e90f3ca581 SHA512 7fcc957ebc6dc3a198fdb857e11b3d29e25018c3107f2edffbfea3794fdd5fad2ba56d7a74209c6d7b30e4287dbb13ab3bf973c8aa3213cfd4a7317e43e713bb
+DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e SHA512 11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4
EBUILD fwbuilder-5.3.7.ebuild 1482 BLAKE2B bf0f2d7e38908e69777f00c75b7139be568dce47dd94c346194af67443ba87d0167eee826243f4ec44b72ef8f8e858bc2272ac093972aa2f753d7ed2e367feae SHA512 6e0ae543d68a35816123b304da2eba45c901bee18e08c54dd5bc5684f94ffaa827d3ab2ee2a23f5955c45396d0da57a533dd1c7cb54cfa8a53c4094e91128000
-EBUILD fwbuilder-6.0.0_pre20200502.ebuild 828 BLAKE2B 862372d76f342a4ec3f5b5cd54a5ef8729c7e6e4a2c27f048a015a7e4d2678bc49101ff638bb0fbcf4896e1922f4956f1a66dcaefcd438ee6d49929b9c03a5b4 SHA512 865f19ae513a158b330b56ec14b504d0d44b7f40f549f0aa06d76fecced4d58a2a68d781fa5ec3a43df4f195f815d5f27e757c74476804bd56aba37a7a61a18a
+EBUILD fwbuilder-6.0.0_rc1.ebuild 1014 BLAKE2B a1b7347e1e2923a015d70471d68377e9fc18bdbe96da23289483333e43153c77717def717e177471138424de7b6409a36024876d01fe9ba10282d2de1080bf5d SHA512 5289924e9a0efed9fe18600bcdbc414f23f5a7898b4c692d5088c55b81380d9e1a9c0b677b442dd1b64a64b3934be30c1bc131dafc81035b68bcc62fc4642ab6
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch
new file mode 100644
index 000000000000..d7f2cfb7e113
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch
@@ -0,0 +1,28 @@
+From 6021c352a009121870107ed37f07ee520110d4c2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 27 Aug 2021 03:24:26 +0100
+Subject: [PATCH] Drop automagic ccache usage
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 97477b0..cd17c6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,11 +5,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
+ CACHE STRING "Minimum macOS deployment version"
+ )
+
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ project(firewallbuilder LANGUAGES CXX C)
+
+ ### Version variables and include file
+--
+2.33.0
+
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch
index d71de42d26cd..cce544a58a0c 100644
--- a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch
@@ -1,11 +1,11 @@
---- a/cmake/VERSION.cmake 2020-09-05 14:54:43.767374594 +0200
-+++ b/cmake/VERSION.cmake 2020-09-05 16:13:20.274809080 +0200
+--- a/cmake/VERSION.cmake
++++ b/cmake/VERSION.cmake
@@ -3,7 +3,7 @@
set(PROJECT_VERSION_MAJOR "6")
set(PROJECT_VERSION_MINOR "0")
set(PROJECT_VERSION_PATCH "0")
--set(PROJECT_VERSION_EXTRA "-beta")
-+set(PROJECT_VERSION_EXTRA "_p20200502")
+-set(PROJECT_VERSION_EXTRA "-rc1")
++set(PROJECT_VERSION_EXTRA "_rc1")
set(PROJECT_GENERATION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
set(PROJECT_GENERATION_SHORT "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_EXTRA}")
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
index e2c2d972c0f1..f7a064139185 100644
--- a/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
@@ -3,16 +3,18 @@
EAPI=7
-inherit cmake vcs-snapshot
+inherit cmake
-MY_COMMIT=a5e14a966447c63bcf7b52a0202149e76bd5ed4a
DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
-SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/libxml2
@@ -23,13 +25,23 @@ RDEPEND="
dev-qt/qtwidgets:5
net-analyzer/net-snmp
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:5 )"
PATCHES=(
- "${FILESDIR}"/${P}-fix_version.patch
"${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch
+ "${FILESDIR}"/${PN}-6.0.0_rc1-automagic-ccache.patch
+ "${FILESDIR}"/${P}-fix_version.patch
)
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
src_install() {
cmake_src_install
docompress -x /usr/share/man
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 08:59:50 +0000