summaryrefslogtreecommitdiff
path: root/net-firewall
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-10-01 23:05:41 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-10-01 23:05:41 +0100
commit2e34d110f164bf74d55fced27fe0000201b3eec5 (patch)
treef00ae60197c58f84ad51f60b210738d9b70f555b /net-firewall
parentf70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (diff)
gentoo resync : 01.10.2020
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/Manifest.gzbin4545 -> 4543 bytes
-rw-r--r--net-firewall/shorewall/Manifest10
-rw-r--r--net-firewall/shorewall/shorewall-5.2.7.ebuild482
-rw-r--r--net-firewall/shorewall/shorewall-5.2.8.ebuild2
4 files changed, 2 insertions, 492 deletions
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 660373cc89f4..ffc8a86875f9 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
Binary files differ
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index ae406b548bc6..ba8e213314d7 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -15,20 +15,12 @@ AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b39
AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
-DIST shorewall-5.2.7.tar.bz2 585135 BLAKE2B 614a993d34927b6f976f8d783608832014e1e2c94d02f53904cc977d3a05cc7ef21bc3dd32545c11b705da7c84ca472f0dc2ec6438af6b60eb705f741d432269 SHA512 abe3f2bfa8944cdecf24e8a2b3bcc5a786bc6bafb1e85e10257f4ff3002689b1e0ed23ddf866f63ce301c6bec43959b6ce77bbbbe8ffeb0f48a18c858be226a2
DIST shorewall-5.2.8.tar.bz2 574427 BLAKE2B 1ea97c8d8ed4619af1ffe0e502c6871a2c14e6e75a12b5e702315aa67411efb6d0c3049017ea48f02e302a7d4af72d06b635dcc8314a4d4325a24cc8f7abd344 SHA512 d5fc562f59e97cb462c6c0d7cf2b0f6211d413c2e3db72d93e8ad4f23cd1d0f69c90fff602d6891bbee1725c2505a72f3677c3050758e36f38f0248e8c6c7e52
-DIST shorewall-core-5.2.7.tar.bz2 76504 BLAKE2B 5456b0f844c3f1c99cd8a89dff58ab5cf86d085a763a8de3918c2cf6fb5e59779912fae103f8b4284ba7a2c474beb786422a5de77eb3a67480d1d6ee0b316839 SHA512 0ed2f2e05abafa60e5d1560c5ee8419e7a3d0afe20192597a1efd263cfbe9331369682d6caa22ebdda128a410197010bb4429a3fa1500f9ac06ce8afcc1e6cc8
DIST shorewall-core-5.2.8.tar.bz2 77980 BLAKE2B 141ac2baf5b466c31d90bb73e8aa4f3f8688656f3734b85dcd392196559a70a9550f125595c488e90e2a34c8ab7067106d728b349fbcb7e42fdd0a8d11c749da SHA512 f0d4f41b2614cc4c6f834ac2a7bdfae181789bc97044171b0fa1e968cda930cfdc86fa1ff4b54b43a8ae22b7b6f80b66b77888644c5a7751edf814cc49d491c6
-DIST shorewall-docs-html-5.2.7.tar.bz2 4316006 BLAKE2B a981e050501d7fa9bdd2ecfc3fba279989089b1e6977abc881c2bc04df698e88cf7260acb28a06ce90d296e17944140ab24af98914839717811f2eb6af84da33 SHA512 4e381ad8fe8db5fe614c6dd6e4b595539519091c4aac2f7aa7ff8655e97fa8d07bec651c428492f334f632968ad94e1c863aeb1888964d696aca011e980fcbc6
DIST shorewall-docs-html-5.2.8.tar.bz2 4322407 BLAKE2B 42daa490ac8b14a93a56b6a2beb388600e7be4336e46bdbadf417c638873f8c362171a6c2b388044fa3bc551cc446832e3773459183eaf31d096af575b85631f SHA512 c6bf1d3d6d2e08c483d72662fef66a0db8dd3cc3637c6731e97d6150bcc24762864bd51eaa9a3ff0f75d7599c7a56a467668a6907c4bdaa9f90d8bf9453e127b
-DIST shorewall-init-5.2.7.tar.bz2 41377 BLAKE2B d39cf687ed4a5592fb8ea7b2d0a4b1313cb80ba81000e3692700a5a95d8035260991626c3e7466d3b9d1a9e8b3e61c559286f08b20494b81b59e5edbc8383378 SHA512 2dd81a4ae87496079990864a7b7a42814855d13210b996e3881e34d7cfb692035a2394adc912337800c72bc8565ae90426a0f1ddbf3e0384048a7c2d3e18aa43
DIST shorewall-init-5.2.8.tar.bz2 42589 BLAKE2B 74e265ed9d938b6130800f548f5f47658b641a76906a40d1980331f78648650a2165c43d232ab8d817ee5bcd63e1920e2e8b6f97b279a48baba1b72908816bc3 SHA512 eda8648ae5e67b2d6bc29f770e4ba791b6befaf85020445fb38d9837d65d8dcc90db79220e8d6a4c4918151ca2d33375cb3f3b7127e300cb9a37a572d154093c
-DIST shorewall-lite-5.2.7.tar.bz2 45949 BLAKE2B 9d56d57c8bbf0d6478aa2b834750c6545fb323bb8ac513eb8df4f377ec70faa1c71c2105ac40bb5c88272bf56e34f39d93d41215b96b889a4fa9bd80339993ac SHA512 9e48d6d48a0a12577518a3b729cb2ad63e5be9a748fd58ef4c450d9f31527773f2fa790f38e7b1547257b49786a56dc293a16fe97b9c6eddd007edcd35efaee8
DIST shorewall-lite-5.2.8.tar.bz2 47250 BLAKE2B 2fff00d7a6248a3db0aa5d6b3ed041b06bdfa35b71195088659afd4036cf61c6bc2f3de739803d4e26e56785aa90c87ec6a2120239183351fae7a54065f1a629 SHA512 d72f260b095f1dfb2b0a0c967ae80bfd7f5f3469a08eb446c0b3e1b1e662cb500510b75f2979a00a9ef57b16e6a23a95483c34e2a5c5d2d090bc1e071ea87292
-DIST shorewall6-5.2.7.tar.bz2 203996 BLAKE2B b8b721d54c5aafae773d0d80b38106a17000793ff16f217ac6ec21f8702afe7a3fd8e99941056e508a8d8c93819e0e5644f1f8ce83c61dc6e3be49fb8fcd70c9 SHA512 039e0092770262f22ba08c2cfd536eccb9530da48306791fa6683e34c34f862001ca827dcb79b535243e68a24bffe92dbd866cf9d7ea8754161b5a8326a86d8e
DIST shorewall6-5.2.8.tar.bz2 203102 BLAKE2B d9117d42cd25e18aa1104ec3f4498227eedcce5c3531623e2e4d6ec27ba5221f98e1ae2e596ac90d7415cd366b2dbfdd024adaaef0c1c2756900188bde105903 SHA512 7044efe84b2c585fcd0bfb661666c71cea140157f22ba7d4881006e24d785eb0091c071c825fa5948bc1383e7fd4617cc8f3d4e68865cf472ddea3811bf1833d
-DIST shorewall6-lite-5.2.7.tar.bz2 45989 BLAKE2B ae698fb3b580bcc373958932d07b8e27bc805616dabe3b6cbf349fd29fa10299f91fffa6d1a74530b008d8806c62cdaf3868d1830cb3869bcfc6ca422cd9a2ef SHA512 c694c00c96e45d437e62ff600f85bb70b9431211ef9ff84753e880b165d694c5cd1a581a8163ed580cee78e790893b6239a8504b422554f14b4d4b7dd3c70601
DIST shorewall6-lite-5.2.8.tar.bz2 47178 BLAKE2B 47026c3fdab7564c8e48b653a4c67db99fe5ff07de723169f65185aea563691806164a637a38c419d19619cf1380462fa7287b0993d9389dd311393bac911602 SHA512 a80ffc7baf7800e024e41a0f9736543b15d10f2d403540e48e8a2cd2ba0196ce04ff01ac98fc03852c7d268bb4954714dd428375e768b80aa4792683b8775935
-EBUILD shorewall-5.2.7.ebuild 16949 BLAKE2B 40c143a0265318201ec0d2186b6a1e75c0cf368e87e2544ade3ff7db49b03134434e27d628453692e33fbddaa34ec3bcb42c9375524be92fb1cbda5f37077bc4 SHA512 055dd811b6ea964f3cd44e9d312684438e17b9a5aae7a1dfd60ea863c8537e4bdc9cd80d7a129b9fa23f2483c7943c91ce3adf8ac872bb3b58e3e562654a415b
-EBUILD shorewall-5.2.8.ebuild 16955 BLAKE2B 492e4680f686a2e733bcc135644882abbc04a1f0e5cdc12cff69bd2f561d88e58fdef36a162f462a7e602b8fc2bcf1c8af1329aab24df9f00d966c0e8fd34d43 SHA512 0f694217f51006e9a7872d8130b849e2461ab07fb84e64bf97a060765cd16b8f3f5cbac4728822ba65cb4dde34158480b7ffbe9ee4a3d0da8df6514a186ad33e
+EBUILD shorewall-5.2.8.ebuild 16949 BLAKE2B 40c143a0265318201ec0d2186b6a1e75c0cf368e87e2544ade3ff7db49b03134434e27d628453692e33fbddaa34ec3bcb42c9375524be92fb1cbda5f37077bc4 SHA512 055dd811b6ea964f3cd44e9d312684438e17b9a5aae7a1dfd60ea863c8537e4bdc9cd80d7a129b9fa23f2483c7943c91ce3adf8ac872bb3b58e3e562654a415b
MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.7.ebuild b/net-firewall/shorewall/shorewall-5.2.7.ebuild
deleted file mode 100644
index c6f9c3e5bed0..000000000000
--- a/net-firewall/shorewall/shorewall-5.2.7.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# 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
- !<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
- local CONFIG_CHECK="~NF_CONNTRACK"
-
- local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
- local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
- # kernel >=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/shorewall/shorewall-5.2.8.ebuild b/net-firewall/shorewall/shorewall-5.2.8.ebuild
index 95a3c0906eab..c6f9c3e5bed0 100644
--- a/net-firewall/shorewall/shorewall-5.2.8.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.8.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
unset _tmp_last_index
unset _tmp_suffix
else
- KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
fi
SRC_URI="