From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- net-firewall/Manifest.gz | Bin 4890 -> 4719 bytes net-firewall/fwbuilder/Manifest | 2 +- net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild | 14 +- net-firewall/shorewall/Manifest | 8 + net-firewall/shorewall/shorewall-5.2.4.5.ebuild | 482 +++++++++++++++++++++ net-firewall/ufw-frontends/Manifest | 5 - .../files/org.gentoo.pkexec.ufw-gtk.policy | 21 - .../files/ufw-frontends-0.3.2-no-log-crash.patch | 61 --- net-firewall/ufw-frontends/metadata.xml | 22 - .../ufw-frontends/ufw-frontends-0.3.2-r5.ebuild | 64 --- 10 files changed, 498 insertions(+), 181 deletions(-) create mode 100644 net-firewall/shorewall/shorewall-5.2.4.5.ebuild delete mode 100644 net-firewall/ufw-frontends/Manifest delete mode 100644 net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy delete mode 100644 net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch delete mode 100644 net-firewall/ufw-frontends/metadata.xml delete mode 100644 net-firewall/ufw-frontends/ufw-frontends-0.3.2-r5.ebuild (limited to 'net-firewall') diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz index f02ac197d99b..6a6173999637 100644 Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest index e4d5f859abbf..bb0b9d340143 100644 --- a/net-firewall/fwbuilder/Manifest +++ b/net-firewall/fwbuilder/Manifest @@ -1,4 +1,4 @@ AUX fwbuilder-5.3.7-qtbindir.patch 1833 BLAKE2B 715f3e218f2e1dd48a58b969da0035bc0caf228d928fc17b3035a57b2170f50efc29d9199193530894ccaae096a285a655093d63548d4a0450fb611833d642cc SHA512 926ea0ebd8fbb58e37c225d84b1e6674ee4e8838ebad35303045e982b689d9b511057d3bdbc93039ad9aa0cd58d875ddcf1717d83c77208bfd1aa125b7b7c2de DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b -EBUILD fwbuilder-5.3.7.ebuild 1419 BLAKE2B 554981de2730a50840309e822c73ca362abfd22c58fce313cfaefc179a5a85d80d46b1ab0d8db628a4dcc1437dd60fa8206046ddef688343dabadc69b7bab509 SHA512 778f843817d904b2348a9565e2eefa4587b654300696633a485de2bd3c9bded0cd98c0a571dfccf2881ca32dd3464c846ebf9e89c805272c9cb46674f9c578cc +EBUILD fwbuilder-5.3.7.ebuild 1482 BLAKE2B bf0f2d7e38908e69777f00c75b7139be568dce47dd94c346194af67443ba87d0167eee826243f4ec44b72ef8f8e858bc2272ac093972aa2f753d7ed2e367feae SHA512 6e0ae543d68a35816123b304da2eba45c901bee18e08c54dd5bc5684f94ffaa827d3ab2ee2a23f5955c45396d0da57a533dd1c7cb54cfa8a53c4094e91128000 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild index c1b9b02547ef..23cb633f9aee 100644 --- a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild +++ b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools gnome2-utils qmake-utils +inherit autotools qmake-utils xdg-utils -DESCRIPTION="A firewall GUI" -HOMEPAGE="http://www.fwbuilder.org/" +DESCRIPTION="GUI management for iptables, PF, Cisco ASA/PIX/FWSM, Cisco router ACL and more" +HOMEPAGE="https://github.com/fwbuilder/fwbuilder" SRC_URI="https://github.com/fwbuilder/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" @@ -61,12 +61,12 @@ src_install() { } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update elog "You need to install sys-apps/iproute2" elog "in order to run the firewall script." } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest index f109297c87d6..dad7b7df12e5 100644 --- a/net-firewall/shorewall/Manifest +++ b/net-firewall/shorewall/Manifest @@ -16,11 +16,19 @@ AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8 DIST shorewall-5.2.4.4.tar.bz2 581085 BLAKE2B 6830f1ce9350534a51b0d79efad07b338c511ab3cc1bf151ac958052c5feb1794d994a71e80ebf1546a76fae1718ebc74abab37fbb4d9362d8b3108133b30354 SHA512 c050af24969c2f18c4c020dfb611edaf9c6a5aa09d1dace502ae99b9aa82d7f217695e8099d6615a9a3c9f6de951f6d8b24621021c48ee2f2095edf9815a8d57 +DIST shorewall-5.2.4.5.tar.bz2 581558 BLAKE2B 9b089a9c5cab212ba130e3865c2ea5a8ad27c88979e6497a0fef823a12a6ac98ca12a150c3e9a5b6c76c90339aeb3c92a438dfc068811790aef13783e39e6204 SHA512 3914bac627cf8787372f21c4332fc13744a6190c7a128521103e3f47533ebbe2fe359a4c6bc95a0d7dfb03e2ce30f7b7cd8eaed9d8fa3169d4b0b5244aa6d8f8 DIST shorewall-core-5.2.4.4.tar.bz2 73257 BLAKE2B 16b8d3a1d08c9db6a939f946324295063cee71b373bd67dd85d0acb4332502df4b5d9bb932695228ad6d33395c6596e86fd3e77ca59abc99d88bab7e883777c9 SHA512 1868dcd6bad6b0cb5be2c1b0724f076605e7990d0b9dfd19fee06c758b19f2ebcbe18bccaa7a4ea861ceb26038ed07837eecdacdd2a02d0c2a927c732d6bdc30 +DIST shorewall-core-5.2.4.5.tar.bz2 73333 BLAKE2B e4d71ddd92e83c31d90b766568d4d595d1035278832c9f92c103e7b95436adecf9e79612f0bf82e7eb3447d067c2d4e626bed14f1c9d74e5f11fa5d585830ba6 SHA512 74d413cbe95688d7604a01580eff32c92b1be754df2052fa4ed22dd549c18887b1462fc70c1a2913c2d77255fccb7badce33863686abffecadb6b316aa545827 DIST shorewall-docs-html-5.2.4.4.tar.bz2 4294159 BLAKE2B 81bb4a9d086f48bf8551be3bc8aff0ed8a0a99d215338f12b711c96115507ea5a7eb567d084db0a93628c4036623a72231f33dd15671e84739d59608268b98c7 SHA512 086096604f5a580906f05b460e1e19df24620b610675a8ec6038c0061199fd6f09cd8aff08f1e8daa8d2898bfaec9db95cf7f4f1397ca9df784d420907b16fac +DIST shorewall-docs-html-5.2.4.5.tar.bz2 4294320 BLAKE2B dd80e0ae8bc622aaa2e1278a20d2b0e2aaccd25debf22301b71dfce125f94be3e9c30dd411f3f7a84592ca126917447d1b61624079b6bf3686156578c54495cd SHA512 6453c0dbdd80c41b5ca706eae2cd05946a6442f939b398985bf2b6687b60c1f636cf387d1581694223b6d887f914764f9193070dfce745e6e32dd0edd582fe76 DIST shorewall-init-5.2.4.4.tar.bz2 38048 BLAKE2B 01b4664396933ca303d4013d50f290be850dad51142257a7b1f3081cee3baac219feadc96636c732072c6918f83d847eca2107aa094804691500972a90f222fd SHA512 fdab4aa68429144cbffdf41aad78744feb3e9736df0e8d6ed87ed7ac80aebf7078c6ec28646069a71cacc8d9a6738605d59c6b6fb35d8c4d9a1ed8353a71775c +DIST shorewall-init-5.2.4.5.tar.bz2 38113 BLAKE2B 4231e22c7dfd862fd6ee8b573ea3f137ea078e488d354ddf197a83c4d60827a462311f5f9cd7d1dd0df17b61713fa164e6c6594eb4b8c173bef59fee75f4c1bc SHA512 51ac7a4022caca14c25efe0e608bb3983f27c31326b1a933385891fbe01aa5137f3d8e50406fddec41024fe8aea6e55ad16c3a4cb2d1b211fd0d13d61ce61cb1 DIST shorewall-lite-5.2.4.4.tar.bz2 42806 BLAKE2B d6dd5d9268d40fb88ee99be36b359423a6d7785417752f6e9d7245806bf9677963851327dcfd0d5fe81ea54ab11d59a5e64ee4115d41d3a6c8f4ced1e7cda732 SHA512 b81aa04f124435d3bf63d1796cca4db987f56c3e31953386ab7f3aae290058e5f3240b43864753121ed48b3744f8d6ee2dcd5210105dc1ccf5a4f790b3e22092 +DIST shorewall-lite-5.2.4.5.tar.bz2 42868 BLAKE2B 5ccab6fd410deb721671d16967fdf57be051c8403d7b2dc7273dea76f42584d01c593adee25d72730091d3f8cc7d85b985e58b5e243f5f5a11522935eae88087 SHA512 329535471f9a44f7cd3935e490d238768fe37bba397dbfd83b1f0960e16a1fdb6407ae6fd36f7054ec998f1ea8c2f91bb4cc1fa6d970675939856b2436cf7c45 DIST shorewall6-5.2.4.4.tar.bz2 199722 BLAKE2B c5c741ea7108e6edbb35190bccea06d04c6a0d1cf5dbae23481e38d3c05155df6bcaf4deb6397d07a1f51ba0b13b18b4ed22349fbe1f6e605d0303486002d876 SHA512 cf212d1c7c8703319a5c6f34ba8629f115b2f03a0713c1b40cf370adad66b671bfd9536a28bc650aba04bf6a6fd7c396788d40c2eb650a006e8f2eb27baf76f8 +DIST shorewall6-5.2.4.5.tar.bz2 200261 BLAKE2B b21f8232a3497be70184c9053e17265d803a9561f5799921ee63ab67bd4b1b8fa8c1950de13a5f6d8f1662013641859844b5a2032e684151a3b85b0de8d8dfb9 SHA512 362802b8b9dc52da00a291f0fb0bb115387a409974e418bb3e00d8c9c900cd49f0b6d90a4c75db5028b5a2d1ad499d352d322e4f7132a9e8647b3502a263531b DIST shorewall6-lite-5.2.4.4.tar.bz2 42739 BLAKE2B 3f1caa78b12f779bd73716dad78a26544bf99204b96da2fa950c709bbb5d68ac1ee062714d5040d961a2df35b4d22e0b6c8747b36a84bb9a5b6805cb6d0158cd SHA512 4a0c6e939bd8ca239734de64ea0b2a94885f8f14d00e37dce291b2f5aa00384227c16cc0595ef1b038f05d3d42212ace3e9482937c8c072d7e194099ab867646 +DIST shorewall6-lite-5.2.4.5.tar.bz2 42843 BLAKE2B a02923bcd75bedbcb3d48f43c11de7956829528c7076f6cdd7353550e4703de3c19d01e16abbc6d2db74a748edaffec613060a7fb6179a1c89a75e0058d766ff SHA512 c93ebb94c9baa627cb9fd18af098ca484c5e6cf2d0405624a00d6cf9093e900e06b6da7f2f9acedf3fcd1c68d6221a50ae2826718313cc0482b74c34d6f2498a EBUILD shorewall-5.2.4.4.ebuild 16949 BLAKE2B 40c143a0265318201ec0d2186b6a1e75c0cf368e87e2544ade3ff7db49b03134434e27d628453692e33fbddaa34ec3bcb42c9375524be92fb1cbda5f37077bc4 SHA512 055dd811b6ea964f3cd44e9d312684438e17b9a5aae7a1dfd60ea863c8537e4bdc9cd80d7a129b9fa23f2483c7943c91ce3adf8ac872bb3b58e3e562654a415b +EBUILD shorewall-5.2.4.5.ebuild 16955 BLAKE2B 492e4680f686a2e733bcc135644882abbc04a1f0e5cdc12cff69bd2f561d88e58fdef36a162f462a7e602b8fc2bcf1c8af1329aab24df9f00d966c0e8fd34d43 SHA512 0f694217f51006e9a7872d8130b849e2461ab07fb84e64bf97a060765cd16b8f3f5cbac4728822ba65cb4dde34158480b7ffbe9ee4a3d0da8df6514a186ad33e MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33 diff --git a/net-firewall/shorewall/shorewall-5.2.4.5.ebuild b/net-firewall/shorewall/shorewall-5.2.4.5.ebuild new file mode 100644 index 000000000000..95a3c0906eab --- /dev/null +++ b/net-firewall/shorewall/shorewall-5.2.4.5.ebuild @@ -0,0 +1,482 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit linux-info prefix systemd + +DESCRIPTION='A high-level tool for configuring Netfilter' +HOMEPAGE="https://shorewall.org/" +LICENSE="GPL-2" +SLOT="0" +IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux" + +MY_PV=${PV/_rc/-RC} +MY_PV=${MY_PV/_beta/-Beta} +MY_P=${PN}-${MY_PV} + +MY_MAJOR_RELEASE_NUMBER=$(ver_cut 1-2) +MY_MAJORMINOR_RELEASE_NUMBER=$(ver_cut 1-3) + +# shorewall +MY_PN_IPV4=Shorewall +MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV} + +# shorewall6 +MY_PN_IPV6=Shorewall6 +MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV} + +# shorewall-lite +MY_PN_LITE4=Shorewall-lite +MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV} + +# shorewall6-lite +MY_PN_LITE6=Shorewall6-lite +MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV} + +# shorewall-init +MY_PN_INIT=Shorewall-init +MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV} + +# shorewall-core +MY_PN_CORE=Shorewall-core +MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV} + +# shorewall-docs-html +MY_PN_DOCS=Shorewall-docs-html +MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV} + +# Upstream URL schema: +# Beta: $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2 +# RC: $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2 +# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2 + +MY_URL_PREFIX= +MY_URL_SUFFIX= +if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then + MY_URL_PREFIX='development/' + + if [[ ${MY_PV} = *-Beta* ]] ; then + MY_URL_SUFFIX="-Beta${MY_PV##*-Beta}" + elif [[ ${MY_PV} = *-RC* ]] ; then + MY_URL_SUFFIX="-RC${MY_PV##*-RC}" + fi + + # Cleaning up temporary variables + unset _tmp_last_index + unset _tmp_suffix +else + KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +SRC_URI=" + https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2 + ipv4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 ) + ipv6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 ) + lite4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 ) + lite6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 ) + init? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 ) + doc? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 ) +" + +# - Shorewall6 requires Shorewall +# - Installing Shorewall-init or just the documentation doesn't make any sense, +# that's why we force the user to select at least one "real" Shorewall product +# +# See https://shorewall.org/download.htm#Which +REQUIRED_USE=" + ipv6? ( ipv4 ) + || ( ipv4 lite4 lite6 ) +" + +# No build dependencies! Just plain shell scripts... +DEPEND="" + +RDEPEND=" + >=net-firewall/iptables-1.4.20 + >=sys-apps/iproute2-3.8.0[-minimal] + >=sys-devel/bc-1.06.95 + ipv4? ( + >=dev-lang/perl-5.16 + virtual/perl-Digest-SHA + ) + ipv6? ( + >=dev-perl/Socket6-0.230.0 + >=net-firewall/iptables-1.4.20[ipv6] + >=sys-apps/iproute2-3.8.0[ipv6] + ) + lite6? ( + >=net-firewall/iptables-1.4.20[ipv6] + >=sys-apps/iproute2-3.8.0[ipv6] + ) + init? ( >=sys-apps/coreutils-8.20 ) + selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) + !net-firewall/shorewall-core + !net-firewall/shorewall6 + !net-firewall/shorewall-lite + !net-firewall/shorewall6-lite + !net-firewall/shorewall-init + !=4.19 has unified NF_CONNTRACK module, bug 671176 + if kernel_is -lt 4 19; then + if use ipv4 || use lite4; then + CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4" + + local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will" + local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system." + fi + + if use ipv6 || use lite6; then + CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6" + + local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will" + local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system." + fi + fi + + check_extra_config +} + +pkg_setup() { + if [[ -n "${DIGEST}" ]]; then + einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..." + unset DIGEST + fi +} + +src_prepare() { + # We are moving each unpacked source from MY_P_* to MY_PN_*. + # This allows us to use patches from upstream and keeps epatch_user working + + einfo "Preparing shorewallrc ..." + cp "${FILESDIR}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" + eprefixify "${S}"/shorewallrc.gentoo + sed -i \ + -e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \ + "${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc" + + # shorewall-core + mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'" + ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..." + ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" + eend 0 + + pushd "${S}"/${MY_PN_CORE} &>/dev/null || die + eapply "${FILESDIR}"/shorewall-core-5.2.1-no-gzipped-manpages.patch + popd &>/dev/null || die + + # shorewall + if use ipv4; then + mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'" + ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}" + ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" + cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed" + cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed" + cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed" + eend 0 + + pushd "${S}"/${MY_PN_IPV4} &>/dev/null || die + eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch + popd &>/dev/null || die + fi + + # shorewall6 + if use ipv6; then + mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'" + ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}" + ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" + cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed" + cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed" + cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed" + eend 0 + + pushd "${S}"/${MY_PN_IPV6} &>/dev/null || die + eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch + popd &>/dev/null || die + fi + + # shorewall-lite + if use lite4; then + mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'" + ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}" + ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" + cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed" + cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed" + cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed" + eend 0 + + pushd "${S}"/${MY_PN_LITE4} &>/dev/null || die + eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch + popd &>/dev/null || die + fi + + # shorewall6-lite + if use lite6; then + mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'" + ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}" + ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" + cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed" + cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed" + cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed" + eend 0 + + pushd "${S}"/${MY_PN_LITE6} &>/dev/null || die + eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch + popd &>/dev/null || die + fi + + # shorewall-init + if use init; then + mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'" + ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}" + ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" + cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed" + cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed" + cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed" + cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed" + eend 0 + + eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh + + pushd "${S}"/${MY_PN_INIT} &>/dev/null || die + eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r2.patch + popd &>/dev/null || die + fi + + # shorewall-docs-html + if use doc; then + mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'" + fi + + eapply_user +} + +src_configure() { + :; +} + +src_compile() { + :; +} + +src_install() { + # shorewall-core + einfo "Installing ${MY_P_CORE} ..." + DESTDIR="${ED}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed" + dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt + + # shorewall + if use ipv4; then + einfo "Installing ${MY_P_IPV4} ..." + DESTDIR="${ED}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed" + keepdir /var/lib/shorewall + + if use doc; then + dodoc -r "${S}"/${MY_PN_IPV4}/Samples + fi + fi + + # shorewall6 + if use ipv6; then + einfo "Installing ${MY_P_IPV6} ..." + DESTDIR="${ED}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed" + keepdir /var/lib/shorewall6 + + if use doc; then + dodoc -r "${S}"/${MY_PN_IPV6}/Samples6 + fi + fi + + # shorewall-lite + if use lite4; then + einfo "Installing ${MY_P_LITE4} ..." + DESTDIR="${ED}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed" + keepdir /var/lib/shorewall-lite + fi + + # shorewall6-lite + if use lite6; then + einfo "Installing ${MY_P_LITE6} ..." + DESTDIR="${ED}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed" + keepdir /var/lib/shorewall6-lite + fi + + # shorewall-init + if use init; then + einfo "Installing ${MY_P_INIT} ..." + DESTDIR="${ED}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed" + dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt + + if [[ -f "${ED}/etc/logrotate.d/shorewall-init" ]]; then + # On Gentoo, shorewall-init will not create shorewall-ifupdown.log, + # so we don't need a logrotate configuration file for shorewall-init + einfo "Removing unused \"${ED}/etc/logrotate.d/shorewall-init\" ..." + rm -rf "${ED}"/etc/logrotate.d/shorewall-init || die "Removing \"${ED}/etc/logrotate.d/shorewall-init\" failed" + fi + + if [[ -d "${ED}/etc/NetworkManager" ]]; then + # On Gentoo, we don't support NetworkManager + # so we don't need this folder at all + einfo "Removing unused \"${ED}/etc/NetworkManager\" ..." + rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed" + fi + + if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then + # This script isn't supported on Gentoo + rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/usr/share/shorewall-init/ifupdown\" failed" + fi + fi + + if use doc; then + einfo "Installing ${MY_P_DOCS} ..." + docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/* + fi +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + + # Show first steps for shorewall/shorewall6 + local _PRODUCTS="" + if use ipv4; then + _PRODUCTS="shorewall" + + if use ipv6; then + _PRODUCTS="${_PRODUCTS}/shorewall6" + fi + fi + + if [[ -n "${_PRODUCTS}" ]]; then + elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:" + elog "" + elog " /etc/shorewall/shorewall.conf" + + if use ipv6; then + elog " /etc/shorewall6/shorewall6.conf" + fi + + elog "" + elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:" + elog "" + elog " # rc-update add shorewall default" + + if use ipv6; then + elog " # rc-update add shorewall6 default" + fi + fi + + # Show first steps for shorewall-lite/shorewall6-lite + _PRODUCTS="" + if use lite4; then + _PRODUCTS="shorewall-lite" + fi + + if use lite6; then + if [[ -z "${_PRODUCTS}" ]]; then + _PRODUCTS="shorewall6-lite" + else + _PRODUCTS="${_PRODUCTS}/shorewall6-lite" + fi + fi + + if [[ -n "${_PRODUCTS}" ]]; then + if use ipv4; then + elog "" + fi + + elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can" + elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)." + elog "" + elog "To read more about ${_PRODUCTS}, please visit" + elog " https://shorewall.org/CompiledPrograms.html" + elog "" + elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:" + elog "" + + if use lite4; then + elog " # rc-update add shorewall-lite default" + fi + + if use lite6; then + elog " # rc-update add shorewall6-lite default" + fi + fi + + if use init; then + elog "" + elog "To secure your system on boot, please add shorewall-init to your boot runlevel:" + elog "" + elog " # rc-update add shorewall-init boot" + elog "" + elog "and review \$PRODUCTS in" + elog "" + elog " /etc/conf.d/shorewall-init" + fi + + fi + + local v + for v in ${REPLACING_VERSIONS}; do + if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then + # This is an upgrade + + elog "You are upgrading from a previous major version. It is highly recommended that you read" + elog "" + elog " - /usr/share/doc/shorewall*/releasenotes.tx*" + elog " - https://shorewall.org/Shorewall-5.html#idm214" + + if use ipv4; then + elog "" + elog "You can auto-migrate your configuration using" + elog "" + elog " # shorewall update -A" + + if use ipv6; then + elog " # shorewall6 update -A" + fi + + elog "" + elog "*after* you have merged the changed files using one of the configuration" + elog "files update tools of your choice (dispatch-conf, etc-update...)." + + elog "" + elog "But if you are not familiar with the \"shorewall[6] update\" command," + elog "please read the shorewall[6] man page first." + fi + + # Show this elog only once + break + fi + done + + if ! use init; then + elog "" + elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot" + elog "before your shorewall-based firewall is ready to start." + elog "" + elog "To read more about shorewall-init, please visit" + elog " https://shorewall.org/Shorewall-init.html" + fi + + if ! has_version "net-firewall/conntrack-tools"; then + elog "" + elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\"" + elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!" + fi + + if ! has_version "dev-perl/Devel-NYTProf"; then + elog "" + elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!" + fi +} diff --git a/net-firewall/ufw-frontends/Manifest b/net-firewall/ufw-frontends/Manifest deleted file mode 100644 index 7760702e1d44..000000000000 --- a/net-firewall/ufw-frontends/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX org.gentoo.pkexec.ufw-gtk.policy 778 BLAKE2B cc0be312e14eac90940e941f9d097244a2c05e73d4836afaf6f8a33b6ee1ba7aee9dc054615c7ad18c1aaef73145f0da8ed0a60c9df64ac602815951a8bf37d1 SHA512 f2b47a01535d565d2d3f40266f61b5b0ee3ad5befa4aa9f704000000f111980ac219eccea7d22fe3b0995d91aa794c278daa4f6a6d36649cd0db7b53772bd61f -AUX ufw-frontends-0.3.2-no-log-crash.patch 2224 BLAKE2B b1cd3ce8c289642f2d53918820a99384eeee4c9cad3dedd4c2ff0790e25651e3c723e1105ccbaf1515f122650bad972783ce1bbd3f8af07e52cb0e64711a312e SHA512 a68e414c92d6570ba7368526ddefae30897d79f7b352e841f69fa95435a1b14c26b551b37b3431830ee3df700d3a48fc62d454c9be8f8e59d070f5e47ece7ea7 -DIST ufw-frontends-0.3.2.tar.gz 85472 BLAKE2B 9aa53a2b2c87de416334c5e9c0c9c63ccf14405c896ad7ba9fc266df728ab29b79186102ee3fdd346dcf470f0a24327f1fc475d2fe25380c96da1645d236d446 SHA512 9f311596a3bad71562ca98acb8bf4d0d55990520cb5373c299dad05d1a1986e791eac984385013a511af4693a9988351ec37d8735ae6748818a9570db416b274 -EBUILD ufw-frontends-0.3.2-r5.ebuild 1732 BLAKE2B 510083cfac6dfa3d93037271d305fa08e43ab48fda331962225c315a59cdf9ef534b62d3260a0702883cce059074d345b6456c2fc1fe280b96bedb259bbc73b1 SHA512 c72a46f0cd68c533fb4c573130fbc7d1ed5c7fe29ee9b0e93a336daf6f5f5392bb0488ac52d8c8fabd8a50fe81402381f6429dcc525b2b28ed6da0a8b6a1cd94 -MISC metadata.xml 917 BLAKE2B 95b048745e22b89201a083314fa0e8e38d8f2de443a8a5f5a73a6c70c69a55cd522f6f89d0cfe1678fc7800e89c4f6b81c8ee294514b3017562c95367f5dc65d SHA512 e61b8a84c60861b69cae3a0f0748e5ab7d730ab0b9356ba29f991bfe1656cefdcc5f7395058003ac073daf71c4f58e484fcdbf9278e991bc92d8a7badcf453a9 diff --git a/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy b/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy deleted file mode 100644 index 7410debbc818..000000000000 --- a/net-firewall/ufw-frontends/files/org.gentoo.pkexec.ufw-gtk.policy +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Gentoo - http://www.gentoo.org/ - - - Authentication is required to run the ufw configuration tool - - auth_admin - auth_admin - auth_admin - - /usr/sbin/ufw-gtk - true - - - diff --git a/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch b/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch deleted file mode 100644 index f4adb49826ec..000000000000 --- a/net-firewall/ufw-frontends/files/ufw-frontends-0.3.2-no-log-crash.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e7bcf87788588c3a38ce18c9a8d69bbe156860e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C5=82awomir=20Nizio?= -Date: Mon, 3 Mar 2014 08:31:47 +0100 -Subject: [PATCH] Fix crash when no log in supported location can be found - -This can happen for example on systems that use Journal -from systemd. - -In this case, ufw-gtk exits with a traceback containing: -IOError: [Errno 2] No such file or directory: '/var/log/messages.log' -(this is the last log file tried). - -The patch works around the issue by handling the error -and disabling the widget in the "Events" tab. ---- - gfw/frontend_gtk.py | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/gfw/frontend_gtk.py b/gfw/frontend_gtk.py -index 75ebb33..75dfde0 100644 ---- a/gfw/frontend_gtk.py -+++ b/gfw/frontend_gtk.py -@@ -33,14 +33,21 @@ from gfw.frontend import Frontend - - class Notifier(gfw.event.Notifier): - -- def __init__(self, callback): -- gfw.event.Notifier.__init__(self, callback) -+ def __init__(self, callback, inactive_handler): -+ self._active = False -+ try: -+ gfw.event.Notifier.__init__(self, callback) -+ except IOError: -+ inactive_handler() -+ return -+ self._active = True - self._w = gobject.io_add_watch(self._fd, gobject.IO_IN | gobject.IO_PRI, - self._trigger) - - def __del__(self): -- gfw.event.Notifier.__del__(self) -- gobject.source_remove(self._w) -+ if self._active: -+ gfw.event.Notifier.__del__(self) -+ gobject.source_remove(self._w) - - - class Builder(gtk.Builder): -@@ -90,7 +97,8 @@ class GtkFrontend(Frontend): - data = (timestamp, event, conn['IN'], conn['OUT'], conn['PROTO'], - conn['SRC'], spt, conn['DST'], dpt) - self.ui.events_model.append(data) -- self._notifier = Notifier(callback) -+ self._notifier = Notifier(callback, -+ lambda: self.ui.events_view.set_sensitive(False)) - self.ui.main_window.show_all() - ## FIXME: for the 0.3.0 release, hide the tab for the connections view - page = self.ui.view.get_nth_page(2) --- -1.9.0 - diff --git a/net-firewall/ufw-frontends/metadata.xml b/net-firewall/ufw-frontends/metadata.xml deleted file mode 100644 index a3ab739d57cd..000000000000 --- a/net-firewall/ufw-frontends/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - slawomir.nizio@sabayon.org - Sławomir Nizio - - - proxy-maint@gentoo.org - Proxy Maintainers - - Currently, UFW provides only a command-line interface (CLI) for user - interaction--the ufw command. This project implements graphical frontends - for UFW using PyGTK and PyQt (the latter in early stage of development). - - baudm/ufw-frontends - - - Use pkexec to gain root privileges - Use kdesu to gain root privileges (note: the flag has lower priority than "policykit") - - diff --git a/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r5.ebuild b/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r5.ebuild deleted file mode 100644 index 6110449589c7..000000000000 --- a/net-firewall/ufw-frontends/ufw-frontends-0.3.2-r5.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 - -DESCRIPTION="Provides graphical frontend to ufw" -HOMEPAGE="https://github.com/baudm/ufw-frontends" -SRC_URI="https://github.com/baudm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -# CC-BY-NC-SA-3.0 is for a png file -LICENSE="GPL-3 CC-BY-NC-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kde policykit" - -DEPEND="" -RDEPEND="${DEPEND} - dev-python/pygobject:2[${PYTHON_USEDEP}] - dev-python/pygtk[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - net-firewall/ufw[${PYTHON_USEDEP}] - !policykit? ( kde? ( kde-plasma/kde-cli-tools[kdesu] ) ) - policykit? ( sys-auth/polkit ) -" - -# fix crash when no ufw logs in supported locations can be found -PATCHES=( "${FILESDIR}/${P}-no-log-crash.patch" ) - -python_prepare_all() { - if use policykit; then - sed -i 's/^Exec=su-to-root -X -c/Exec=pkexec/' \ - share/ufw-gtk.desktop || die - elif use kde; then - sed -i 's/^Exec=su-to-root -X -c/Exec=kdesu/' \ - share/ufw-gtk.desktop || die - fi - - # don't try to override run() to install the script - # under /usr/sbin; it does not work with distutils-r1 - # and so it is handled differently (in python_install) - sed -i '/cmdclass=/d' setup.py || die - - # Qt version is unusable - rm gfw/frontend_qt.py || die - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install --install-scripts="/usr/sbin" -} - -python_install_all() { - distutils-r1_python_install_all - - if use policykit; then - insinto /usr/share/polkit-1/actions/ - doins "${FILESDIR}"/org.gentoo.pkexec.ufw-gtk.policy - elif ! use kde; then - rm "${ED}usr/share/applications/ufw-gtk.desktop" || die - fi -} -- cgit v1.2.3