public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2015-08-26 10:32 Agostino Sarubbo
  0 siblings, 0 replies; 159+ messages in thread
From: Agostino Sarubbo @ 2015-08-26 10:32 UTC (permalink / raw
  To: gentoo-commits

commit:     c0b8693f903bf7d9d30e8b4b38f7be3097d461fc
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 10:31:46 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 10:31:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b8693f

net-firewall/shorewall: ppc64 stable, (ALLARCHES policy) wrt bug #555188

Package-Manager: portage-2.2.20.1

 net-firewall/shorewall/shorewall-4.6.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-4.6.10.1.ebuild b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
index 9c4abe3..192104a 100644
--- a/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
@@ -68,7 +68,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2015-09-18  5:46 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2015-09-18  5:46 UTC (permalink / raw
  To: gentoo-commits

commit:     fc4c45f129bc60f4682f788f0b7f34b0a0136d90
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Sun Sep 13 23:56:56 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 05:45:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc4c45f1

net-firewall/shorewall: Dropped old

Bug: https://bugs.gentoo.org/show_bug.cgi?id=559978

 net-firewall/shorewall/Manifest                 |  14 -
 net-firewall/shorewall/shorewall-4.6.11.ebuild  | 442 ------------------------
 net-firewall/shorewall/shorewall-4.6.6.2.ebuild | 442 ------------------------
 3 files changed, 898 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 486525c..e3680a9 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,32 +1,18 @@
 DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5
 DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
 DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48efe28a897d339a2187a45e3efed8ef SHA512 a5ef4783ff04b6faaa2e25d1da57ca3c46860960859dad5cd3b8d3cb252626b1db39c35767b226333f10db7b08b0fb18c0c09cd4eaf14586cb02b1a4259b571d WHIRLPOOL 26ebb72e769d5ca7489f718cabdb1f9cfb78e2acd514329c7036edcafe27f159ffa4cdadeeb1cee43619f748474fcc7a614011147976abb14cf627503a542e3f
-DIST shorewall-4.6.11.tar.bz2 496630 SHA256 b504371e94281330fef8e60efcf8fcde0d4898322001930e7c9a11b4aee1599c SHA512 8661c89ad7e632e69206d5f308d2cc9bb150efc8e99fe911c55383c82fab5543915305f72e515e13a2d28917a3afc69088b52ec1dc8d126915516e2db699d40b WHIRLPOOL 5a645e4c25f1641a3a6634fb9b8572cc83e80f110fbf734c7ef724208616e1c94430d6594a675c9650de838d4e9ec2b255d5262b3487c6fbe06743c07966f1b2
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
-DIST shorewall-4.6.6.2.tar.bz2 485880 SHA256 db41744e6303e031e29be531dbedd4191624c4a70f9e23fa0b450e26953708f4 SHA512 9b37430a51b84e16d6fec3bbe0581ff18d1f8f15defd4d73ac6a13cd68eebe063da129a9b422079a433f5d4b3bcd7c0800d844cb05bf0ef0c41aa36fe57915f2 WHIRLPOOL 09c90c5871c546d8e396bca32e1a2b8b1a7041653330b74930c415bfe2b94ff24ac4c34f38644c6b539495a277410c59c3816f396f86060754bd4247fb622194
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
-DIST shorewall-core-4.6.11.tar.bz2 59476 SHA256 7651aee387eb497f71b0645234b0ae39eac906bce1d622475a1fc4401817ceed SHA512 28bfa0900826ec3f70d85257d086eea186a0a49a098b66a6263ed0812877d9552ec13a0e5a535816918e03314236893a869afb3918606a9debcc9b047798fd3d WHIRLPOOL a04ff53322eb8dda8e1cec656be689be60865dbd5b9b6dc885e461da5bfcb0995f2b8576a6dddabea7295337e0d8b37ce05351d7f6dbc0a63b7233f88cc0bd6a
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
-DIST shorewall-core-4.6.6.2.tar.bz2 54127 SHA256 764c8c22f619cdfd61eebd77e9f271a168515d44c4578b85af44921cc1f3b675 SHA512 bab5a8f1bb17a5273a5eadb734ad378a8b617b9a8be47a2a825f941d20c5161c88ce87dae285ebbbdbb21fe18c2e8cc5eff9b1097daef2d8def37c2eced05d6a WHIRLPOOL 8fd70565cfe0c6abc946cb41fc5cb1eca9ccc613fb4898f07b92f878fedd6293bc40e0aaf7c4af11f3e67ba47b341f471d69700e3edc0cc9426b4aad3bf38fb3
 DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
 DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
-DIST shorewall-docs-html-4.6.11.tar.bz2 4175307 SHA256 e1f6966d5d06b043eb3b7f91d8b6d87a0f90418ecd173af2e3e817670435bd8c SHA512 85b5efa3f8bd9322fa8f982e0cdcf4e1ccdd99f419b77dce51a39a5f2d6ad02de8d6123437a2f55b5af2467cb59d9cbb8bbbd32195ab1587fc329c6f65173471 WHIRLPOOL 01577073dbbcf8e16f8dae2a2295bd4e60d6b5ce48384ebc8dbb03d0b75cf9b3c72c51dcdfc4934761f021eed85c26e0eeb637853b99af42702f5129be0ce25b
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
-DIST shorewall-docs-html-4.6.6.2.tar.bz2 4178931 SHA256 89c6b3baba42bd3a4d7f67ccfbae395fec4054412bf636ff60a889dc2f5edc57 SHA512 63686a59eb6fe6330b036800dc99758bdfaecc1e67cf95c4dd3cc014db2e96a17a76d8cf92d1f44582990b34b53d062327c850187bc0a83e4d2369ac7e03d032 WHIRLPOOL 31eacfe0c6ea3dac32c24de0c5d01214f3ce4e2b95306e3d6e4165a636a7f6f225fedc741d19fa995c148a2758ec08439da0d5e1cd654483e2e5be4f21a5dfda
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
-DIST shorewall-init-4.6.11.tar.bz2 38404 SHA256 025958f609ccfea21229f4a3f76e030f82d4d9b444ccb71e5c82f620c46ca35a SHA512 5b0dd33885825457d94ad2c59cd9b3690d9a5bfad43a8b281ba55537c1e8edc7e1de227ac0bcd22162b54bc31cc606b9db1387f2618739b2ef28292b5b6b8be7 WHIRLPOOL 06b79197b9a61fb7d63c19b7e145e08fd68e9adbbc8c60b224882649f6759848b411f99fd39a7ff9c65b9aafb33b76005c788a16a28498d19cf2622e1bd94336
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
-DIST shorewall-init-4.6.6.2.tar.bz2 34467 SHA256 361374cd8f52cec0f807e07a7a100da4627595c7c80c2d75d050ccee1a342e67 SHA512 760eb593c53e89622c6efafe8a46f43956aa606853f26c9a5402ca43eabbf1243a2dd3c2d64cc4a1e70da54bd0fb86de31c0f5dc14aefd0540b37745c243fb48 WHIRLPOOL 64953fab35a4a95ece8757b786a301caefbb47bd70821b61c48bfbbb445ebb3f434ca87ac5808bdf691a5469d2e2e3dd47b8857f272267790282ad8bbeb8b3b9
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
-DIST shorewall-lite-4.6.11.tar.bz2 54339 SHA256 6b939754c685dc2e218ebb1f5bd4d81b1c73df8c99545d83644e5c7fa50dd568 SHA512 5a75a8e03bf48666e04cc2f5ac2a4e352b5624e8adfb1e92de400624691508fe2fe22d6f5a4e48dd412d4011d3ea737d7e0b098c56480daf72fd4801ec98f834 WHIRLPOOL 205387277cb6132c43ff18baad40c3ce6fbd7c483e736fce5f5775febeb68c3cfafbae3162682f1fb05312e48ca15c0851bb538761f6e53b5780070108397aa5
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
-DIST shorewall-lite-4.6.6.2.tar.bz2 48495 SHA256 6bd25fa1066da5272fa9bcc7a8a6041462eda682895cd000afce354bf42d9ebe SHA512 3c073b7531448c2d704bbdd0a7ad0287948d8969c371954f05a3cc276e6fcaaca907c554f4549c26aff2256d393fcc53221e7a1f93ac058cf519dc55c822104d WHIRLPOOL 1743c799022ab2a5ed1d86155f917120b44963c064d75b4168ea48b4e0b19970ccd1d944eb22eef0ea96f0abf396d60420508bda3f2cc30a33207c2edd12b27d
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
-DIST shorewall6-4.6.11.tar.bz2 232736 SHA256 1b7a58f97c40c28c4ff8b614a44cc2bc8a8e4a332afa2b5b132e78ec06fef866 SHA512 5ae1a89a980efaf860a32a106a24c98d7543bf4523361b62b568b390a5a515e67d6090523499d2e9bae9421f5a6ceb29460efed8286c41ea67d8912e4fe59ab4 WHIRLPOOL 627d0b4521ce90a3d8ea34c98c1ed9fea84ba7f631c1478c58a3ce52fc538c05116278526d66ccd08e59326467e4bf5eb44ff8e5d74ef47ed4c0492644c0b1e7
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
-DIST shorewall6-4.6.6.2.tar.bz2 225643 SHA256 b475473eaf9d4a8b4067214f8fa14f1c1d97cdb77c180abd9e22dfdea6b9f637 SHA512 a448e6367459fe06ff2869e45d06a3ff31ce5c7a6766920ad8367e251f8380ccf9cc62333d011f79baa7d3d97efb42fcadf1c6aecce124f2a3b94c15d3454db9 WHIRLPOOL 7f1fc2288983cb779872098362d98c7820164207dcbbcdf63d0fbec4b8fb2190724fde10f071f51ad51ba3f8f10282ecba5ba4f4b976ffa816da39935c336c54
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
-DIST shorewall6-lite-4.6.11.tar.bz2 53501 SHA256 fb9a4a42d39e3277c7f49fc09eacb6e347bc08485281c578cacce8429a055a84 SHA512 4010dd36a1cad7fc491272db202914964a1588779645e12fb0dbaa9749c37e1c28b15826ac6b07449609cbf1e77a979a29619c8cf6a9fffbbe6d1f34c843b560 WHIRLPOOL 62554f304364c61dfde283042a81568ffc740c754d7078b462b5cf8cc8a3e7afb072325900e74c99c1efb5586a35c103a190cb618dd82b8d5cb09a1b9d912f02
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993
-DIST shorewall6-lite-4.6.6.2.tar.bz2 47909 SHA256 a7a6de15ea84a0486c9ed92492fcd6f731f2c4ce71f06ce3c59f3abf3780ae86 SHA512 0d5b0fc3d166cfdd58978e1d6b36e2ac19a0d10b5b59bbf2fa62e79040e636d72256b120df14a7d8111dc39d24ac218758feb07c5fb2119aa61e51f78c567597 WHIRLPOOL c02c11ca0f578022daf96b2c594a7f62d042cf875c7c35682eaa2b312416446239c21c9af31f965536761a081015d73ae49b553c7cc08850955378d1cfb76af7

diff --git a/net-firewall/shorewall/shorewall-4.6.11.ebuild b/net-firewall/shorewall/shorewall-4.6.11.ebuild
deleted file mode 100644
index 992829c..0000000
--- a/net-firewall/shorewall/shorewall-4.6.11.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.systemd-r1 "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.systemd-r1 "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.systemd-r1 "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.systemd-r1 "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.systemd-r1 "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/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
-
-		cd "${S}"/${MY_PN_INIT}
-		epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}"
-	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
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [ -d "${D}etc/NetworkManager" ]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		dohtml -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 "  http://shorewall.net/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
-
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
-		fi
-	fi
-
-	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 "  http://www.shorewall.net/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
-}

diff --git a/net-firewall/shorewall/shorewall-4.6.6.2.ebuild b/net-firewall/shorewall/shorewall-4.6.6.2.ebuild
deleted file mode 100644
index 06be7f7..0000000
--- a/net-firewall/shorewall/shorewall-4.6.6.2.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/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
-
-		cd "${S}"/${MY_PN_INIT}
-		epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}"
-	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
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [ -d "${D}etc/NetworkManager" ]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		dohtml -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 "  http://shorewall.net/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
-
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
-		fi
-	fi
-
-	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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2015-09-26  9:09 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2015-09-26  9:09 UTC (permalink / raw
  To: gentoo-commits

commit:     ac2eb68409ddc1df096e3090ac49f0259808a44e
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 09:08:40 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 09:09:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2eb684

net-firewall/shorewall: bump to -4.6.13.1

Package-Manager: portage-2.2.20.1

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-4.6.13.1.ebuild | 447 +++++++++++++++++++++++
 2 files changed, 454 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e3680a9..7d2576f 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,18 +1,25 @@
 DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5
 DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
 DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48efe28a897d339a2187a45e3efed8ef SHA512 a5ef4783ff04b6faaa2e25d1da57ca3c46860960859dad5cd3b8d3cb252626b1db39c35767b226333f10db7b08b0fb18c0c09cd4eaf14586cb02b1a4259b571d WHIRLPOOL 26ebb72e769d5ca7489f718cabdb1f9cfb78e2acd514329c7036edcafe27f159ffa4cdadeeb1cee43619f748474fcc7a614011147976abb14cf627503a542e3f
+DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
+DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
 DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
 DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
+DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
+DIST shorewall-init-4.6.13.1.tar.bz2 40718 SHA256 35684f1955eed65d897f5c51a74b9bf431a839cdeabc9ca7b37109d7b47a9d95 SHA512 f6b5d6e59eb3e4f4408b68bee69dacd3e5b00b3d0628b4b0f6408342bd05b279efc3962c0b294e37b8e6c719442232e73e348f048534916f97e3f40fb3a598d5 WHIRLPOOL 05c774194b33e1ffecec42e756851d3a9bd6764a13b280f63737dca53efe4223cea081b42e4f1a205062baaa3fac62a92b490b1402a6cd0ada637f98bea1b690
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
+DIST shorewall-lite-4.6.13.1.tar.bz2 56534 SHA256 639213a42c424def670a8b54ce13f0fe007aa9ff97e2beb8cb1cd98deb3fba2f SHA512 0fd3ac13e09dc4975d8a186a536b02420e00374376e3d8b903d6a69cb542de88a303bbe5d3e44831ef8d3ef3fd9ba0a34f19c89803d3ff4b622a366338cf7453 WHIRLPOOL 640541b5bb1c92d3fcb23ec970094200257af5b55a4a71be47a854be781d3e29d8354ea03d79b28fc654f3cab49c1e6de16ee01b3a02a61f0299a0a9bb4b5255
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
+DIST shorewall6-4.6.13.1.tar.bz2 235114 SHA256 561887394a04532e06ebdf153aa60c6eaf176349f59a7a30e2c1d31aa48ba4eb SHA512 0700255da06c48577227439b3b358f4693a4e1e4c311f39079686c16b573e5bc4efd251160f69c1e6fc3daa8a503b2ede8fe44d51c93a9abd89431fd85081d72 WHIRLPOOL 9bcdf5b7a0c0a79143b3d451f7b362d41290ad641ab92b92abcfdda0fe15903ff2a225fc3571abe7c9c12e4b6ac34d054adf46372d94acfe997579a931a2979b
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
+DIST shorewall6-lite-4.6.13.1.tar.bz2 55723 SHA256 33a95315f4b976a4fe003f084c3f4363761a076c758c05c6a211a884fe6a63c5 SHA512 6c240fc31bf07e8c52aae3285cf22e7b2fefe846898bea02514157cffbedb930a7cf6a12a4ef473b1713ef8c524b7a48b916f0ffff37477c4ac94afb72397e11 WHIRLPOOL c9b99295ee498e9be3ae7d2a947153828653c931fba90527ecb05254c1fccb1981f800894b31786bcfab50cffdc2dd7e91964e70e43ab67a2d3d0954303b35a3
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993

diff --git a/net-firewall/shorewall/shorewall-4.6.13.1.ebuild b/net-firewall/shorewall/shorewall-4.6.13.1.ebuild
new file mode 100644
index 0000000..fd85c68
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.6.13.1.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
+DESCRIPTION+=' a high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.systemd-r1 "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.systemd-r1 "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.systemd-r1 "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.systemd-r1 "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.systemd-r2 "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/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
+
+		cd "${S}"/${MY_PN_INIT}
+		epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}"
+	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
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [ -d "${D}etc/NetworkManager" ]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		dohtml -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 "  http://shorewall.net/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
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2015-10-27  3:09 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2015-10-27  3:09 UTC (permalink / raw
  To: gentoo-commits

commit:     6f21739160fc4f4e11c72ed3f53f623672419ab2
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 03:08:40 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 03:08:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f217391

net-firewall/shorewall: remove old versions < -4.6.10.1

Gentoo bug: #560392

Package-Manager: portage-2.2.23

 net-firewall/shorewall/Manifest                    |   4 -
 .../shorewall/shorewall-4.5.21.10-r1.ebuild        | 118 ---------------------
 net-firewall/shorewall/shorewall-4.5.21.9.ebuild   | 116 --------------------
 3 files changed, 238 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 461f8bb..519fcaf 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,5 +1,3 @@
-DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5
-DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
 DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48efe28a897d339a2187a45e3efed8ef SHA512 a5ef4783ff04b6faaa2e25d1da57ca3c46860960859dad5cd3b8d3cb252626b1db39c35767b226333f10db7b08b0fb18c0c09cd4eaf14586cb02b1a4259b571d WHIRLPOOL 26ebb72e769d5ca7489f718cabdb1f9cfb78e2acd514329c7036edcafe27f159ffa4cdadeeb1cee43619f748474fcc7a614011147976abb14cf627503a542e3f
 DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
@@ -8,8 +6,6 @@ DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913
 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
 DIST shorewall-core-5.0.1.tar.bz2 45988 SHA256 fd2c764f34f02b923ad4a2c5b4017b9b96df2c6886710254f2e2771e3b007a0b SHA512 a65965d272190ff4e32022a5ba21eaabfedfde50ffa1c2d100892f1b3796a5908641f5fe40e3c66f9d0bd7666217ba046e61a89368a41d8dc9eaee7db2efa4cf WHIRLPOOL 8366b0d423dc38349e795e65dace67e7c851a00335b49da1c8308796e9ff5c9544c76375d00c8c521ade30b21ccc91e874382c89691cf11927624fc42fd1a434
-DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
-DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31

diff --git a/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild b/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild
deleted file mode 100644
index 18a2a85..0000000
--- a/net-firewall/shorewall/shorewall-4.5.21.10-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	=net-firewall/shorewall-core-${PVR}
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-	local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PVR}/shorewall-10-fix-ipset-support-detection.patch
-
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}

diff --git a/net-firewall/shorewall/shorewall-4.5.21.9.ebuild b/net-firewall/shorewall/shorewall-4.5.21.9.ebuild
deleted file mode 100644
index 6219381..0000000
--- a/net-firewall/shorewall/shorewall-4.5.21.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	=net-firewall/shorewall-core-${PVR}
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-	local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2015-11-10  6:12 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2015-11-10  6:12 UTC (permalink / raw
  To: gentoo-commits

commit:     2e6ffe1a649cee2815c359c370b5ca279235ba0b
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 02:31:35 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 06:12:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6ffe1a

net-firewall/shorewall: bump to 5.0.1.1, rm shorewall-5.0.1.ebuild

request by proxy maintianer via the gentoo bug

Gentoo bug: #564962

Package-Manager: portage-2.2.24

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.1.ebuild => shorewall-5.0.1.1.ebuild}   |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 519fcaf..52f2606 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,28 @@
 DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48efe28a897d339a2187a45e3efed8ef SHA512 a5ef4783ff04b6faaa2e25d1da57ca3c46860960859dad5cd3b8d3cb252626b1db39c35767b226333f10db7b08b0fb18c0c09cd4eaf14586cb02b1a4259b571d WHIRLPOOL 26ebb72e769d5ca7489f718cabdb1f9cfb78e2acd514329c7036edcafe27f159ffa4cdadeeb1cee43619f748474fcc7a614011147976abb14cf627503a542e3f
 DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
-DIST shorewall-5.0.1.tar.bz2 477174 SHA256 1b5147d5ecb1ccf950785c239a6b6db47fa694cde229ad7d4eaea2e3fcc2a4ee SHA512 1eb1d1d4fb5f750a93af61462b789e5c725ab960a3512e5363aab8a3d4ca9823ed3dd3e189222ed782321edbb9f28230446b7cae3156ab0e86d6fe584c2ba253 WHIRLPOOL f24be9f60e10937f760c316c74d7d854541df2c1f0d019dcefa128c27bdfbe71b5fc72201dc750671adc61667923c3138350d00210cfe5d2112308b4bf1df7fc
+DIST shorewall-5.0.1.1.tar.bz2 476999 SHA256 9f42005ffffc4a48f051b356c109ac48f05bf1f63c03c08a30fd7fcfb2a8c737 SHA512 77f1111b253ec2d83ea8bbe380a3d56fa6a17298f05fd0cb820df7149c5ea4d7756604d3d2a195ad951289dccce914b660af151a8994bf40ed0915a6f1495e6b WHIRLPOOL 68f7e0cbf6c631bc408daf1f26a06e6ec3e77122d824a42336b6eaaeb72437a827338817ae5c159b0a2e66f74855bffffdc1fd9a22dc17895c5874fccd2b0459
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
-DIST shorewall-core-5.0.1.tar.bz2 45988 SHA256 fd2c764f34f02b923ad4a2c5b4017b9b96df2c6886710254f2e2771e3b007a0b SHA512 a65965d272190ff4e32022a5ba21eaabfedfde50ffa1c2d100892f1b3796a5908641f5fe40e3c66f9d0bd7666217ba046e61a89368a41d8dc9eaee7db2efa4cf WHIRLPOOL 8366b0d423dc38349e795e65dace67e7c851a00335b49da1c8308796e9ff5c9544c76375d00c8c521ade30b21ccc91e874382c89691cf11927624fc42fd1a434
+DIST shorewall-core-5.0.1.1.tar.bz2 46363 SHA256 4501a4c7d4d8e7572f5b23e988736740e5da477277f1e636ed9a9dbd2e874457 SHA512 f127c4056d64c1bbc36d3e5a61e12829ef687d0c37c3a277c6a51c8e57b787187246201f293ea65414e057967eabc5601b81d2154b780eca572ab0c64cfeb75d WHIRLPOOL 777e8e84eef4ddcd54c1db36bb394cf35b724ebd988f2c86158cfcfeb7fba544279386e98ad897f58690b6cf8ac684a385c3fe42d8f2c498b1fcfd89ade0a20b
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
-DIST shorewall-docs-html-5.0.1.tar.bz2 4274054 SHA256 c43f847ae2b106c7966b3aeb6a4221c0b9b3d5219e35b485b84d70f2e84ff8d9 SHA512 1bb264ba0166204c77588a7741388af2ac3091c305331f962b333c3adf725a055bf2b15974d0f6007ff93f4112a387937668b815acff3ca19ee2cc36d36a827f WHIRLPOOL e200846eff4e467b9cbec7097e9d69c4f039bfe0e5a8e8ff193f077ab7e92c4d9c41458b8041a6be27e4afe9e06b1809a54b0d1797c38bc7d62d933173812edf
+DIST shorewall-docs-html-5.0.1.1.tar.bz2 4274105 SHA256 55b74717e744624763bfb073e3c41c4a9219b82568ba5d0d99f300a2518af1a0 SHA512 d73a5c6267f628288d0cce7624b62546f852392a83ec314218f8c663d768ae0a5e0672eca534efe34d60dab713ff3769994a87d498c9bf491e20c5b2530654e2 WHIRLPOOL 665e72218b594817f29ecfe6ecadf444818bcebd09757c391671228ed032d7c706c4457724157b7a4af9f42e6844010bd5c0400b2472178cc50868c5affb020d
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-4.6.13.1.tar.bz2 40718 SHA256 35684f1955eed65d897f5c51a74b9bf431a839cdeabc9ca7b37109d7b47a9d95 SHA512 f6b5d6e59eb3e4f4408b68bee69dacd3e5b00b3d0628b4b0f6408342bd05b279efc3962c0b294e37b8e6c719442232e73e348f048534916f97e3f40fb3a598d5 WHIRLPOOL 05c774194b33e1ffecec42e756851d3a9bd6764a13b280f63737dca53efe4223cea081b42e4f1a205062baaa3fac62a92b490b1402a6cd0ada637f98bea1b690
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
-DIST shorewall-init-5.0.1.tar.bz2 25161 SHA256 ab2e2cfbe87fb4503d7b587ca3072e70b649f4a3a2a1e16651d801181390acfe SHA512 fb4d1764311bd3d244315c3f33d2881c9d78501102a619b389bc439c306e12871e65e7cc8fef25ce45e44b88bafd57798feb5c6cc3f988ad1ff1125d8c002db3 WHIRLPOOL ec6277fe1c881bc8ad55fa92e70676972228a13ca95a6c36ef2b5cf5e87d280d87ee5a743b98002e26be8b90a51a79d786abe3fdb72bfe5ab4ee08f3aa25d43f
+DIST shorewall-init-5.0.1.1.tar.bz2 25448 SHA256 6930400caa2edcf8d478a9e0a1056545da81b21cef2283ffcf8ed838304a81f3 SHA512 dd7c0df33e3d3de9d55954df0352244a3de54dbc95779da2bd9214478930dc316afceb29857acf2651d138999fe05293afafa1f760da02a3179a09f5e543f10c WHIRLPOOL 1f3ce179d9621431eb0eb696255afc3a25329eade0cb6c42b93d8d16ff4367bf6fcfc3b51176b9029fcfe80130e4cc97fb7333f21078246a7c4f8953b1a8456a
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-4.6.13.1.tar.bz2 56534 SHA256 639213a42c424def670a8b54ce13f0fe007aa9ff97e2beb8cb1cd98deb3fba2f SHA512 0fd3ac13e09dc4975d8a186a536b02420e00374376e3d8b903d6a69cb542de88a303bbe5d3e44831ef8d3ef3fd9ba0a34f19c89803d3ff4b622a366338cf7453 WHIRLPOOL 640541b5bb1c92d3fcb23ec970094200257af5b55a4a71be47a854be781d3e29d8354ea03d79b28fc654f3cab49c1e6de16ee01b3a02a61f0299a0a9bb4b5255
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
-DIST shorewall-lite-5.0.1.tar.bz2 41893 SHA256 591fc40ca5af74f4a0d50a9aa7413e3c6311b4eeb46f36b72e2bf90ee392ed53 SHA512 9debace6a1202ff5b438078e8a0e47033fe13a563ea26fa6b163b55a3355eec31d1b89a1bdae071a6da8f3c4130b669eadd3b91073a366cfe8b9b31f3eb6fcc7 WHIRLPOOL 921cc0643b62ab5a068f8b0c276a971f7361d3cb59851ba96328afc95558cf3a85cd4bf3589c098b070474df18d9f5704e592ae0e51e6485c67804512e5bc009
+DIST shorewall-lite-5.0.1.1.tar.bz2 42106 SHA256 35101666f056fa90c3a8af5d9dfc1e57d85644d17d2a58d09235acaa29f736f5 SHA512 8289394b37feae9da80409d967a9f3e01e75cb066047386223b6306a4a55ac63385e2033c007d8fd08952d46d1109e24a8cd361aecc39a8007711f4aa7419e8a WHIRLPOOL ac5c830ecd928e8dc5fcd29e79c57763d6bd046faaa3d93a6b1b4fb91dc3a474c366dfccf0aac4c62c6c6b2da4da009aaf7b1d559ca411239fc1ffd125938755
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-4.6.13.1.tar.bz2 235114 SHA256 561887394a04532e06ebdf153aa60c6eaf176349f59a7a30e2c1d31aa48ba4eb SHA512 0700255da06c48577227439b3b358f4693a4e1e4c311f39079686c16b573e5bc4efd251160f69c1e6fc3daa8a503b2ede8fe44d51c93a9abd89431fd85081d72 WHIRLPOOL 9bcdf5b7a0c0a79143b3d451f7b362d41290ad641ab92b92abcfdda0fe15903ff2a225fc3571abe7c9c12e4b6ac34d054adf46372d94acfe997579a931a2979b
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
-DIST shorewall6-5.0.1.tar.bz2 220973 SHA256 466b6486cb992385443e46158afab60d669e6e5f774f68b0754d2b394feaf740 SHA512 0af72641961eb9b86e679a7456968a807e72ff296bcee28a8fcc60c1c8254a8b1b4d9c8ca22949f02705cb022622d9435a66a65ac35948ca49b419e410665823 WHIRLPOOL c72368da11227f2a1cc2b061e329314f06517617a322fbe2394a3a94fd11c7dab00ed86e657f74c344732cfc4217cfa5cf7af424f5c751632523bbcf7c45bef1
+DIST shorewall6-5.0.1.1.tar.bz2 220981 SHA256 ddd25edb1da9f85357bb3b6451b66a76c59c2aec196009568f91f69da4832907 SHA512 00ecef823044f93c0884d8f32783d4f1c8312a7073d2bf5eeb9bbb41ce629a8bd5ddb92efa240ed438ddfe132d41264d35ca4ff027247fa54f08e36826243900 WHIRLPOOL 5f2b81bf738be046707152688ae8c45c4badc9e6a9b6b0d96abccd2826eddc5b91c84f89a1e3cd39407bee56aa4fa0ecd8e0ff5c6df22e4f42e43d976f6a2962
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-4.6.13.1.tar.bz2 55723 SHA256 33a95315f4b976a4fe003f084c3f4363761a076c758c05c6a211a884fe6a63c5 SHA512 6c240fc31bf07e8c52aae3285cf22e7b2fefe846898bea02514157cffbedb930a7cf6a12a4ef473b1713ef8c524b7a48b916f0ffff37477c4ac94afb72397e11 WHIRLPOOL c9b99295ee498e9be3ae7d2a947153828653c931fba90527ecb05254c1fccb1981f800894b31786bcfab50cffdc2dd7e91964e70e43ab67a2d3d0954303b35a3
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993
-DIST shorewall6-lite-5.0.1.tar.bz2 41039 SHA256 fec8bc38fff94f0f5375992038eee83fb395a232b7cad83e1cf215a5d3388061 SHA512 1dc6f0681e429998880b90ca6e877bdeb4bfdf2c68036026db88aa55efdeaff27c59e4829597da938b0ee0e395278e744e98f7a41eabe536f7e6a1bea38850d3 WHIRLPOOL c5dcb398c353500f76ab6f555e387639d09f122ad792d40021958971c0dcf8e44cf16a4e443697574eecbc63eee2dc1d465aec1b86f6b9784b1a832c018ef3a0
+DIST shorewall6-lite-5.0.1.1.tar.bz2 41272 SHA256 c14b79fb10b0ad8e7ed14040353216317fd5f7c53502e227c43e521f85840dc6 SHA512 c62536b76b9bc48131b97a577e707ed5050504010d501c48686457afd973286385444d00c2a30e743ba229c6c6518925a0fe870b198095eadc1060487e980aa5 WHIRLPOOL ff1c394fa4e0dae72352c0e84c76bac138904002498f4acb52cd6f1322fe7e3a8acd6334e42525f15620c30a2d28d6eb8656af122785b9c163599f357ef184ad

diff --git a/net-firewall/shorewall/shorewall-5.0.1.ebuild b/net-firewall/shorewall/shorewall-5.0.1.1.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.1.ebuild
rename to net-firewall/shorewall/shorewall-5.0.1.1.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2015-12-15  4:45 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2015-12-15  4:45 UTC (permalink / raw
  To: gentoo-commits

commit:     415c35cc995bd8b4370792858aefa94eadde7295
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Fri Dec 11 11:58:17 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 11:58:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=415c35cc

net-firewall/shorewall: Bumped to v5.0.2.1

EBuild changes:

- Fixed description to satisfy repoman.

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.0.2.1.ebuild | 446 ++++++++++++++++++++++++
 2 files changed, 453 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 52f2606..41c5dd0 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -2,27 +2,34 @@ DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48
 DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
 DIST shorewall-5.0.1.1.tar.bz2 476999 SHA256 9f42005ffffc4a48f051b356c109ac48f05bf1f63c03c08a30fd7fcfb2a8c737 SHA512 77f1111b253ec2d83ea8bbe380a3d56fa6a17298f05fd0cb820df7149c5ea4d7756604d3d2a195ad951289dccce914b660af151a8994bf40ed0915a6f1495e6b WHIRLPOOL 68f7e0cbf6c631bc408daf1f26a06e6ec3e77122d824a42336b6eaaeb72437a827338817ae5c159b0a2e66f74855bffffdc1fd9a22dc17895c5874fccd2b0459
+DIST shorewall-5.0.2.1.tar.bz2 478874 SHA256 10136cf586b620abdad1f3c716f03d1160cfa65c8461fba42d858fa1ab8d5856 SHA512 54589366a7743b9e8035a13b83a77e80a319531e07c803fd88ea31d2023445b9a63b99e0ad030997f43cb49050dfc4b0c94af2ec6c6631249fc1a2354d5565c1 WHIRLPOOL 559f916008b04c6779b50185e123274c8a20994c3ade58789ee840c5d9e13c7dba3e0885b3babd7a187aeb19a25b4ea8a6e151270fed3f363ce4d14d0fe749fc
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
 DIST shorewall-core-5.0.1.1.tar.bz2 46363 SHA256 4501a4c7d4d8e7572f5b23e988736740e5da477277f1e636ed9a9dbd2e874457 SHA512 f127c4056d64c1bbc36d3e5a61e12829ef687d0c37c3a277c6a51c8e57b787187246201f293ea65414e057967eabc5601b81d2154b780eca572ab0c64cfeb75d WHIRLPOOL 777e8e84eef4ddcd54c1db36bb394cf35b724ebd988f2c86158cfcfeb7fba544279386e98ad897f58690b6cf8ac684a385c3fe42d8f2c498b1fcfd89ade0a20b
+DIST shorewall-core-5.0.2.1.tar.bz2 47922 SHA256 8be30270e527c7697c365c437bff07e6a41ccdcf28b7163b2866750158e5845d SHA512 bf614cc73bc321c46b0825deb198943ce3a37a6e1b5dc5f2b9be17799409de9909219dec327c493a8382111cc9b7e7319c15effd84b238bee85ed9b6f0281100 WHIRLPOOL 5e415c8fb17edb96978cd3f8811fdd0953de556efe3cb6e5b1e9abe98535f905119eb968dadb65b3a525801c49af1fdbabc3b3e7eb06364c420323be6eeecb51
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
 DIST shorewall-docs-html-5.0.1.1.tar.bz2 4274105 SHA256 55b74717e744624763bfb073e3c41c4a9219b82568ba5d0d99f300a2518af1a0 SHA512 d73a5c6267f628288d0cce7624b62546f852392a83ec314218f8c663d768ae0a5e0672eca534efe34d60dab713ff3769994a87d498c9bf491e20c5b2530654e2 WHIRLPOOL 665e72218b594817f29ecfe6ecadf444818bcebd09757c391671228ed032d7c706c4457724157b7a4af9f42e6844010bd5c0400b2472178cc50868c5affb020d
+DIST shorewall-docs-html-5.0.2.1.tar.bz2 4272585 SHA256 a9c55c513fd086dc90d686f9a0444311453670487f10d3ed44505b952c72fcf2 SHA512 dc310f694b4cde8b27e3df99f75081019f752a3c7faa693093b1d5ec786392d2c2202f76b7372f894fd6e72fad5f7816db3b9a88a3a3409edcf4368d9e6b36d0 WHIRLPOOL 2f26c930a3aa56571cbfb02ba8f61b29103af91d46b014b21ed4b7da64f891c89df17fc725ba87b5809ad50d2d3ee2f8a55e6e983a612e6320d689afd6c287c6
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-4.6.13.1.tar.bz2 40718 SHA256 35684f1955eed65d897f5c51a74b9bf431a839cdeabc9ca7b37109d7b47a9d95 SHA512 f6b5d6e59eb3e4f4408b68bee69dacd3e5b00b3d0628b4b0f6408342bd05b279efc3962c0b294e37b8e6c719442232e73e348f048534916f97e3f40fb3a598d5 WHIRLPOOL 05c774194b33e1ffecec42e756851d3a9bd6764a13b280f63737dca53efe4223cea081b42e4f1a205062baaa3fac62a92b490b1402a6cd0ada637f98bea1b690
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
 DIST shorewall-init-5.0.1.1.tar.bz2 25448 SHA256 6930400caa2edcf8d478a9e0a1056545da81b21cef2283ffcf8ed838304a81f3 SHA512 dd7c0df33e3d3de9d55954df0352244a3de54dbc95779da2bd9214478930dc316afceb29857acf2651d138999fe05293afafa1f760da02a3179a09f5e543f10c WHIRLPOOL 1f3ce179d9621431eb0eb696255afc3a25329eade0cb6c42b93d8d16ff4367bf6fcfc3b51176b9029fcfe80130e4cc97fb7333f21078246a7c4f8953b1a8456a
+DIST shorewall-init-5.0.2.1.tar.bz2 27055 SHA256 2ce13881f7442b9e43bb1417bed9236931bb46ce8c74dd87af5d18be41b05311 SHA512 d8debb25e36d7829dcdb08698a889ccee680126da40f5606bba6a04b344cfd28660450cb3fd2037f6ec4d75058d8a243da82fb4c3b25184b609a5aa454739eca WHIRLPOOL 5d17a58c157993af37f75b64e53b693c8f62854bfebb8774520bd435a6c65e24e06c22398181941b352e218945055d8e3927f2cfbcb32e09d8c30f3f8e45fc29
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-4.6.13.1.tar.bz2 56534 SHA256 639213a42c424def670a8b54ce13f0fe007aa9ff97e2beb8cb1cd98deb3fba2f SHA512 0fd3ac13e09dc4975d8a186a536b02420e00374376e3d8b903d6a69cb542de88a303bbe5d3e44831ef8d3ef3fd9ba0a34f19c89803d3ff4b622a366338cf7453 WHIRLPOOL 640541b5bb1c92d3fcb23ec970094200257af5b55a4a71be47a854be781d3e29d8354ea03d79b28fc654f3cab49c1e6de16ee01b3a02a61f0299a0a9bb4b5255
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
 DIST shorewall-lite-5.0.1.1.tar.bz2 42106 SHA256 35101666f056fa90c3a8af5d9dfc1e57d85644d17d2a58d09235acaa29f736f5 SHA512 8289394b37feae9da80409d967a9f3e01e75cb066047386223b6306a4a55ac63385e2033c007d8fd08952d46d1109e24a8cd361aecc39a8007711f4aa7419e8a WHIRLPOOL ac5c830ecd928e8dc5fcd29e79c57763d6bd046faaa3d93a6b1b4fb91dc3a474c366dfccf0aac4c62c6c6b2da4da009aaf7b1d559ca411239fc1ffd125938755
+DIST shorewall-lite-5.0.2.1.tar.bz2 44159 SHA256 0b7074d098c44156aac4234c02c36ec97d8ac2fd8042ec1f5e5c390612e3620b SHA512 0d2f93622d9dc000c2e58c73a20b13ecf97e139d542f99db3690f75974bab579c8379bd56eb7ffbb58cabcefbedf685d50ed7748c39c15ef7b3636ddbdcece3c WHIRLPOOL 4fb32d7c66411e9b45decbb1fddae00ccad83ba226f8fab806a7e2c6f54f7fa9f2d94bcba3133cdc8bfe0fe240213e016b8b94cd9f00eb46cf2735ac111ce100
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-4.6.13.1.tar.bz2 235114 SHA256 561887394a04532e06ebdf153aa60c6eaf176349f59a7a30e2c1d31aa48ba4eb SHA512 0700255da06c48577227439b3b358f4693a4e1e4c311f39079686c16b573e5bc4efd251160f69c1e6fc3daa8a503b2ede8fe44d51c93a9abd89431fd85081d72 WHIRLPOOL 9bcdf5b7a0c0a79143b3d451f7b362d41290ad641ab92b92abcfdda0fe15903ff2a225fc3571abe7c9c12e4b6ac34d054adf46372d94acfe997579a931a2979b
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
 DIST shorewall6-5.0.1.1.tar.bz2 220981 SHA256 ddd25edb1da9f85357bb3b6451b66a76c59c2aec196009568f91f69da4832907 SHA512 00ecef823044f93c0884d8f32783d4f1c8312a7073d2bf5eeb9bbb41ce629a8bd5ddb92efa240ed438ddfe132d41264d35ca4ff027247fa54f08e36826243900 WHIRLPOOL 5f2b81bf738be046707152688ae8c45c4badc9e6a9b6b0d96abccd2826eddc5b91c84f89a1e3cd39407bee56aa4fa0ecd8e0ff5c6df22e4f42e43d976f6a2962
+DIST shorewall6-5.0.2.1.tar.bz2 221777 SHA256 ab8489662511990c5430e795803a01249e26e036f84c1079f08c45f52ef501fd SHA512 f79e890b1d6af42c9f3ae236d63fc731d963fc6a0f121a5f3f5a820f8f578b82cc92d450b0385ac0c9446049701500f83bf64b28e00b604d6b89a39529c46519 WHIRLPOOL ea4b1c72515069f4a636c9aa139734dc8c46a1583a4feb8ed6992a36d2e5607c870613b5ad8f4d2ab92629e292150b586986a6e791f3755ee7e48588c2da184f
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-4.6.13.1.tar.bz2 55723 SHA256 33a95315f4b976a4fe003f084c3f4363761a076c758c05c6a211a884fe6a63c5 SHA512 6c240fc31bf07e8c52aae3285cf22e7b2fefe846898bea02514157cffbedb930a7cf6a12a4ef473b1713ef8c524b7a48b916f0ffff37477c4ac94afb72397e11 WHIRLPOOL c9b99295ee498e9be3ae7d2a947153828653c931fba90527ecb05254c1fccb1981f800894b31786bcfab50cffdc2dd7e91964e70e43ab67a2d3d0954303b35a3
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993
 DIST shorewall6-lite-5.0.1.1.tar.bz2 41272 SHA256 c14b79fb10b0ad8e7ed14040353216317fd5f7c53502e227c43e521f85840dc6 SHA512 c62536b76b9bc48131b97a577e707ed5050504010d501c48686457afd973286385444d00c2a30e743ba229c6c6518925a0fe870b198095eadc1060487e980aa5 WHIRLPOOL ff1c394fa4e0dae72352c0e84c76bac138904002498f4acb52cd6f1322fe7e3a8acd6334e42525f15620c30a2d28d6eb8656af122785b9c163599f357ef184ad
+DIST shorewall6-lite-5.0.2.1.tar.bz2 43345 SHA256 ebf19ef0ce409213b9c395911391f5f4e42c6542f6414cd849e66d6d19bd2751 SHA512 87fb50306c3e9d89cdf03bddb9b780929932ccbe5a346295f0bcdda8d3eeac6abd56387aad08aebc208228b5eee4378c29872d34b2d7ab11e8334ba5d7ec5165 WHIRLPOOL 9fbc60a75504be96b3bde80fc8c397d91af29c6c6d465bc14497586acbc8bd03a667f4680c847879dc59be2db9f15d5bed2fc22700d50a4d25eedc28d867c41a

diff --git a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
new file mode 100644
index 0000000..7ef1b45
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
+		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
+		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
+		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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
+
+		cd "${S}"/${MY_PN_INIT}
+		epatch "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}"
+	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
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [ -d "${D}etc/NetworkManager" ]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		dohtml -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 "  http://shorewall.net/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
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2015-12-15  4:45 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2015-12-15  4:45 UTC (permalink / raw
  To: gentoo-commits

commit:     379bb526a486b250786472260e43a29bfa68ae8d
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Fri Dec 11 11:59:17 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 11:59:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379bb526

net-firewall/shorewall: Dropped v5.0.1.1 in favor of new v5.0.2.1

Because additional version numbers have been removed from configuration
files and macros I won't stabilize v5.0.1.1 so people going from v4.x to v5.x only
have to update headers once.

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.0.1.1.ebuild | 447 ------------------------
 2 files changed, 454 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 41c5dd0..62e78ea 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,35 +1,28 @@
 DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48efe28a897d339a2187a45e3efed8ef SHA512 a5ef4783ff04b6faaa2e25d1da57ca3c46860960859dad5cd3b8d3cb252626b1db39c35767b226333f10db7b08b0fb18c0c09cd4eaf14586cb02b1a4259b571d WHIRLPOOL 26ebb72e769d5ca7489f718cabdb1f9cfb78e2acd514329c7036edcafe27f159ffa4cdadeeb1cee43619f748474fcc7a614011147976abb14cf627503a542e3f
 DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
-DIST shorewall-5.0.1.1.tar.bz2 476999 SHA256 9f42005ffffc4a48f051b356c109ac48f05bf1f63c03c08a30fd7fcfb2a8c737 SHA512 77f1111b253ec2d83ea8bbe380a3d56fa6a17298f05fd0cb820df7149c5ea4d7756604d3d2a195ad951289dccce914b660af151a8994bf40ed0915a6f1495e6b WHIRLPOOL 68f7e0cbf6c631bc408daf1f26a06e6ec3e77122d824a42336b6eaaeb72437a827338817ae5c159b0a2e66f74855bffffdc1fd9a22dc17895c5874fccd2b0459
 DIST shorewall-5.0.2.1.tar.bz2 478874 SHA256 10136cf586b620abdad1f3c716f03d1160cfa65c8461fba42d858fa1ab8d5856 SHA512 54589366a7743b9e8035a13b83a77e80a319531e07c803fd88ea31d2023445b9a63b99e0ad030997f43cb49050dfc4b0c94af2ec6c6631249fc1a2354d5565c1 WHIRLPOOL 559f916008b04c6779b50185e123274c8a20994c3ade58789ee840c5d9e13c7dba3e0885b3babd7a187aeb19a25b4ea8a6e151270fed3f363ce4d14d0fe749fc
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
-DIST shorewall-core-5.0.1.1.tar.bz2 46363 SHA256 4501a4c7d4d8e7572f5b23e988736740e5da477277f1e636ed9a9dbd2e874457 SHA512 f127c4056d64c1bbc36d3e5a61e12829ef687d0c37c3a277c6a51c8e57b787187246201f293ea65414e057967eabc5601b81d2154b780eca572ab0c64cfeb75d WHIRLPOOL 777e8e84eef4ddcd54c1db36bb394cf35b724ebd988f2c86158cfcfeb7fba544279386e98ad897f58690b6cf8ac684a385c3fe42d8f2c498b1fcfd89ade0a20b
 DIST shorewall-core-5.0.2.1.tar.bz2 47922 SHA256 8be30270e527c7697c365c437bff07e6a41ccdcf28b7163b2866750158e5845d SHA512 bf614cc73bc321c46b0825deb198943ce3a37a6e1b5dc5f2b9be17799409de9909219dec327c493a8382111cc9b7e7319c15effd84b238bee85ed9b6f0281100 WHIRLPOOL 5e415c8fb17edb96978cd3f8811fdd0953de556efe3cb6e5b1e9abe98535f905119eb968dadb65b3a525801c49af1fdbabc3b3e7eb06364c420323be6eeecb51
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
-DIST shorewall-docs-html-5.0.1.1.tar.bz2 4274105 SHA256 55b74717e744624763bfb073e3c41c4a9219b82568ba5d0d99f300a2518af1a0 SHA512 d73a5c6267f628288d0cce7624b62546f852392a83ec314218f8c663d768ae0a5e0672eca534efe34d60dab713ff3769994a87d498c9bf491e20c5b2530654e2 WHIRLPOOL 665e72218b594817f29ecfe6ecadf444818bcebd09757c391671228ed032d7c706c4457724157b7a4af9f42e6844010bd5c0400b2472178cc50868c5affb020d
 DIST shorewall-docs-html-5.0.2.1.tar.bz2 4272585 SHA256 a9c55c513fd086dc90d686f9a0444311453670487f10d3ed44505b952c72fcf2 SHA512 dc310f694b4cde8b27e3df99f75081019f752a3c7faa693093b1d5ec786392d2c2202f76b7372f894fd6e72fad5f7816db3b9a88a3a3409edcf4368d9e6b36d0 WHIRLPOOL 2f26c930a3aa56571cbfb02ba8f61b29103af91d46b014b21ed4b7da64f891c89df17fc725ba87b5809ad50d2d3ee2f8a55e6e983a612e6320d689afd6c287c6
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-4.6.13.1.tar.bz2 40718 SHA256 35684f1955eed65d897f5c51a74b9bf431a839cdeabc9ca7b37109d7b47a9d95 SHA512 f6b5d6e59eb3e4f4408b68bee69dacd3e5b00b3d0628b4b0f6408342bd05b279efc3962c0b294e37b8e6c719442232e73e348f048534916f97e3f40fb3a598d5 WHIRLPOOL 05c774194b33e1ffecec42e756851d3a9bd6764a13b280f63737dca53efe4223cea081b42e4f1a205062baaa3fac62a92b490b1402a6cd0ada637f98bea1b690
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
-DIST shorewall-init-5.0.1.1.tar.bz2 25448 SHA256 6930400caa2edcf8d478a9e0a1056545da81b21cef2283ffcf8ed838304a81f3 SHA512 dd7c0df33e3d3de9d55954df0352244a3de54dbc95779da2bd9214478930dc316afceb29857acf2651d138999fe05293afafa1f760da02a3179a09f5e543f10c WHIRLPOOL 1f3ce179d9621431eb0eb696255afc3a25329eade0cb6c42b93d8d16ff4367bf6fcfc3b51176b9029fcfe80130e4cc97fb7333f21078246a7c4f8953b1a8456a
 DIST shorewall-init-5.0.2.1.tar.bz2 27055 SHA256 2ce13881f7442b9e43bb1417bed9236931bb46ce8c74dd87af5d18be41b05311 SHA512 d8debb25e36d7829dcdb08698a889ccee680126da40f5606bba6a04b344cfd28660450cb3fd2037f6ec4d75058d8a243da82fb4c3b25184b609a5aa454739eca WHIRLPOOL 5d17a58c157993af37f75b64e53b693c8f62854bfebb8774520bd435a6c65e24e06c22398181941b352e218945055d8e3927f2cfbcb32e09d8c30f3f8e45fc29
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-4.6.13.1.tar.bz2 56534 SHA256 639213a42c424def670a8b54ce13f0fe007aa9ff97e2beb8cb1cd98deb3fba2f SHA512 0fd3ac13e09dc4975d8a186a536b02420e00374376e3d8b903d6a69cb542de88a303bbe5d3e44831ef8d3ef3fd9ba0a34f19c89803d3ff4b622a366338cf7453 WHIRLPOOL 640541b5bb1c92d3fcb23ec970094200257af5b55a4a71be47a854be781d3e29d8354ea03d79b28fc654f3cab49c1e6de16ee01b3a02a61f0299a0a9bb4b5255
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
-DIST shorewall-lite-5.0.1.1.tar.bz2 42106 SHA256 35101666f056fa90c3a8af5d9dfc1e57d85644d17d2a58d09235acaa29f736f5 SHA512 8289394b37feae9da80409d967a9f3e01e75cb066047386223b6306a4a55ac63385e2033c007d8fd08952d46d1109e24a8cd361aecc39a8007711f4aa7419e8a WHIRLPOOL ac5c830ecd928e8dc5fcd29e79c57763d6bd046faaa3d93a6b1b4fb91dc3a474c366dfccf0aac4c62c6c6b2da4da009aaf7b1d559ca411239fc1ffd125938755
 DIST shorewall-lite-5.0.2.1.tar.bz2 44159 SHA256 0b7074d098c44156aac4234c02c36ec97d8ac2fd8042ec1f5e5c390612e3620b SHA512 0d2f93622d9dc000c2e58c73a20b13ecf97e139d542f99db3690f75974bab579c8379bd56eb7ffbb58cabcefbedf685d50ed7748c39c15ef7b3636ddbdcece3c WHIRLPOOL 4fb32d7c66411e9b45decbb1fddae00ccad83ba226f8fab806a7e2c6f54f7fa9f2d94bcba3133cdc8bfe0fe240213e016b8b94cd9f00eb46cf2735ac111ce100
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-4.6.13.1.tar.bz2 235114 SHA256 561887394a04532e06ebdf153aa60c6eaf176349f59a7a30e2c1d31aa48ba4eb SHA512 0700255da06c48577227439b3b358f4693a4e1e4c311f39079686c16b573e5bc4efd251160f69c1e6fc3daa8a503b2ede8fe44d51c93a9abd89431fd85081d72 WHIRLPOOL 9bcdf5b7a0c0a79143b3d451f7b362d41290ad641ab92b92abcfdda0fe15903ff2a225fc3571abe7c9c12e4b6ac34d054adf46372d94acfe997579a931a2979b
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
-DIST shorewall6-5.0.1.1.tar.bz2 220981 SHA256 ddd25edb1da9f85357bb3b6451b66a76c59c2aec196009568f91f69da4832907 SHA512 00ecef823044f93c0884d8f32783d4f1c8312a7073d2bf5eeb9bbb41ce629a8bd5ddb92efa240ed438ddfe132d41264d35ca4ff027247fa54f08e36826243900 WHIRLPOOL 5f2b81bf738be046707152688ae8c45c4badc9e6a9b6b0d96abccd2826eddc5b91c84f89a1e3cd39407bee56aa4fa0ecd8e0ff5c6df22e4f42e43d976f6a2962
 DIST shorewall6-5.0.2.1.tar.bz2 221777 SHA256 ab8489662511990c5430e795803a01249e26e036f84c1079f08c45f52ef501fd SHA512 f79e890b1d6af42c9f3ae236d63fc731d963fc6a0f121a5f3f5a820f8f578b82cc92d450b0385ac0c9446049701500f83bf64b28e00b604d6b89a39529c46519 WHIRLPOOL ea4b1c72515069f4a636c9aa139734dc8c46a1583a4feb8ed6992a36d2e5607c870613b5ad8f4d2ab92629e292150b586986a6e791f3755ee7e48588c2da184f
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-4.6.13.1.tar.bz2 55723 SHA256 33a95315f4b976a4fe003f084c3f4363761a076c758c05c6a211a884fe6a63c5 SHA512 6c240fc31bf07e8c52aae3285cf22e7b2fefe846898bea02514157cffbedb930a7cf6a12a4ef473b1713ef8c524b7a48b916f0ffff37477c4ac94afb72397e11 WHIRLPOOL c9b99295ee498e9be3ae7d2a947153828653c931fba90527ecb05254c1fccb1981f800894b31786bcfab50cffdc2dd7e91964e70e43ab67a2d3d0954303b35a3
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993
-DIST shorewall6-lite-5.0.1.1.tar.bz2 41272 SHA256 c14b79fb10b0ad8e7ed14040353216317fd5f7c53502e227c43e521f85840dc6 SHA512 c62536b76b9bc48131b97a577e707ed5050504010d501c48686457afd973286385444d00c2a30e743ba229c6c6518925a0fe870b198095eadc1060487e980aa5 WHIRLPOOL ff1c394fa4e0dae72352c0e84c76bac138904002498f4acb52cd6f1322fe7e3a8acd6334e42525f15620c30a2d28d6eb8656af122785b9c163599f357ef184ad
 DIST shorewall6-lite-5.0.2.1.tar.bz2 43345 SHA256 ebf19ef0ce409213b9c395911391f5f4e42c6542f6414cd849e66d6d19bd2751 SHA512 87fb50306c3e9d89cdf03bddb9b780929932ccbe5a346295f0bcdda8d3eeac6abd56387aad08aebc208228b5eee4378c29872d34b2d7ab11e8334ba5d7ec5165 WHIRLPOOL 9fbc60a75504be96b3bde80fc8c397d91af29c6c6d465bc14497586acbc8bd03a667f4680c847879dc59be2db9f15d5bed2fc22700d50a4d25eedc28d867c41a

diff --git a/net-firewall/shorewall/shorewall-5.0.1.1.ebuild b/net-firewall/shorewall/shorewall-5.0.1.1.ebuild
deleted file mode 100644
index 66ba2b7..0000000
--- a/net-firewall/shorewall/shorewall-5.0.1.1.ebuild
+++ /dev/null
@@ -1,447 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
-		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
-		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
-		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
-		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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
-
-		cd "${S}"/${MY_PN_INIT}
-		epatch "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}"
-	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
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [ -d "${D}etc/NetworkManager" ]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		dohtml -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 "  http://shorewall.net/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
-
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
-		fi
-	fi
-
-	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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-02-01  8:14 Agostino Sarubbo
  0 siblings, 0 replies; 159+ messages in thread
From: Agostino Sarubbo @ 2016-02-01  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     9085ac8b21ae3dd772f8df772c0b5a28b24fe995
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 08:13:08 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 08:13:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9085ac8b

net-firewall/shorewall: amd64 stable wrt bug #573216

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
index 7ef1b45..df64299 100644
--- a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-02-03  8:33 Amy Winston
  0 siblings, 0 replies; 159+ messages in thread
From: Amy Winston @ 2016-02-03  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     c4a3d688167a9d57b455820326d15a4a72247cbd
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  3 08:31:50 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Feb  3 08:31:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4a3d688

net-firewall/shorewall: fix the description lenght

Package-Manager: portage-2.2.26

 net-firewall/shorewall/shorewall-4.6.10.1.ebuild | 5 ++---
 net-firewall/shorewall/shorewall-4.6.13.1.ebuild | 5 ++---
 net-firewall/shorewall/shorewall-4.6.13.ebuild   | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-4.6.10.1.ebuild b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
index 192104a..13c2055 100644
--- a/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,8 +6,7 @@ EAPI="5"
 
 inherit eutils linux-info prefix systemd versionator
 
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
+DESCRIPTION='A high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/"
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-firewall/shorewall/shorewall-4.6.13.1.ebuild b/net-firewall/shorewall/shorewall-4.6.13.1.ebuild
index fd85c68..f9f66e7 100644
--- a/net-firewall/shorewall/shorewall-4.6.13.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,8 +6,7 @@ EAPI="5"
 
 inherit eutils linux-info prefix systemd versionator
 
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
+DESCRIPTION='A high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/"
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-firewall/shorewall/shorewall-4.6.13.ebuild b/net-firewall/shorewall/shorewall-4.6.13.ebuild
index fd85c68..f9f66e7 100644
--- a/net-firewall/shorewall/shorewall-4.6.13.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,8 +6,7 @@ EAPI="5"
 
 inherit eutils linux-info prefix systemd versionator
 
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
+DESCRIPTION='A high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/"
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-02-03  8:33 Amy Winston
  0 siblings, 0 replies; 159+ messages in thread
From: Amy Winston @ 2016-02-03  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     3839c7444b32ae1ec2c6812283467eb871fc8edd
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  3 08:29:04 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Feb  3 08:29:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3839c744

net-firewall/shorewall: 5.0.4 version bump bug #573214. Whissi

Package-Manager: portage-2.2.26

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.0.4.ebuild | 446 ++++++++++++++++++++++++++
 2 files changed, 453 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 62e78ea..ca4bfd2 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -2,27 +2,34 @@ DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48
 DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1d338d748b4a0605695c3141e24d35e SHA512 1b8e0a008660a8b66bcc77bb92f110fbdc04a0925d6f19bb01a6e798baa907f5ca4f6f60851c861963ab49b1a0b2ae652d4d1234fcf18ab56325ebcc66fbefb1 WHIRLPOOL 6c2a63a5c547d429c3d9c5d05683d8c4a2bdc662f58b7b8e7ae197053a13c06ad1c0ae9fcd0face2601d05a7becfaf0948e0765ff22e5dbeace0176e77e4bad6
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
 DIST shorewall-5.0.2.1.tar.bz2 478874 SHA256 10136cf586b620abdad1f3c716f03d1160cfa65c8461fba42d858fa1ab8d5856 SHA512 54589366a7743b9e8035a13b83a77e80a319531e07c803fd88ea31d2023445b9a63b99e0ad030997f43cb49050dfc4b0c94af2ec6c6631249fc1a2354d5565c1 WHIRLPOOL 559f916008b04c6779b50185e123274c8a20994c3ade58789ee840c5d9e13c7dba3e0885b3babd7a187aeb19a25b4ea8a6e151270fed3f363ce4d14d0fe749fc
+DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
 DIST shorewall-core-5.0.2.1.tar.bz2 47922 SHA256 8be30270e527c7697c365c437bff07e6a41ccdcf28b7163b2866750158e5845d SHA512 bf614cc73bc321c46b0825deb198943ce3a37a6e1b5dc5f2b9be17799409de9909219dec327c493a8382111cc9b7e7319c15effd84b238bee85ed9b6f0281100 WHIRLPOOL 5e415c8fb17edb96978cd3f8811fdd0953de556efe3cb6e5b1e9abe98535f905119eb968dadb65b3a525801c49af1fdbabc3b3e7eb06364c420323be6eeecb51
+DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
 DIST shorewall-docs-html-5.0.2.1.tar.bz2 4272585 SHA256 a9c55c513fd086dc90d686f9a0444311453670487f10d3ed44505b952c72fcf2 SHA512 dc310f694b4cde8b27e3df99f75081019f752a3c7faa693093b1d5ec786392d2c2202f76b7372f894fd6e72fad5f7816db3b9a88a3a3409edcf4368d9e6b36d0 WHIRLPOOL 2f26c930a3aa56571cbfb02ba8f61b29103af91d46b014b21ed4b7da64f891c89df17fc725ba87b5809ad50d2d3ee2f8a55e6e983a612e6320d689afd6c287c6
+DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-4.6.13.1.tar.bz2 40718 SHA256 35684f1955eed65d897f5c51a74b9bf431a839cdeabc9ca7b37109d7b47a9d95 SHA512 f6b5d6e59eb3e4f4408b68bee69dacd3e5b00b3d0628b4b0f6408342bd05b279efc3962c0b294e37b8e6c719442232e73e348f048534916f97e3f40fb3a598d5 WHIRLPOOL 05c774194b33e1ffecec42e756851d3a9bd6764a13b280f63737dca53efe4223cea081b42e4f1a205062baaa3fac62a92b490b1402a6cd0ada637f98bea1b690
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
 DIST shorewall-init-5.0.2.1.tar.bz2 27055 SHA256 2ce13881f7442b9e43bb1417bed9236931bb46ce8c74dd87af5d18be41b05311 SHA512 d8debb25e36d7829dcdb08698a889ccee680126da40f5606bba6a04b344cfd28660450cb3fd2037f6ec4d75058d8a243da82fb4c3b25184b609a5aa454739eca WHIRLPOOL 5d17a58c157993af37f75b64e53b693c8f62854bfebb8774520bd435a6c65e24e06c22398181941b352e218945055d8e3927f2cfbcb32e09d8c30f3f8e45fc29
+DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-4.6.13.1.tar.bz2 56534 SHA256 639213a42c424def670a8b54ce13f0fe007aa9ff97e2beb8cb1cd98deb3fba2f SHA512 0fd3ac13e09dc4975d8a186a536b02420e00374376e3d8b903d6a69cb542de88a303bbe5d3e44831ef8d3ef3fd9ba0a34f19c89803d3ff4b622a366338cf7453 WHIRLPOOL 640541b5bb1c92d3fcb23ec970094200257af5b55a4a71be47a854be781d3e29d8354ea03d79b28fc654f3cab49c1e6de16ee01b3a02a61f0299a0a9bb4b5255
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
 DIST shorewall-lite-5.0.2.1.tar.bz2 44159 SHA256 0b7074d098c44156aac4234c02c36ec97d8ac2fd8042ec1f5e5c390612e3620b SHA512 0d2f93622d9dc000c2e58c73a20b13ecf97e139d542f99db3690f75974bab579c8379bd56eb7ffbb58cabcefbedf685d50ed7748c39c15ef7b3636ddbdcece3c WHIRLPOOL 4fb32d7c66411e9b45decbb1fddae00ccad83ba226f8fab806a7e2c6f54f7fa9f2d94bcba3133cdc8bfe0fe240213e016b8b94cd9f00eb46cf2735ac111ce100
+DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-4.6.13.1.tar.bz2 235114 SHA256 561887394a04532e06ebdf153aa60c6eaf176349f59a7a30e2c1d31aa48ba4eb SHA512 0700255da06c48577227439b3b358f4693a4e1e4c311f39079686c16b573e5bc4efd251160f69c1e6fc3daa8a503b2ede8fe44d51c93a9abd89431fd85081d72 WHIRLPOOL 9bcdf5b7a0c0a79143b3d451f7b362d41290ad641ab92b92abcfdda0fe15903ff2a225fc3571abe7c9c12e4b6ac34d054adf46372d94acfe997579a931a2979b
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
 DIST shorewall6-5.0.2.1.tar.bz2 221777 SHA256 ab8489662511990c5430e795803a01249e26e036f84c1079f08c45f52ef501fd SHA512 f79e890b1d6af42c9f3ae236d63fc731d963fc6a0f121a5f3f5a820f8f578b82cc92d450b0385ac0c9446049701500f83bf64b28e00b604d6b89a39529c46519 WHIRLPOOL ea4b1c72515069f4a636c9aa139734dc8c46a1583a4feb8ed6992a36d2e5607c870613b5ad8f4d2ab92629e292150b586986a6e791f3755ee7e48588c2da184f
+DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-4.6.13.1.tar.bz2 55723 SHA256 33a95315f4b976a4fe003f084c3f4363761a076c758c05c6a211a884fe6a63c5 SHA512 6c240fc31bf07e8c52aae3285cf22e7b2fefe846898bea02514157cffbedb930a7cf6a12a4ef473b1713ef8c524b7a48b916f0ffff37477c4ac94afb72397e11 WHIRLPOOL c9b99295ee498e9be3ae7d2a947153828653c931fba90527ecb05254c1fccb1981f800894b31786bcfab50cffdc2dd7e91964e70e43ab67a2d3d0954303b35a3
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993
 DIST shorewall6-lite-5.0.2.1.tar.bz2 43345 SHA256 ebf19ef0ce409213b9c395911391f5f4e42c6542f6414cd849e66d6d19bd2751 SHA512 87fb50306c3e9d89cdf03bddb9b780929932ccbe5a346295f0bcdda8d3eeac6abd56387aad08aebc208228b5eee4378c29872d34b2d7ab11e8334ba5d7ec5165 WHIRLPOOL 9fbc60a75504be96b3bde80fc8c397d91af29c6c6d465bc14497586acbc8bd03a667f4680c847879dc59be2db9f15d5bed2fc22700d50a4d25eedc28d867c41a
+DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215

diff --git a/net-firewall/shorewall/shorewall-5.0.4.ebuild b/net-firewall/shorewall/shorewall-5.0.4.ebuild
new file mode 100644
index 0000000..59dff46
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.4.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
+		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
+		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
+		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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
+
+		cd "${S}"/${MY_PN_INIT}
+		epatch "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}"
+	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
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [ -d "${D}etc/NetworkManager" ]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		dohtml -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 "  http://shorewall.net/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
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-02-04 11:01 Tobias Klausmann
  0 siblings, 0 replies; 159+ messages in thread
From: Tobias Klausmann @ 2016-02-04 11:01 UTC (permalink / raw
  To: gentoo-commits

commit:     685b4a3327945e1fd3028a8080f12ab7a79a8501
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  4 11:01:10 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 11:01:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=685b4a33

net-firewall/shorewall: add alpha keyword

Gentoo-Bug: 573216

Package-Manager: portage-2.2.27

 net-firewall/shorewall/shorewall-5.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
index df64299..0d750af 100644
--- a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-02-20  8:18 Jeroen Roovers
  0 siblings, 0 replies; 159+ messages in thread
From: Jeroen Roovers @ 2016-02-20  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     1090f54ac8fe09c77c84385bb9ed485dd1446997
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 08:18:10 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 08:18:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1090f54a

net-firewall/shorewall: Stable for HPPA (bug #573216).

Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches

 net-firewall/shorewall/shorewall-5.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
index d0e2515..51020bc 100644
--- a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-02-28 19:04 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-02-28 19:04 UTC (permalink / raw
  To: gentoo-commits

commit:     9a77690226b863f97c66fc6b823aa04f8278fe39
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Sun Feb 28 15:19:33 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 15:19:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a776902

net-firewall/shorewall: metadata.xml updated

- longdescription added
- upstream information added

Package-Manager: portage-2.2.27

 net-firewall/shorewall/metadata.xml | 55 ++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index d1391a3..8ba5a0c 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -1,23 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@whissi.de</email>
-    <name>Thomas D. (Whissi)</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <use>
-    <flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
-    <flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
-    <flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall[ipv4]</pkg>)</flag>
-    <flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall[ipv4]</pkg></flag>
-    <flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall[ipv6]</pkg></flag>
-  </use>
+	<maintainer type="person">
+		<email>whissi@whissi.de</email>
+		<name>Thomas D. (Whissi)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Shoreline Firewall, more commonly known as "Shorewall", is high-level tool for configuring Netfilter.
+		You describe your firewall/gateway requirements using entries in a set of configuration files.
+		Shorewall reads those configuration files and with the help of the iptables, iptables-restore, ip and
+		tc utilities, Shorewall configures Netfilter and the Linux networking subsystem to match your requirements.
+		Shorewall can be used on a dedicated firewall system, a multi-function gateway/router/server or on a
+		standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains compatibility mode and can thus
+		take advantage of Netfilter's connection state tracking capabilities.
+
+		Shorewall is not a daemon. Once Shorewall has configured the Linux networking subsystem, its job is complete and
+		there is no "Shorewall process" left running in your system. The /usr/sbin/shorewall program can be used at
+		any time to monitor the Netfilter firewall.
+	</longdescription>
+	<upstream>
+		<doc lang="en">http://shorewall.net/Documentation_Index.html</doc>
+		<remote-id type="sourceforge">shorewall</remote-id>
+	</upstream>
+	<use>
+		<flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
+		<flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
+		<flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall[ipv4]</pkg>)</flag>
+		<flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall[ipv4]</pkg></flag>
+		<flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall[ipv6]</pkg></flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-02-28 19:04 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-02-28 19:04 UTC (permalink / raw
  To: gentoo-commits

commit:     88489404c7b56ce54c26d12db67affc36b7b0c26
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Sun Feb 28 15:21:40 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 15:21:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88489404

net-firewall/shorewall: Bumped to v5.0.5.1

Package-Manager: portage-2.2.27

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.0.5.1.ebuild | 446 ++++++++++++++++++++++++
 2 files changed, 453 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index ca4bfd2..7666d08 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -3,33 +3,40 @@ DIST shorewall-4.6.13.1.tar.bz2 498949 SHA256 fc2c390fecbc0c78d5cd648596abc1edb1
 DIST shorewall-4.6.13.tar.bz2 500076 SHA256 fc4530d891da22d9efaa4339f10ebde27133bef9fe8c6e93abc701991f8b30ba SHA512 5018d34a15784870c521614a725baa05ea8df5e11e11d0177d01fc3012ed006f25b6a2afaf20cbae7b1c189ea841cc5ad2764067af0513f8378b316645524b48 WHIRLPOOL a6fef96deed7f7ad7bdc0273de88c15f77b901ec27905af474399b3b86fd8b6cdfe92556ae2314feaa73cd525960b56d986ce426225f7779e9235ccdc9f7248c
 DIST shorewall-5.0.2.1.tar.bz2 478874 SHA256 10136cf586b620abdad1f3c716f03d1160cfa65c8461fba42d858fa1ab8d5856 SHA512 54589366a7743b9e8035a13b83a77e80a319531e07c803fd88ea31d2023445b9a63b99e0ad030997f43cb49050dfc4b0c94af2ec6c6631249fc1a2354d5565c1 WHIRLPOOL 559f916008b04c6779b50185e123274c8a20994c3ade58789ee840c5d9e13c7dba3e0885b3babd7a187aeb19a25b4ea8a6e151270fed3f363ce4d14d0fe749fc
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
+DIST shorewall-5.0.5.1.tar.bz2 481202 SHA256 8964a5ace631865d9b69222ec2ce31aec69eb86cfafffc2fd63d5a73e4a463b4 SHA512 5516a38e73e106762b77da1c6fa77ea9fe2ba99a822f7d527201f20f683146e69c3058ae5f18821a850a63703442d7987f463e1cf6db9cc497dfec1d329763d2 WHIRLPOOL b879ce24f077b3ea27793d18e7cd8b593adec004164df60eed9cadc70a0647c107700a37bcbac6c061f5f00ece3bff9fab41314652cad936d96ed708efad5830
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-4.6.13.1.tar.bz2 61749 SHA256 d06a4c1050578013c6e37468f0a803fd129f1ac95b6ea5ab8af80f3eb0739539 SHA512 8db64a150101368ad50075f7ed97e2ceecf0d974ae1d0d61f6bc8dd967ff8f222265c543dfbe8f1217d90b21d93398669cc3d6e06a2b2c706c25347b27f13868 WHIRLPOOL 493f9a739388d3ecfe5fc9d04414c272d09a6eade8f236e21ec773b7df423844d2b9b427a297c9fa842ef22e7c491427d74e83dbc0aa267b16c20c1aff8525ed
 DIST shorewall-core-4.6.13.tar.bz2 61679 SHA256 e31dd55c8df37ee2168c5aa9843f9c2727f6a31a98634445e0c10990360665a4 SHA512 2c769f2f77ee51357f92daa1fe3f794fd3e3b537f0686a004809767340ad7bdd922be2580760cdbb834e8c80f53e9d5329ef86ee741520870c242452b1e44f30 WHIRLPOOL 90668efd2db2f09bf40934206b3124666b96157f085dfabc17ff2c2d65ebb8f348db6727516fced866d16eb4d44aa0ea9d6d91ed907593785788c6cdb50f10dc
 DIST shorewall-core-5.0.2.1.tar.bz2 47922 SHA256 8be30270e527c7697c365c437bff07e6a41ccdcf28b7163b2866750158e5845d SHA512 bf614cc73bc321c46b0825deb198943ce3a37a6e1b5dc5f2b9be17799409de9909219dec327c493a8382111cc9b7e7319c15effd84b238bee85ed9b6f0281100 WHIRLPOOL 5e415c8fb17edb96978cd3f8811fdd0953de556efe3cb6e5b1e9abe98535f905119eb968dadb65b3a525801c49af1fdbabc3b3e7eb06364c420323be6eeecb51
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
+DIST shorewall-core-5.0.5.1.tar.bz2 51123 SHA256 6efc71fcd5cf5530f5db129e80ac828ca3a1665342ec491895d74d5774bfb299 SHA512 da419a495152467809b302d9033bf7dad5cd6c8db0ac2780c26d94eb881d2335cca1491a31fc4328954358001b65aebdd84136592ba7fec45d593c24e942227c WHIRLPOOL 41051760efb48618c7f985bf4708db20277677178d6d8df37d55cb4b46158bcee893c9932018e3503bb56f094d0ac2492ef39029b5ee64fb5c9ee4beafabe3dc
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.13.1.tar.bz2 4280904 SHA256 ded94cd41022855bbb20e3a5a579f82515fea8eb3d6b7ea110e491a5cc654804 SHA512 0f6090a428ead0c5ccfca020776a93c6c69de7043b947c129ca9fba8289919448af4b5c6a2a65dc9317df2979688f86873dc0ff6a04ba6e9a14b26f183872f33 WHIRLPOOL 4cf65fd2e4afcf40d7e7fdaab43002551f7af4bba6a12466d7dab87d5df5cbcf5ed80d3238ec6cf77e59f7587056adc4450db4765a2ef47e9bcf2641cf38407a
 DIST shorewall-docs-html-4.6.13.tar.bz2 4280790 SHA256 2fdc3d5aa2d998831b66ed2ebf257a581924ef9b5ef1a5a2d18511aeb6f46d3d SHA512 40b3db8e8ca022ee47f928fac512f28dff7da597d19dbf9d19f5d706764d01aa09ff348df37be40a8551a7e6fae9a8b1be7e1321de7f581af4e7217ad6e3bc64 WHIRLPOOL e639126f0b16ad332bf115ccd773e7b32b1b9a0c7bda78cf072096a466d4e78d2a404f2ec923cd1acc152481a01cd90affa9af25496ee136555cc55ed1156a31
 DIST shorewall-docs-html-5.0.2.1.tar.bz2 4272585 SHA256 a9c55c513fd086dc90d686f9a0444311453670487f10d3ed44505b952c72fcf2 SHA512 dc310f694b4cde8b27e3df99f75081019f752a3c7faa693093b1d5ec786392d2c2202f76b7372f894fd6e72fad5f7816db3b9a88a3a3409edcf4368d9e6b36d0 WHIRLPOOL 2f26c930a3aa56571cbfb02ba8f61b29103af91d46b014b21ed4b7da64f891c89df17fc725ba87b5809ad50d2d3ee2f8a55e6e983a612e6320d689afd6c287c6
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
+DIST shorewall-docs-html-5.0.5.1.tar.bz2 4266435 SHA256 6f1bfe999d12fb561dfd7d31341fa814aad6e53f5e298e660dead5e52352ff44 SHA512 9f71d86886861ee373a29ad4043b4f70bf189a29481b7aaf9444bc07626ed4336d9af1d10574db5665dbd9b2796322ae531b11c505aa93bb44a13988f2cc4bad WHIRLPOOL 003110054e779d9fa4767fb51e04e0e0920855215b79165aadc86d274c650ff1c7d5539da6c8f87770ef4b4089d8b6308827492f60374dde0ed2ce2348f5e4da
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-4.6.13.1.tar.bz2 40718 SHA256 35684f1955eed65d897f5c51a74b9bf431a839cdeabc9ca7b37109d7b47a9d95 SHA512 f6b5d6e59eb3e4f4408b68bee69dacd3e5b00b3d0628b4b0f6408342bd05b279efc3962c0b294e37b8e6c719442232e73e348f048534916f97e3f40fb3a598d5 WHIRLPOOL 05c774194b33e1ffecec42e756851d3a9bd6764a13b280f63737dca53efe4223cea081b42e4f1a205062baaa3fac62a92b490b1402a6cd0ada637f98bea1b690
 DIST shorewall-init-4.6.13.tar.bz2 40574 SHA256 a1ebf757ccf5b455220daf80af71d23dd6290d9bcd9440da2058bdf6fcfcd768 SHA512 63092ad30f4528e96ca8a12e0e76ef702446a9b61c880455f13ab9ce86c953a3cc3c3f05a04fff9df1a93cad8d01ffd2b846281a7f46a3d9000e5cd3c908051e WHIRLPOOL cf78de19cdcf6c0de23a3259509a95382aaac554a827cca4a031ce4c1ef3b57e7ccaa65c40daadea53dc4433ad819416cafb215aff7088b8eecfeecb1ab7983b
 DIST shorewall-init-5.0.2.1.tar.bz2 27055 SHA256 2ce13881f7442b9e43bb1417bed9236931bb46ce8c74dd87af5d18be41b05311 SHA512 d8debb25e36d7829dcdb08698a889ccee680126da40f5606bba6a04b344cfd28660450cb3fd2037f6ec4d75058d8a243da82fb4c3b25184b609a5aa454739eca WHIRLPOOL 5d17a58c157993af37f75b64e53b693c8f62854bfebb8774520bd435a6c65e24e06c22398181941b352e218945055d8e3927f2cfbcb32e09d8c30f3f8e45fc29
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
+DIST shorewall-init-5.0.5.1.tar.bz2 30371 SHA256 04e0de5b88916640b63470df35472e7af07104ca17913efb3191cf4df04900fd SHA512 6c0946f99ba3497509a9cf38fb60f22705a1a6355dd2c7e0a9fb262d267f5903dc498e573724af61772a9470790e2f7451006da6c0d184013e5a5ff16839aab1 WHIRLPOOL 23a29d8bd6f058cbe21f38de54d71506e46a579beef83fbfe67cf1643d39435c2331bcbcac4f3cc78e0d4429eb834039fddb312771d6322806ab6cc07d5b69ff
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-4.6.13.1.tar.bz2 56534 SHA256 639213a42c424def670a8b54ce13f0fe007aa9ff97e2beb8cb1cd98deb3fba2f SHA512 0fd3ac13e09dc4975d8a186a536b02420e00374376e3d8b903d6a69cb542de88a303bbe5d3e44831ef8d3ef3fd9ba0a34f19c89803d3ff4b622a366338cf7453 WHIRLPOOL 640541b5bb1c92d3fcb23ec970094200257af5b55a4a71be47a854be781d3e29d8354ea03d79b28fc654f3cab49c1e6de16ee01b3a02a61f0299a0a9bb4b5255
 DIST shorewall-lite-4.6.13.tar.bz2 56490 SHA256 b73707abeb7d9911cae12c8280c014ed4189bd181e8e45f341d9b786b2f22b82 SHA512 c19aaaec6f31efd1afc2cc8e00d341b6135bb5a3b019a3f4a050ec43e4c1f5e4f8d68b00ec29a41201bd8e37a39c4b37348ddef575a1771cc6e6f80024db027c WHIRLPOOL eef127d2c8b76e2846490c916ddfd95692f13f362fd8a522f4b14fe47aec3c91a18a96935db46f5f6bdeb148ce9b1287c99bb4cb4e8292d74812c3ac677a9b41
 DIST shorewall-lite-5.0.2.1.tar.bz2 44159 SHA256 0b7074d098c44156aac4234c02c36ec97d8ac2fd8042ec1f5e5c390612e3620b SHA512 0d2f93622d9dc000c2e58c73a20b13ecf97e139d542f99db3690f75974bab579c8379bd56eb7ffbb58cabcefbedf685d50ed7748c39c15ef7b3636ddbdcece3c WHIRLPOOL 4fb32d7c66411e9b45decbb1fddae00ccad83ba226f8fab806a7e2c6f54f7fa9f2d94bcba3133cdc8bfe0fe240213e016b8b94cd9f00eb46cf2735ac111ce100
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
+DIST shorewall-lite-5.0.5.1.tar.bz2 46941 SHA256 2b84227553c8a69cfae1f9fe3dcfd119a1517e41fb34cc7603fb83279bd2dd42 SHA512 98494a885035d32944add6b1c94a54a5c6cf0f2eb59bc27aefd1e051c5222ccfe41b4003f4168ff3cad1a586f1dca6d578ea5c9353d4cb087a0ec03a6d9ef182 WHIRLPOOL bab30c208e9910e7d072df6d79d6af2ed937e15d1e8a5c27f2af27b6ab1c9723c7f25330701f8f82bce57ed412fd187138461638928a3391ae4bfc445febfae1
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-4.6.13.1.tar.bz2 235114 SHA256 561887394a04532e06ebdf153aa60c6eaf176349f59a7a30e2c1d31aa48ba4eb SHA512 0700255da06c48577227439b3b358f4693a4e1e4c311f39079686c16b573e5bc4efd251160f69c1e6fc3daa8a503b2ede8fe44d51c93a9abd89431fd85081d72 WHIRLPOOL 9bcdf5b7a0c0a79143b3d451f7b362d41290ad641ab92b92abcfdda0fe15903ff2a225fc3571abe7c9c12e4b6ac34d054adf46372d94acfe997579a931a2979b
 DIST shorewall6-4.6.13.tar.bz2 235132 SHA256 dceb2de20460cd2015297925529fc95feb7bfc156465ef907dead663213a5994 SHA512 91184afc3b42b2b9d9ae679f9061964d79fd8320ff95eb8ab040dd2e2b144a2b546ba458c19a432992924b51c560cd04bff5750634b41f367f40314f8e3399a4 WHIRLPOOL d9a87edccc3d59146d3bcb97264b2a8c1c540b79885e76309ec8cfb9c73f0ce0332f9abc92574c5eb4812a000bede85ca28f5b144ceeb39af52f28cb9571a2a6
 DIST shorewall6-5.0.2.1.tar.bz2 221777 SHA256 ab8489662511990c5430e795803a01249e26e036f84c1079f08c45f52ef501fd SHA512 f79e890b1d6af42c9f3ae236d63fc731d963fc6a0f121a5f3f5a820f8f578b82cc92d450b0385ac0c9446049701500f83bf64b28e00b604d6b89a39529c46519 WHIRLPOOL ea4b1c72515069f4a636c9aa139734dc8c46a1583a4feb8ed6992a36d2e5607c870613b5ad8f4d2ab92629e292150b586986a6e791f3755ee7e48588c2da184f
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
+DIST shorewall6-5.0.5.1.tar.bz2 219004 SHA256 eb5cbba08e6d41086c53ec33fa89ab5cae3387b11b1bcdb0c46db72468039542 SHA512 ecc54b0a339c15c19037d7fc1fee221611ad4122b11f234e51bb3e12b2c36573028755929770a00f8b2f58c01b3df345c891d1949b64c8cfad80fae2e8924443 WHIRLPOOL 1650e82b92c91fa46931eaa537c17363398126f2bd90dcb5a15401eec18e3afb5c3b59a3e799afe01bdbb5408dd58dbf78722f185a40cbfb21ce6c8c2dcaae98
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-4.6.13.1.tar.bz2 55723 SHA256 33a95315f4b976a4fe003f084c3f4363761a076c758c05c6a211a884fe6a63c5 SHA512 6c240fc31bf07e8c52aae3285cf22e7b2fefe846898bea02514157cffbedb930a7cf6a12a4ef473b1713ef8c524b7a48b916f0ffff37477c4ac94afb72397e11 WHIRLPOOL c9b99295ee498e9be3ae7d2a947153828653c931fba90527ecb05254c1fccb1981f800894b31786bcfab50cffdc2dd7e91964e70e43ab67a2d3d0954303b35a3
 DIST shorewall6-lite-4.6.13.tar.bz2 55646 SHA256 9da8d4e29d867ba96aaaa9c0854e385e26b107aa0e5babbc5b1ffd36327cb413 SHA512 e826778478532f32155514e47aad35e2bace38933f5c4ccded67d058acba0766ef6687cc8bcdef6ba4ee1e629af7b5e8d11a77c5a8bb67d4fdc0b0167dadb731 WHIRLPOOL 9a6bba924e24f400d46afb0e13760ee4ed2e690c35e4364f652e4c252f9930d5710eed30e51ff5f312bff6bd56130321c49d0a8ea893c789122bd412c6c79993
 DIST shorewall6-lite-5.0.2.1.tar.bz2 43345 SHA256 ebf19ef0ce409213b9c395911391f5f4e42c6542f6414cd849e66d6d19bd2751 SHA512 87fb50306c3e9d89cdf03bddb9b780929932ccbe5a346295f0bcdda8d3eeac6abd56387aad08aebc208228b5eee4378c29872d34b2d7ab11e8334ba5d7ec5165 WHIRLPOOL 9fbc60a75504be96b3bde80fc8c397d91af29c6c6d465bc14497586acbc8bd03a667f4680c847879dc59be2db9f15d5bed2fc22700d50a4d25eedc28d867c41a
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
+DIST shorewall6-lite-5.0.5.1.tar.bz2 46118 SHA256 e28690bc6137ee59a264495c7496d66868a6178c06b1443b2c6f3e6b5716b084 SHA512 0998f87a2aab8637f54cc31eaa6b974c4eac7825cd65264420a975be8a887a4fb4042b3cb61c84cbcbd6d6c1ffc38cce73ccdda80234e9de93f1fff34e90ab93 WHIRLPOOL e0258127a1af10bb91f95757445e81471e593cc3fdf0155ce4d24022b46075c5885261747c54dec3e8c2c443c32ca65da0d67b91b5855e7f9c808bd4f178984c

diff --git a/net-firewall/shorewall/shorewall-5.0.5.1.ebuild b/net-firewall/shorewall/shorewall-5.0.5.1.ebuild
new file mode 100644
index 0000000..59dff46
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.5.1.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
+		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
+		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
+		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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
+
+		cd "${S}"/${MY_PN_INIT}
+		epatch "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}"
+	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
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [ -d "${D}etc/NetworkManager" ]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		dohtml -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 "  http://shorewall.net/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
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-03-14 14:34 Agostino Sarubbo
  0 siblings, 0 replies; 159+ messages in thread
From: Agostino Sarubbo @ 2016-03-14 14:34 UTC (permalink / raw
  To: gentoo-commits

commit:     0b947b1a87f2944c381e8049e442593f8a78e885
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 14:34:22 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 14:34:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b947b1a

net-firewall/shorewall: ppc/ppc64/sparc stable, (ALLARCHES policy) wrt bug #573216

Package-Manager: portage-2.2.26
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
index 51020bc..3e71daf 100644
--- a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-03-15  2:24 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2016-03-15  2:24 UTC (permalink / raw
  To: gentoo-commits

commit:     b5a9e82fcf38e4cf61db384ec25bd5b2232b89b0
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Mon Mar 14 22:16:09 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 02:24:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a9e82f

net-firewall/shorewall: Bumped to v5.0.6.1

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1055

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.0.6.1.ebuild | 446 ++++++++++++++++++++++++
 2 files changed, 453 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index c03ffce..9b3cab3 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -2,27 +2,34 @@ DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48
 DIST shorewall-5.0.2.1.tar.bz2 478874 SHA256 10136cf586b620abdad1f3c716f03d1160cfa65c8461fba42d858fa1ab8d5856 SHA512 54589366a7743b9e8035a13b83a77e80a319531e07c803fd88ea31d2023445b9a63b99e0ad030997f43cb49050dfc4b0c94af2ec6c6631249fc1a2354d5565c1 WHIRLPOOL 559f916008b04c6779b50185e123274c8a20994c3ade58789ee840c5d9e13c7dba3e0885b3babd7a187aeb19a25b4ea8a6e151270fed3f363ce4d14d0fe749fc
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.5.1.tar.bz2 481202 SHA256 8964a5ace631865d9b69222ec2ce31aec69eb86cfafffc2fd63d5a73e4a463b4 SHA512 5516a38e73e106762b77da1c6fa77ea9fe2ba99a822f7d527201f20f683146e69c3058ae5f18821a850a63703442d7987f463e1cf6db9cc497dfec1d329763d2 WHIRLPOOL b879ce24f077b3ea27793d18e7cd8b593adec004164df60eed9cadc70a0647c107700a37bcbac6c061f5f00ece3bff9fab41314652cad936d96ed708efad5830
+DIST shorewall-5.0.6.1.tar.bz2 486468 SHA256 994771e9382d3d8aa13c320f1d728f517a27410d782acb859c4e3f3a00b5980e SHA512 84a82a3b777e72f954d235b3e2204315dae7109531307d68516683ba3b0889abe1511085a2dca4bf4c03a72d72dd672eaef7b76022be4491f4e786c83fb2fb6c WHIRLPOOL 92d669ef23500a488a727be039777aa4af9dde90e74af79e8e538f79a69608c9cba13a6a373081536d3f583ae49aad9ec8de05879d40c98f190df5c0f16a9cf2
 DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-5.0.2.1.tar.bz2 47922 SHA256 8be30270e527c7697c365c437bff07e6a41ccdcf28b7163b2866750158e5845d SHA512 bf614cc73bc321c46b0825deb198943ce3a37a6e1b5dc5f2b9be17799409de9909219dec327c493a8382111cc9b7e7319c15effd84b238bee85ed9b6f0281100 WHIRLPOOL 5e415c8fb17edb96978cd3f8811fdd0953de556efe3cb6e5b1e9abe98535f905119eb968dadb65b3a525801c49af1fdbabc3b3e7eb06364c420323be6eeecb51
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.5.1.tar.bz2 51123 SHA256 6efc71fcd5cf5530f5db129e80ac828ca3a1665342ec491895d74d5774bfb299 SHA512 da419a495152467809b302d9033bf7dad5cd6c8db0ac2780c26d94eb881d2335cca1491a31fc4328954358001b65aebdd84136592ba7fec45d593c24e942227c WHIRLPOOL 41051760efb48618c7f985bf4708db20277677178d6d8df37d55cb4b46158bcee893c9932018e3503bb56f094d0ac2492ef39029b5ee64fb5c9ee4beafabe3dc
+DIST shorewall-core-5.0.6.1.tar.bz2 52604 SHA256 9e7bb2d5abf02395c7f0f8753d0aba0019776bb35657b2d5171bf2bb09c98a94 SHA512 01340ce77a90c86009dd4e81a2ccb494394b935602e22f6a16221e98e540df5338b76d840d1e197ab023903d18f8d785e54dbb3a824b869a2d00b3860041cbe1 WHIRLPOOL cfdb7065c549d88e7e914f1377ef4a9b81be3574cb13dbffac3d5f385dddb6e08935ad3836bdc5b0514f2372b8ee6d6b13160e04bfd705b8ea7edceb93f647a6
 DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-5.0.2.1.tar.bz2 4272585 SHA256 a9c55c513fd086dc90d686f9a0444311453670487f10d3ed44505b952c72fcf2 SHA512 dc310f694b4cde8b27e3df99f75081019f752a3c7faa693093b1d5ec786392d2c2202f76b7372f894fd6e72fad5f7816db3b9a88a3a3409edcf4368d9e6b36d0 WHIRLPOOL 2f26c930a3aa56571cbfb02ba8f61b29103af91d46b014b21ed4b7da64f891c89df17fc725ba87b5809ad50d2d3ee2f8a55e6e983a612e6320d689afd6c287c6
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.5.1.tar.bz2 4266435 SHA256 6f1bfe999d12fb561dfd7d31341fa814aad6e53f5e298e660dead5e52352ff44 SHA512 9f71d86886861ee373a29ad4043b4f70bf189a29481b7aaf9444bc07626ed4336d9af1d10574db5665dbd9b2796322ae531b11c505aa93bb44a13988f2cc4bad WHIRLPOOL 003110054e779d9fa4767fb51e04e0e0920855215b79165aadc86d274c650ff1c7d5539da6c8f87770ef4b4089d8b6308827492f60374dde0ed2ce2348f5e4da
+DIST shorewall-docs-html-5.0.6.1.tar.bz2 4267130 SHA256 92751d57e9d54d8b0330ae38e65f7d8b1230d0bb9559fc922efa32361be69c08 SHA512 f78e0e5a288a4ae29437ae74f8286a55332448ea2d65ec3640231319d5a29bccebf06195948452960562c425123d8c76f60414a1f8b6975443afcb8594b9b6a9 WHIRLPOOL 61113a39d44bcb20d7c7b551178f8175c2fdc417c07ae66739928b23d8a42c95975b86285473ac052a62e2bccbd05f660392224cb50896f58ae4ebf5432eebf4
 DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-5.0.2.1.tar.bz2 27055 SHA256 2ce13881f7442b9e43bb1417bed9236931bb46ce8c74dd87af5d18be41b05311 SHA512 d8debb25e36d7829dcdb08698a889ccee680126da40f5606bba6a04b344cfd28660450cb3fd2037f6ec4d75058d8a243da82fb4c3b25184b609a5aa454739eca WHIRLPOOL 5d17a58c157993af37f75b64e53b693c8f62854bfebb8774520bd435a6c65e24e06c22398181941b352e218945055d8e3927f2cfbcb32e09d8c30f3f8e45fc29
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.5.1.tar.bz2 30371 SHA256 04e0de5b88916640b63470df35472e7af07104ca17913efb3191cf4df04900fd SHA512 6c0946f99ba3497509a9cf38fb60f22705a1a6355dd2c7e0a9fb262d267f5903dc498e573724af61772a9470790e2f7451006da6c0d184013e5a5ff16839aab1 WHIRLPOOL 23a29d8bd6f058cbe21f38de54d71506e46a579beef83fbfe67cf1643d39435c2331bcbcac4f3cc78e0d4429eb834039fddb312771d6322806ab6cc07d5b69ff
+DIST shorewall-init-5.0.6.1.tar.bz2 31591 SHA256 bade0018e12546c6665024918d361d8f00d24624e7d601dc38984334b5629426 SHA512 3c33616b5e6baa1fd0876273b9b5c7a762a3adf026279d94f58ed6d92460cd2665792eba5b923c187d974a51cba138a77f6131af4d28c4ff7e57c0b484300e4d WHIRLPOOL 579b9fd6d1b68595afd9db23df11e37d461a6f61ba5c5a15668830eeecc272dc0a65568d563d04304b76a5f693ed8da957933459c1e1f6180497fce23393cba3
 DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-5.0.2.1.tar.bz2 44159 SHA256 0b7074d098c44156aac4234c02c36ec97d8ac2fd8042ec1f5e5c390612e3620b SHA512 0d2f93622d9dc000c2e58c73a20b13ecf97e139d542f99db3690f75974bab579c8379bd56eb7ffbb58cabcefbedf685d50ed7748c39c15ef7b3636ddbdcece3c WHIRLPOOL 4fb32d7c66411e9b45decbb1fddae00ccad83ba226f8fab806a7e2c6f54f7fa9f2d94bcba3133cdc8bfe0fe240213e016b8b94cd9f00eb46cf2735ac111ce100
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.5.1.tar.bz2 46941 SHA256 2b84227553c8a69cfae1f9fe3dcfd119a1517e41fb34cc7603fb83279bd2dd42 SHA512 98494a885035d32944add6b1c94a54a5c6cf0f2eb59bc27aefd1e051c5222ccfe41b4003f4168ff3cad1a586f1dca6d578ea5c9353d4cb087a0ec03a6d9ef182 WHIRLPOOL bab30c208e9910e7d072df6d79d6af2ed937e15d1e8a5c27f2af27b6ab1c9723c7f25330701f8f82bce57ed412fd187138461638928a3391ae4bfc445febfae1
+DIST shorewall-lite-5.0.6.1.tar.bz2 48124 SHA256 b78d81138ab4ed5cd5f791eebd1fe667814c43ecd07cb2ffef53a185f5541e74 SHA512 b0dd2a7516de13a5d891ec11388a2258449262a57763c45aac68180fc9d4ef35e411c40ac0114742c8d96c8d4a47519769d17c15926c5d80613e6254c365406e WHIRLPOOL 9f032016285674e92c1e5ac265e7b01aba740e2d057caca621e3baa7c63d02d9574c18aed923ab9dc556fb69bfe772e9ec90c84b8a65545d1d778854b935c8e4
 DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-5.0.2.1.tar.bz2 221777 SHA256 ab8489662511990c5430e795803a01249e26e036f84c1079f08c45f52ef501fd SHA512 f79e890b1d6af42c9f3ae236d63fc731d963fc6a0f121a5f3f5a820f8f578b82cc92d450b0385ac0c9446049701500f83bf64b28e00b604d6b89a39529c46519 WHIRLPOOL ea4b1c72515069f4a636c9aa139734dc8c46a1583a4feb8ed6992a36d2e5607c870613b5ad8f4d2ab92629e292150b586986a6e791f3755ee7e48588c2da184f
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.5.1.tar.bz2 219004 SHA256 eb5cbba08e6d41086c53ec33fa89ab5cae3387b11b1bcdb0c46db72468039542 SHA512 ecc54b0a339c15c19037d7fc1fee221611ad4122b11f234e51bb3e12b2c36573028755929770a00f8b2f58c01b3df345c891d1949b64c8cfad80fae2e8924443 WHIRLPOOL 1650e82b92c91fa46931eaa537c17363398126f2bd90dcb5a15401eec18e3afb5c3b59a3e799afe01bdbb5408dd58dbf78722f185a40cbfb21ce6c8c2dcaae98
+DIST shorewall6-5.0.6.1.tar.bz2 220240 SHA256 c80992734fa2ff1a686dbe4e0ec14fb420ca97188f709ec6611725e25c94e542 SHA512 5efcc51d616208ffd590eb4087f97d82ce9b29c5925f85584dc14409058b30b38b614a15da2b8c91dd55d0720ef6dcc886d4dddf52463d493f1534abf3599075 WHIRLPOOL 6ce4a62c539befb5df99cfa53419bf621a3b8bc4c9ffdfe4f30084635a2b499e0d8185a9a562de8b7bf4e7c97df9a79b158be7d35382865d5de56ef13e670df7
 DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-5.0.2.1.tar.bz2 43345 SHA256 ebf19ef0ce409213b9c395911391f5f4e42c6542f6414cd849e66d6d19bd2751 SHA512 87fb50306c3e9d89cdf03bddb9b780929932ccbe5a346295f0bcdda8d3eeac6abd56387aad08aebc208228b5eee4378c29872d34b2d7ab11e8334ba5d7ec5165 WHIRLPOOL 9fbc60a75504be96b3bde80fc8c397d91af29c6c6d465bc14497586acbc8bd03a667f4680c847879dc59be2db9f15d5bed2fc22700d50a4d25eedc28d867c41a
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.5.1.tar.bz2 46118 SHA256 e28690bc6137ee59a264495c7496d66868a6178c06b1443b2c6f3e6b5716b084 SHA512 0998f87a2aab8637f54cc31eaa6b974c4eac7825cd65264420a975be8a887a4fb4042b3cb61c84cbcbd6d6c1ffc38cce73ccdda80234e9de93f1fff34e90ab93 WHIRLPOOL e0258127a1af10bb91f95757445e81471e593cc3fdf0155ce4d24022b46075c5885261747c54dec3e8c2c443c32ca65da0d67b91b5855e7f9c808bd4f178984c
+DIST shorewall6-lite-5.0.6.1.tar.bz2 47281 SHA256 07c5e98f52cbb0cedf81979dbe5d1ad88ca77740b49ac90d47b3e52b7623ec52 SHA512 75ee9206d713af3de8eb508eb719e59f62d24793a9fcc086265428999d9219ab503699e4ed2e0e97390e35aabca8264dcf1ba4b704654e9fe91fd739f51741a4 WHIRLPOOL 055ad8f5593bac186dc985c917b6faa914011b72d03d2d429bee6e11747e346f09d8025a25332f10b8571d3e009d42957b191910d6f189d3caf92f9482c8ea20

diff --git a/net-firewall/shorewall/shorewall-5.0.6.1.ebuild b/net-firewall/shorewall/shorewall-5.0.6.1.ebuild
new file mode 100644
index 0000000..5b037ee
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.6.1.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
+		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
+		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
+		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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
+
+		cd "${S}"/${MY_PN_INIT}
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}"
+	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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [ -d "${D}etc/NetworkManager" ]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-03-15  9:01 Agostino Sarubbo
  0 siblings, 0 replies; 159+ messages in thread
From: Agostino Sarubbo @ 2016-03-15  9:01 UTC (permalink / raw
  To: gentoo-commits

commit:     a9c12f0f5bdff65613b1fec32db1c1a32fd3fa78
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 09:00:51 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 09:00:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c12f0f

net-firewall/shorewall: alpha/amd64/hppa/ppc64/ppc/sparc/x86 stable, (ALLARCHES policy) wrt bug #577440

Package-Manager: portage-2.2.26
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.4.ebuild b/net-firewall/shorewall/shorewall-5.0.4.ebuild
index 59dff46..0c749b3 100644
--- a/net-firewall/shorewall/shorewall-5.0.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.4.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-03-21 21:50 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-03-21 21:50 UTC (permalink / raw
  To: gentoo-commits

commit:     822c7bed09f122334a63043bc1d15c8e7c87cb71
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Mon Mar 21 21:21:37 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 21:37:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822c7bed

net-firewall/shorewall: Version bump.

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1108

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.6.1.ebuild => shorewall-5.0.6.2.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 275d23b..29c0df6 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,14 @@
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
-DIST shorewall-5.0.6.1.tar.bz2 486468 SHA256 994771e9382d3d8aa13c320f1d728f517a27410d782acb859c4e3f3a00b5980e SHA512 84a82a3b777e72f954d235b3e2204315dae7109531307d68516683ba3b0889abe1511085a2dca4bf4c03a72d72dd672eaef7b76022be4491f4e786c83fb2fb6c WHIRLPOOL 92d669ef23500a488a727be039777aa4af9dde90e74af79e8e538f79a69608c9cba13a6a373081536d3f583ae49aad9ec8de05879d40c98f190df5c0f16a9cf2
+DIST shorewall-5.0.6.2.tar.bz2 485616 SHA256 efb0136a21ee7bd61670b2f14b11acd1c10302d70a56d42b3bdfbd880ba8afc1 SHA512 f605d5157d3b84b4607aaf449e99363dd13e1e3acc1b8902a12d0b395427b6bdcf4681b54503904397aa6141b6bd2e86bf1cf5e9bc2cf2318a1c814de1fdca18 WHIRLPOOL b08e5c3f29599dff4788e0e2365a5e152eec1f1c59c6c9a10ec754be03c0273df2a2e8bf03491df5095b0a8427fe75b510c695bf4f6d03a9d936b8ba19c8a823
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
-DIST shorewall-core-5.0.6.1.tar.bz2 52604 SHA256 9e7bb2d5abf02395c7f0f8753d0aba0019776bb35657b2d5171bf2bb09c98a94 SHA512 01340ce77a90c86009dd4e81a2ccb494394b935602e22f6a16221e98e540df5338b76d840d1e197ab023903d18f8d785e54dbb3a824b869a2d00b3860041cbe1 WHIRLPOOL cfdb7065c549d88e7e914f1377ef4a9b81be3574cb13dbffac3d5f385dddb6e08935ad3836bdc5b0514f2372b8ee6d6b13160e04bfd705b8ea7edceb93f647a6
+DIST shorewall-core-5.0.6.2.tar.bz2 52826 SHA256 df9523f71e8611541111846793a04cce9fde76b9e0cc12a7333ae3a9b9ea8880 SHA512 01911d2a690e3b3514386bb8b3227d4dbb24ed5d1f9b5bba5b210e57df3c16ece5d037ce447238919f800545ba1e4b6a02a483db19b3360301d287508b759be9 WHIRLPOOL 22bc3f6b61ab9b653ca32d712250f2b4dccf45aee276ee5b72215e69c4b01b2acdafb7d24ef7bc4e2eecb0e2fb5aa99dd09f6bad90ddb0b5dcfe21e7e6b0d5b0
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
-DIST shorewall-docs-html-5.0.6.1.tar.bz2 4267130 SHA256 92751d57e9d54d8b0330ae38e65f7d8b1230d0bb9559fc922efa32361be69c08 SHA512 f78e0e5a288a4ae29437ae74f8286a55332448ea2d65ec3640231319d5a29bccebf06195948452960562c425123d8c76f60414a1f8b6975443afcb8594b9b6a9 WHIRLPOOL 61113a39d44bcb20d7c7b551178f8175c2fdc417c07ae66739928b23d8a42c95975b86285473ac052a62e2bccbd05f660392224cb50896f58ae4ebf5432eebf4
+DIST shorewall-docs-html-5.0.6.2.tar.bz2 4267172 SHA256 9df20309476abef09a34c0d582125a56d7880affb7e7eeaef4cb2275b18404e3 SHA512 9e9cdcd87d33b848530ca2df89028b5cf65e279e01a476d4c1c85af8a76442f31e0890e3f72ba215b6f89b61745d157d157643467d07a1ba0bd7f1afca301b92 WHIRLPOOL d369aa0655766252d1e513363805d3393a7b9d9bfc4e08dc2d50fc7fdcc72233645e61dced783a141b2f332529038280e38364d86c5b5d439946cf3ff1466a03
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
-DIST shorewall-init-5.0.6.1.tar.bz2 31591 SHA256 bade0018e12546c6665024918d361d8f00d24624e7d601dc38984334b5629426 SHA512 3c33616b5e6baa1fd0876273b9b5c7a762a3adf026279d94f58ed6d92460cd2665792eba5b923c187d974a51cba138a77f6131af4d28c4ff7e57c0b484300e4d WHIRLPOOL 579b9fd6d1b68595afd9db23df11e37d461a6f61ba5c5a15668830eeecc272dc0a65568d563d04304b76a5f693ed8da957933459c1e1f6180497fce23393cba3
+DIST shorewall-init-5.0.6.2.tar.bz2 31736 SHA256 90702a8ed63a586169627b5f71a89ae58dab8ecd3bcf51cd3fc08f7d2e21a94e SHA512 4349c9a6cee250dd621ef33412abee21e0825bac3f8549958c8da21ce3f012d271530452d53566d67925e9357c980f9f06360ccb5e4604466d80a5601063a407 WHIRLPOOL c3d70f341dacaf6822311d1e2a9f58ad5c65565fa1ac85773b6d6989f1f092a44fe22d27319ac8ad48af00395ddb1deff6f1805d05b21dfee7ac67ab019a6268
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
-DIST shorewall-lite-5.0.6.1.tar.bz2 48124 SHA256 b78d81138ab4ed5cd5f791eebd1fe667814c43ecd07cb2ffef53a185f5541e74 SHA512 b0dd2a7516de13a5d891ec11388a2258449262a57763c45aac68180fc9d4ef35e411c40ac0114742c8d96c8d4a47519769d17c15926c5d80613e6254c365406e WHIRLPOOL 9f032016285674e92c1e5ac265e7b01aba740e2d057caca621e3baa7c63d02d9574c18aed923ab9dc556fb69bfe772e9ec90c84b8a65545d1d778854b935c8e4
+DIST shorewall-lite-5.0.6.2.tar.bz2 48329 SHA256 aa4be034a3536ace69f295338fa170a92402e0a6be40bca1037e859548e48330 SHA512 3080ea4ec9018bbe22e5d433bdf44f64ae62069aded82b14924563cb8a5c90ff214276bf8f84a33ca368ae269e05773e0733f9fa3181d29760f0c9769cf66e23 WHIRLPOOL 7186ef91b402b453ff3a1c2b8cd4fed127874e9c6851c3f3c86769436e4bc0b5b3b36b4fb283d69abb7d89f014bf7b54142f2c6d7103a6fcdfe6d8b9cad5228f
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
-DIST shorewall6-5.0.6.1.tar.bz2 220240 SHA256 c80992734fa2ff1a686dbe4e0ec14fb420ca97188f709ec6611725e25c94e542 SHA512 5efcc51d616208ffd590eb4087f97d82ce9b29c5925f85584dc14409058b30b38b614a15da2b8c91dd55d0720ef6dcc886d4dddf52463d493f1534abf3599075 WHIRLPOOL 6ce4a62c539befb5df99cfa53419bf621a3b8bc4c9ffdfe4f30084635a2b499e0d8185a9a562de8b7bf4e7c97df9a79b158be7d35382865d5de56ef13e670df7
+DIST shorewall6-5.0.6.2.tar.bz2 220406 SHA256 586bbd8da9fd13aeb0f5d399f0e18a95079b027a134ca5ad8a95c23a25286b75 SHA512 eada07254fcd012e660cd23f03a00b9670ac9b5817bde3590eebc175b529ced6e09f65565efb86e7e7ddf97d5849edd9c59121724bae46ac475797be4487ae65 WHIRLPOOL 8e44878e8575f001546dac483d4e0ee3804207a24ad267d88b075642f21b9dbf71d0fe2a00790b4eec74933f5f5479c6ada091606f14684b7e7ffba6fb609367
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
-DIST shorewall6-lite-5.0.6.1.tar.bz2 47281 SHA256 07c5e98f52cbb0cedf81979dbe5d1ad88ca77740b49ac90d47b3e52b7623ec52 SHA512 75ee9206d713af3de8eb508eb719e59f62d24793a9fcc086265428999d9219ab503699e4ed2e0e97390e35aabca8264dcf1ba4b704654e9fe91fd739f51741a4 WHIRLPOOL 055ad8f5593bac186dc985c917b6faa914011b72d03d2d429bee6e11747e346f09d8025a25332f10b8571d3e009d42957b191910d6f189d3caf92f9482c8ea20
+DIST shorewall6-lite-5.0.6.2.tar.bz2 47437 SHA256 ce6d9d97803d007edf9089478882a023b4cc7795b224713bf64715f03e5805a8 SHA512 cbedb0c15ef4b9dcc5e972740642f4ccc8ef9be1c8adedbbaf83bdda4a1934dd65555c053b9bd6da3a1e8003fdd356f629aaec5f7b113c86fd29664f2a130431 WHIRLPOOL 95c654b3c083cf62c7a601d6e520128e6cac0d9b139fa7a1a7aa8bb391568daf69b3743a6c94cc74a0c6ddb54bdfde0dc23135b3df6d250ef922c2513beb8d8c

diff --git a/net-firewall/shorewall/shorewall-5.0.6.1.ebuild b/net-firewall/shorewall/shorewall-5.0.6.2.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.6.1.ebuild
rename to net-firewall/shorewall/shorewall-5.0.6.2.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-03-21 21:50 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-03-21 21:50 UTC (permalink / raw
  To: gentoo-commits

commit:     c21c9c1bca51be78522c31f746faad9c52393250
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Mon Mar 21 21:20:29 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 21:37:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21c9c1b

net-firewall/shorewall: Clean up old.

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1108

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.0.2.1.ebuild | 446 ------------------------
 2 files changed, 453 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 4fc0d74..275d23b 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,14 @@
-DIST shorewall-5.0.2.1.tar.bz2 478874 SHA256 10136cf586b620abdad1f3c716f03d1160cfa65c8461fba42d858fa1ab8d5856 SHA512 54589366a7743b9e8035a13b83a77e80a319531e07c803fd88ea31d2023445b9a63b99e0ad030997f43cb49050dfc4b0c94af2ec6c6631249fc1a2354d5565c1 WHIRLPOOL 559f916008b04c6779b50185e123274c8a20994c3ade58789ee840c5d9e13c7dba3e0885b3babd7a187aeb19a25b4ea8a6e151270fed3f363ce4d14d0fe749fc
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.6.1.tar.bz2 486468 SHA256 994771e9382d3d8aa13c320f1d728f517a27410d782acb859c4e3f3a00b5980e SHA512 84a82a3b777e72f954d235b3e2204315dae7109531307d68516683ba3b0889abe1511085a2dca4bf4c03a72d72dd672eaef7b76022be4491f4e786c83fb2fb6c WHIRLPOOL 92d669ef23500a488a727be039777aa4af9dde90e74af79e8e538f79a69608c9cba13a6a373081536d3f583ae49aad9ec8de05879d40c98f190df5c0f16a9cf2
-DIST shorewall-core-5.0.2.1.tar.bz2 47922 SHA256 8be30270e527c7697c365c437bff07e6a41ccdcf28b7163b2866750158e5845d SHA512 bf614cc73bc321c46b0825deb198943ce3a37a6e1b5dc5f2b9be17799409de9909219dec327c493a8382111cc9b7e7319c15effd84b238bee85ed9b6f0281100 WHIRLPOOL 5e415c8fb17edb96978cd3f8811fdd0953de556efe3cb6e5b1e9abe98535f905119eb968dadb65b3a525801c49af1fdbabc3b3e7eb06364c420323be6eeecb51
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.6.1.tar.bz2 52604 SHA256 9e7bb2d5abf02395c7f0f8753d0aba0019776bb35657b2d5171bf2bb09c98a94 SHA512 01340ce77a90c86009dd4e81a2ccb494394b935602e22f6a16221e98e540df5338b76d840d1e197ab023903d18f8d785e54dbb3a824b869a2d00b3860041cbe1 WHIRLPOOL cfdb7065c549d88e7e914f1377ef4a9b81be3574cb13dbffac3d5f385dddb6e08935ad3836bdc5b0514f2372b8ee6d6b13160e04bfd705b8ea7edceb93f647a6
-DIST shorewall-docs-html-5.0.2.1.tar.bz2 4272585 SHA256 a9c55c513fd086dc90d686f9a0444311453670487f10d3ed44505b952c72fcf2 SHA512 dc310f694b4cde8b27e3df99f75081019f752a3c7faa693093b1d5ec786392d2c2202f76b7372f894fd6e72fad5f7816db3b9a88a3a3409edcf4368d9e6b36d0 WHIRLPOOL 2f26c930a3aa56571cbfb02ba8f61b29103af91d46b014b21ed4b7da64f891c89df17fc725ba87b5809ad50d2d3ee2f8a55e6e983a612e6320d689afd6c287c6
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.6.1.tar.bz2 4267130 SHA256 92751d57e9d54d8b0330ae38e65f7d8b1230d0bb9559fc922efa32361be69c08 SHA512 f78e0e5a288a4ae29437ae74f8286a55332448ea2d65ec3640231319d5a29bccebf06195948452960562c425123d8c76f60414a1f8b6975443afcb8594b9b6a9 WHIRLPOOL 61113a39d44bcb20d7c7b551178f8175c2fdc417c07ae66739928b23d8a42c95975b86285473ac052a62e2bccbd05f660392224cb50896f58ae4ebf5432eebf4
-DIST shorewall-init-5.0.2.1.tar.bz2 27055 SHA256 2ce13881f7442b9e43bb1417bed9236931bb46ce8c74dd87af5d18be41b05311 SHA512 d8debb25e36d7829dcdb08698a889ccee680126da40f5606bba6a04b344cfd28660450cb3fd2037f6ec4d75058d8a243da82fb4c3b25184b609a5aa454739eca WHIRLPOOL 5d17a58c157993af37f75b64e53b693c8f62854bfebb8774520bd435a6c65e24e06c22398181941b352e218945055d8e3927f2cfbcb32e09d8c30f3f8e45fc29
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.6.1.tar.bz2 31591 SHA256 bade0018e12546c6665024918d361d8f00d24624e7d601dc38984334b5629426 SHA512 3c33616b5e6baa1fd0876273b9b5c7a762a3adf026279d94f58ed6d92460cd2665792eba5b923c187d974a51cba138a77f6131af4d28c4ff7e57c0b484300e4d WHIRLPOOL 579b9fd6d1b68595afd9db23df11e37d461a6f61ba5c5a15668830eeecc272dc0a65568d563d04304b76a5f693ed8da957933459c1e1f6180497fce23393cba3
-DIST shorewall-lite-5.0.2.1.tar.bz2 44159 SHA256 0b7074d098c44156aac4234c02c36ec97d8ac2fd8042ec1f5e5c390612e3620b SHA512 0d2f93622d9dc000c2e58c73a20b13ecf97e139d542f99db3690f75974bab579c8379bd56eb7ffbb58cabcefbedf685d50ed7748c39c15ef7b3636ddbdcece3c WHIRLPOOL 4fb32d7c66411e9b45decbb1fddae00ccad83ba226f8fab806a7e2c6f54f7fa9f2d94bcba3133cdc8bfe0fe240213e016b8b94cd9f00eb46cf2735ac111ce100
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.6.1.tar.bz2 48124 SHA256 b78d81138ab4ed5cd5f791eebd1fe667814c43ecd07cb2ffef53a185f5541e74 SHA512 b0dd2a7516de13a5d891ec11388a2258449262a57763c45aac68180fc9d4ef35e411c40ac0114742c8d96c8d4a47519769d17c15926c5d80613e6254c365406e WHIRLPOOL 9f032016285674e92c1e5ac265e7b01aba740e2d057caca621e3baa7c63d02d9574c18aed923ab9dc556fb69bfe772e9ec90c84b8a65545d1d778854b935c8e4
-DIST shorewall6-5.0.2.1.tar.bz2 221777 SHA256 ab8489662511990c5430e795803a01249e26e036f84c1079f08c45f52ef501fd SHA512 f79e890b1d6af42c9f3ae236d63fc731d963fc6a0f121a5f3f5a820f8f578b82cc92d450b0385ac0c9446049701500f83bf64b28e00b604d6b89a39529c46519 WHIRLPOOL ea4b1c72515069f4a636c9aa139734dc8c46a1583a4feb8ed6992a36d2e5607c870613b5ad8f4d2ab92629e292150b586986a6e791f3755ee7e48588c2da184f
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.6.1.tar.bz2 220240 SHA256 c80992734fa2ff1a686dbe4e0ec14fb420ca97188f709ec6611725e25c94e542 SHA512 5efcc51d616208ffd590eb4087f97d82ce9b29c5925f85584dc14409058b30b38b614a15da2b8c91dd55d0720ef6dcc886d4dddf52463d493f1534abf3599075 WHIRLPOOL 6ce4a62c539befb5df99cfa53419bf621a3b8bc4c9ffdfe4f30084635a2b499e0d8185a9a562de8b7bf4e7c97df9a79b158be7d35382865d5de56ef13e670df7
-DIST shorewall6-lite-5.0.2.1.tar.bz2 43345 SHA256 ebf19ef0ce409213b9c395911391f5f4e42c6542f6414cd849e66d6d19bd2751 SHA512 87fb50306c3e9d89cdf03bddb9b780929932ccbe5a346295f0bcdda8d3eeac6abd56387aad08aebc208228b5eee4378c29872d34b2d7ab11e8334ba5d7ec5165 WHIRLPOOL 9fbc60a75504be96b3bde80fc8c397d91af29c6c6d465bc14497586acbc8bd03a667f4680c847879dc59be2db9f15d5bed2fc22700d50a4d25eedc28d867c41a
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.6.1.tar.bz2 47281 SHA256 07c5e98f52cbb0cedf81979dbe5d1ad88ca77740b49ac90d47b3e52b7623ec52 SHA512 75ee9206d713af3de8eb508eb719e59f62d24793a9fcc086265428999d9219ab503699e4ed2e0e97390e35aabca8264dcf1ba4b704654e9fe91fd739f51741a4 WHIRLPOOL 055ad8f5593bac186dc985c917b6faa914011b72d03d2d429bee6e11747e346f09d8025a25332f10b8571d3e009d42957b191910d6f189d3caf92f9482c8ea20

diff --git a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild b/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
deleted file mode 100644
index 3e71daf..0000000
--- a/net-firewall/shorewall/shorewall-5.0.2.1.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
-		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
-		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
-		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
-		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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
-
-		cd "${S}"/${MY_PN_INIT}
-		epatch "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}"
-	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
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [ -d "${D}etc/NetworkManager" ]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		dohtml -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 "  http://shorewall.net/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
-
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
-		fi
-	fi
-
-	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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-03-29 13:53 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2016-03-29 13:53 UTC (permalink / raw
  To: gentoo-commits

commit:     7310cb5ad95bf3a820d43783e579d8119088240f
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Tue Mar 29 05:46:29 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 13:44:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7310cb5a

net-firewall/shorewall: Bump to v5.0.7.1

Skipping stabilization of v5.0.6.x due to bug #578076

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1158

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.6.2.ebuild => shorewall-5.0.7.1.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 29c0df6..cf65ded 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,14 @@
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
-DIST shorewall-5.0.6.2.tar.bz2 485616 SHA256 efb0136a21ee7bd61670b2f14b11acd1c10302d70a56d42b3bdfbd880ba8afc1 SHA512 f605d5157d3b84b4607aaf449e99363dd13e1e3acc1b8902a12d0b395427b6bdcf4681b54503904397aa6141b6bd2e86bf1cf5e9bc2cf2318a1c814de1fdca18 WHIRLPOOL b08e5c3f29599dff4788e0e2365a5e152eec1f1c59c6c9a10ec754be03c0273df2a2e8bf03491df5095b0a8427fe75b510c695bf4f6d03a9d936b8ba19c8a823
+DIST shorewall-5.0.7.1.tar.bz2 488299 SHA256 df3d3ae60a875e70dfa938e947320a9c06717082aabed23ce581fd2b58c2bdd2 SHA512 ac8a1e93192f88f86bef7f9b2b4d3ea7d854f0f986934b611e2c8a2f47a531e27881946c0d2bf60c69f0e55fbfe1e00736b05334e8ad24afbab886b76a002b83 WHIRLPOOL 906ffb94368be8e48e92c6825a2c397978e426b85f866a487eba64c1405a1568cf5d3e1e43463e7f1764ff847df04ef67219344c3684912c08f4e97a6d16da82
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
-DIST shorewall-core-5.0.6.2.tar.bz2 52826 SHA256 df9523f71e8611541111846793a04cce9fde76b9e0cc12a7333ae3a9b9ea8880 SHA512 01911d2a690e3b3514386bb8b3227d4dbb24ed5d1f9b5bba5b210e57df3c16ece5d037ce447238919f800545ba1e4b6a02a483db19b3360301d287508b759be9 WHIRLPOOL 22bc3f6b61ab9b653ca32d712250f2b4dccf45aee276ee5b72215e69c4b01b2acdafb7d24ef7bc4e2eecb0e2fb5aa99dd09f6bad90ddb0b5dcfe21e7e6b0d5b0
+DIST shorewall-core-5.0.7.1.tar.bz2 53482 SHA256 7e7ef76690f9698e5cdb69005a6749e2d777a0e724c144591e14f9894c5dfe58 SHA512 0d0d8a57850cd15c2025c3d6aaa2968e8d5abce7890ff41bcce5e2038712e81a2e417469bf62a871c3185cf9e4a598071310edb105d1cbb5d127a8b0fe5f5e0a WHIRLPOOL 2f0c26cd51e3b158e84b9bcc666bb8ec2e8681848459e21b849fda317f5a3662d734b75e968adc05a3e924f3101abd33571f7aa8fac62eeab1a04107f5f148b1
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
-DIST shorewall-docs-html-5.0.6.2.tar.bz2 4267172 SHA256 9df20309476abef09a34c0d582125a56d7880affb7e7eeaef4cb2275b18404e3 SHA512 9e9cdcd87d33b848530ca2df89028b5cf65e279e01a476d4c1c85af8a76442f31e0890e3f72ba215b6f89b61745d157d157643467d07a1ba0bd7f1afca301b92 WHIRLPOOL d369aa0655766252d1e513363805d3393a7b9d9bfc4e08dc2d50fc7fdcc72233645e61dced783a141b2f332529038280e38364d86c5b5d439946cf3ff1466a03
+DIST shorewall-docs-html-5.0.7.1.tar.bz2 4268193 SHA256 9936b960376a508ed7fac33ecf7c879dfcf9190535f12dde5b872354146ae7c6 SHA512 aa6769c0002f59a1767e9feeb2928d821940a89bf4e70a586a55e4bcfa650b66e5048a3722809f87d727b24dd1d4d99a88f2a00477e9249a585989ada637738a WHIRLPOOL c1ff87f2d5f39d2585a33c1150a7b2f99fc8264162471fd12f632798ed9cfe299e1ceef852887f690ed78ea0bef468a2d92b4da1c5009e81b947aa725577e185
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
-DIST shorewall-init-5.0.6.2.tar.bz2 31736 SHA256 90702a8ed63a586169627b5f71a89ae58dab8ecd3bcf51cd3fc08f7d2e21a94e SHA512 4349c9a6cee250dd621ef33412abee21e0825bac3f8549958c8da21ce3f012d271530452d53566d67925e9357c980f9f06360ccb5e4604466d80a5601063a407 WHIRLPOOL c3d70f341dacaf6822311d1e2a9f58ad5c65565fa1ac85773b6d6989f1f092a44fe22d27319ac8ad48af00395ddb1deff6f1805d05b21dfee7ac67ab019a6268
+DIST shorewall-init-5.0.7.1.tar.bz2 32320 SHA256 b2098be43b062e7cd5ceb7e0231db3fae60f393aed0e1065709379311614fc7a SHA512 c0bf1369afa30c1048e0008e3af04d42b2d0a8d4c00801ae62c1209aedfa4ffeb27e4947f6ecb704583a1f2bbd0adbdcea1135b9822cccb1dde859b6605d5337 WHIRLPOOL 6d90995771366b62272c80f17bfe41063bd771dd14aad4c8d13074743e81593ceaba8c542e33eb97d14489d445b191d37d993822d85f7e40b9f7d76e32e0ac00
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
-DIST shorewall-lite-5.0.6.2.tar.bz2 48329 SHA256 aa4be034a3536ace69f295338fa170a92402e0a6be40bca1037e859548e48330 SHA512 3080ea4ec9018bbe22e5d433bdf44f64ae62069aded82b14924563cb8a5c90ff214276bf8f84a33ca368ae269e05773e0733f9fa3181d29760f0c9769cf66e23 WHIRLPOOL 7186ef91b402b453ff3a1c2b8cd4fed127874e9c6851c3f3c86769436e4bc0b5b3b36b4fb283d69abb7d89f014bf7b54142f2c6d7103a6fcdfe6d8b9cad5228f
+DIST shorewall-lite-5.0.7.1.tar.bz2 48251 SHA256 2e04d5355d7c78b83a5999d939fb51f04818e72ed4003443ab6d93b0b72b824c SHA512 f94083f116b99dda40747674061dcdb7e8fb2550e73c3042a6aaecac5535880e3b9bf47f3452d62a81746bd72e4d16f078fdcf13edc7bc8806760168bb08deec WHIRLPOOL b0b16d687e552243b267f381aced553fd49dd35003550b0854a7631d387a8e8999490615607472b13cb51d25dbc8cece005043872ecc13f6ac376c485b2cbb0a
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
-DIST shorewall6-5.0.6.2.tar.bz2 220406 SHA256 586bbd8da9fd13aeb0f5d399f0e18a95079b027a134ca5ad8a95c23a25286b75 SHA512 eada07254fcd012e660cd23f03a00b9670ac9b5817bde3590eebc175b529ced6e09f65565efb86e7e7ddf97d5849edd9c59121724bae46ac475797be4487ae65 WHIRLPOOL 8e44878e8575f001546dac483d4e0ee3804207a24ad267d88b075642f21b9dbf71d0fe2a00790b4eec74933f5f5479c6ada091606f14684b7e7ffba6fb609367
+DIST shorewall6-5.0.7.1.tar.bz2 222292 SHA256 7d96cc0992e00ebbc8b8153eb884accfa90d5b241570a7d28e5b45301d2f8047 SHA512 676bed55ef5a5ed6acc7f157674751ffa4078e20d1d150818195fe4b730b4ff4d6acd44b0b41b3ff42fdada6ceae96b05f67020de900636ecc6fe8b1e36059be WHIRLPOOL a9731f6ee18bf96f8c7e17ce8dd306ad1c2e949d98b6603fe28fe4e7fe8e8a3ec51b03dab5efb9f036fc337a50b464516a33a232b5fdee610c33e916a2f3009e
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
-DIST shorewall6-lite-5.0.6.2.tar.bz2 47437 SHA256 ce6d9d97803d007edf9089478882a023b4cc7795b224713bf64715f03e5805a8 SHA512 cbedb0c15ef4b9dcc5e972740642f4ccc8ef9be1c8adedbbaf83bdda4a1934dd65555c053b9bd6da3a1e8003fdd356f629aaec5f7b113c86fd29664f2a130431 WHIRLPOOL 95c654b3c083cf62c7a601d6e520128e6cac0d9b139fa7a1a7aa8bb391568daf69b3743a6c94cc74a0c6ddb54bdfde0dc23135b3df6d250ef922c2513beb8d8c
+DIST shorewall6-lite-5.0.7.1.tar.bz2 47650 SHA256 58bb6cdc5c1266b10206830bf8d867fa75feaf2d8ee4a3c3b5eca801132149ac SHA512 5b7261fa0b9323f34fbdada3c120e90de72dead133178b37aa4e6ad6055ead4660f744b866bd6942b9a7776302f0235fa4eca805e6706e75d5523dc672f31580 WHIRLPOOL 80b118a93130e13e994c587a8457664bdd502772e35c2fb90538584eca129a26445a8c8a738481e79bb642d6871f8f3654398fd55f7c0417dff4c4f229a73043

diff --git a/net-firewall/shorewall/shorewall-5.0.6.2.ebuild b/net-firewall/shorewall/shorewall-5.0.7.1.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.6.2.ebuild
rename to net-firewall/shorewall/shorewall-5.0.7.1.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-04-01  6:44 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-04-01  6:44 UTC (permalink / raw
  To: gentoo-commits

commit:     b0044b4401c2c5c5577a78a7d632ee7b83df481f
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Thu Mar 31 17:19:49 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 06:30:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0044b44

net-firewall/shorewall: Version bump.

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1174

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.7.1.ebuild => shorewall-5.0.7.2.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index cf65ded..659efd4 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,14 @@
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
-DIST shorewall-5.0.7.1.tar.bz2 488299 SHA256 df3d3ae60a875e70dfa938e947320a9c06717082aabed23ce581fd2b58c2bdd2 SHA512 ac8a1e93192f88f86bef7f9b2b4d3ea7d854f0f986934b611e2c8a2f47a531e27881946c0d2bf60c69f0e55fbfe1e00736b05334e8ad24afbab886b76a002b83 WHIRLPOOL 906ffb94368be8e48e92c6825a2c397978e426b85f866a487eba64c1405a1568cf5d3e1e43463e7f1764ff847df04ef67219344c3684912c08f4e97a6d16da82
+DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
-DIST shorewall-core-5.0.7.1.tar.bz2 53482 SHA256 7e7ef76690f9698e5cdb69005a6749e2d777a0e724c144591e14f9894c5dfe58 SHA512 0d0d8a57850cd15c2025c3d6aaa2968e8d5abce7890ff41bcce5e2038712e81a2e417469bf62a871c3185cf9e4a598071310edb105d1cbb5d127a8b0fe5f5e0a WHIRLPOOL 2f0c26cd51e3b158e84b9bcc666bb8ec2e8681848459e21b849fda317f5a3662d734b75e968adc05a3e924f3101abd33571f7aa8fac62eeab1a04107f5f148b1
+DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
-DIST shorewall-docs-html-5.0.7.1.tar.bz2 4268193 SHA256 9936b960376a508ed7fac33ecf7c879dfcf9190535f12dde5b872354146ae7c6 SHA512 aa6769c0002f59a1767e9feeb2928d821940a89bf4e70a586a55e4bcfa650b66e5048a3722809f87d727b24dd1d4d99a88f2a00477e9249a585989ada637738a WHIRLPOOL c1ff87f2d5f39d2585a33c1150a7b2f99fc8264162471fd12f632798ed9cfe299e1ceef852887f690ed78ea0bef468a2d92b4da1c5009e81b947aa725577e185
+DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
-DIST shorewall-init-5.0.7.1.tar.bz2 32320 SHA256 b2098be43b062e7cd5ceb7e0231db3fae60f393aed0e1065709379311614fc7a SHA512 c0bf1369afa30c1048e0008e3af04d42b2d0a8d4c00801ae62c1209aedfa4ffeb27e4947f6ecb704583a1f2bbd0adbdcea1135b9822cccb1dde859b6605d5337 WHIRLPOOL 6d90995771366b62272c80f17bfe41063bd771dd14aad4c8d13074743e81593ceaba8c542e33eb97d14489d445b191d37d993822d85f7e40b9f7d76e32e0ac00
+DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
-DIST shorewall-lite-5.0.7.1.tar.bz2 48251 SHA256 2e04d5355d7c78b83a5999d939fb51f04818e72ed4003443ab6d93b0b72b824c SHA512 f94083f116b99dda40747674061dcdb7e8fb2550e73c3042a6aaecac5535880e3b9bf47f3452d62a81746bd72e4d16f078fdcf13edc7bc8806760168bb08deec WHIRLPOOL b0b16d687e552243b267f381aced553fd49dd35003550b0854a7631d387a8e8999490615607472b13cb51d25dbc8cece005043872ecc13f6ac376c485b2cbb0a
+DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
-DIST shorewall6-5.0.7.1.tar.bz2 222292 SHA256 7d96cc0992e00ebbc8b8153eb884accfa90d5b241570a7d28e5b45301d2f8047 SHA512 676bed55ef5a5ed6acc7f157674751ffa4078e20d1d150818195fe4b730b4ff4d6acd44b0b41b3ff42fdada6ceae96b05f67020de900636ecc6fe8b1e36059be WHIRLPOOL a9731f6ee18bf96f8c7e17ce8dd306ad1c2e949d98b6603fe28fe4e7fe8e8a3ec51b03dab5efb9f036fc337a50b464516a33a232b5fdee610c33e916a2f3009e
+DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
-DIST shorewall6-lite-5.0.7.1.tar.bz2 47650 SHA256 58bb6cdc5c1266b10206830bf8d867fa75feaf2d8ee4a3c3b5eca801132149ac SHA512 5b7261fa0b9323f34fbdada3c120e90de72dead133178b37aa4e6ad6055ead4660f744b866bd6942b9a7776302f0235fa4eca805e6706e75d5523dc672f31580 WHIRLPOOL 80b118a93130e13e994c587a8457664bdd502772e35c2fb90538584eca129a26445a8c8a738481e79bb642d6871f8f3654398fd55f7c0417dff4c4f229a73043
+DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833

diff --git a/net-firewall/shorewall/shorewall-5.0.7.1.ebuild b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.7.1.ebuild
rename to net-firewall/shorewall/shorewall-5.0.7.2.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-04-18  8:13 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-04-18  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     a06fc9c591b604dc6021e15219fda14f65739cee
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 07:17:24 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 07:59:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06fc9c5

net-firewall/shorewall: Fix metadata.xml file.

Package-Manager: portage-2.2.26

 net-firewall/shorewall/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index 8ba5a0c..cd6edc7 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -33,8 +33,8 @@
 	<use>
 		<flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
 		<flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
-		<flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall[ipv4]</pkg>)</flag>
-		<flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall[ipv4]</pkg></flag>
-		<flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall[ipv6]</pkg></flag>
+		<flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall</pkg> ipv4 USE flag)</flag>
+		<flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall</pkg> ipv4 USE flag</flag>
+		<flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall</pkg> ipv6 USE flag</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-05-09 16:44 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-05-09 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     74b0a8f59a8dce454bbc68df49602c282f1a9a73
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Mon May  9 11:28:13 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon May  9 16:29:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b0a8f5

net-firewall/shorewall: Bump to v5.0.8.2

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1444

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.8.ebuild => shorewall-5.0.8.2.ebuild}   |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 8610ecd..fdd5b10 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,21 @@
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
-DIST shorewall-5.0.8.tar.bz2 497396 SHA256 a1a598a3bb73793de245841ff54fae01cc2e29e006a4f4c09f04f16be4c41f54 SHA512 b0ad03aa86f1c5d607026db37fe3fb6ba335d29dd596770ef1b4b338b8afa5916062c07372427d44e8cdbd7e59183b3a73f4b531a869cc1dd4025f72ae5fc945 WHIRLPOOL 6e5643b094199a5bfa8da253e1348547525449b74f22ddfc5fa75fd504f456e914a56122a040532b460632ce43e178f28c22174ac000e724f43a2523c572819b
+DIST shorewall-5.0.8.2.tar.bz2 497595 SHA256 3efb344091ea4be9e06014c9edc2cbadcc1abab63b48bd0a3ae5a52305e605a0 SHA512 0cee806eed8383eab17bf7a9f488a96152e7670869d3065c71b5a3282fdb951bb0321b4179d4235c5ba2efd63272d219701a42bc34169130a0fa690547911f95 WHIRLPOOL 28d294c7e19d89fb86579fc40f509c1aab818055abc93962b7efdd97886ea61603cab8d0ba4d8da4feb6a14e49663b421238d3bd2fc21d9115333bfcc2164f9c
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
-DIST shorewall-core-5.0.8.tar.bz2 57121 SHA256 1cd2449e4f86a23c518d180c9c802fa77400d33f0a2945b4434d89407167ecad SHA512 901673f76a65d7039abbad6d8b8553d9a1751dcc7559d25f0f798135121a52b4c25159b7ef4c95affdba6ed92e6a37d7d39928468e6a7737eaa78acb365c8a32 WHIRLPOOL df60d7ecb7422d5dd81c0a9b487bc7a4b15a1384c5a2ba262d9a8041262fec048d27d72c03dedfbe7a3b310b2708d40412d355dd70eeba7427eb5f43a3d44edf
+DIST shorewall-core-5.0.8.2.tar.bz2 57571 SHA256 ede4d7a69dc2c38cf6c44c87b013cb4292748dfd77812ec91078aa139ce1789e SHA512 d947eefaacbd436cfae7fa35aa4e2cc0e5cf4b170d1b8daaeff2039e9c91bad2f2d09dd7f661d587044d825a80acd0c264fcae087f227268f8bb7efc3a06d25d WHIRLPOOL bfc65350500764989ebfabcd4b9b5c992f7058082af3960a1eadcc5ce61cb02c20aeeb01e24fd4ddc5303c17cbbd111e7ce57a436e31d6f99403817caa2aa8aa
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
-DIST shorewall-docs-html-5.0.8.tar.bz2 4270299 SHA256 8646627ce8a4ceb8e0800e82c8a62facf5e4c8240b6fded00d4fed4516a275d1 SHA512 a820a3e0a2e6d95b8f349e66bd7ed8d27d7155801494042d6732b16cd93ad7f7e1a76a62b32335a62e98eb9528b49f16e11a4b2fe7bc0d9d8064a270cbd52d4f WHIRLPOOL 358b5948d3bb9912e8634e025003a969ecd546b7552e149c5e779844446a107f66a662c381f393d43a6d3cf241dafd8299341ae9ef56fb3ff37ca7277608deb8
+DIST shorewall-docs-html-5.0.8.2.tar.bz2 4269538 SHA256 23684caa014208001d06a1fc8c3299bb2e94c5870b5a44df5f939b9e92b8ddf5 SHA512 cda393360d95cd768300b74500d37e26a1f287f783e7597f9387aa571292aa029217deabc23eaf1c1303c538c179bf314b54ecfb086269be3fe66c4311c55eda WHIRLPOOL fa42f82beaf6246faad524574e6a5c3feca7a7a6a77599b250af467b58208b6f6cbb343af3f32bd43a1fb0c875c43e1d5a8604f7480137b112de986c47850030
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
-DIST shorewall-init-5.0.8.tar.bz2 35665 SHA256 953a1ed63bcb36e2ecbe98813c85e4bae90f3dfadd4a4d034544b5eec113af4e SHA512 bc20cee91140e39c7cfcbf8b08c4dc3f19ce3cb76df62d7321a41679af007a2c4da49b6fff160a3cc4fb909a7cbb984157ad78e156df1c6094812f66cb549d2d WHIRLPOOL c56dace686dbe2e29123854374ed350cea0a399389577d7c8c2cc68a5534da6145a8b22819d53f1f4a42cee2e020085cac2544a20d3889476980a9fb4f062884
+DIST shorewall-init-5.0.8.2.tar.bz2 36080 SHA256 08eb15cca5c768be5a1539fbbbaef7eb62c1286ee50c1c96a5f9ca8f8d6f238e SHA512 da6df5d738ccd76cba4f25f4b1535b31541d1f133788d1ea8055dda9a221c2c0f93f5ed8cc3dd8c66587463913de93cbd97dd2e9ce9c30c9d1a611a1871bf618 WHIRLPOOL 1fe8776deb03d3ede6aa384ad9060ae8b1c41d380c7ff09d8f4dbef3c94c07e90b36ab927553235ba6736650970443380d1cf09886c66fa4499bf04cf9b4f939
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
-DIST shorewall-lite-5.0.8.tar.bz2 51897 SHA256 42c2a2f7c81bfab47371748e8e5230bbac7bd5985372dce64071e695f9d8746a SHA512 7a2497a768102c331fda410206c77ef9e57b012eb6932ed519caf036b7cd8ae110bad536175db0339024c4d8aaa77b682a2b816358a3268e15018371c4fd69b8 WHIRLPOOL 4738355687e05ca133a6f9d7c3b467567cd49a8124bee4d12ec04981e38642555911b7249a9e161d22e6c1b64f221fea202141f7fcd05be8ea973cf78bc1900d
+DIST shorewall-lite-5.0.8.2.tar.bz2 52311 SHA256 455690aeb82550012d622f92e8431e88e29a3cda36a7509093ce04073e542756 SHA512 ea406209e91624d032e51e9fde218a267f542c197fe59fe2b228ab544187f244d6a6585b562385998a3f85cc519da2c4b69f16c7f25e0e7d8318681133897d55 WHIRLPOOL 8746d6009fc9acffd7633fdbff7c343a25e964063fbfa9931ca0f7f2409cf286214e69ca04ab9d71ba61c0c1d5f414b203566d96368d029227bedc6f2aa0aa5b
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
-DIST shorewall6-5.0.8.tar.bz2 224839 SHA256 564fb305c8d816d9e2b5a2487b68b80e34049144b8499931767a647d8bbd2192 SHA512 7d0eeac59c965cb4599b0fb42bdc8791ad29f284de9635a96df0c1e27bbdf69a35c501b72b4787380176c97fbbbdcd22a1a6b113c24344f296ec6b2438d2f77f WHIRLPOOL 47dc867b7c84db50cae87aeed79ba2c0f954841a5d593e76ca3c3caa0547ff1dd3e9e433a649cb655e8c1ad876faa518cd04fbf7daeb7be3f9d89625bfd2c77d
+DIST shorewall6-5.0.8.2.tar.bz2 225159 SHA256 2139b274a1ce358c83042b1135260a0583cd4b96fb9cbea321ddd0e38b3f286f SHA512 e42dcb6f57fa0cad1df9f571cbb308c411640ad3fe050d671e21e5da1b54bb12da20524397f13fd3f626fe8f6d349518645c3d9911fbd5d057d4109b9084663f WHIRLPOOL 826c76f0fb3076b3044c615ab94376302e1022e29fc09e4ceb10a1f16ed26ce77fe337a7e64ee3194c252b7621d5a9fa6311837ec234912f548e19f412801fd6
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
-DIST shorewall6-lite-5.0.8.tar.bz2 51351 SHA256 970b738ac1d3f6c7ca64769fde7daedd855dfb4ce000127f48bb6a352e28c184 SHA512 bc4fa6cb635b25856764009a7d10cf9d38d3df820ee291658a38c8014491baa407476ff5f5955168b84090ee6c8fdaf2718ea77dacdf15abd5c862f0e2e6eed6 WHIRLPOOL 8cabd7086f0fe593dea29ace8fedcff7078a9ce5c07b314c104c53d758962a3f344a46268e814516ebd03a225b4296d0b381b676c9d52fe94ce2afa5557bf5da
+DIST shorewall6-lite-5.0.8.2.tar.bz2 51728 SHA256 a27bdac2153487077475c92d2fa142cc06911a45d7268d5f6a778d42259ce24e SHA512 f02acdae913430de1b673c70cfef6d93579f4a02916d9f85e755b1ffeac1a7b06fcd548c16588c43558a80f96e13cb0fddfb46a5a9bb589eec1fe82275b7108c WHIRLPOOL 3395581bb8f250bba72be7fce568628d3fe76dae9698771dbeb76238ae54bc42ef95611c33847c22d727db04717571c82abb770e30c9a1986c103fff2a492911

diff --git a/net-firewall/shorewall/shorewall-5.0.8.ebuild b/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.8.ebuild
rename to net-firewall/shorewall/shorewall-5.0.8.2.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-05-13  8:41 Agostino Sarubbo
  0 siblings, 0 replies; 159+ messages in thread
From: Agostino Sarubbo @ 2016-05-13  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     907b1a4d2be0eaf06b7ae47058923d0f5e153990
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 08:39:57 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 13 08:41:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907b1a4d

net-firewall/shorewall: amd64 stable wrt bug #579816

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
index 5b037ee..800e37b 100644
--- a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-05-23 11:33 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2016-05-23 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     e55d050cdceaa145ae77120772450a2cf2e77f5f
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 15:57:36 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon May 23 11:32:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e55d050c

net-firewall/shorewall: bash syntax tidy

replace POSIX '[' with the bash '[[' in 5.0.8.2

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1512

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.0.8.2.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.8.2.ebuild b/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
index 96d62a2..afd5706 100644
--- a/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
@@ -145,7 +145,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if [ -n "${DIGEST}" ]; then
+	if [[ -n "${DIGEST}" ]]; then
 		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
 		unset DIGEST
 	fi
@@ -291,21 +291,21 @@ src_install() {
 		DESTDIR="${D%/}" ${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 "${D}etc/logrotate.d/shorewall-init" ]; then
+		if [[ -f "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
 			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
 		fi
 
-		if [ -d "${D}etc/NetworkManager" ]; then
+		if [[ -d "${D}etc/NetworkManager" ]]; then
 			# On Gentoo, we don't support NetworkManager
 			# so we don't need this folder at all
 			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
 			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
 		fi
 
-		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
 			# This script isn't supported on Gentoo
 			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
 		fi


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-05-23 11:33 Ian Delaney
  0 siblings, 0 replies; 159+ messages in thread
From: Ian Delaney @ 2016-05-23 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     45a91a72386eba5442257bacaf1a200ea3e21a1f
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 16:00:59 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon May 23 11:32:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a91a72

net-firewall/shorewall: add a few missing '|| die' for 5.0.8.2

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1512

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.0.8.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.8.2.ebuild b/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
index afd5706..f87c043 100644
--- a/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
@@ -222,9 +222,9 @@ src_prepare() {
 
 		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
 
-		cd "${S}"/${MY_PN_INIT}
+		cd "${S}"/${MY_PN_INIT} || die
 		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}"
+		cd "${S}" || die
 	fi
 
 	# shorewall-docs-html


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-05-31 13:58 Tobias Klausmann
  0 siblings, 0 replies; 159+ messages in thread
From: Tobias Klausmann @ 2016-05-31 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     395f82a790f72295a5cce415dc947dfe1f8d143f
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 13:58:03 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue May 31 13:58:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395f82a7

net-firewall/shorewall-5.0.7.2-r0: add alpha keyword

Gentoo-Bug: 579816

Package-Manager: portage-2.3.0_rc1

 net-firewall/shorewall/shorewall-5.0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
index 800e37b..fc4b952 100644
--- a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-06-11 20:20 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-06-11 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     a8c73cbf54c92249f5e58c1a627695c547c3b177
Author:     Thomas Deutschmann <whissi <AT> whissi <DOT> de>
AuthorDate: Sat Jun 11 12:53:29 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 19:52:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c73cbf

net-firewall/shorewall: Bump to v5.0.9

Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1649

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.0.9.ebuild | 446 ++++++++++++++++++++++++++
 2 files changed, 453 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index fdd5b10..b6beb2f 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-5.0.8.2.tar.bz2 497595 SHA256 3efb344091ea4be9e06014c9edc2cbadcc1abab63b48bd0a3ae5a52305e605a0 SHA512 0cee806eed8383eab17bf7a9f488a96152e7670869d3065c71b5a3282fdb951bb0321b4179d4235c5ba2efd63272d219701a42bc34169130a0fa690547911f95 WHIRLPOOL 28d294c7e19d89fb86579fc40f509c1aab818055abc93962b7efdd97886ea61603cab8d0ba4d8da4feb6a14e49663b421238d3bd2fc21d9115333bfcc2164f9c
+DIST shorewall-5.0.9.tar.bz2 499158 SHA256 aceab0fc98359ec27b3647701dedc2a1e4e01299b0555b801baee39070f5028d SHA512 4fab242183ec11caf5470f0aaa643d9b510387d551947a11a099949a5d2f7245e6996d38bf910da55b88f0b0842192ee232f9a48c571d050c318e7774a550f3e WHIRLPOOL 226c3a4cbb5fdbdcc6e67b56bbb89fe6fe8d471949c99cad91fd5b79536d1eb32abe8f7a34f3aad62019983dbef508dafa732693ecf7957d5077b71d36401c94
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-core-5.0.8.2.tar.bz2 57571 SHA256 ede4d7a69dc2c38cf6c44c87b013cb4292748dfd77812ec91078aa139ce1789e SHA512 d947eefaacbd436cfae7fa35aa4e2cc0e5cf4b170d1b8daaeff2039e9c91bad2f2d09dd7f661d587044d825a80acd0c264fcae087f227268f8bb7efc3a06d25d WHIRLPOOL bfc65350500764989ebfabcd4b9b5c992f7058082af3960a1eadcc5ce61cb02c20aeeb01e24fd4ddc5303c17cbbd111e7ce57a436e31d6f99403817caa2aa8aa
+DIST shorewall-core-5.0.9.tar.bz2 58289 SHA256 42ae23cbe31726a0e749e60e51fdc85a35ddfad6249965fe6304ff7b3dcef733 SHA512 97a8c6621cea77a09af051e9682612a896f1971ec2103da71ec467dd5637255f7b3e8d4332ff7316d54fe66138c4b377249b987b42a9fc05fd1f9c64f84512fe WHIRLPOOL 99e2cb6bb72a0c3bfc1834d5cfca672c141d85329f07794617522c1aa80cae96fa7f504f325466cb9d3381a6ac1b08836fd6947d2ada95d1628c9b183809bab5
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-docs-html-5.0.8.2.tar.bz2 4269538 SHA256 23684caa014208001d06a1fc8c3299bb2e94c5870b5a44df5f939b9e92b8ddf5 SHA512 cda393360d95cd768300b74500d37e26a1f287f783e7597f9387aa571292aa029217deabc23eaf1c1303c538c179bf314b54ecfb086269be3fe66c4311c55eda WHIRLPOOL fa42f82beaf6246faad524574e6a5c3feca7a7a6a77599b250af467b58208b6f6cbb343af3f32bd43a1fb0c875c43e1d5a8604f7480137b112de986c47850030
+DIST shorewall-docs-html-5.0.9.tar.bz2 4270490 SHA256 a2083d2254098bca989b581dff5280fe20159597df08fb36d74b3b5ced614fbb SHA512 d1596ee3302aa3976e7c9cf73580c95d2801b82adaefffa2dd828b6e4077678d183887fb0a51b64f766241153a0af95009b63812a3a70047e43d577da409eb70 WHIRLPOOL 1113ffb740616587e437dff55ce2d7e1c56dd46d1d6819ea32121830d4447d86407bcce3adeacc19e08880d9400c4b8db963f9de9883665c0ef3dbeb06191ebc
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-init-5.0.8.2.tar.bz2 36080 SHA256 08eb15cca5c768be5a1539fbbbaef7eb62c1286ee50c1c96a5f9ca8f8d6f238e SHA512 da6df5d738ccd76cba4f25f4b1535b31541d1f133788d1ea8055dda9a221c2c0f93f5ed8cc3dd8c66587463913de93cbd97dd2e9ce9c30c9d1a611a1871bf618 WHIRLPOOL 1fe8776deb03d3ede6aa384ad9060ae8b1c41d380c7ff09d8f4dbef3c94c07e90b36ab927553235ba6736650970443380d1cf09886c66fa4499bf04cf9b4f939
+DIST shorewall-init-5.0.9.tar.bz2 36483 SHA256 a473e68456cdc2e09ffd0c0e84a40ea59412d2a317235eff662d2f8a79a77e73 SHA512 d62b1b9a34d8e617c2cab9291e00c1572def113599184d07b1ef53ccf3872993a500d08ddaf4b255d655ed30f9d6d2f72dab63e1a52e108609f4cf5837312a46 WHIRLPOOL f73d631e808560736bdb9669dda6f3383d88d933d39c2fd2d44f223b8c8ca9086a38214426998f22344fd79bcee193e6f0ffe62feddeb7d534218245660b8fed
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall-lite-5.0.8.2.tar.bz2 52311 SHA256 455690aeb82550012d622f92e8431e88e29a3cda36a7509093ce04073e542756 SHA512 ea406209e91624d032e51e9fde218a267f542c197fe59fe2b228ab544187f244d6a6585b562385998a3f85cc519da2c4b69f16c7f25e0e7d8318681133897d55 WHIRLPOOL 8746d6009fc9acffd7633fdbff7c343a25e964063fbfa9931ca0f7f2409cf286214e69ca04ab9d71ba61c0c1d5f414b203566d96368d029227bedc6f2aa0aa5b
+DIST shorewall-lite-5.0.9.tar.bz2 52718 SHA256 04c5f5bd9dfa246745581f20fb5755f4fa309deb970fa451f68ca605ea3b5f9e SHA512 6cb748199ab217f2a8c51d4f4cf076c122f8ba793167481bd582e0d7c35d137760c74e708375ea863df3b704dae0c95afe65a57f1f082c6eca0af85d1d3f78cd WHIRLPOOL db998d5fb0175004ddf3c43365923d2f4cdb12a930e7c88434b841ddf3004476cebbde586913ee89e54e26c5a352fe02291b348ee452f4055cc3b4734206bd1b
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-5.0.8.2.tar.bz2 225159 SHA256 2139b274a1ce358c83042b1135260a0583cd4b96fb9cbea321ddd0e38b3f286f SHA512 e42dcb6f57fa0cad1df9f571cbb308c411640ad3fe050d671e21e5da1b54bb12da20524397f13fd3f626fe8f6d349518645c3d9911fbd5d057d4109b9084663f WHIRLPOOL 826c76f0fb3076b3044c615ab94376302e1022e29fc09e4ceb10a1f16ed26ce77fe337a7e64ee3194c252b7621d5a9fa6311837ec234912f548e19f412801fd6
+DIST shorewall6-5.0.9.tar.bz2 226753 SHA256 4b35aa0ed39ffa88f1d64b8313d4a8a56a2cc540683b70dd13099284c985abae SHA512 0692377f9801008c66adf676fc93f7a17a26fb937e21213b8db6d502cf10c2280b77ac0a83aae308f5a0a08fadd45bf9b7b7c08dd7fc613d1496d2a760f760fe WHIRLPOOL fe95d501b4ccefe9541c4ddf16b6cfb17d2f11543ff9b1bcb0caf0b3904b49f6f2189ad18befaa4d99096d33d740bee601451e070c0fc52b31e2fd37cd467d2f
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
 DIST shorewall6-lite-5.0.8.2.tar.bz2 51728 SHA256 a27bdac2153487077475c92d2fa142cc06911a45d7268d5f6a778d42259ce24e SHA512 f02acdae913430de1b673c70cfef6d93579f4a02916d9f85e755b1ffeac1a7b06fcd548c16588c43558a80f96e13cb0fddfb46a5a9bb589eec1fe82275b7108c WHIRLPOOL 3395581bb8f250bba72be7fce568628d3fe76dae9698771dbeb76238ae54bc42ef95611c33847c22d727db04717571c82abb770e30c9a1986c103fff2a492911
+DIST shorewall6-lite-5.0.9.tar.bz2 52157 SHA256 2e9edd77ac0050d1f73091211369f4a1227b88fe04fc777254554f0c23bf7500 SHA512 cd29fa5c11084c8fb38e7d3e88f5600dc5e0ad988b428d9c9742448bb1b21381b553b1f8ba9d1f79c3c2453e532060d1dac065a311e8218c7e3c55675bd9a622 WHIRLPOOL e25633e8b2f52c210c9e186644f8fde9c2a6c255a325b2fbef836b0ae626bef9a273a064357068af82c6cb80368b78d8fa6d3a15feb28b542f71418482cfd816

diff --git a/net-firewall/shorewall/shorewall-5.0.9.ebuild b/net-firewall/shorewall/shorewall-5.0.9.ebuild
new file mode 100644
index 0000000..f87c043
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.9.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-06-11 20:20 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-06-11 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     59618c913c449362f6ddfaf646b7fb0a7f946675
Author:     Thomas Deutschmann <whissi <AT> whissi <DOT> de>
AuthorDate: Sat Jun 11 12:57:01 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 19:52:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59618c91

net-firewall/shorewall: Remove old

Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1649

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.0.8.2.ebuild | 446 ------------------------
 2 files changed, 453 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index b6beb2f..c19110a 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,21 @@
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
-DIST shorewall-5.0.8.2.tar.bz2 497595 SHA256 3efb344091ea4be9e06014c9edc2cbadcc1abab63b48bd0a3ae5a52305e605a0 SHA512 0cee806eed8383eab17bf7a9f488a96152e7670869d3065c71b5a3282fdb951bb0321b4179d4235c5ba2efd63272d219701a42bc34169130a0fa690547911f95 WHIRLPOOL 28d294c7e19d89fb86579fc40f509c1aab818055abc93962b7efdd97886ea61603cab8d0ba4d8da4feb6a14e49663b421238d3bd2fc21d9115333bfcc2164f9c
 DIST shorewall-5.0.9.tar.bz2 499158 SHA256 aceab0fc98359ec27b3647701dedc2a1e4e01299b0555b801baee39070f5028d SHA512 4fab242183ec11caf5470f0aaa643d9b510387d551947a11a099949a5d2f7245e6996d38bf910da55b88f0b0842192ee232f9a48c571d050c318e7774a550f3e WHIRLPOOL 226c3a4cbb5fdbdcc6e67b56bbb89fe6fe8d471949c99cad91fd5b79536d1eb32abe8f7a34f3aad62019983dbef508dafa732693ecf7957d5077b71d36401c94
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
-DIST shorewall-core-5.0.8.2.tar.bz2 57571 SHA256 ede4d7a69dc2c38cf6c44c87b013cb4292748dfd77812ec91078aa139ce1789e SHA512 d947eefaacbd436cfae7fa35aa4e2cc0e5cf4b170d1b8daaeff2039e9c91bad2f2d09dd7f661d587044d825a80acd0c264fcae087f227268f8bb7efc3a06d25d WHIRLPOOL bfc65350500764989ebfabcd4b9b5c992f7058082af3960a1eadcc5ce61cb02c20aeeb01e24fd4ddc5303c17cbbd111e7ce57a436e31d6f99403817caa2aa8aa
 DIST shorewall-core-5.0.9.tar.bz2 58289 SHA256 42ae23cbe31726a0e749e60e51fdc85a35ddfad6249965fe6304ff7b3dcef733 SHA512 97a8c6621cea77a09af051e9682612a896f1971ec2103da71ec467dd5637255f7b3e8d4332ff7316d54fe66138c4b377249b987b42a9fc05fd1f9c64f84512fe WHIRLPOOL 99e2cb6bb72a0c3bfc1834d5cfca672c141d85329f07794617522c1aa80cae96fa7f504f325466cb9d3381a6ac1b08836fd6947d2ada95d1628c9b183809bab5
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
-DIST shorewall-docs-html-5.0.8.2.tar.bz2 4269538 SHA256 23684caa014208001d06a1fc8c3299bb2e94c5870b5a44df5f939b9e92b8ddf5 SHA512 cda393360d95cd768300b74500d37e26a1f287f783e7597f9387aa571292aa029217deabc23eaf1c1303c538c179bf314b54ecfb086269be3fe66c4311c55eda WHIRLPOOL fa42f82beaf6246faad524574e6a5c3feca7a7a6a77599b250af467b58208b6f6cbb343af3f32bd43a1fb0c875c43e1d5a8604f7480137b112de986c47850030
 DIST shorewall-docs-html-5.0.9.tar.bz2 4270490 SHA256 a2083d2254098bca989b581dff5280fe20159597df08fb36d74b3b5ced614fbb SHA512 d1596ee3302aa3976e7c9cf73580c95d2801b82adaefffa2dd828b6e4077678d183887fb0a51b64f766241153a0af95009b63812a3a70047e43d577da409eb70 WHIRLPOOL 1113ffb740616587e437dff55ce2d7e1c56dd46d1d6819ea32121830d4447d86407bcce3adeacc19e08880d9400c4b8db963f9de9883665c0ef3dbeb06191ebc
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
-DIST shorewall-init-5.0.8.2.tar.bz2 36080 SHA256 08eb15cca5c768be5a1539fbbbaef7eb62c1286ee50c1c96a5f9ca8f8d6f238e SHA512 da6df5d738ccd76cba4f25f4b1535b31541d1f133788d1ea8055dda9a221c2c0f93f5ed8cc3dd8c66587463913de93cbd97dd2e9ce9c30c9d1a611a1871bf618 WHIRLPOOL 1fe8776deb03d3ede6aa384ad9060ae8b1c41d380c7ff09d8f4dbef3c94c07e90b36ab927553235ba6736650970443380d1cf09886c66fa4499bf04cf9b4f939
 DIST shorewall-init-5.0.9.tar.bz2 36483 SHA256 a473e68456cdc2e09ffd0c0e84a40ea59412d2a317235eff662d2f8a79a77e73 SHA512 d62b1b9a34d8e617c2cab9291e00c1572def113599184d07b1ef53ccf3872993a500d08ddaf4b255d655ed30f9d6d2f72dab63e1a52e108609f4cf5837312a46 WHIRLPOOL f73d631e808560736bdb9669dda6f3383d88d933d39c2fd2d44f223b8c8ca9086a38214426998f22344fd79bcee193e6f0ffe62feddeb7d534218245660b8fed
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
-DIST shorewall-lite-5.0.8.2.tar.bz2 52311 SHA256 455690aeb82550012d622f92e8431e88e29a3cda36a7509093ce04073e542756 SHA512 ea406209e91624d032e51e9fde218a267f542c197fe59fe2b228ab544187f244d6a6585b562385998a3f85cc519da2c4b69f16c7f25e0e7d8318681133897d55 WHIRLPOOL 8746d6009fc9acffd7633fdbff7c343a25e964063fbfa9931ca0f7f2409cf286214e69ca04ab9d71ba61c0c1d5f414b203566d96368d029227bedc6f2aa0aa5b
 DIST shorewall-lite-5.0.9.tar.bz2 52718 SHA256 04c5f5bd9dfa246745581f20fb5755f4fa309deb970fa451f68ca605ea3b5f9e SHA512 6cb748199ab217f2a8c51d4f4cf076c122f8ba793167481bd582e0d7c35d137760c74e708375ea863df3b704dae0c95afe65a57f1f082c6eca0af85d1d3f78cd WHIRLPOOL db998d5fb0175004ddf3c43365923d2f4cdb12a930e7c88434b841ddf3004476cebbde586913ee89e54e26c5a352fe02291b348ee452f4055cc3b4734206bd1b
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
-DIST shorewall6-5.0.8.2.tar.bz2 225159 SHA256 2139b274a1ce358c83042b1135260a0583cd4b96fb9cbea321ddd0e38b3f286f SHA512 e42dcb6f57fa0cad1df9f571cbb308c411640ad3fe050d671e21e5da1b54bb12da20524397f13fd3f626fe8f6d349518645c3d9911fbd5d057d4109b9084663f WHIRLPOOL 826c76f0fb3076b3044c615ab94376302e1022e29fc09e4ceb10a1f16ed26ce77fe337a7e64ee3194c252b7621d5a9fa6311837ec234912f548e19f412801fd6
 DIST shorewall6-5.0.9.tar.bz2 226753 SHA256 4b35aa0ed39ffa88f1d64b8313d4a8a56a2cc540683b70dd13099284c985abae SHA512 0692377f9801008c66adf676fc93f7a17a26fb937e21213b8db6d502cf10c2280b77ac0a83aae308f5a0a08fadd45bf9b7b7c08dd7fc613d1496d2a760f760fe WHIRLPOOL fe95d501b4ccefe9541c4ddf16b6cfb17d2f11543ff9b1bcb0caf0b3904b49f6f2189ad18befaa4d99096d33d740bee601451e070c0fc52b31e2fd37cd467d2f
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
-DIST shorewall6-lite-5.0.8.2.tar.bz2 51728 SHA256 a27bdac2153487077475c92d2fa142cc06911a45d7268d5f6a778d42259ce24e SHA512 f02acdae913430de1b673c70cfef6d93579f4a02916d9f85e755b1ffeac1a7b06fcd548c16588c43558a80f96e13cb0fddfb46a5a9bb589eec1fe82275b7108c WHIRLPOOL 3395581bb8f250bba72be7fce568628d3fe76dae9698771dbeb76238ae54bc42ef95611c33847c22d727db04717571c82abb770e30c9a1986c103fff2a492911
 DIST shorewall6-lite-5.0.9.tar.bz2 52157 SHA256 2e9edd77ac0050d1f73091211369f4a1227b88fe04fc777254554f0c23bf7500 SHA512 cd29fa5c11084c8fb38e7d3e88f5600dc5e0ad988b428d9c9742448bb1b21381b553b1f8ba9d1f79c3c2453e532060d1dac065a311e8218c7e3c55675bd9a622 WHIRLPOOL e25633e8b2f52c210c9e186644f8fde9c2a6c255a325b2fbef836b0ae626bef9a273a064357068af82c6cb80368b78d8fa6d3a15feb28b542f71418482cfd816

diff --git a/net-firewall/shorewall/shorewall-5.0.8.2.ebuild b/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
deleted file mode 100644
index f87c043..0000000
--- a/net-firewall/shorewall/shorewall-5.0.8.2.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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
-
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
-		fi
-	fi
-
-	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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-06-16  7:01 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-06-16  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1be090a37ea0ee9e8dabe8fe6dd71ac63b7eae5f
Author:     Thomas Deutschmann <whissi <AT> whissi <DOT> de>
AuthorDate: Wed Jun 15 00:18:12 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 06:31:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be090a3

net-firewall/shorewall: Version bump to v5.0.9.2

Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1665

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.9.ebuild => shorewall-5.0.9.2.ebuild}   |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index c19110a..14bc080 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,21 @@
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
-DIST shorewall-5.0.9.tar.bz2 499158 SHA256 aceab0fc98359ec27b3647701dedc2a1e4e01299b0555b801baee39070f5028d SHA512 4fab242183ec11caf5470f0aaa643d9b510387d551947a11a099949a5d2f7245e6996d38bf910da55b88f0b0842192ee232f9a48c571d050c318e7774a550f3e WHIRLPOOL 226c3a4cbb5fdbdcc6e67b56bbb89fe6fe8d471949c99cad91fd5b79536d1eb32abe8f7a34f3aad62019983dbef508dafa732693ecf7957d5077b71d36401c94
+DIST shorewall-5.0.9.2.tar.bz2 499644 SHA256 62b764d833d78eddafd2a2592eac983599c77a6063540cdb351954d4c61c6822 SHA512 ac3a91da2ee97e3e129a0db85975c5ff10d46f4dc86771b203dfd325d129585c6d3023e230ed8615e95dceabbb5be61d394e0f77ab53d75c8666f6698b3c2a30 WHIRLPOOL e9012bf6cfe08ba05688a3d545f43e5c9a8414bc20558403ad778caf3d2e0cb8c847355ccc035066c47496720aab635d7b7cc2ccbf08af75ce3ecac0ce15fd4a
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
-DIST shorewall-core-5.0.9.tar.bz2 58289 SHA256 42ae23cbe31726a0e749e60e51fdc85a35ddfad6249965fe6304ff7b3dcef733 SHA512 97a8c6621cea77a09af051e9682612a896f1971ec2103da71ec467dd5637255f7b3e8d4332ff7316d54fe66138c4b377249b987b42a9fc05fd1f9c64f84512fe WHIRLPOOL 99e2cb6bb72a0c3bfc1834d5cfca672c141d85329f07794617522c1aa80cae96fa7f504f325466cb9d3381a6ac1b08836fd6947d2ada95d1628c9b183809bab5
+DIST shorewall-core-5.0.9.2.tar.bz2 58815 SHA256 5dd9d9b14d780672b23c51cd96f5470cb3278aab30a8c40242cc7d61d7c3203b SHA512 05f33b7d4191b300ceeb32833b517302ab118be282775f2611943b29a7149eff017d5ef0a3c8af50fb8e53e8aadf563fdbaf7b4f04892ab51a82be1d5ab33ca4 WHIRLPOOL bd97b84abc518f3b0fd2af808109d352845718b1741fc45e41e51d83d73910e074f231df3660c1b5a7f5167b25cf65e9cea8d6b573b5a85be8bf3a681fab28c4
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
-DIST shorewall-docs-html-5.0.9.tar.bz2 4270490 SHA256 a2083d2254098bca989b581dff5280fe20159597df08fb36d74b3b5ced614fbb SHA512 d1596ee3302aa3976e7c9cf73580c95d2801b82adaefffa2dd828b6e4077678d183887fb0a51b64f766241153a0af95009b63812a3a70047e43d577da409eb70 WHIRLPOOL 1113ffb740616587e437dff55ce2d7e1c56dd46d1d6819ea32121830d4447d86407bcce3adeacc19e08880d9400c4b8db963f9de9883665c0ef3dbeb06191ebc
+DIST shorewall-docs-html-5.0.9.2.tar.bz2 4270255 SHA256 9c1700e6a83eeb925473077bb4db06351a0ed0d1c1a666a1f0e5c4a0830ef69b SHA512 34677aa7a226aca81858619bdf52264df4468f9e46795d2c29897c5cbce221c18763c566d04900c2c4f6cc58083176641e745f483baa4703249d29f6645cae07 WHIRLPOOL 529aaaa4639538848fda3951160ad8aaa4668a1063f82b4d02f3bf22a2010137120f43085f1d0b66cee7b0e519caa20b4315307959a75da2deb5725e2b0b0bf4
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
-DIST shorewall-init-5.0.9.tar.bz2 36483 SHA256 a473e68456cdc2e09ffd0c0e84a40ea59412d2a317235eff662d2f8a79a77e73 SHA512 d62b1b9a34d8e617c2cab9291e00c1572def113599184d07b1ef53ccf3872993a500d08ddaf4b255d655ed30f9d6d2f72dab63e1a52e108609f4cf5837312a46 WHIRLPOOL f73d631e808560736bdb9669dda6f3383d88d933d39c2fd2d44f223b8c8ca9086a38214426998f22344fd79bcee193e6f0ffe62feddeb7d534218245660b8fed
+DIST shorewall-init-5.0.9.2.tar.bz2 36938 SHA256 a7abb1fb2f8312018abbd33c26d8ac066020d6c243730854f6593873018472d6 SHA512 cc5e5535f76526929abbb7df709e20fe36038d6497f8134bab544c3a798b93cc38f784e1fd6558432befb91aea4b86275694fa3fa78254642c03dbfa9bcf9220 WHIRLPOOL 0f9dd635c44f67b68ae78f4f15e3d9a4d18d0ac3c2bb95d19df994bf9fc0eebc21e33d3d9cd6a1ba4e0f04517f1c7f1564205f18f5bfd062eb9269c6efc4c653
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
-DIST shorewall-lite-5.0.9.tar.bz2 52718 SHA256 04c5f5bd9dfa246745581f20fb5755f4fa309deb970fa451f68ca605ea3b5f9e SHA512 6cb748199ab217f2a8c51d4f4cf076c122f8ba793167481bd582e0d7c35d137760c74e708375ea863df3b704dae0c95afe65a57f1f082c6eca0af85d1d3f78cd WHIRLPOOL db998d5fb0175004ddf3c43365923d2f4cdb12a930e7c88434b841ddf3004476cebbde586913ee89e54e26c5a352fe02291b348ee452f4055cc3b4734206bd1b
+DIST shorewall-lite-5.0.9.2.tar.bz2 53172 SHA256 6cdb19e7a6bca43f8d89ca01b357e5046655667752b5ab41e0539dce9f5177ec SHA512 fdaddeb4cb2dee2ab5a15744254c54dd01e1db88fd0938127b5077a55e257f1a8edec7f0d2f200235f190d183f58ee15625da2a798e581f1dc82024e75a363c4 WHIRLPOOL 2ce26b39eeb4eadf42e0b7f10be16532137ece88f811bde66aced3abc414cecf4dee000c17abc800fbf17e8b59618cd01d1ffd1882c55af74aaa25e926224d09
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
-DIST shorewall6-5.0.9.tar.bz2 226753 SHA256 4b35aa0ed39ffa88f1d64b8313d4a8a56a2cc540683b70dd13099284c985abae SHA512 0692377f9801008c66adf676fc93f7a17a26fb937e21213b8db6d502cf10c2280b77ac0a83aae308f5a0a08fadd45bf9b7b7c08dd7fc613d1496d2a760f760fe WHIRLPOOL fe95d501b4ccefe9541c4ddf16b6cfb17d2f11543ff9b1bcb0caf0b3904b49f6f2189ad18befaa4d99096d33d740bee601451e070c0fc52b31e2fd37cd467d2f
+DIST shorewall6-5.0.9.2.tar.bz2 227223 SHA256 275c12d81cdb528b7e66b60e6d0ec568f53ce81c764eef1197cf521bc5b930e4 SHA512 86795a04fe4f3af1950d077388fe640374c206b384b447f346f38d26b314c3b0ed40de938fb2645307938e6e61b70eb772ddd4bdb0f2fe8c7a2916ff3846e674 WHIRLPOOL b43787601d0769c7628e169c8bdc478086d0335e5f687ff0f6ed0167dc3c881d42ed13cd33a44e68263cf47573eccbacc61801208474844a286aa5f3c7990208
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
-DIST shorewall6-lite-5.0.9.tar.bz2 52157 SHA256 2e9edd77ac0050d1f73091211369f4a1227b88fe04fc777254554f0c23bf7500 SHA512 cd29fa5c11084c8fb38e7d3e88f5600dc5e0ad988b428d9c9742448bb1b21381b553b1f8ba9d1f79c3c2453e532060d1dac065a311e8218c7e3c55675bd9a622 WHIRLPOOL e25633e8b2f52c210c9e186644f8fde9c2a6c255a325b2fbef836b0ae626bef9a273a064357068af82c6cb80368b78d8fa6d3a15feb28b542f71418482cfd816
+DIST shorewall6-lite-5.0.9.2.tar.bz2 52600 SHA256 08d7047416dc9b8cbdfebb4b978990aeb66db8719282f089fac6c3e35baa6c7f SHA512 4e96cae6719ed3685c883842b4f5c4edb41b850d21de501e64f9e571de4d3935b4a4e71f5ca8f558128228ae998630098de2d6e39d72cf16156905a678613605 WHIRLPOOL 33f197a873f1d44031f627e90b54d601c761bdcafff41c639db79e091fe661a1ef43c70e207ebc7346cb8321e8545ebbd3069dfbfbda92fba057b11abf8cc7f1

diff --git a/net-firewall/shorewall/shorewall-5.0.9.ebuild b/net-firewall/shorewall/shorewall-5.0.9.2.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.9.ebuild
rename to net-firewall/shorewall/shorewall-5.0.9.2.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-07-08 18:55 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-07-08 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     0454da46a54d6222ceb504840d124c3139becb71
Author:     Thomas Deutschmann <whissi <AT> whissi <DOT> de>
AuthorDate: Fri Jul  8 13:32:00 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 18:27:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0454da46

net-firewall/shorewall: version bump to v5.0.10.

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/1844

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/Manifest                |   7 +
 net-firewall/shorewall/shorewall-5.0.10.ebuild | 446 +++++++++++++++++++++++++
 2 files changed, 453 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 14bc080..7a5369a 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
+DIST shorewall-5.0.10.tar.bz2 502204 SHA256 13f69c346f8180e98c9e2da3ddea16f4826f58ad76ee9893b282790ef91f7f6c SHA512 718e6568a2743d85a2e512843e4d6fb132222b2fb78a25b34861c0d32aa1e155c9e8a314d682e4a4b1a740eb8041fe8591395be66d199b6e5e8ab2685e6fdfa1 WHIRLPOOL 63ddc97748ba642a3a8d64222f12c4bab100d40742ef5e959ab66e1505ebd12d120465f8f280cfe15e294449b086e3987e6b1c4b3798ae1c607ffb86795a0881
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-5.0.9.2.tar.bz2 499644 SHA256 62b764d833d78eddafd2a2592eac983599c77a6063540cdb351954d4c61c6822 SHA512 ac3a91da2ee97e3e129a0db85975c5ff10d46f4dc86771b203dfd325d129585c6d3023e230ed8615e95dceabbb5be61d394e0f77ab53d75c8666f6698b3c2a30 WHIRLPOOL e9012bf6cfe08ba05688a3d545f43e5c9a8414bc20558403ad778caf3d2e0cb8c847355ccc035066c47496720aab635d7b7cc2ccbf08af75ce3ecac0ce15fd4a
+DIST shorewall-core-5.0.10.tar.bz2 59054 SHA256 f2b8bd4b4942375eb7cb09fa121e8684b8b61f9817a27a5fd7b3595da2cd440e SHA512 fe105241b3054267cd89d0915ab918302b3607266495b901103ad88903628bb00820836e0e98c85f169349cfda6e69cd01d62b81152476fa7b6fadc6c051b98e WHIRLPOOL f6585340dd18bd92b1f1cf6292211c7efcfef1cc01931b6bf62a35d68d4cc489ebf3a516421d824da5857dd4d011280f7c940b3eef39df8ae64bde30cd5084f7
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-core-5.0.9.2.tar.bz2 58815 SHA256 5dd9d9b14d780672b23c51cd96f5470cb3278aab30a8c40242cc7d61d7c3203b SHA512 05f33b7d4191b300ceeb32833b517302ab118be282775f2611943b29a7149eff017d5ef0a3c8af50fb8e53e8aadf563fdbaf7b4f04892ab51a82be1d5ab33ca4 WHIRLPOOL bd97b84abc518f3b0fd2af808109d352845718b1741fc45e41e51d83d73910e074f231df3660c1b5a7f5167b25cf65e9cea8d6b573b5a85be8bf3a681fab28c4
+DIST shorewall-docs-html-5.0.10.tar.bz2 4270720 SHA256 a242c1090075d529f81ca1850a727a987d6dc1d8f3c0fd0dda39b684f5a87ff9 SHA512 4b03c08c90555f0f6305d29c35100bd6b6a734f63852724775cdc54d618848a7ae4b3a2cda3d515d73cabc95ac778cf6ec389a1fd7fd2fd7350bd4fa1c9dfcee WHIRLPOOL debc3f95084debfa97a40482f47365f16bab825336f1a5e5ba418814a2aa5a5d755be75ccb7085476d21eb69dceb1a9d4042350ba4652becd359b085b4678f93
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-docs-html-5.0.9.2.tar.bz2 4270255 SHA256 9c1700e6a83eeb925473077bb4db06351a0ed0d1c1a666a1f0e5c4a0830ef69b SHA512 34677aa7a226aca81858619bdf52264df4468f9e46795d2c29897c5cbce221c18763c566d04900c2c4f6cc58083176641e745f483baa4703249d29f6645cae07 WHIRLPOOL 529aaaa4639538848fda3951160ad8aaa4668a1063f82b4d02f3bf22a2010137120f43085f1d0b66cee7b0e519caa20b4315307959a75da2deb5725e2b0b0bf4
+DIST shorewall-init-5.0.10.tar.bz2 37201 SHA256 4d65f288315be496a9e3c6147ad235f10da443558bd4c0a163120f83fac8879e SHA512 f75a570f4a973f561f972ca8ef7c214f792fe0f073f66e8ad17c3321a1f5bde4aba37bca57f65ea3342620ec625e64cfa8ed3ee8577c04c63223fe24db3c317e WHIRLPOOL d14425710e25e00e1560980dbda98b2d3d41509f8cceb0f4afa8158eec9989adea7a40e33390d5094d7fab520c0f5ffc3268e7e0946bcb4fbe9d2b2b643ce7fc
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-init-5.0.9.2.tar.bz2 36938 SHA256 a7abb1fb2f8312018abbd33c26d8ac066020d6c243730854f6593873018472d6 SHA512 cc5e5535f76526929abbb7df709e20fe36038d6497f8134bab544c3a798b93cc38f784e1fd6558432befb91aea4b86275694fa3fa78254642c03dbfa9bcf9220 WHIRLPOOL 0f9dd635c44f67b68ae78f4f15e3d9a4d18d0ac3c2bb95d19df994bf9fc0eebc21e33d3d9cd6a1ba4e0f04517f1c7f1564205f18f5bfd062eb9269c6efc4c653
+DIST shorewall-lite-5.0.10.tar.bz2 53426 SHA256 da01252334d7359f891bfd68910643d2b0a389a621324dd11256d35936d8404c SHA512 c2269afafd0724ce313c0b24040bf9070c3ab839281adb610091ebebcc4c9c71dfb3d803f9b409f0e6c759fcad1723ae5467195e352650c6095c16357f53b4cb WHIRLPOOL 8f1e4368c80a0aedc1dba0330ff4b32e25371754a9b9919afb2ff3c1f2199f9f59abb378e01578603561435731e74fed20c21483d7013ba84f48839907982e57
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall-lite-5.0.9.2.tar.bz2 53172 SHA256 6cdb19e7a6bca43f8d89ca01b357e5046655667752b5ab41e0539dce9f5177ec SHA512 fdaddeb4cb2dee2ab5a15744254c54dd01e1db88fd0938127b5077a55e257f1a8edec7f0d2f200235f190d183f58ee15625da2a798e581f1dc82024e75a363c4 WHIRLPOOL 2ce26b39eeb4eadf42e0b7f10be16532137ece88f811bde66aced3abc414cecf4dee000c17abc800fbf17e8b59618cd01d1ffd1882c55af74aaa25e926224d09
+DIST shorewall6-5.0.10.tar.bz2 227557 SHA256 7e53436c1becee79f4da728643b445289266d482308deca6f2e7ba30d4d6dfc4 SHA512 287b6204f6de15e28ce84d6f7f6e3dddef7975168b3f910f8ae5c255110357fe315189073926e52023d22a86d621e6e3a66f54965333a6f8213a098a2449b9ed WHIRLPOOL 5507ac0a9f930e903f1ed7c5cce15ade8300ec20b624c8b57008e31efd094f8ae5527074dbc93badbbf086d924261796485c3741e5a66114f75e588586060976
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-5.0.9.2.tar.bz2 227223 SHA256 275c12d81cdb528b7e66b60e6d0ec568f53ce81c764eef1197cf521bc5b930e4 SHA512 86795a04fe4f3af1950d077388fe640374c206b384b447f346f38d26b314c3b0ed40de938fb2645307938e6e61b70eb772ddd4bdb0f2fe8c7a2916ff3846e674 WHIRLPOOL b43787601d0769c7628e169c8bdc478086d0335e5f687ff0f6ed0167dc3c881d42ed13cd33a44e68263cf47573eccbacc61801208474844a286aa5f3c7990208
+DIST shorewall6-lite-5.0.10.tar.bz2 52852 SHA256 575a6e9cd0f084cd6e748b009bab47e58d2ceb0a327c63643e675e2de036e267 SHA512 17d37362674eb4658524b79f39d040b546b41c9da7687dcb6c852fb09b0032098aae4f9c97bc19a13d298088577fcc66214d12b0f58fc3a507142a9d6474a816 WHIRLPOOL 3a141ab49aaa0e3e5c66f18dbb2042b19ab3668e3ddd88d2ce5a7d8145927c9f4daac9bbeb688981bdcae7090c76f261405c2d0e61dedc90ebe944eaac7f0856
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
 DIST shorewall6-lite-5.0.9.2.tar.bz2 52600 SHA256 08d7047416dc9b8cbdfebb4b978990aeb66db8719282f089fac6c3e35baa6c7f SHA512 4e96cae6719ed3685c883842b4f5c4edb41b850d21de501e64f9e571de4d3935b4a4e71f5ca8f558128228ae998630098de2d6e39d72cf16156905a678613605 WHIRLPOOL 33f197a873f1d44031f627e90b54d601c761bdcafff41c639db79e091fe661a1ef43c70e207ebc7346cb8321e8545ebbd3069dfbfbda92fba057b11abf8cc7f1

diff --git a/net-firewall/shorewall/shorewall-5.0.10.ebuild b/net-firewall/shorewall/shorewall-5.0.10.ebuild
new file mode 100644
index 0000000..f87c043
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.10.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-03  8:03 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-08-03  8:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b545b1d5a3e5fde5a7f2ec15366d273200ccb478
Author:     Thomas Deutschmann <whissi <AT> whissi <DOT> de>
AuthorDate: Tue Aug  2 13:01:04 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 08:01:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b545b1d5

net-firewall/shorewall: Bumped to v5.0.10.1

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2000

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.0.10.1.ebuild | 452 +++++++++++++++++++++++
 2 files changed, 459 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 7a5369a..6153ced 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,27 +1,34 @@
+DIST shorewall-5.0.10.1.tar.bz2 503114 SHA256 138d86968e99d079a6268ca05e00b22874448b29e5a9698cccba295b35c457cd SHA512 478792c0605174c85821ecddf3665b3ff0559074ee71a085c81035286f57987959619c40f5a6138fc832ed3cb3045f7e54b1a3242e0b7fa420661159d1238743 WHIRLPOOL a326ee33e060b02c0936135f701cd0f08b85d2bc3eb2cf9380ad764be280571c27b87ce7cafd51384a5e370f98cdf96caabb85d7cee6859d30a432a5874b7829
 DIST shorewall-5.0.10.tar.bz2 502204 SHA256 13f69c346f8180e98c9e2da3ddea16f4826f58ad76ee9893b282790ef91f7f6c SHA512 718e6568a2743d85a2e512843e4d6fb132222b2fb78a25b34861c0d32aa1e155c9e8a314d682e4a4b1a740eb8041fe8591395be66d199b6e5e8ab2685e6fdfa1 WHIRLPOOL 63ddc97748ba642a3a8d64222f12c4bab100d40742ef5e959ab66e1505ebd12d120465f8f280cfe15e294449b086e3987e6b1c4b3798ae1c607ffb86795a0881
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-5.0.9.2.tar.bz2 499644 SHA256 62b764d833d78eddafd2a2592eac983599c77a6063540cdb351954d4c61c6822 SHA512 ac3a91da2ee97e3e129a0db85975c5ff10d46f4dc86771b203dfd325d129585c6d3023e230ed8615e95dceabbb5be61d394e0f77ab53d75c8666f6698b3c2a30 WHIRLPOOL e9012bf6cfe08ba05688a3d545f43e5c9a8414bc20558403ad778caf3d2e0cb8c847355ccc035066c47496720aab635d7b7cc2ccbf08af75ce3ecac0ce15fd4a
+DIST shorewall-core-5.0.10.1.tar.bz2 59308 SHA256 c048afa488da0ec3cf4d140fb105de45c984c6c1f71d88ce39a99bda4ba0ffe8 SHA512 a9a529f5c4c7d414d4cd3179378694fa25261159563425c64630b33e1ffe39594ca7eab171091b2412dd7c995bd113a08b0689eadf501e711b09b861fc1c295f WHIRLPOOL fca720a4ea18334d1d383f121a2424d6e726eed7cd47fbda7595f06c0e608aae413fa0d394c305052a8a457e4ffb2cafcb2081560882c7f77abac52a203168b6
 DIST shorewall-core-5.0.10.tar.bz2 59054 SHA256 f2b8bd4b4942375eb7cb09fa121e8684b8b61f9817a27a5fd7b3595da2cd440e SHA512 fe105241b3054267cd89d0915ab918302b3607266495b901103ad88903628bb00820836e0e98c85f169349cfda6e69cd01d62b81152476fa7b6fadc6c051b98e WHIRLPOOL f6585340dd18bd92b1f1cf6292211c7efcfef1cc01931b6bf62a35d68d4cc489ebf3a516421d824da5857dd4d011280f7c940b3eef39df8ae64bde30cd5084f7
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-core-5.0.9.2.tar.bz2 58815 SHA256 5dd9d9b14d780672b23c51cd96f5470cb3278aab30a8c40242cc7d61d7c3203b SHA512 05f33b7d4191b300ceeb32833b517302ab118be282775f2611943b29a7149eff017d5ef0a3c8af50fb8e53e8aadf563fdbaf7b4f04892ab51a82be1d5ab33ca4 WHIRLPOOL bd97b84abc518f3b0fd2af808109d352845718b1741fc45e41e51d83d73910e074f231df3660c1b5a7f5167b25cf65e9cea8d6b573b5a85be8bf3a681fab28c4
+DIST shorewall-docs-html-5.0.10.1.tar.bz2 4270330 SHA256 7dadc4996bd725b9391e4acc4a939337c37de5738a2dea5594d399b1e2a91995 SHA512 c575abbdd8d31f2cceee40b78f596bd7223d4bb1087dcb5b54d1edb2eff91b56e03e4a31f243c587b6357a185be5908cff5681dfc438ecd4224f04e309933327 WHIRLPOOL 3ee758b6c601e6eedb857d09d5f707ed7067be4e87afd22024c2212846ec13ca8b8052c9cc1ccbf484c849c852ca881c5c9c730cb672bc954e201e76dfc63a54
 DIST shorewall-docs-html-5.0.10.tar.bz2 4270720 SHA256 a242c1090075d529f81ca1850a727a987d6dc1d8f3c0fd0dda39b684f5a87ff9 SHA512 4b03c08c90555f0f6305d29c35100bd6b6a734f63852724775cdc54d618848a7ae4b3a2cda3d515d73cabc95ac778cf6ec389a1fd7fd2fd7350bd4fa1c9dfcee WHIRLPOOL debc3f95084debfa97a40482f47365f16bab825336f1a5e5ba418814a2aa5a5d755be75ccb7085476d21eb69dceb1a9d4042350ba4652becd359b085b4678f93
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-docs-html-5.0.9.2.tar.bz2 4270255 SHA256 9c1700e6a83eeb925473077bb4db06351a0ed0d1c1a666a1f0e5c4a0830ef69b SHA512 34677aa7a226aca81858619bdf52264df4468f9e46795d2c29897c5cbce221c18763c566d04900c2c4f6cc58083176641e745f483baa4703249d29f6645cae07 WHIRLPOOL 529aaaa4639538848fda3951160ad8aaa4668a1063f82b4d02f3bf22a2010137120f43085f1d0b66cee7b0e519caa20b4315307959a75da2deb5725e2b0b0bf4
+DIST shorewall-init-5.0.10.1.tar.bz2 37413 SHA256 4066ef23bcb2702db5651705a086190663026856f94096800cff46438db9d97f SHA512 703b2f755c7e0d691e69b9508484551a1b331c85080b86b4aaa7c9513e4f0be55a25bf38bdf769b12be37b3bc48d8d34b6ac514c372605dd9bfbe11e17378e82 WHIRLPOOL 0097d09302e677afc39b4fbc722f179ba56370bae8070c75ad0594cb9e2dc7fd4d6ac5abc2bdb204dd30355b640f42894996a50ec61b940b2e86fa14e65a3401
 DIST shorewall-init-5.0.10.tar.bz2 37201 SHA256 4d65f288315be496a9e3c6147ad235f10da443558bd4c0a163120f83fac8879e SHA512 f75a570f4a973f561f972ca8ef7c214f792fe0f073f66e8ad17c3321a1f5bde4aba37bca57f65ea3342620ec625e64cfa8ed3ee8577c04c63223fe24db3c317e WHIRLPOOL d14425710e25e00e1560980dbda98b2d3d41509f8cceb0f4afa8158eec9989adea7a40e33390d5094d7fab520c0f5ffc3268e7e0946bcb4fbe9d2b2b643ce7fc
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-init-5.0.9.2.tar.bz2 36938 SHA256 a7abb1fb2f8312018abbd33c26d8ac066020d6c243730854f6593873018472d6 SHA512 cc5e5535f76526929abbb7df709e20fe36038d6497f8134bab544c3a798b93cc38f784e1fd6558432befb91aea4b86275694fa3fa78254642c03dbfa9bcf9220 WHIRLPOOL 0f9dd635c44f67b68ae78f4f15e3d9a4d18d0ac3c2bb95d19df994bf9fc0eebc21e33d3d9cd6a1ba4e0f04517f1c7f1564205f18f5bfd062eb9269c6efc4c653
+DIST shorewall-lite-5.0.10.1.tar.bz2 53625 SHA256 82d79f2f918a763c20340276dd0bc3741920960425beafa8c21a4d314b1977de SHA512 729766d994b4286731a362af5b1316bfbe2a9607b97b662a69ae6f93971874d0707cf648e9b31728deb3533e7ccf0e83e1ad7d7d18d4b26c66e2a365bf8a7e3e WHIRLPOOL b95a224f590ec3b5baa884288d020b9bf25cdd771844cd0c5745d7dca03edf413d90645a743e17e22b2ae8265ee42c0ca977d8f7720de84de8b9674f6defe6c6
 DIST shorewall-lite-5.0.10.tar.bz2 53426 SHA256 da01252334d7359f891bfd68910643d2b0a389a621324dd11256d35936d8404c SHA512 c2269afafd0724ce313c0b24040bf9070c3ab839281adb610091ebebcc4c9c71dfb3d803f9b409f0e6c759fcad1723ae5467195e352650c6095c16357f53b4cb WHIRLPOOL 8f1e4368c80a0aedc1dba0330ff4b32e25371754a9b9919afb2ff3c1f2199f9f59abb378e01578603561435731e74fed20c21483d7013ba84f48839907982e57
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall-lite-5.0.9.2.tar.bz2 53172 SHA256 6cdb19e7a6bca43f8d89ca01b357e5046655667752b5ab41e0539dce9f5177ec SHA512 fdaddeb4cb2dee2ab5a15744254c54dd01e1db88fd0938127b5077a55e257f1a8edec7f0d2f200235f190d183f58ee15625da2a798e581f1dc82024e75a363c4 WHIRLPOOL 2ce26b39eeb4eadf42e0b7f10be16532137ece88f811bde66aced3abc414cecf4dee000c17abc800fbf17e8b59618cd01d1ffd1882c55af74aaa25e926224d09
+DIST shorewall6-5.0.10.1.tar.bz2 228468 SHA256 045f75b895c5c4d23dac760e532984ab8108dcbd6b0610d021902028e1d62910 SHA512 019df4f8a3f873ca50dd88b8b069fa4b2ed7d3dd1579d368e0133475b05d09cd8e8642f2b1f384de7b650dc90f483972884ce0a064040ed70d7087fcaaa73319 WHIRLPOOL 0670de112b2b323c2edccd945c8dd697b25d356c73eb15ccc8dbbd28dbaed8250b73d81d5216339714e2c4da66369d051cc83ffb491b2afe10877e45efaccfe0
 DIST shorewall6-5.0.10.tar.bz2 227557 SHA256 7e53436c1becee79f4da728643b445289266d482308deca6f2e7ba30d4d6dfc4 SHA512 287b6204f6de15e28ce84d6f7f6e3dddef7975168b3f910f8ae5c255110357fe315189073926e52023d22a86d621e6e3a66f54965333a6f8213a098a2449b9ed WHIRLPOOL 5507ac0a9f930e903f1ed7c5cce15ade8300ec20b624c8b57008e31efd094f8ae5527074dbc93badbbf086d924261796485c3741e5a66114f75e588586060976
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-5.0.9.2.tar.bz2 227223 SHA256 275c12d81cdb528b7e66b60e6d0ec568f53ce81c764eef1197cf521bc5b930e4 SHA512 86795a04fe4f3af1950d077388fe640374c206b384b447f346f38d26b314c3b0ed40de938fb2645307938e6e61b70eb772ddd4bdb0f2fe8c7a2916ff3846e674 WHIRLPOOL b43787601d0769c7628e169c8bdc478086d0335e5f687ff0f6ed0167dc3c881d42ed13cd33a44e68263cf47573eccbacc61801208474844a286aa5f3c7990208
+DIST shorewall6-lite-5.0.10.1.tar.bz2 53078 SHA256 36287800a3eb240e9206bc427835c97d22f8ab309eb01f718e33b3d58f43b8a8 SHA512 cca1c02a832b66bcb03d6314266e38c10ed5419ab7a2726b105e6cb3fa3d3d7823d7407a37990379687a17bbf9640505b0542406d80d69d07c6a92b70ea8d8d0 WHIRLPOOL b05fa3bfb2bb7e7f3efa7033ed1bf61fdc29e3f0b943c04f438c91be58157f046436ce7716d1007843e59d8be5452b8cd59832960dd6d3e1160f75375b17f935
 DIST shorewall6-lite-5.0.10.tar.bz2 52852 SHA256 575a6e9cd0f084cd6e748b009bab47e58d2ceb0a327c63643e675e2de036e267 SHA512 17d37362674eb4658524b79f39d040b546b41c9da7687dcb6c852fb09b0032098aae4f9c97bc19a13d298088577fcc66214d12b0f58fc3a507142a9d6474a816 WHIRLPOOL 3a141ab49aaa0e3e5c66f18dbb2042b19ab3668e3ddd88d2ce5a7d8145927c9f4daac9bbeb688981bdcae7090c76f261405c2d0e61dedc90ebe944eaac7f0856
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833

diff --git a/net-firewall/shorewall/shorewall-5.0.10.1.ebuild b/net-firewall/shorewall/shorewall-5.0.10.1.ebuild
new file mode 100644
index 0000000..011c75d
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.10.1.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-03  8:03 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-08-03  8:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d831ea79bab8c2d0a1861270dd8a4a84f8831d98
Author:     Thomas Deutschmann <whissi <AT> whissi <DOT> de>
AuthorDate: Tue Aug  2 13:01:54 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 08:01:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d831ea79

net-firewall/shorewall: Cleanup old version

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2000

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/Manifest                |   7 -
 net-firewall/shorewall/shorewall-5.0.10.ebuild | 452 -------------------------
 2 files changed, 459 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 6153ced..46378e0 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,35 +1,28 @@
 DIST shorewall-5.0.10.1.tar.bz2 503114 SHA256 138d86968e99d079a6268ca05e00b22874448b29e5a9698cccba295b35c457cd SHA512 478792c0605174c85821ecddf3665b3ff0559074ee71a085c81035286f57987959619c40f5a6138fc832ed3cb3045f7e54b1a3242e0b7fa420661159d1238743 WHIRLPOOL a326ee33e060b02c0936135f701cd0f08b85d2bc3eb2cf9380ad764be280571c27b87ce7cafd51384a5e370f98cdf96caabb85d7cee6859d30a432a5874b7829
-DIST shorewall-5.0.10.tar.bz2 502204 SHA256 13f69c346f8180e98c9e2da3ddea16f4826f58ad76ee9893b282790ef91f7f6c SHA512 718e6568a2743d85a2e512843e4d6fb132222b2fb78a25b34861c0d32aa1e155c9e8a314d682e4a4b1a740eb8041fe8591395be66d199b6e5e8ab2685e6fdfa1 WHIRLPOOL 63ddc97748ba642a3a8d64222f12c4bab100d40742ef5e959ab66e1505ebd12d120465f8f280cfe15e294449b086e3987e6b1c4b3798ae1c607ffb86795a0881
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-5.0.9.2.tar.bz2 499644 SHA256 62b764d833d78eddafd2a2592eac983599c77a6063540cdb351954d4c61c6822 SHA512 ac3a91da2ee97e3e129a0db85975c5ff10d46f4dc86771b203dfd325d129585c6d3023e230ed8615e95dceabbb5be61d394e0f77ab53d75c8666f6698b3c2a30 WHIRLPOOL e9012bf6cfe08ba05688a3d545f43e5c9a8414bc20558403ad778caf3d2e0cb8c847355ccc035066c47496720aab635d7b7cc2ccbf08af75ce3ecac0ce15fd4a
 DIST shorewall-core-5.0.10.1.tar.bz2 59308 SHA256 c048afa488da0ec3cf4d140fb105de45c984c6c1f71d88ce39a99bda4ba0ffe8 SHA512 a9a529f5c4c7d414d4cd3179378694fa25261159563425c64630b33e1ffe39594ca7eab171091b2412dd7c995bd113a08b0689eadf501e711b09b861fc1c295f WHIRLPOOL fca720a4ea18334d1d383f121a2424d6e726eed7cd47fbda7595f06c0e608aae413fa0d394c305052a8a457e4ffb2cafcb2081560882c7f77abac52a203168b6
-DIST shorewall-core-5.0.10.tar.bz2 59054 SHA256 f2b8bd4b4942375eb7cb09fa121e8684b8b61f9817a27a5fd7b3595da2cd440e SHA512 fe105241b3054267cd89d0915ab918302b3607266495b901103ad88903628bb00820836e0e98c85f169349cfda6e69cd01d62b81152476fa7b6fadc6c051b98e WHIRLPOOL f6585340dd18bd92b1f1cf6292211c7efcfef1cc01931b6bf62a35d68d4cc489ebf3a516421d824da5857dd4d011280f7c940b3eef39df8ae64bde30cd5084f7
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-core-5.0.9.2.tar.bz2 58815 SHA256 5dd9d9b14d780672b23c51cd96f5470cb3278aab30a8c40242cc7d61d7c3203b SHA512 05f33b7d4191b300ceeb32833b517302ab118be282775f2611943b29a7149eff017d5ef0a3c8af50fb8e53e8aadf563fdbaf7b4f04892ab51a82be1d5ab33ca4 WHIRLPOOL bd97b84abc518f3b0fd2af808109d352845718b1741fc45e41e51d83d73910e074f231df3660c1b5a7f5167b25cf65e9cea8d6b573b5a85be8bf3a681fab28c4
 DIST shorewall-docs-html-5.0.10.1.tar.bz2 4270330 SHA256 7dadc4996bd725b9391e4acc4a939337c37de5738a2dea5594d399b1e2a91995 SHA512 c575abbdd8d31f2cceee40b78f596bd7223d4bb1087dcb5b54d1edb2eff91b56e03e4a31f243c587b6357a185be5908cff5681dfc438ecd4224f04e309933327 WHIRLPOOL 3ee758b6c601e6eedb857d09d5f707ed7067be4e87afd22024c2212846ec13ca8b8052c9cc1ccbf484c849c852ca881c5c9c730cb672bc954e201e76dfc63a54
-DIST shorewall-docs-html-5.0.10.tar.bz2 4270720 SHA256 a242c1090075d529f81ca1850a727a987d6dc1d8f3c0fd0dda39b684f5a87ff9 SHA512 4b03c08c90555f0f6305d29c35100bd6b6a734f63852724775cdc54d618848a7ae4b3a2cda3d515d73cabc95ac778cf6ec389a1fd7fd2fd7350bd4fa1c9dfcee WHIRLPOOL debc3f95084debfa97a40482f47365f16bab825336f1a5e5ba418814a2aa5a5d755be75ccb7085476d21eb69dceb1a9d4042350ba4652becd359b085b4678f93
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-docs-html-5.0.9.2.tar.bz2 4270255 SHA256 9c1700e6a83eeb925473077bb4db06351a0ed0d1c1a666a1f0e5c4a0830ef69b SHA512 34677aa7a226aca81858619bdf52264df4468f9e46795d2c29897c5cbce221c18763c566d04900c2c4f6cc58083176641e745f483baa4703249d29f6645cae07 WHIRLPOOL 529aaaa4639538848fda3951160ad8aaa4668a1063f82b4d02f3bf22a2010137120f43085f1d0b66cee7b0e519caa20b4315307959a75da2deb5725e2b0b0bf4
 DIST shorewall-init-5.0.10.1.tar.bz2 37413 SHA256 4066ef23bcb2702db5651705a086190663026856f94096800cff46438db9d97f SHA512 703b2f755c7e0d691e69b9508484551a1b331c85080b86b4aaa7c9513e4f0be55a25bf38bdf769b12be37b3bc48d8d34b6ac514c372605dd9bfbe11e17378e82 WHIRLPOOL 0097d09302e677afc39b4fbc722f179ba56370bae8070c75ad0594cb9e2dc7fd4d6ac5abc2bdb204dd30355b640f42894996a50ec61b940b2e86fa14e65a3401
-DIST shorewall-init-5.0.10.tar.bz2 37201 SHA256 4d65f288315be496a9e3c6147ad235f10da443558bd4c0a163120f83fac8879e SHA512 f75a570f4a973f561f972ca8ef7c214f792fe0f073f66e8ad17c3321a1f5bde4aba37bca57f65ea3342620ec625e64cfa8ed3ee8577c04c63223fe24db3c317e WHIRLPOOL d14425710e25e00e1560980dbda98b2d3d41509f8cceb0f4afa8158eec9989adea7a40e33390d5094d7fab520c0f5ffc3268e7e0946bcb4fbe9d2b2b643ce7fc
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-init-5.0.9.2.tar.bz2 36938 SHA256 a7abb1fb2f8312018abbd33c26d8ac066020d6c243730854f6593873018472d6 SHA512 cc5e5535f76526929abbb7df709e20fe36038d6497f8134bab544c3a798b93cc38f784e1fd6558432befb91aea4b86275694fa3fa78254642c03dbfa9bcf9220 WHIRLPOOL 0f9dd635c44f67b68ae78f4f15e3d9a4d18d0ac3c2bb95d19df994bf9fc0eebc21e33d3d9cd6a1ba4e0f04517f1c7f1564205f18f5bfd062eb9269c6efc4c653
 DIST shorewall-lite-5.0.10.1.tar.bz2 53625 SHA256 82d79f2f918a763c20340276dd0bc3741920960425beafa8c21a4d314b1977de SHA512 729766d994b4286731a362af5b1316bfbe2a9607b97b662a69ae6f93971874d0707cf648e9b31728deb3533e7ccf0e83e1ad7d7d18d4b26c66e2a365bf8a7e3e WHIRLPOOL b95a224f590ec3b5baa884288d020b9bf25cdd771844cd0c5745d7dca03edf413d90645a743e17e22b2ae8265ee42c0ca977d8f7720de84de8b9674f6defe6c6
-DIST shorewall-lite-5.0.10.tar.bz2 53426 SHA256 da01252334d7359f891bfd68910643d2b0a389a621324dd11256d35936d8404c SHA512 c2269afafd0724ce313c0b24040bf9070c3ab839281adb610091ebebcc4c9c71dfb3d803f9b409f0e6c759fcad1723ae5467195e352650c6095c16357f53b4cb WHIRLPOOL 8f1e4368c80a0aedc1dba0330ff4b32e25371754a9b9919afb2ff3c1f2199f9f59abb378e01578603561435731e74fed20c21483d7013ba84f48839907982e57
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall-lite-5.0.9.2.tar.bz2 53172 SHA256 6cdb19e7a6bca43f8d89ca01b357e5046655667752b5ab41e0539dce9f5177ec SHA512 fdaddeb4cb2dee2ab5a15744254c54dd01e1db88fd0938127b5077a55e257f1a8edec7f0d2f200235f190d183f58ee15625da2a798e581f1dc82024e75a363c4 WHIRLPOOL 2ce26b39eeb4eadf42e0b7f10be16532137ece88f811bde66aced3abc414cecf4dee000c17abc800fbf17e8b59618cd01d1ffd1882c55af74aaa25e926224d09
 DIST shorewall6-5.0.10.1.tar.bz2 228468 SHA256 045f75b895c5c4d23dac760e532984ab8108dcbd6b0610d021902028e1d62910 SHA512 019df4f8a3f873ca50dd88b8b069fa4b2ed7d3dd1579d368e0133475b05d09cd8e8642f2b1f384de7b650dc90f483972884ce0a064040ed70d7087fcaaa73319 WHIRLPOOL 0670de112b2b323c2edccd945c8dd697b25d356c73eb15ccc8dbbd28dbaed8250b73d81d5216339714e2c4da66369d051cc83ffb491b2afe10877e45efaccfe0
-DIST shorewall6-5.0.10.tar.bz2 227557 SHA256 7e53436c1becee79f4da728643b445289266d482308deca6f2e7ba30d4d6dfc4 SHA512 287b6204f6de15e28ce84d6f7f6e3dddef7975168b3f910f8ae5c255110357fe315189073926e52023d22a86d621e6e3a66f54965333a6f8213a098a2449b9ed WHIRLPOOL 5507ac0a9f930e903f1ed7c5cce15ade8300ec20b624c8b57008e31efd094f8ae5527074dbc93badbbf086d924261796485c3741e5a66114f75e588586060976
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-5.0.9.2.tar.bz2 227223 SHA256 275c12d81cdb528b7e66b60e6d0ec568f53ce81c764eef1197cf521bc5b930e4 SHA512 86795a04fe4f3af1950d077388fe640374c206b384b447f346f38d26b314c3b0ed40de938fb2645307938e6e61b70eb772ddd4bdb0f2fe8c7a2916ff3846e674 WHIRLPOOL b43787601d0769c7628e169c8bdc478086d0335e5f687ff0f6ed0167dc3c881d42ed13cd33a44e68263cf47573eccbacc61801208474844a286aa5f3c7990208
 DIST shorewall6-lite-5.0.10.1.tar.bz2 53078 SHA256 36287800a3eb240e9206bc427835c97d22f8ab309eb01f718e33b3d58f43b8a8 SHA512 cca1c02a832b66bcb03d6314266e38c10ed5419ab7a2726b105e6cb3fa3d3d7823d7407a37990379687a17bbf9640505b0542406d80d69d07c6a92b70ea8d8d0 WHIRLPOOL b05fa3bfb2bb7e7f3efa7033ed1bf61fdc29e3f0b943c04f438c91be58157f046436ce7716d1007843e59d8be5452b8cd59832960dd6d3e1160f75375b17f935
-DIST shorewall6-lite-5.0.10.tar.bz2 52852 SHA256 575a6e9cd0f084cd6e748b009bab47e58d2ceb0a327c63643e675e2de036e267 SHA512 17d37362674eb4658524b79f39d040b546b41c9da7687dcb6c852fb09b0032098aae4f9c97bc19a13d298088577fcc66214d12b0f58fc3a507142a9d6474a816 WHIRLPOOL 3a141ab49aaa0e3e5c66f18dbb2042b19ab3668e3ddd88d2ce5a7d8145927c9f4daac9bbeb688981bdcae7090c76f261405c2d0e61dedc90ebe944eaac7f0856
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
 DIST shorewall6-lite-5.0.9.2.tar.bz2 52600 SHA256 08d7047416dc9b8cbdfebb4b978990aeb66db8719282f089fac6c3e35baa6c7f SHA512 4e96cae6719ed3685c883842b4f5c4edb41b850d21de501e64f9e571de4d3935b4a4e71f5ca8f558128228ae998630098de2d6e39d72cf16156905a678613605 WHIRLPOOL 33f197a873f1d44031f627e90b54d601c761bdcafff41c639db79e091fe661a1ef43c70e207ebc7346cb8321e8545ebbd3069dfbfbda92fba057b11abf8cc7f1

diff --git a/net-firewall/shorewall/shorewall-5.0.10.ebuild b/net-firewall/shorewall/shorewall-5.0.10.ebuild
deleted file mode 100644
index 011c75d..0000000
--- a/net-firewall/shorewall/shorewall-5.0.10.ebuild
+++ /dev/null
@@ -1,452 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-03  8:03 Patrice Clement
  0 siblings, 0 replies; 159+ messages in thread
From: Patrice Clement @ 2016-08-03  8:03 UTC (permalink / raw
  To: gentoo-commits

commit:     54f3752b3fb9ded157bdc634cc40998750bca525
Author:     Thomas Deutschmann <whissi <AT> whissi <DOT> de>
AuthorDate: Tue Aug  2 12:59:43 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 08:01:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f3752b

net-firewall/shorewall: Fix REPLACING_VERSIONS usage

Gentoo-Bug: https://bugs.gentoo.org/589482

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2000

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.0.10.ebuild  | 40 ++++++++++++++-----------
 net-firewall/shorewall/shorewall-5.0.4.ebuild   | 40 ++++++++++++++-----------
 net-firewall/shorewall/shorewall-5.0.7.2.ebuild | 40 ++++++++++++++-----------
 net-firewall/shorewall/shorewall-5.0.9.2.ebuild | 40 ++++++++++++++-----------
 4 files changed, 92 insertions(+), 68 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.10.ebuild b/net-firewall/shorewall/shorewall-5.0.10.ebuild
index f87c043..011c75d 100644
--- a/net-firewall/shorewall/shorewall-5.0.10.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.10.ebuild
@@ -400,29 +400,35 @@ pkg_postinst() {
 
 	fi
 
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then
-		# This is an upgrade
+	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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		if use ipv4; then
-			elog ""
-			elog "You can auto-migrate your configuration using"
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
 			elog ""
-			elog "  # shorewall update -A"
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
 
-			if use ipv6; then
-				elog "  # shorewall6 update -A"
+			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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
 			fi
 
-			elog ""
-			elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
+			# Show this elog only once
+			break
 		fi
-	fi
+	done
 
 	if ! use init; then
 		elog ""

diff --git a/net-firewall/shorewall/shorewall-5.0.4.ebuild b/net-firewall/shorewall/shorewall-5.0.4.ebuild
index 0c749b3..5600489 100644
--- a/net-firewall/shorewall/shorewall-5.0.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.4.ebuild
@@ -400,29 +400,35 @@ pkg_postinst() {
 
 	fi
 
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then
-		# This is an upgrade
+	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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		if use ipv4; then
-			elog ""
-			elog "You can auto-migrate your configuration using"
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
 			elog ""
-			elog "  # shorewall update -A"
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
 
-			if use ipv6; then
-				elog "  # shorewall6 update -A"
+			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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
 			fi
 
-			elog ""
-			elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
+			# Show this elog only once
+			break
 		fi
-	fi
+	done
 
 	if ! use init; then
 		elog ""

diff --git a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
index 879e1b5..112aa20 100644
--- a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
@@ -400,29 +400,35 @@ pkg_postinst() {
 
 	fi
 
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then
-		# This is an upgrade
+	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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		if use ipv4; then
-			elog ""
-			elog "You can auto-migrate your configuration using"
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
 			elog ""
-			elog "  # shorewall update -A"
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
 
-			if use ipv6; then
-				elog "  # shorewall6 update -A"
+			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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
 			fi
 
-			elog ""
-			elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
+			# Show this elog only once
+			break
 		fi
-	fi
+	done
 
 	if ! use init; then
 		elog ""

diff --git a/net-firewall/shorewall/shorewall-5.0.9.2.ebuild b/net-firewall/shorewall/shorewall-5.0.9.2.ebuild
index f87c043..011c75d 100644
--- a/net-firewall/shorewall/shorewall-5.0.9.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.9.2.ebuild
@@ -400,29 +400,35 @@ pkg_postinst() {
 
 	fi
 
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then
-		# This is an upgrade
+	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 "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
-
-		if use ipv4; then
-			elog ""
-			elog "You can auto-migrate your configuration using"
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
 			elog ""
-			elog "  # shorewall update -A"
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
 
-			if use ipv6; then
-				elog "  # shorewall6 update -A"
+			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 "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
 			fi
 
-			elog ""
-			elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
+			# Show this elog only once
+			break
 		fi
-	fi
+	done
 
 	if ! use init; then
 		elog ""


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-04  8:57 Jeroen Roovers
  0 siblings, 0 replies; 159+ messages in thread
From: Jeroen Roovers @ 2016-08-04  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     92433cf96bfb0d194ebb9a31f0d2fdcaf0d8bf88
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 08:57:27 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 08:57:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92433cf9

net-firewall/shorewall: Stable for HPPA PPC64 (bug #579816).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 net-firewall/shorewall/shorewall-5.0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
index 112aa20..18698a2 100644
--- a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-10 19:47 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-08-10 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     c462179e2125c90a90e988aefc1f2605f084bbec
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 19:39:20 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 19:47:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c462179e

net-firewall/shorewall: Updating maintainer details

Updating my own maintainer details to reflect that I am now a Gentoo
developer.

Gentoo-Bug: 581174

Package-Manager: portage-2.3.0

 net-firewall/shorewall/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index cd6edc7..084595d 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@whissi.de</email>
-		<name>Thomas D. (Whissi)</name>
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-10 19:47 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-08-10 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f5063caf4b4b520d763c5c967803e0237d9150f1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 19:46:42 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 19:47:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5063caf

net-firewall/shorewall: Removing proxy-maintainer

Now that I am a Gentoo developer this package is no longer maintained
through proxy-maintainer project.

Package-Manager: portage-2.3.0

 net-firewall/shorewall/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index 084595d..e985bb0 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -9,10 +9,6 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		The Shoreline Firewall, more commonly known as "Shorewall", is high-level tool for configuring Netfilter.
 		You describe your firewall/gateway requirements using entries in a set of configuration files.


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-13  0:26 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-08-13  0:26 UTC (permalink / raw
  To: gentoo-commits

commit:     2e6a71b85f300a08654fc437fedb3cc0059010ed
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 00:23:18 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 00:26:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6a71b8

net-firewall/shorewall: Bump to v5.0.11

Package-Manager: portage-2.3.0

 net-firewall/shorewall/Manifest                |   7 +
 net-firewall/shorewall/shorewall-5.0.11.ebuild | 452 +++++++++++++++++++++++++
 2 files changed, 459 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 46378e0..e2e88de 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,35 @@
 DIST shorewall-5.0.10.1.tar.bz2 503114 SHA256 138d86968e99d079a6268ca05e00b22874448b29e5a9698cccba295b35c457cd SHA512 478792c0605174c85821ecddf3665b3ff0559074ee71a085c81035286f57987959619c40f5a6138fc832ed3cb3045f7e54b1a3242e0b7fa420661159d1238743 WHIRLPOOL a326ee33e060b02c0936135f701cd0f08b85d2bc3eb2cf9380ad764be280571c27b87ce7cafd51384a5e370f98cdf96caabb85d7cee6859d30a432a5874b7829
+DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
 DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-5.0.9.2.tar.bz2 499644 SHA256 62b764d833d78eddafd2a2592eac983599c77a6063540cdb351954d4c61c6822 SHA512 ac3a91da2ee97e3e129a0db85975c5ff10d46f4dc86771b203dfd325d129585c6d3023e230ed8615e95dceabbb5be61d394e0f77ab53d75c8666f6698b3c2a30 WHIRLPOOL e9012bf6cfe08ba05688a3d545f43e5c9a8414bc20558403ad778caf3d2e0cb8c847355ccc035066c47496720aab635d7b7cc2ccbf08af75ce3ecac0ce15fd4a
 DIST shorewall-core-5.0.10.1.tar.bz2 59308 SHA256 c048afa488da0ec3cf4d140fb105de45c984c6c1f71d88ce39a99bda4ba0ffe8 SHA512 a9a529f5c4c7d414d4cd3179378694fa25261159563425c64630b33e1ffe39594ca7eab171091b2412dd7c995bd113a08b0689eadf501e711b09b861fc1c295f WHIRLPOOL fca720a4ea18334d1d383f121a2424d6e726eed7cd47fbda7595f06c0e608aae413fa0d394c305052a8a457e4ffb2cafcb2081560882c7f77abac52a203168b6
+DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-core-5.0.9.2.tar.bz2 58815 SHA256 5dd9d9b14d780672b23c51cd96f5470cb3278aab30a8c40242cc7d61d7c3203b SHA512 05f33b7d4191b300ceeb32833b517302ab118be282775f2611943b29a7149eff017d5ef0a3c8af50fb8e53e8aadf563fdbaf7b4f04892ab51a82be1d5ab33ca4 WHIRLPOOL bd97b84abc518f3b0fd2af808109d352845718b1741fc45e41e51d83d73910e074f231df3660c1b5a7f5167b25cf65e9cea8d6b573b5a85be8bf3a681fab28c4
 DIST shorewall-docs-html-5.0.10.1.tar.bz2 4270330 SHA256 7dadc4996bd725b9391e4acc4a939337c37de5738a2dea5594d399b1e2a91995 SHA512 c575abbdd8d31f2cceee40b78f596bd7223d4bb1087dcb5b54d1edb2eff91b56e03e4a31f243c587b6357a185be5908cff5681dfc438ecd4224f04e309933327 WHIRLPOOL 3ee758b6c601e6eedb857d09d5f707ed7067be4e87afd22024c2212846ec13ca8b8052c9cc1ccbf484c849c852ca881c5c9c730cb672bc954e201e76dfc63a54
+DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-docs-html-5.0.9.2.tar.bz2 4270255 SHA256 9c1700e6a83eeb925473077bb4db06351a0ed0d1c1a666a1f0e5c4a0830ef69b SHA512 34677aa7a226aca81858619bdf52264df4468f9e46795d2c29897c5cbce221c18763c566d04900c2c4f6cc58083176641e745f483baa4703249d29f6645cae07 WHIRLPOOL 529aaaa4639538848fda3951160ad8aaa4668a1063f82b4d02f3bf22a2010137120f43085f1d0b66cee7b0e519caa20b4315307959a75da2deb5725e2b0b0bf4
 DIST shorewall-init-5.0.10.1.tar.bz2 37413 SHA256 4066ef23bcb2702db5651705a086190663026856f94096800cff46438db9d97f SHA512 703b2f755c7e0d691e69b9508484551a1b331c85080b86b4aaa7c9513e4f0be55a25bf38bdf769b12be37b3bc48d8d34b6ac514c372605dd9bfbe11e17378e82 WHIRLPOOL 0097d09302e677afc39b4fbc722f179ba56370bae8070c75ad0594cb9e2dc7fd4d6ac5abc2bdb204dd30355b640f42894996a50ec61b940b2e86fa14e65a3401
+DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-init-5.0.9.2.tar.bz2 36938 SHA256 a7abb1fb2f8312018abbd33c26d8ac066020d6c243730854f6593873018472d6 SHA512 cc5e5535f76526929abbb7df709e20fe36038d6497f8134bab544c3a798b93cc38f784e1fd6558432befb91aea4b86275694fa3fa78254642c03dbfa9bcf9220 WHIRLPOOL 0f9dd635c44f67b68ae78f4f15e3d9a4d18d0ac3c2bb95d19df994bf9fc0eebc21e33d3d9cd6a1ba4e0f04517f1c7f1564205f18f5bfd062eb9269c6efc4c653
 DIST shorewall-lite-5.0.10.1.tar.bz2 53625 SHA256 82d79f2f918a763c20340276dd0bc3741920960425beafa8c21a4d314b1977de SHA512 729766d994b4286731a362af5b1316bfbe2a9607b97b662a69ae6f93971874d0707cf648e9b31728deb3533e7ccf0e83e1ad7d7d18d4b26c66e2a365bf8a7e3e WHIRLPOOL b95a224f590ec3b5baa884288d020b9bf25cdd771844cd0c5745d7dca03edf413d90645a743e17e22b2ae8265ee42c0ca977d8f7720de84de8b9674f6defe6c6
+DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall-lite-5.0.9.2.tar.bz2 53172 SHA256 6cdb19e7a6bca43f8d89ca01b357e5046655667752b5ab41e0539dce9f5177ec SHA512 fdaddeb4cb2dee2ab5a15744254c54dd01e1db88fd0938127b5077a55e257f1a8edec7f0d2f200235f190d183f58ee15625da2a798e581f1dc82024e75a363c4 WHIRLPOOL 2ce26b39eeb4eadf42e0b7f10be16532137ece88f811bde66aced3abc414cecf4dee000c17abc800fbf17e8b59618cd01d1ffd1882c55af74aaa25e926224d09
 DIST shorewall6-5.0.10.1.tar.bz2 228468 SHA256 045f75b895c5c4d23dac760e532984ab8108dcbd6b0610d021902028e1d62910 SHA512 019df4f8a3f873ca50dd88b8b069fa4b2ed7d3dd1579d368e0133475b05d09cd8e8642f2b1f384de7b650dc90f483972884ce0a064040ed70d7087fcaaa73319 WHIRLPOOL 0670de112b2b323c2edccd945c8dd697b25d356c73eb15ccc8dbbd28dbaed8250b73d81d5216339714e2c4da66369d051cc83ffb491b2afe10877e45efaccfe0
+DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-5.0.9.2.tar.bz2 227223 SHA256 275c12d81cdb528b7e66b60e6d0ec568f53ce81c764eef1197cf521bc5b930e4 SHA512 86795a04fe4f3af1950d077388fe640374c206b384b447f346f38d26b314c3b0ed40de938fb2645307938e6e61b70eb772ddd4bdb0f2fe8c7a2916ff3846e674 WHIRLPOOL b43787601d0769c7628e169c8bdc478086d0335e5f687ff0f6ed0167dc3c881d42ed13cd33a44e68263cf47573eccbacc61801208474844a286aa5f3c7990208
 DIST shorewall6-lite-5.0.10.1.tar.bz2 53078 SHA256 36287800a3eb240e9206bc427835c97d22f8ab309eb01f718e33b3d58f43b8a8 SHA512 cca1c02a832b66bcb03d6314266e38c10ed5419ab7a2726b105e6cb3fa3d3d7823d7407a37990379687a17bbf9640505b0542406d80d69d07c6a92b70ea8d8d0 WHIRLPOOL b05fa3bfb2bb7e7f3efa7033ed1bf61fdc29e3f0b943c04f438c91be58157f046436ce7716d1007843e59d8be5452b8cd59832960dd6d3e1160f75375b17f935
+DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
 DIST shorewall6-lite-5.0.9.2.tar.bz2 52600 SHA256 08d7047416dc9b8cbdfebb4b978990aeb66db8719282f089fac6c3e35baa6c7f SHA512 4e96cae6719ed3685c883842b4f5c4edb41b850d21de501e64f9e571de4d3935b4a4e71f5ca8f558128228ae998630098de2d6e39d72cf16156905a678613605 WHIRLPOOL 33f197a873f1d44031f627e90b54d601c761bdcafff41c639db79e091fe661a1ef43c70e207ebc7346cb8321e8545ebbd3069dfbfbda92fba057b11abf8cc7f1

diff --git a/net-firewall/shorewall/shorewall-5.0.11.ebuild b/net-firewall/shorewall/shorewall-5.0.11.ebuild
new file mode 100644
index 0000000..011c75d
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.11.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	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}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	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-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	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}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-13  0:26 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-08-13  0:26 UTC (permalink / raw
  To: gentoo-commits

commit:     35d9a27dbe3ab933502d2d1884630e50e9187389
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 00:19:00 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 00:26:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d9a27d

net-firewall/shorewall: Retroactively mark stable for the remaining arches using the ALLARCHES policy

Gentoo-Bug: https://bugs.gentoo.org/579816

Package-Manager: portage-2.3.0

 net-firewall/shorewall/shorewall-5.0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
index 18698a2..d15be82 100644
--- a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-08-13  0:26 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-08-13  0:26 UTC (permalink / raw
  To: gentoo-commits

commit:     366a8a8374c156b02cd95498a962ac34a0d8b41c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 00:25:29 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 00:26:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=366a8a83

net-firewall/shorewall: Cleanup

Package-Manager: portage-2.3.0

 net-firewall/shorewall/Manifest                 |  14 -
 net-firewall/shorewall/shorewall-5.0.4.ebuild   | 452 ------------------------
 net-firewall/shorewall/shorewall-5.0.9.2.ebuild | 452 ------------------------
 3 files changed, 918 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e2e88de..14bdf31 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,35 +1,21 @@
 DIST shorewall-5.0.10.1.tar.bz2 503114 SHA256 138d86968e99d079a6268ca05e00b22874448b29e5a9698cccba295b35c457cd SHA512 478792c0605174c85821ecddf3665b3ff0559074ee71a085c81035286f57987959619c40f5a6138fc832ed3cb3045f7e54b1a3242e0b7fa420661159d1238743 WHIRLPOOL a326ee33e060b02c0936135f701cd0f08b85d2bc3eb2cf9380ad764be280571c27b87ce7cafd51384a5e370f98cdf96caabb85d7cee6859d30a432a5874b7829
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
-DIST shorewall-5.0.4.tar.bz2 482227 SHA256 34a4ab3e4ded052cb563a280f07f350616db913ded124bfceb39adb325f1ce0a SHA512 7912d46e794b4facf29d290370a5cbad83a568873d8aca1b6efe7856c1420a7da882957d16bd4d376d9e7c69accb5263bfa0dd73af06f3c85eab41a0e244c362 WHIRLPOOL eb7351b01c9a3c709179eb6e21d6bb54935a11c066fb31588a1b90c9a089eac7e2d8387006f436c2a68c1618847f5ea69c65e8233240a8d3c8352e0a4d685dc9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
-DIST shorewall-5.0.9.2.tar.bz2 499644 SHA256 62b764d833d78eddafd2a2592eac983599c77a6063540cdb351954d4c61c6822 SHA512 ac3a91da2ee97e3e129a0db85975c5ff10d46f4dc86771b203dfd325d129585c6d3023e230ed8615e95dceabbb5be61d394e0f77ab53d75c8666f6698b3c2a30 WHIRLPOOL e9012bf6cfe08ba05688a3d545f43e5c9a8414bc20558403ad778caf3d2e0cb8c847355ccc035066c47496720aab635d7b7cc2ccbf08af75ce3ecac0ce15fd4a
 DIST shorewall-core-5.0.10.1.tar.bz2 59308 SHA256 c048afa488da0ec3cf4d140fb105de45c984c6c1f71d88ce39a99bda4ba0ffe8 SHA512 a9a529f5c4c7d414d4cd3179378694fa25261159563425c64630b33e1ffe39594ca7eab171091b2412dd7c995bd113a08b0689eadf501e711b09b861fc1c295f WHIRLPOOL fca720a4ea18334d1d383f121a2424d6e726eed7cd47fbda7595f06c0e608aae413fa0d394c305052a8a457e4ffb2cafcb2081560882c7f77abac52a203168b6
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
-DIST shorewall-core-5.0.4.tar.bz2 50604 SHA256 ea80b9e1854033c723a5321fc920b35aa0ebb0dea3721a47cee616aa3b92ed9f SHA512 1db3b7a44bf2f99d1a9c6775c798285bbc9a4bec5a340a10fd762600c01486f90d305297247cceb451616e852d9deb89163a43082e06f9eadad75cdd5d480a21 WHIRLPOOL bb4cea303c7ea1190ec3788f9e7cab4f0febf88ab5047c18adbe9e88476c5ebe569bd3ead6105131a61ac6c31bdab6d3192383e1709847e637220f223a8875b9
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
-DIST shorewall-core-5.0.9.2.tar.bz2 58815 SHA256 5dd9d9b14d780672b23c51cd96f5470cb3278aab30a8c40242cc7d61d7c3203b SHA512 05f33b7d4191b300ceeb32833b517302ab118be282775f2611943b29a7149eff017d5ef0a3c8af50fb8e53e8aadf563fdbaf7b4f04892ab51a82be1d5ab33ca4 WHIRLPOOL bd97b84abc518f3b0fd2af808109d352845718b1741fc45e41e51d83d73910e074f231df3660c1b5a7f5167b25cf65e9cea8d6b573b5a85be8bf3a681fab28c4
 DIST shorewall-docs-html-5.0.10.1.tar.bz2 4270330 SHA256 7dadc4996bd725b9391e4acc4a939337c37de5738a2dea5594d399b1e2a91995 SHA512 c575abbdd8d31f2cceee40b78f596bd7223d4bb1087dcb5b54d1edb2eff91b56e03e4a31f243c587b6357a185be5908cff5681dfc438ecd4224f04e309933327 WHIRLPOOL 3ee758b6c601e6eedb857d09d5f707ed7067be4e87afd22024c2212846ec13ca8b8052c9cc1ccbf484c849c852ca881c5c9c730cb672bc954e201e76dfc63a54
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
-DIST shorewall-docs-html-5.0.4.tar.bz2 4263406 SHA256 501d76f53d6e638aaa14ab60718fa173ef0c3a7756e325326288c353d2845707 SHA512 7e35191fbd5a1b7f0172880fa03ce95f4ac13da3a481c4c2cace83380bcacd23809c56ea12876e55c6d2371a4c88ba44d6a8a600c83481156294ff1a2a48c0e4 WHIRLPOOL 347666e97898ea19af93aef3fb2852b1453791038fa534bb5cad8e96acff75460cb5527389b726f7e09d4721a7b171ca9d2171ac5704f8fa50e172d7ac403929
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
-DIST shorewall-docs-html-5.0.9.2.tar.bz2 4270255 SHA256 9c1700e6a83eeb925473077bb4db06351a0ed0d1c1a666a1f0e5c4a0830ef69b SHA512 34677aa7a226aca81858619bdf52264df4468f9e46795d2c29897c5cbce221c18763c566d04900c2c4f6cc58083176641e745f483baa4703249d29f6645cae07 WHIRLPOOL 529aaaa4639538848fda3951160ad8aaa4668a1063f82b4d02f3bf22a2010137120f43085f1d0b66cee7b0e519caa20b4315307959a75da2deb5725e2b0b0bf4
 DIST shorewall-init-5.0.10.1.tar.bz2 37413 SHA256 4066ef23bcb2702db5651705a086190663026856f94096800cff46438db9d97f SHA512 703b2f755c7e0d691e69b9508484551a1b331c85080b86b4aaa7c9513e4f0be55a25bf38bdf769b12be37b3bc48d8d34b6ac514c372605dd9bfbe11e17378e82 WHIRLPOOL 0097d09302e677afc39b4fbc722f179ba56370bae8070c75ad0594cb9e2dc7fd4d6ac5abc2bdb204dd30355b640f42894996a50ec61b940b2e86fa14e65a3401
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
-DIST shorewall-init-5.0.4.tar.bz2 29902 SHA256 97c99c9e68f2546139f26f1f713e1a3377754e53bf2ba0d8f431469aed47ee9c SHA512 67a66ba6db64a320192f5affa38fb779c1f7d7b915523fe82e4dc8a79bb6590b8da62979f9108ba3f56beef05c1cddb5bb2ffea21317e516c2d8a380a5117567 WHIRLPOOL b4f7875ed0f52d8667135dc7204b1a570dec351a7d3fb42a37618af3d54b808355b4479bfb3421d29d4ab808aeae37cd3f1d12b66046f96ec80f776e796d86c7
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
-DIST shorewall-init-5.0.9.2.tar.bz2 36938 SHA256 a7abb1fb2f8312018abbd33c26d8ac066020d6c243730854f6593873018472d6 SHA512 cc5e5535f76526929abbb7df709e20fe36038d6497f8134bab544c3a798b93cc38f784e1fd6558432befb91aea4b86275694fa3fa78254642c03dbfa9bcf9220 WHIRLPOOL 0f9dd635c44f67b68ae78f4f15e3d9a4d18d0ac3c2bb95d19df994bf9fc0eebc21e33d3d9cd6a1ba4e0f04517f1c7f1564205f18f5bfd062eb9269c6efc4c653
 DIST shorewall-lite-5.0.10.1.tar.bz2 53625 SHA256 82d79f2f918a763c20340276dd0bc3741920960425beafa8c21a4d314b1977de SHA512 729766d994b4286731a362af5b1316bfbe2a9607b97b662a69ae6f93971874d0707cf648e9b31728deb3533e7ccf0e83e1ad7d7d18d4b26c66e2a365bf8a7e3e WHIRLPOOL b95a224f590ec3b5baa884288d020b9bf25cdd771844cd0c5745d7dca03edf413d90645a743e17e22b2ae8265ee42c0ca977d8f7720de84de8b9674f6defe6c6
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
-DIST shorewall-lite-5.0.4.tar.bz2 46454 SHA256 23ac0c1b5f8f1650e6a03a70022b3de0c705fb4257c56d0f84d823b0a10f659d SHA512 8f29c4318de4464eaaaab81096e6290abb0c5d148b043dda70f2f38b21823338e093766dd6fcf0d8924a8a7cd3dd84b5c253fdae421982bc2f9ada13a38db7ba WHIRLPOOL 271b9605e97b1f2c5891cae9c30b4b56b8e07e69f1effbc277d784d781cb35f33f1f3c8e2bcbae0e7ae0e6fe092937573cdbf7c9adea498212007b4db7a5ee95
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
-DIST shorewall-lite-5.0.9.2.tar.bz2 53172 SHA256 6cdb19e7a6bca43f8d89ca01b357e5046655667752b5ab41e0539dce9f5177ec SHA512 fdaddeb4cb2dee2ab5a15744254c54dd01e1db88fd0938127b5077a55e257f1a8edec7f0d2f200235f190d183f58ee15625da2a798e581f1dc82024e75a363c4 WHIRLPOOL 2ce26b39eeb4eadf42e0b7f10be16532137ece88f811bde66aced3abc414cecf4dee000c17abc800fbf17e8b59618cd01d1ffd1882c55af74aaa25e926224d09
 DIST shorewall6-5.0.10.1.tar.bz2 228468 SHA256 045f75b895c5c4d23dac760e532984ab8108dcbd6b0610d021902028e1d62910 SHA512 019df4f8a3f873ca50dd88b8b069fa4b2ed7d3dd1579d368e0133475b05d09cd8e8642f2b1f384de7b650dc90f483972884ce0a064040ed70d7087fcaaa73319 WHIRLPOOL 0670de112b2b323c2edccd945c8dd697b25d356c73eb15ccc8dbbd28dbaed8250b73d81d5216339714e2c4da66369d051cc83ffb491b2afe10877e45efaccfe0
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
-DIST shorewall6-5.0.4.tar.bz2 221062 SHA256 86b939f5a27e464d2d4928b66ba145c30c299bc90fd19802817d8a013cfc1fff SHA512 cc38b44fd4af38981d2a7acff11be4f481683f5d6227ed072a2147650ff20fbafdf2bdca63f66b330c11cabf521484f6d860ad1dc426f1d952d94643ff3d63dc WHIRLPOOL 2e0abbcd7e308f2523907be285c77a257a37aa70b81af0d356de53cd6e330305ca66be6972ab53954d0b02ada9fc6b5176b928db8f4a9ee588410c81dce55792
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
-DIST shorewall6-5.0.9.2.tar.bz2 227223 SHA256 275c12d81cdb528b7e66b60e6d0ec568f53ce81c764eef1197cf521bc5b930e4 SHA512 86795a04fe4f3af1950d077388fe640374c206b384b447f346f38d26b314c3b0ed40de938fb2645307938e6e61b70eb772ddd4bdb0f2fe8c7a2916ff3846e674 WHIRLPOOL b43787601d0769c7628e169c8bdc478086d0335e5f687ff0f6ed0167dc3c881d42ed13cd33a44e68263cf47573eccbacc61801208474844a286aa5f3c7990208
 DIST shorewall6-lite-5.0.10.1.tar.bz2 53078 SHA256 36287800a3eb240e9206bc427835c97d22f8ab309eb01f718e33b3d58f43b8a8 SHA512 cca1c02a832b66bcb03d6314266e38c10ed5419ab7a2726b105e6cb3fa3d3d7823d7407a37990379687a17bbf9640505b0542406d80d69d07c6a92b70ea8d8d0 WHIRLPOOL b05fa3bfb2bb7e7f3efa7033ed1bf61fdc29e3f0b943c04f438c91be58157f046436ce7716d1007843e59d8be5452b8cd59832960dd6d3e1160f75375b17f935
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
-DIST shorewall6-lite-5.0.4.tar.bz2 45573 SHA256 ea578f90bdb5b797c5604a4490ce90437bb4fbc1384f99ef131b2a6415ce6cfe SHA512 eb85ba4cc7992acb0667c735593cceb958ffa06fedd101a6c987078cbfb8509a7b979c92147dfbc4be58a00a2042a20d88873ba6048038ba5c6c8695487c3a85 WHIRLPOOL b040e1850f30103642d83a93467bb21d31a22a1e2c3759677720f0efc613d43759a278536f6304968fba208121f91a151df1b64f9dec6aaae3859f04a2da8215
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
-DIST shorewall6-lite-5.0.9.2.tar.bz2 52600 SHA256 08d7047416dc9b8cbdfebb4b978990aeb66db8719282f089fac6c3e35baa6c7f SHA512 4e96cae6719ed3685c883842b4f5c4edb41b850d21de501e64f9e571de4d3935b4a4e71f5ca8f558128228ae998630098de2d6e39d72cf16156905a678613605 WHIRLPOOL 33f197a873f1d44031f627e90b54d601c761bdcafff41c639db79e091fe661a1ef43c70e207ebc7346cb8321e8545ebbd3069dfbfbda92fba057b11abf8cc7f1

diff --git a/net-firewall/shorewall/shorewall-5.0.4.ebuild b/net-firewall/shorewall/shorewall-5.0.4.ebuild
deleted file mode 100644
index 5600489..0000000
--- a/net-firewall/shorewall/shorewall-5.0.4.ebuild
+++ /dev/null
@@ -1,452 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
-		cp "${FILESDIR}"/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
-		cp "${FILESDIR}"/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
-		cp "${FILESDIR}"/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
-		cp "${FILESDIR}"/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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
-
-		cd "${S}"/${MY_PN_INIT}
-		epatch "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}"
-	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
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [ -d "${D}etc/NetworkManager" ]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		dohtml -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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "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 "  http://www.shorewall.net/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.0.9.2.ebuild b/net-firewall/shorewall/shorewall-5.0.9.2.ebuild
deleted file mode 100644
index 011c75d..0000000
--- a/net-firewall/shorewall/shorewall-5.0.9.2.ebuild
+++ /dev/null
@@ -1,452 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-10-03 23:48 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-10-03 23:48 UTC (permalink / raw
  To: gentoo-commits

commit:     5b0b37e4d63d412b5645892a9aea995f30438a19
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 23:48:24 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 23:48:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0b37e4

net-firewall/shorewall: Drop old

Package-Manager: portage-2.3.1

 net-firewall/shorewall/Manifest                  |   7 -
 net-firewall/shorewall/shorewall-5.0.10.1.ebuild | 452 -----------------------
 2 files changed, 459 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 9dca796..9ce020b 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,21 @@
-DIST shorewall-5.0.10.1.tar.bz2 503114 SHA256 138d86968e99d079a6268ca05e00b22874448b29e5a9698cccba295b35c457cd SHA512 478792c0605174c85821ecddf3665b3ff0559074ee71a085c81035286f57987959619c40f5a6138fc832ed3cb3045f7e54b1a3242e0b7fa420661159d1238743 WHIRLPOOL a326ee33e060b02c0936135f701cd0f08b85d2bc3eb2cf9380ad764be280571c27b87ce7cafd51384a5e370f98cdf96caabb85d7cee6859d30a432a5874b7829
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
 DIST shorewall-5.0.12.tar.bz2 507676 SHA256 235f5a81c77f6f1d08f846c28b34ebe1f769d8d6015198962b2695aad4598f7f SHA512 c72adb081d5a7a7d2a43e48c18ee497f3c107e4687b80bb94be555d22c1d312dc2dc7f948ab0bad77ebcf51c3c98d24254001baf951dab274dfd7beb79ce5d81 WHIRLPOOL c521bac6cd6a1a814919d55f133117e56014ae1055e9d0ef4d2df2b1d7ffbf280b74cdcb61980eb424fd476c6642651f4be992022f57ccca518e5ae905ed4c83
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
-DIST shorewall-core-5.0.10.1.tar.bz2 59308 SHA256 c048afa488da0ec3cf4d140fb105de45c984c6c1f71d88ce39a99bda4ba0ffe8 SHA512 a9a529f5c4c7d414d4cd3179378694fa25261159563425c64630b33e1ffe39594ca7eab171091b2412dd7c995bd113a08b0689eadf501e711b09b861fc1c295f WHIRLPOOL fca720a4ea18334d1d383f121a2424d6e726eed7cd47fbda7595f06c0e608aae413fa0d394c305052a8a457e4ffb2cafcb2081560882c7f77abac52a203168b6
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.12.tar.bz2 61097 SHA256 82f156ff653871cf3b02241884f4400a899469c536f2fe17443f7494ddc88a01 SHA512 6bbc163ddc323c56d5b3bf98885652b96c10f933026e3aa837870bfd5b9759d092fb9b0dc177669877df5642e4b90d7dd9571c544b5139db86ef451e57fa7c84 WHIRLPOOL 3aa6144aee78d939df00b807ef13fb1c54a196b4c57b27535ee75d1a89cab65eba5da061419c3a20f2701dd401bad89350fa433e1b3d7937a69f2288be907928
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
-DIST shorewall-docs-html-5.0.10.1.tar.bz2 4270330 SHA256 7dadc4996bd725b9391e4acc4a939337c37de5738a2dea5594d399b1e2a91995 SHA512 c575abbdd8d31f2cceee40b78f596bd7223d4bb1087dcb5b54d1edb2eff91b56e03e4a31f243c587b6357a185be5908cff5681dfc438ecd4224f04e309933327 WHIRLPOOL 3ee758b6c601e6eedb857d09d5f707ed7067be4e87afd22024c2212846ec13ca8b8052c9cc1ccbf484c849c852ca881c5c9c730cb672bc954e201e76dfc63a54
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.12.tar.bz2 4271255 SHA256 b21a7c89a37e6188c397832ad3034183e7f2b9a601234d5ceafddd1c48e9d796 SHA512 640e2867dd99c679f0fb9dff7498784229d7de0e209bb203bf0c07b07f7977be397c7ce35303a25b6b2b425a7799707c83925c8c5e3d1fd9bc73dad7ae606f91 WHIRLPOOL ee93b1657b20f5b3e8298e08877b432cb21a80ddc6084ad6123017acdb4aa52ea17a228e268f4df3aa1ab47df374913516dcae6dafec9c7ac28593a8612b282a
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
-DIST shorewall-init-5.0.10.1.tar.bz2 37413 SHA256 4066ef23bcb2702db5651705a086190663026856f94096800cff46438db9d97f SHA512 703b2f755c7e0d691e69b9508484551a1b331c85080b86b4aaa7c9513e4f0be55a25bf38bdf769b12be37b3bc48d8d34b6ac514c372605dd9bfbe11e17378e82 WHIRLPOOL 0097d09302e677afc39b4fbc722f179ba56370bae8070c75ad0594cb9e2dc7fd4d6ac5abc2bdb204dd30355b640f42894996a50ec61b940b2e86fa14e65a3401
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.12.tar.bz2 39311 SHA256 9217bae6709ae945133f84ef59b74fe27830db9b4783ef827b3b521fc8aa9128 SHA512 c1c961d9840d3e3015066d9dd11336ce97938487696f1ded7305d47bed9be8d49139d45b921664c293b009f9b184860e5a84ea6fdc2215e515a2985060de7e2e WHIRLPOOL cde1127c7741d3e3aa9c6f670abd15d9014ae6c1ed592cab5a9bc633d4e68ad34949c1427d83e5836c56996fb6d9ce2224322f8681e02227f4ce3a87b0970c59
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
-DIST shorewall-lite-5.0.10.1.tar.bz2 53625 SHA256 82d79f2f918a763c20340276dd0bc3741920960425beafa8c21a4d314b1977de SHA512 729766d994b4286731a362af5b1316bfbe2a9607b97b662a69ae6f93971874d0707cf648e9b31728deb3533e7ccf0e83e1ad7d7d18d4b26c66e2a365bf8a7e3e WHIRLPOOL b95a224f590ec3b5baa884288d020b9bf25cdd771844cd0c5745d7dca03edf413d90645a743e17e22b2ae8265ee42c0ca977d8f7720de84de8b9674f6defe6c6
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.12.tar.bz2 55485 SHA256 206c34172b5566f0267269d759bd631109951b9bb8fec233cae508108d20ca01 SHA512 d6fab7803556f033583f067ae41a7d30499e8135c36218c2cfa1b9c208b00771e4bc66e189cd386fe96d262003eb779942c0527b71282cb52e95ba8657698b35 WHIRLPOOL 2b01c431b6687d00bf27fc27d977514b808813bb619aa7cb1437e2830c6d0eff0e6d705a25eeff024366a080f9aa94b83ff1b8baa0552a6020dd3f96ede382fb
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
-DIST shorewall6-5.0.10.1.tar.bz2 228468 SHA256 045f75b895c5c4d23dac760e532984ab8108dcbd6b0610d021902028e1d62910 SHA512 019df4f8a3f873ca50dd88b8b069fa4b2ed7d3dd1579d368e0133475b05d09cd8e8642f2b1f384de7b650dc90f483972884ce0a064040ed70d7087fcaaa73319 WHIRLPOOL 0670de112b2b323c2edccd945c8dd697b25d356c73eb15ccc8dbbd28dbaed8250b73d81d5216339714e2c4da66369d051cc83ffb491b2afe10877e45efaccfe0
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.12.tar.bz2 231289 SHA256 ec4d916834ba7dae9b5ccb5af33b4b45993821045e485f4d3e4e8d307fabf11a SHA512 4a9ede1c73454f065cd2ffeb542986138cca21dbe570dca20056a0f50364cb5c0d7560390ea273b49ca55501a1818a7c3ae03185ea5ff5171889e72677ba4a14 WHIRLPOOL ce3ed3941082f5d041f7a2f0aab390409c07167f2b69f3a636d3e17f283f5d750bde087d3031bc147ebc5de1e0c2b2b44dbc32fc63088e077f75f4fe51821744
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
-DIST shorewall6-lite-5.0.10.1.tar.bz2 53078 SHA256 36287800a3eb240e9206bc427835c97d22f8ab309eb01f718e33b3d58f43b8a8 SHA512 cca1c02a832b66bcb03d6314266e38c10ed5419ab7a2726b105e6cb3fa3d3d7823d7407a37990379687a17bbf9640505b0542406d80d69d07c6a92b70ea8d8d0 WHIRLPOOL b05fa3bfb2bb7e7f3efa7033ed1bf61fdc29e3f0b943c04f438c91be58157f046436ce7716d1007843e59d8be5452b8cd59832960dd6d3e1160f75375b17f935
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.12.tar.bz2 54944 SHA256 8c00841ff085f8887217979529f75583d3774e94b146532e9b700c02ce297b76 SHA512 558215761ec2a5bdf809efde1089cbd9e08ccbe691b34cb2fba974be7b7f70c1a097721dedb8838a7fdf2cc326b3f111926cace275d10c32dbdbbef09bbf1947 WHIRLPOOL ca9485cb854719f34e7365eea0e1b32973fc25e249137790e47b5d3a26031161512cdfd23c8a9630f1533c592e5612eb8dd20727295aa88d1e45f3b89b1782bf
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833

diff --git a/net-firewall/shorewall/shorewall-5.0.10.1.ebuild b/net-firewall/shorewall/shorewall-5.0.10.1.ebuild
deleted file mode 100644
index 011c75d..00000000
--- a/net-firewall/shorewall/shorewall-5.0.10.1.ebuild
+++ /dev/null
@@ -1,452 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	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}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	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-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	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}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-10-04  7:37 Tobias Klausmann
  0 siblings, 0 replies; 159+ messages in thread
From: Tobias Klausmann @ 2016-10-04  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     539e3a54f1c4ab213e3d0d74151e72cbf6738e89
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 07:36:47 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 07:36:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539e3a54

net-firewall/shorewall-5.0.11-r0: stable on alpha

Gentoo-Bug: 596108

 net-firewall/shorewall/shorewall-5.0.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.11.ebuild b/net-firewall/shorewall/shorewall-5.0.11.ebuild
index 011c75d..2d9e239 100644
--- a/net-firewall/shorewall/shorewall-5.0.11.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.11.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-10-12 22:05 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-10-12 22:05 UTC (permalink / raw
  To: gentoo-commits

commit:     a4926373e89cea72ca059d8e0a771e01acb1a1af
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 22:05:28 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 22:05:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4926373

net-firewall/shorewall: Bump to v5.0.12.1

Package-Manager: portage-2.3.2

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.12.ebuild => shorewall-5.0.12.1.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 9ce020b..ef9c947 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,21 @@
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
-DIST shorewall-5.0.12.tar.bz2 507676 SHA256 235f5a81c77f6f1d08f846c28b34ebe1f769d8d6015198962b2695aad4598f7f SHA512 c72adb081d5a7a7d2a43e48c18ee497f3c107e4687b80bb94be555d22c1d312dc2dc7f948ab0bad77ebcf51c3c98d24254001baf951dab274dfd7beb79ce5d81 WHIRLPOOL c521bac6cd6a1a814919d55f133117e56014ae1055e9d0ef4d2df2b1d7ffbf280b74cdcb61980eb424fd476c6642651f4be992022f57ccca518e5ae905ed4c83
+DIST shorewall-5.0.12.1.tar.bz2 508163 SHA256 acb6d61da1a522f1ffff27a32931e691785324a5803bf359f1dd8784d8ce743d SHA512 3ae0ccaf993ee05f2bed5e51e5d24843c4540caba71d9e66ebf7592ba3dcc4531996bb838b85586b4e3d57b6cb95f028fa287c15656ad50da29eb1ccb54725c7 WHIRLPOOL 8a31b441b7b7c27525f08113c03ab794ec70da722f84f2f90b14212b9e1080d9cb3b05fbf68130400f82d685250918ebdbe90a6bfc6150c30f1d84b1ea17e1d9
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
-DIST shorewall-core-5.0.12.tar.bz2 61097 SHA256 82f156ff653871cf3b02241884f4400a899469c536f2fe17443f7494ddc88a01 SHA512 6bbc163ddc323c56d5b3bf98885652b96c10f933026e3aa837870bfd5b9759d092fb9b0dc177669877df5642e4b90d7dd9571c544b5139db86ef451e57fa7c84 WHIRLPOOL 3aa6144aee78d939df00b807ef13fb1c54a196b4c57b27535ee75d1a89cab65eba5da061419c3a20f2701dd401bad89350fa433e1b3d7937a69f2288be907928
+DIST shorewall-core-5.0.12.1.tar.bz2 61392 SHA256 24d19836a4c6f8323d77848afb4d603c87e926c5412e8e82944b1a1b7c439bc9 SHA512 f83741e4a07dfbcce4c3bef12496699ef99d3fa025126014961b20203ce409f84a342db58048aac44718c42b0463c883c17f19fb0ad1662041a38e7e79505f92 WHIRLPOOL 22b5023bd2a301247db5b4459841f2eb6097321dbdbb03ab280840da11a6170d8101cd79ff4e514d820aedc1abc0be7c605de471888a4c53fe24355b9bfbe98c
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
-DIST shorewall-docs-html-5.0.12.tar.bz2 4271255 SHA256 b21a7c89a37e6188c397832ad3034183e7f2b9a601234d5ceafddd1c48e9d796 SHA512 640e2867dd99c679f0fb9dff7498784229d7de0e209bb203bf0c07b07f7977be397c7ce35303a25b6b2b425a7799707c83925c8c5e3d1fd9bc73dad7ae606f91 WHIRLPOOL ee93b1657b20f5b3e8298e08877b432cb21a80ddc6084ad6123017acdb4aa52ea17a228e268f4df3aa1ab47df374913516dcae6dafec9c7ac28593a8612b282a
+DIST shorewall-docs-html-5.0.12.1.tar.bz2 4271210 SHA256 af8effd64b6ff3f798f76c966744cb6b3c4d672f6e6061872593356dec969b47 SHA512 ae01359fc4bea9811ddc1ee6f1eb15a7d2472638c12d1c0a8fbc86d13f305583005762b941c6bc0b81c7ebf91fc7c726b721bf54886da958f9d1eca067ea21e2 WHIRLPOOL a7e30637619d6c2adbce455070d981421a17a214bbd78667b989496240d6a79ad327c9451cae1490a13d22f91d329db01a734fd30d52741922a17d61dd247977
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
-DIST shorewall-init-5.0.12.tar.bz2 39311 SHA256 9217bae6709ae945133f84ef59b74fe27830db9b4783ef827b3b521fc8aa9128 SHA512 c1c961d9840d3e3015066d9dd11336ce97938487696f1ded7305d47bed9be8d49139d45b921664c293b009f9b184860e5a84ea6fdc2215e515a2985060de7e2e WHIRLPOOL cde1127c7741d3e3aa9c6f670abd15d9014ae6c1ed592cab5a9bc633d4e68ad34949c1427d83e5836c56996fb6d9ce2224322f8681e02227f4ce3a87b0970c59
+DIST shorewall-init-5.0.12.1.tar.bz2 39454 SHA256 4a2eb7f123b1ed5e302ef03ef99c80ad6bc8b3d8d50b4002440e07c2cb44ad17 SHA512 d2062af7aef1cf01f44c9e2201a2fec292f37fdca0c07bcc3372d23304431f13322d9f81159033e1f97fa614694dd37fc90c8a801942145a0d507fbbf19dc77a WHIRLPOOL 6c0bdef4b1e9c104d28a2b26c6ae6f1d2ff094a4abea6b5a5c01bf8dbcd1ac8d8d8f417f4888cf63ef0b97d8de6c3f7abf7fa632b6dacb11995d5ae62b4bfb0e
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
-DIST shorewall-lite-5.0.12.tar.bz2 55485 SHA256 206c34172b5566f0267269d759bd631109951b9bb8fec233cae508108d20ca01 SHA512 d6fab7803556f033583f067ae41a7d30499e8135c36218c2cfa1b9c208b00771e4bc66e189cd386fe96d262003eb779942c0527b71282cb52e95ba8657698b35 WHIRLPOOL 2b01c431b6687d00bf27fc27d977514b808813bb619aa7cb1437e2830c6d0eff0e6d705a25eeff024366a080f9aa94b83ff1b8baa0552a6020dd3f96ede382fb
+DIST shorewall-lite-5.0.12.1.tar.bz2 55678 SHA256 acac714a400dc6bdc8d7c0dd66b7f67f9f381db45f257e66d3f83b73fe59fb8a SHA512 e9fcf707f5cb27d321a155a2dd0bd43605b8d696a6f8888d61fc5986826fadc5fbd611fe529492e7a04d6df37c3e7be6daf416e583a313f2c24d8d89adc5351c WHIRLPOOL 1894e8d033748812e6847b913c44652e6d195e92838607486759c8459ce30b91c0146367c3ab2855af9de676e8ca7de54014b86b185e84e8062c1071aaf472fa
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
-DIST shorewall6-5.0.12.tar.bz2 231289 SHA256 ec4d916834ba7dae9b5ccb5af33b4b45993821045e485f4d3e4e8d307fabf11a SHA512 4a9ede1c73454f065cd2ffeb542986138cca21dbe570dca20056a0f50364cb5c0d7560390ea273b49ca55501a1818a7c3ae03185ea5ff5171889e72677ba4a14 WHIRLPOOL ce3ed3941082f5d041f7a2f0aab390409c07167f2b69f3a636d3e17f283f5d750bde087d3031bc147ebc5de1e0c2b2b44dbc32fc63088e077f75f4fe51821744
+DIST shorewall6-5.0.12.1.tar.bz2 230892 SHA256 b8da035e95b8cb642bb21a8b440f8c6fb6d3d8d7722d8d421e8d8f6d9414524d SHA512 5447afbec9cc9cb4b48ed38f8b9dce159530ce08b56d1158510c629a7f761bbe9f9fa3d4817b9ee2cde2aaef269cec5376e8baa67136a3d755f2e351422bd696 WHIRLPOOL 5f834c1283ea7b079d5b3b0566251b36d6e8bc68ad74b66c03e910f90110470fc1d49f3afec19354d2d917d0a487133f4024d744f0a2c52e935288edfb313ff8
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
-DIST shorewall6-lite-5.0.12.tar.bz2 54944 SHA256 8c00841ff085f8887217979529f75583d3774e94b146532e9b700c02ce297b76 SHA512 558215761ec2a5bdf809efde1089cbd9e08ccbe691b34cb2fba974be7b7f70c1a097721dedb8838a7fdf2cc326b3f111926cace275d10c32dbdbbef09bbf1947 WHIRLPOOL ca9485cb854719f34e7365eea0e1b32973fc25e249137790e47b5d3a26031161512cdfd23c8a9630f1533c592e5612eb8dd20727295aa88d1e45f3b89b1782bf
+DIST shorewall6-lite-5.0.12.1.tar.bz2 55135 SHA256 f244c53ad55c67b3126ddc0ac896b7ca2fe95afd8f7a76046d9166a18afefd2f SHA512 9bb5f042d4552cf5ddb48488b413a5be70a57f8aa1035873f9d1ddf7496eba562e7bd6a4dfdcfc45aeaf32321227288235d3d3e14d50418ed77cdd164ea66e1d WHIRLPOOL 1917ea021bbbe83005ea56ebb013e9d67cf53fd17ada7566dbf879d7a440542307fc45c3e29c53c50eedda61bd5b67c3aed0c5530cf07382356f18d78d5824ac
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833

diff --git a/net-firewall/shorewall/shorewall-5.0.12.ebuild b/net-firewall/shorewall/shorewall-5.0.12.1.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.12.ebuild
rename to net-firewall/shorewall/shorewall-5.0.12.1.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-10-16  7:00 Jeroen Roovers
  0 siblings, 0 replies; 159+ messages in thread
From: Jeroen Roovers @ 2016-10-16  7:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e3fade27910df28d171de15632e0de6ae246bd0b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 07:00:12 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 07:00:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3fade27

net-firewall/shorewall: Stable for HPPA (bug #596108).

Package-Manager: portage-2.3.2
RepoMan-Options: --ignore-arches

 net-firewall/shorewall/shorewall-5.0.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.11.ebuild b/net-firewall/shorewall/shorewall-5.0.11.ebuild
index 2d9e239..e0f2303 100644
--- a/net-firewall/shorewall/shorewall-5.0.11.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.11.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-10-16 11:46 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-10-16 11:46 UTC (permalink / raw
  To: gentoo-commits

commit:     116bdc62d6f17c39696a44bb828faf7f1a1b587a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 11:46:31 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 11:46:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116bdc62

net-firewall/shorewall: Retroactively mark stable for the remaining arches using the ALLARCHES policy

Gentoo-Bug: https://bugs.gentoo.org/596108

Package-Manager: portage-2.3.2

 net-firewall/shorewall/shorewall-5.0.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.11.ebuild b/net-firewall/shorewall/shorewall-5.0.11.ebuild
index e0f2303..17b2853 100644
--- a/net-firewall/shorewall/shorewall-5.0.11.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.11.ebuild
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-10-18 23:46 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-10-18 23:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e5021ba7ba873c6557f890df26be1c818a672259
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 23:45:59 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 23:45:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5021ba7

net-firewall/shorewall: Bump to v5.0.13

Package-Manager: portage-2.3.2

 net-firewall/shorewall/Manifest                |   7 +
 net-firewall/shorewall/shorewall-5.0.13.ebuild | 452 +++++++++++++++++++++++++
 2 files changed, 459 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index ef9c947..b77ba8b 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
 DIST shorewall-5.0.12.1.tar.bz2 508163 SHA256 acb6d61da1a522f1ffff27a32931e691785324a5803bf359f1dd8784d8ce743d SHA512 3ae0ccaf993ee05f2bed5e51e5d24843c4540caba71d9e66ebf7592ba3dcc4531996bb838b85586b4e3d57b6cb95f028fa287c15656ad50da29eb1ccb54725c7 WHIRLPOOL 8a31b441b7b7c27525f08113c03ab794ec70da722f84f2f90b14212b9e1080d9cb3b05fbf68130400f82d685250918ebdbe90a6bfc6150c30f1d84b1ea17e1d9
+DIST shorewall-5.0.13.tar.bz2 509816 SHA256 dd43baae4199e84937727fb07cb7a40cffd285660863af9ca2fe58bbee90b95f SHA512 2d48d4d2995fa0d6c0c089e7c15f5c6e33fb9cbdbee1732357b284987cc24b791f1e2f5188bbe3bb0500262fd4a8b0c299c7273f1df432dce0524640c601e05b WHIRLPOOL 158981bbd6f2514d7166e7ed675eca60ab95a8ca46069f1c600282b5e03fe81f0190e217605353c5e09335ae5ed37124169587ac3d676fef78c2384ee65a9758
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.12.1.tar.bz2 61392 SHA256 24d19836a4c6f8323d77848afb4d603c87e926c5412e8e82944b1a1b7c439bc9 SHA512 f83741e4a07dfbcce4c3bef12496699ef99d3fa025126014961b20203ce409f84a342db58048aac44718c42b0463c883c17f19fb0ad1662041a38e7e79505f92 WHIRLPOOL 22b5023bd2a301247db5b4459841f2eb6097321dbdbb03ab280840da11a6170d8101cd79ff4e514d820aedc1abc0be7c605de471888a4c53fe24355b9bfbe98c
+DIST shorewall-core-5.0.13.tar.bz2 62216 SHA256 8d9bde3ebfbd3082efb3066e2205ab2e621022bd2c111cb9b1f68e545f1b40ef SHA512 e2d7c7606e778ab61fa5d9af898ee81962d46faeac63cc2f833c2a6294647a037101ed020251c812aaf1739c1fcd72d522d537cdb0267857e4bf8d8ba4020a2b WHIRLPOOL a89d5fa4d22e3c20ceccb6d96ff8aaa42c90d574f9845bae3a5516ffb30950e555377aebbdb39c3dcd36f72f20be8cbe2a87e7d1318a7ec304828b3dc61b1d6e
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.12.1.tar.bz2 4271210 SHA256 af8effd64b6ff3f798f76c966744cb6b3c4d672f6e6061872593356dec969b47 SHA512 ae01359fc4bea9811ddc1ee6f1eb15a7d2472638c12d1c0a8fbc86d13f305583005762b941c6bc0b81c7ebf91fc7c726b721bf54886da958f9d1eca067ea21e2 WHIRLPOOL a7e30637619d6c2adbce455070d981421a17a214bbd78667b989496240d6a79ad327c9451cae1490a13d22f91d329db01a734fd30d52741922a17d61dd247977
+DIST shorewall-docs-html-5.0.13.tar.bz2 4272329 SHA256 03b12cfb5d49952383b12a81aad958a8742d89b01c51e6ae0a93eaee50d15df8 SHA512 54c430d90fbaa135d9be8997c25418825f81310e247443b1bd712c509b99624229bb7e4e5d687c8203b51592c9ddc217def69b5000dbaabdee6db42679f2e145 WHIRLPOOL 51615b2e0e52cf6e863df37525ae2bcbcbb3b38e3c3a527b382324083469bce632ad564e922cc44f32f63ff2bbcdc4da4890ccd036180df5b0b3dd0eb8ae5d05
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.12.1.tar.bz2 39454 SHA256 4a2eb7f123b1ed5e302ef03ef99c80ad6bc8b3d8d50b4002440e07c2cb44ad17 SHA512 d2062af7aef1cf01f44c9e2201a2fec292f37fdca0c07bcc3372d23304431f13322d9f81159033e1f97fa614694dd37fc90c8a801942145a0d507fbbf19dc77a WHIRLPOOL 6c0bdef4b1e9c104d28a2b26c6ae6f1d2ff094a4abea6b5a5c01bf8dbcd1ac8d8d8f417f4888cf63ef0b97d8de6c3f7abf7fa632b6dacb11995d5ae62b4bfb0e
+DIST shorewall-init-5.0.13.tar.bz2 40056 SHA256 406a45da9cdfb14f2525b51101a6ec9c1845e6a46348b4fd51f352b6c4b36e24 SHA512 6606b4132745cd6d7a5db1a36fc142c14220cf8e121a21959dfe4616ab9780e08b3b51cac2bbc1c4d67a6425bf668e7bd42f01f1031acef60e1cd1b078d8856d WHIRLPOOL 3a4447f13152213823d2b003a6709cf0dfe8b4deb8b702581119a6b4326957c658b3600938f9febf37b47a6e2ac6f67ddfeee2f255dda936ad13a359cd454368
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.12.1.tar.bz2 55678 SHA256 acac714a400dc6bdc8d7c0dd66b7f67f9f381db45f257e66d3f83b73fe59fb8a SHA512 e9fcf707f5cb27d321a155a2dd0bd43605b8d696a6f8888d61fc5986826fadc5fbd611fe529492e7a04d6df37c3e7be6daf416e583a313f2c24d8d89adc5351c WHIRLPOOL 1894e8d033748812e6847b913c44652e6d195e92838607486759c8459ce30b91c0146367c3ab2855af9de676e8ca7de54014b86b185e84e8062c1071aaf472fa
+DIST shorewall-lite-5.0.13.tar.bz2 56477 SHA256 4fda6beb10a6fc9c2af20166b99e4b9f8e787b818317c8de64ea08fa3e3ff40a SHA512 62586c9510b7d4923742978232a3f85e98c42c67d207f4716808d7d0aab476866c00299e43147e54615e1f8cf2eb3974fc0f326b98249370d71c2eeada8c95de WHIRLPOOL f8b48efacf89d22b8c75e929e670d6d3975b5f8447fa8204721380fb5dd7322368b688aba5cad4ce0232971dc37e42265a677c850b88cb010b017da3d1b78096
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.12.1.tar.bz2 230892 SHA256 b8da035e95b8cb642bb21a8b440f8c6fb6d3d8d7722d8d421e8d8f6d9414524d SHA512 5447afbec9cc9cb4b48ed38f8b9dce159530ce08b56d1158510c629a7f761bbe9f9fa3d4817b9ee2cde2aaef269cec5376e8baa67136a3d755f2e351422bd696 WHIRLPOOL 5f834c1283ea7b079d5b3b0566251b36d6e8bc68ad74b66c03e910f90110470fc1d49f3afec19354d2d917d0a487133f4024d744f0a2c52e935288edfb313ff8
+DIST shorewall6-5.0.13.tar.bz2 232243 SHA256 d1c85c2f448d8a988d76bb1478c684a8e5cf79522bfe78ea711d1113505c2833 SHA512 44e7aefad2d9839c69b4fabd0e0d98e93401d4bd99e4dfb11257ff86df5dacd13b4f6a76ac12822f1b94549b41d5c3b0b118b02c8d1bb057aa636088d7e8b4f9 WHIRLPOOL 534d97955b54270a736dd9b14ac26399227d0ae9959dd41086ed70633c1ee4207f0397ac1785254c79edda1b13f20a90d9a9b51d0366035357764ce89a8ba7e3
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.12.1.tar.bz2 55135 SHA256 f244c53ad55c67b3126ddc0ac896b7ca2fe95afd8f7a76046d9166a18afefd2f SHA512 9bb5f042d4552cf5ddb48488b413a5be70a57f8aa1035873f9d1ddf7496eba562e7bd6a4dfdcfc45aeaf32321227288235d3d3e14d50418ed77cdd164ea66e1d WHIRLPOOL 1917ea021bbbe83005ea56ebb013e9d67cf53fd17ada7566dbf879d7a440542307fc45c3e29c53c50eedda61bd5b67c3aed0c5530cf07382356f18d78d5824ac
+DIST shorewall6-lite-5.0.13.tar.bz2 55907 SHA256 7671bcac1561571774fc2df23abcf93f207a7e4c5ce0ac94481039c636ba8055 SHA512 ac5e18d776ec2f7292d1841b2a91ad56849fc47c81398493a434c2cf85783fc2d4ba141f427b935e1e7b7378ddc0d0fedd5ef53f441fd891d9efb0a1ad1b2757 WHIRLPOOL ffc20def37ae5c313af481eb588ad8fb6b266fc61c7d2473ceaec160a4de23eccecb77a5ac6c2b1091df679930bbeae29f40d89ae9ff85c98a58ce9db40cd111
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833

diff --git a/net-firewall/shorewall/shorewall-5.0.13.ebuild b/net-firewall/shorewall/shorewall-5.0.13.ebuild
new file mode 100644
index 00000000..54d3b67
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.13.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-10-18 23:46 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-10-18 23:46 UTC (permalink / raw
  To: gentoo-commits

commit:     196659f229115844c1811c49d80450a07fa4ae30
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 23:42:41 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 23:42:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196659f2

net-firewall/shorewall: Adjust die messages

Since commit b8bb1a1271f we are using same runscript base file for shorewall and
shorewall-lite however die messages in the ebuild wasn't updated.

Just a small internal cosmetic change.

 net-firewall/shorewall/shorewall-5.0.12.1.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.12.1.ebuild b/net-firewall/shorewall/shorewall-5.0.12.1.ebuild
index 1fa1d9e..54d3b67 100644
--- a/net-firewall/shorewall/shorewall-5.0.12.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.12.1.ebuild
@@ -171,7 +171,7 @@ src_prepare() {
 		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-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${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
 	fi
@@ -181,8 +181,8 @@ src_prepare() {
 		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 shorewall6.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${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
 	fi
@@ -193,7 +193,7 @@ src_prepare() {
 		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-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${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
 	fi
@@ -203,8 +203,8 @@ src_prepare() {
 		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 shorewall6-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${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
 	fi


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-11-01 15:45 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-11-01 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     5c1c832226834326d5e384d3347f267acc1a1fdb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 15:44:46 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 15:45:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1c8322

net-firewall/shorewall: Bump to v5.0.13.4

Package-Manager: portage-2.3.2

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.13.ebuild => shorewall-5.0.13.4.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index b77ba8b..963e6d8 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,28 @@
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
 DIST shorewall-5.0.12.1.tar.bz2 508163 SHA256 acb6d61da1a522f1ffff27a32931e691785324a5803bf359f1dd8784d8ce743d SHA512 3ae0ccaf993ee05f2bed5e51e5d24843c4540caba71d9e66ebf7592ba3dcc4531996bb838b85586b4e3d57b6cb95f028fa287c15656ad50da29eb1ccb54725c7 WHIRLPOOL 8a31b441b7b7c27525f08113c03ab794ec70da722f84f2f90b14212b9e1080d9cb3b05fbf68130400f82d685250918ebdbe90a6bfc6150c30f1d84b1ea17e1d9
-DIST shorewall-5.0.13.tar.bz2 509816 SHA256 dd43baae4199e84937727fb07cb7a40cffd285660863af9ca2fe58bbee90b95f SHA512 2d48d4d2995fa0d6c0c089e7c15f5c6e33fb9cbdbee1732357b284987cc24b791f1e2f5188bbe3bb0500262fd4a8b0c299c7273f1df432dce0524640c601e05b WHIRLPOOL 158981bbd6f2514d7166e7ed675eca60ab95a8ca46069f1c600282b5e03fe81f0190e217605353c5e09335ae5ed37124169587ac3d676fef78c2384ee65a9758
+DIST shorewall-5.0.13.4.tar.bz2 511274 SHA256 af85e73247655969588699e5b2f199b161adf19477ce13c3a97764a7aa1b6daa SHA512 b77ad3fbe285a6a8b988e3cdb8826b131dc6a7d94b136ba14d07d0173654144ea8bca162cda8cecb2e3249634194ba4f4eefda73be51c69f754c53b05d4ca95d WHIRLPOOL 95e00c92e02c5f9314331bc7a4ec675a565b978b265d222a5d45ef601732f281413324395a81d5f9647d773fab0b29219b7f86546e987c04791a7ce6250783ff
 DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.12.1.tar.bz2 61392 SHA256 24d19836a4c6f8323d77848afb4d603c87e926c5412e8e82944b1a1b7c439bc9 SHA512 f83741e4a07dfbcce4c3bef12496699ef99d3fa025126014961b20203ce409f84a342db58048aac44718c42b0463c883c17f19fb0ad1662041a38e7e79505f92 WHIRLPOOL 22b5023bd2a301247db5b4459841f2eb6097321dbdbb03ab280840da11a6170d8101cd79ff4e514d820aedc1abc0be7c605de471888a4c53fe24355b9bfbe98c
-DIST shorewall-core-5.0.13.tar.bz2 62216 SHA256 8d9bde3ebfbd3082efb3066e2205ab2e621022bd2c111cb9b1f68e545f1b40ef SHA512 e2d7c7606e778ab61fa5d9af898ee81962d46faeac63cc2f833c2a6294647a037101ed020251c812aaf1739c1fcd72d522d537cdb0267857e4bf8d8ba4020a2b WHIRLPOOL a89d5fa4d22e3c20ceccb6d96ff8aaa42c90d574f9845bae3a5516ffb30950e555377aebbdb39c3dcd36f72f20be8cbe2a87e7d1318a7ec304828b3dc61b1d6e
+DIST shorewall-core-5.0.13.4.tar.bz2 63124 SHA256 f8340cc9b0bd6aed85d3305887b565c8f93066316037d5962443ca1296d0643b SHA512 b4d3ab1fd99f9536e3ec22a6fcf6c1ca283a5d493cf5ae3ffdd15524bc9f1ab91329decb1faa2d334746a0bf9fc523fbbacb759cd48fbcff6fab6acb71dfb8ed WHIRLPOOL 81cbd0a5501806881e462796ab17a2964f30edd95a3b07e671ac1d9b2df7580e55839331817127beb5f5b487904147a8c83dcc72555136fe045086a7fd7e0b16
 DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.12.1.tar.bz2 4271210 SHA256 af8effd64b6ff3f798f76c966744cb6b3c4d672f6e6061872593356dec969b47 SHA512 ae01359fc4bea9811ddc1ee6f1eb15a7d2472638c12d1c0a8fbc86d13f305583005762b941c6bc0b81c7ebf91fc7c726b721bf54886da958f9d1eca067ea21e2 WHIRLPOOL a7e30637619d6c2adbce455070d981421a17a214bbd78667b989496240d6a79ad327c9451cae1490a13d22f91d329db01a734fd30d52741922a17d61dd247977
-DIST shorewall-docs-html-5.0.13.tar.bz2 4272329 SHA256 03b12cfb5d49952383b12a81aad958a8742d89b01c51e6ae0a93eaee50d15df8 SHA512 54c430d90fbaa135d9be8997c25418825f81310e247443b1bd712c509b99624229bb7e4e5d687c8203b51592c9ddc217def69b5000dbaabdee6db42679f2e145 WHIRLPOOL 51615b2e0e52cf6e863df37525ae2bcbcbb3b38e3c3a527b382324083469bce632ad564e922cc44f32f63ff2bbcdc4da4890ccd036180df5b0b3dd0eb8ae5d05
+DIST shorewall-docs-html-5.0.13.4.tar.bz2 4272429 SHA256 8ea9041bebccb4ceef13373236d297ed13a3a2c804f2409d5cdb8028fe97707b SHA512 fe2d11618ab95d49598d977e7148c8d0fdbc49810b42f7f6e20bc8f550f2c67927002262467248bf91825d447e6e9c6eab5b4f870a19dfb71e298bd1aa09828e WHIRLPOOL 23d758bf78e134e22a6fa93e4a0c8ed257548ac33dc4ba043e8cbec8678bdbaeff1da2639a34cb084eafae6870a8ada6f298e3dd0c99606c03ea47ccd7778320
 DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.12.1.tar.bz2 39454 SHA256 4a2eb7f123b1ed5e302ef03ef99c80ad6bc8b3d8d50b4002440e07c2cb44ad17 SHA512 d2062af7aef1cf01f44c9e2201a2fec292f37fdca0c07bcc3372d23304431f13322d9f81159033e1f97fa614694dd37fc90c8a801942145a0d507fbbf19dc77a WHIRLPOOL 6c0bdef4b1e9c104d28a2b26c6ae6f1d2ff094a4abea6b5a5c01bf8dbcd1ac8d8d8f417f4888cf63ef0b97d8de6c3f7abf7fa632b6dacb11995d5ae62b4bfb0e
-DIST shorewall-init-5.0.13.tar.bz2 40056 SHA256 406a45da9cdfb14f2525b51101a6ec9c1845e6a46348b4fd51f352b6c4b36e24 SHA512 6606b4132745cd6d7a5db1a36fc142c14220cf8e121a21959dfe4616ab9780e08b3b51cac2bbc1c4d67a6425bf668e7bd42f01f1031acef60e1cd1b078d8856d WHIRLPOOL 3a4447f13152213823d2b003a6709cf0dfe8b4deb8b702581119a6b4326957c658b3600938f9febf37b47a6e2ac6f67ddfeee2f255dda936ad13a359cd454368
+DIST shorewall-init-5.0.13.4.tar.bz2 40765 SHA256 b03b6969a9d7f312eb5eef5b08ccca4fd875b1b604de43d1c3351ed1e790b0ee SHA512 d90ea2b44e6f50d7a4d0957a8f5e4eb7b6da4e206ae9f6f8ccf22f1c5c07d3c41a1a45d6805a6fef361b1a35a78823d7ba9c592d891cbe7736d305405c8c0b14 WHIRLPOOL bd472da0991d724bb13d9cd028e69e57de97db2f7a6f948271f5b23849519d86e76603ccf2ddf09c8e932723c9a4e1fbd48736a8347a0bf933d59ca1d2a69156
 DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.12.1.tar.bz2 55678 SHA256 acac714a400dc6bdc8d7c0dd66b7f67f9f381db45f257e66d3f83b73fe59fb8a SHA512 e9fcf707f5cb27d321a155a2dd0bd43605b8d696a6f8888d61fc5986826fadc5fbd611fe529492e7a04d6df37c3e7be6daf416e583a313f2c24d8d89adc5351c WHIRLPOOL 1894e8d033748812e6847b913c44652e6d195e92838607486759c8459ce30b91c0146367c3ab2855af9de676e8ca7de54014b86b185e84e8062c1071aaf472fa
-DIST shorewall-lite-5.0.13.tar.bz2 56477 SHA256 4fda6beb10a6fc9c2af20166b99e4b9f8e787b818317c8de64ea08fa3e3ff40a SHA512 62586c9510b7d4923742978232a3f85e98c42c67d207f4716808d7d0aab476866c00299e43147e54615e1f8cf2eb3974fc0f326b98249370d71c2eeada8c95de WHIRLPOOL f8b48efacf89d22b8c75e929e670d6d3975b5f8447fa8204721380fb5dd7322368b688aba5cad4ce0232971dc37e42265a677c850b88cb010b017da3d1b78096
+DIST shorewall-lite-5.0.13.4.tar.bz2 57203 SHA256 cfcc95c4b4d7a2c0af7d37e193fac6d00d98544e41445dc092ed888671e45ac1 SHA512 cf711f6552337419b24b1f6156297eaafc636d293dd7f7c93dff64f3abaa41ba0e69e2eeba4fd9739bf0aafb785849245886648d6d53da85b8d9c1439f58960d WHIRLPOOL 26c69b913a52d97eb9b50bca407a0d9445953e212bff5509e0b50b5b06bf53651e81a89be79dc80800a7a586cc9945ee4fb15f3ab1ca4ca43f841c7927f73c3e
 DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.12.1.tar.bz2 230892 SHA256 b8da035e95b8cb642bb21a8b440f8c6fb6d3d8d7722d8d421e8d8f6d9414524d SHA512 5447afbec9cc9cb4b48ed38f8b9dce159530ce08b56d1158510c629a7f761bbe9f9fa3d4817b9ee2cde2aaef269cec5376e8baa67136a3d755f2e351422bd696 WHIRLPOOL 5f834c1283ea7b079d5b3b0566251b36d6e8bc68ad74b66c03e910f90110470fc1d49f3afec19354d2d917d0a487133f4024d744f0a2c52e935288edfb313ff8
-DIST shorewall6-5.0.13.tar.bz2 232243 SHA256 d1c85c2f448d8a988d76bb1478c684a8e5cf79522bfe78ea711d1113505c2833 SHA512 44e7aefad2d9839c69b4fabd0e0d98e93401d4bd99e4dfb11257ff86df5dacd13b4f6a76ac12822f1b94549b41d5c3b0b118b02c8d1bb057aa636088d7e8b4f9 WHIRLPOOL 534d97955b54270a736dd9b14ac26399227d0ae9959dd41086ed70633c1ee4207f0397ac1785254c79edda1b13f20a90d9a9b51d0366035357764ce89a8ba7e3
+DIST shorewall6-5.0.13.4.tar.bz2 233740 SHA256 f092a46d55cbfc72624b47b4ba60cba7b179b6c44e58b0ae220564293471aa1f SHA512 4b820948b5d46f2a02c58a7d4837ce32782d3486a52dfbd2d1c84102367ac72abee5f764236b6570d0c38fc293ce0411913cecfaa541bd85528f441b18b56783 WHIRLPOOL f91031414ae2ae1c46acdca86f7e2d659cf699c2b1d8e0ff393cba905fbe8b0ab494e2bc0f09bcd91267fe893d477019434ce2c6ec8ae758e13e768831e02f02
 DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.12.1.tar.bz2 55135 SHA256 f244c53ad55c67b3126ddc0ac896b7ca2fe95afd8f7a76046d9166a18afefd2f SHA512 9bb5f042d4552cf5ddb48488b413a5be70a57f8aa1035873f9d1ddf7496eba562e7bd6a4dfdcfc45aeaf32321227288235d3d3e14d50418ed77cdd164ea66e1d WHIRLPOOL 1917ea021bbbe83005ea56ebb013e9d67cf53fd17ada7566dbf879d7a440542307fc45c3e29c53c50eedda61bd5b67c3aed0c5530cf07382356f18d78d5824ac
-DIST shorewall6-lite-5.0.13.tar.bz2 55907 SHA256 7671bcac1561571774fc2df23abcf93f207a7e4c5ce0ac94481039c636ba8055 SHA512 ac5e18d776ec2f7292d1841b2a91ad56849fc47c81398493a434c2cf85783fc2d4ba141f427b935e1e7b7378ddc0d0fedd5ef53f441fd891d9efb0a1ad1b2757 WHIRLPOOL ffc20def37ae5c313af481eb588ad8fb6b266fc61c7d2473ceaec160a4de23eccecb77a5ac6c2b1091df679930bbeae29f40d89ae9ff85c98a58ce9db40cd111
+DIST shorewall6-lite-5.0.13.4.tar.bz2 56604 SHA256 89ed17364d4aa1f5db65adf7dac2d26cc78836e9b046c10b56e37a08a2bb3d4f SHA512 19d0d6be14f5ab781d42ca1c1e87806c50ae2a33fc5343b79c0c15b67cb1ee8c2bd8ae4137f4b08a9bbcf0dc25d953dc7be14c9257f66ebbb00e143356040042 WHIRLPOOL 67e37914332ca6a121468b002e2908a9db726af2bea9ffa0bf20270f03a0d5c9797886338dba68856f98ade65fe578272e7271efea9c456634d4e4ecc7fe62bb
 DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833

diff --git a/net-firewall/shorewall/shorewall-5.0.13.ebuild b/net-firewall/shorewall/shorewall-5.0.13.4.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.13.ebuild
rename to net-firewall/shorewall/shorewall-5.0.13.4.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-11-07 16:41 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-11-07 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6e6635b2df37ea16e736151230da53e2617fbbac
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  7 16:40:53 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 16:41:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e6635b2

net-firewall/shorewall: Bump to v5.0.14

Package-Manager: portage-2.3.2

 net-firewall/shorewall/Manifest                |   7 +
 net-firewall/shorewall/shorewall-5.0.14.ebuild | 452 +++++++++++++++++++++++++
 2 files changed, 459 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 6a1817f..7ba15ef 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
 DIST shorewall-5.0.13.4.tar.bz2 511274 SHA256 af85e73247655969588699e5b2f199b161adf19477ce13c3a97764a7aa1b6daa SHA512 b77ad3fbe285a6a8b988e3cdb8826b131dc6a7d94b136ba14d07d0173654144ea8bca162cda8cecb2e3249634194ba4f4eefda73be51c69f754c53b05d4ca95d WHIRLPOOL 95e00c92e02c5f9314331bc7a4ec675a565b978b265d222a5d45ef601732f281413324395a81d5f9647d773fab0b29219b7f86546e987c04791a7ce6250783ff
+DIST shorewall-5.0.14.tar.bz2 523293 SHA256 58555cbc61685f2db4402f821effd186f7d8c7e662a1a3171bc2b45111c4b81f SHA512 c96f55fa19687db9d7d9618c566ed9d85cfad9103e91ff49a2b9fcc2f17b1fd224ced1481c58e968397937eb24d0aac16c084491319f14feb884c5d3271a33c5 WHIRLPOOL 3e4f4e301c54417eaf4c97930d4df75c0e04b500f2cfb1466a29c95c8044c73645dd2f8d70929a8f9f89ef3cbaabc1992834e8c3c6d953450aeacaceec264027
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.13.4.tar.bz2 63124 SHA256 f8340cc9b0bd6aed85d3305887b565c8f93066316037d5962443ca1296d0643b SHA512 b4d3ab1fd99f9536e3ec22a6fcf6c1ca283a5d493cf5ae3ffdd15524bc9f1ab91329decb1faa2d334746a0bf9fc523fbbacb759cd48fbcff6fab6acb71dfb8ed WHIRLPOOL 81cbd0a5501806881e462796ab17a2964f30edd95a3b07e671ac1d9b2df7580e55839331817127beb5f5b487904147a8c83dcc72555136fe045086a7fd7e0b16
+DIST shorewall-core-5.0.14.tar.bz2 63632 SHA256 8be334a556adff955a642d0631f4de0c82323fa34850c7ccf74e8f375d926292 SHA512 914950615250743a3946781b019a50b886083728c62ed5c79aa2d1e48088b8b9bb4358c9042cef2fb21169996be2e22464d4ca5fe4f2a3020d85ad1852740953 WHIRLPOOL 3404bfeafab82c581afd91593aa75a5b7a2d27f83e8c71a3e8fc29cf2a00af2bc037f0ad67361efd903703f18b8a231fdeee27ac19bbdd92f65edeb77f5a3957
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.13.4.tar.bz2 4272429 SHA256 8ea9041bebccb4ceef13373236d297ed13a3a2c804f2409d5cdb8028fe97707b SHA512 fe2d11618ab95d49598d977e7148c8d0fdbc49810b42f7f6e20bc8f550f2c67927002262467248bf91825d447e6e9c6eab5b4f870a19dfb71e298bd1aa09828e WHIRLPOOL 23d758bf78e134e22a6fa93e4a0c8ed257548ac33dc4ba043e8cbec8678bdbaeff1da2639a34cb084eafae6870a8ada6f298e3dd0c99606c03ea47ccd7778320
+DIST shorewall-docs-html-5.0.14.tar.bz2 4290508 SHA256 28fdb0d0b50e9304b19a035b1bdd6b0231f54afeecde93d0ffff1409849db6cf SHA512 b2ea483c926f45b87164a7835634d534b074a05d8e2afc4cd83496b6d34d84c6032ed6f4c23e36df6073df3efd5b28a51c993f2fd411eac64a050ebb5cb6ff73 WHIRLPOOL 5fd436a5513811c8e690112207e74de78ea1b83ced9a3b9fa143474bceec893b4624e84ddcf265e5b353d042e6eaa1fcfa8475f624dc2562a0565b0674ca730a
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.13.4.tar.bz2 40765 SHA256 b03b6969a9d7f312eb5eef5b08ccca4fd875b1b604de43d1c3351ed1e790b0ee SHA512 d90ea2b44e6f50d7a4d0957a8f5e4eb7b6da4e206ae9f6f8ccf22f1c5c07d3c41a1a45d6805a6fef361b1a35a78823d7ba9c592d891cbe7736d305405c8c0b14 WHIRLPOOL bd472da0991d724bb13d9cd028e69e57de97db2f7a6f948271f5b23849519d86e76603ccf2ddf09c8e932723c9a4e1fbd48736a8347a0bf933d59ca1d2a69156
+DIST shorewall-init-5.0.14.tar.bz2 41536 SHA256 7d1e736cf7dda9eb476d4443104ba7fd9b902a9b1cf5a41b0fe10bc95d051dde SHA512 7bbf5d5cdd50cb766d506de96e63f77560cfb21b13c16bfebbf16b7a327939d16a90eb2041405725bd0bcc37d13bc1dde82cde321610fd9f22e171c0db639f7c WHIRLPOOL de211437729b23d7ccc8b1b8622ba7ad05ab45cd9a7eb0d11644fe9a086427554826bf08cb170a2cd1e5ae5af661210e99675de1fba283696d7a7cf9f21c9897
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.13.4.tar.bz2 57203 SHA256 cfcc95c4b4d7a2c0af7d37e193fac6d00d98544e41445dc092ed888671e45ac1 SHA512 cf711f6552337419b24b1f6156297eaafc636d293dd7f7c93dff64f3abaa41ba0e69e2eeba4fd9739bf0aafb785849245886648d6d53da85b8d9c1439f58960d WHIRLPOOL 26c69b913a52d97eb9b50bca407a0d9445953e212bff5509e0b50b5b06bf53651e81a89be79dc80800a7a586cc9945ee4fb15f3ab1ca4ca43f841c7927f73c3e
+DIST shorewall-lite-5.0.14.tar.bz2 57987 SHA256 08576c48f43e8eed145fbd9c810553c929316f9ad090d3f40cf8911437fb2fc1 SHA512 f545c7fb2b56940f42dd16b8b93c81a4e0dd183708f31fd99a647e83f4d493a0a246332f3421b261f33fe134369e511bc6a535df2e6da74655ee203926dd8e0b WHIRLPOOL 43abe36ad5bc1dcbe51ef50c173c8845ab7d24c91be66e4ae43831265b7d6dc655afc65cb90be9f82aae6d5783fa5e9133859ce7397b73abca81725d8c5e487b
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.13.4.tar.bz2 233740 SHA256 f092a46d55cbfc72624b47b4ba60cba7b179b6c44e58b0ae220564293471aa1f SHA512 4b820948b5d46f2a02c58a7d4837ce32782d3486a52dfbd2d1c84102367ac72abee5f764236b6570d0c38fc293ce0411913cecfaa541bd85528f441b18b56783 WHIRLPOOL f91031414ae2ae1c46acdca86f7e2d659cf699c2b1d8e0ff393cba905fbe8b0ab494e2bc0f09bcd91267fe893d477019434ce2c6ec8ae758e13e768831e02f02
+DIST shorewall6-5.0.14.tar.bz2 239638 SHA256 99ebb3151ad08adf151511cde34f0aaf72e6288c750f557581ca079dc150ae37 SHA512 b9ac7ba20131aa041be735eb9eed1c12f672524755bc05a3d3547101774da2a41d886804e21c7db23580f3327ba397e4452a3734563120f9936d567df1dd455e WHIRLPOOL 89aef2373f726da9636f380b2f46f7257e9e5d634cc0e78cd4770c6d32ff1b936971e5ec0a4c07887ac9e65a98a18e75bffb6f86cf4d5bd1a8c96b2242517e99
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.13.4.tar.bz2 56604 SHA256 89ed17364d4aa1f5db65adf7dac2d26cc78836e9b046c10b56e37a08a2bb3d4f SHA512 19d0d6be14f5ab781d42ca1c1e87806c50ae2a33fc5343b79c0c15b67cb1ee8c2bd8ae4137f4b08a9bbcf0dc25d953dc7be14c9257f66ebbb00e143356040042 WHIRLPOOL 67e37914332ca6a121468b002e2908a9db726af2bea9ffa0bf20270f03a0d5c9797886338dba68856f98ade65fe578272e7271efea9c456634d4e4ecc7fe62bb
+DIST shorewall6-lite-5.0.14.tar.bz2 57426 SHA256 35790cbb60d3d5b29e28da361ff25d3fcd8a1ba5b0e43e4c106c4788e7525603 SHA512 2c1b19443c3e495fc499f27b5e7612c3fcbb60ee59154c6845380eaf6f454a4f11947dc8e85505e50ae7e63ed200b547b37c3dc8076fcfd496ff497f9695257f WHIRLPOOL e097cd0504e3e30df81fe9561ca2ab19b01c4ff7d0d508ccdcf85fe2974c422835d92c2251216a23b71bd040210fe71694d932275ce89521ecc74d0561a9238f

diff --git a/net-firewall/shorewall/shorewall-5.0.14.ebuild b/net-firewall/shorewall/shorewall-5.0.14.ebuild
new file mode 100644
index 00000000..54d3b67
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.14.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-11-10  0:08 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-11-10  0:08 UTC (permalink / raw
  To: gentoo-commits

commit:     ab065529877b27de801da6c571c4504594644f0b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 00:08:04 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 00:08:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab065529

net-firewall/shorewall: Bumped to v5.0.14.1

Package-Manager: portage-2.3.2

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.0.14.ebuild => shorewall-5.0.14.1.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 7ba15ef..50a7448 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,21 @@
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
 DIST shorewall-5.0.13.4.tar.bz2 511274 SHA256 af85e73247655969588699e5b2f199b161adf19477ce13c3a97764a7aa1b6daa SHA512 b77ad3fbe285a6a8b988e3cdb8826b131dc6a7d94b136ba14d07d0173654144ea8bca162cda8cecb2e3249634194ba4f4eefda73be51c69f754c53b05d4ca95d WHIRLPOOL 95e00c92e02c5f9314331bc7a4ec675a565b978b265d222a5d45ef601732f281413324395a81d5f9647d773fab0b29219b7f86546e987c04791a7ce6250783ff
-DIST shorewall-5.0.14.tar.bz2 523293 SHA256 58555cbc61685f2db4402f821effd186f7d8c7e662a1a3171bc2b45111c4b81f SHA512 c96f55fa19687db9d7d9618c566ed9d85cfad9103e91ff49a2b9fcc2f17b1fd224ced1481c58e968397937eb24d0aac16c084491319f14feb884c5d3271a33c5 WHIRLPOOL 3e4f4e301c54417eaf4c97930d4df75c0e04b500f2cfb1466a29c95c8044c73645dd2f8d70929a8f9f89ef3cbaabc1992834e8c3c6d953450aeacaceec264027
+DIST shorewall-5.0.14.1.tar.bz2 523476 SHA256 cb4b303d42dd99c3ab28acaf99446aff5f9273b8393dc8e9b6123f3dd427afd1 SHA512 709f784aaf9a558024ca31fa4e2fef29aa012b3fd074dccd97854f02dad512e05c29b184ec0ea733d21c81f6a078d7b2c77671744e7fb5f21dc34198135cfd50 WHIRLPOOL 1a55fb6a1a490a0a28c2175119ebe41555390dd5e702a3e599591248d3dae316830eec5e9e213eacc5120f1102ab5bcdfa6b1259df33370a4af960234e00dd5d
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.13.4.tar.bz2 63124 SHA256 f8340cc9b0bd6aed85d3305887b565c8f93066316037d5962443ca1296d0643b SHA512 b4d3ab1fd99f9536e3ec22a6fcf6c1ca283a5d493cf5ae3ffdd15524bc9f1ab91329decb1faa2d334746a0bf9fc523fbbacb759cd48fbcff6fab6acb71dfb8ed WHIRLPOOL 81cbd0a5501806881e462796ab17a2964f30edd95a3b07e671ac1d9b2df7580e55839331817127beb5f5b487904147a8c83dcc72555136fe045086a7fd7e0b16
-DIST shorewall-core-5.0.14.tar.bz2 63632 SHA256 8be334a556adff955a642d0631f4de0c82323fa34850c7ccf74e8f375d926292 SHA512 914950615250743a3946781b019a50b886083728c62ed5c79aa2d1e48088b8b9bb4358c9042cef2fb21169996be2e22464d4ca5fe4f2a3020d85ad1852740953 WHIRLPOOL 3404bfeafab82c581afd91593aa75a5b7a2d27f83e8c71a3e8fc29cf2a00af2bc037f0ad67361efd903703f18b8a231fdeee27ac19bbdd92f65edeb77f5a3957
+DIST shorewall-core-5.0.14.1.tar.bz2 63788 SHA256 a856a07ab61734db3c259962edefa3a891106430b5efc20a41d55b15431de9bd SHA512 de8d841a93d2b1d1d1a9024634c63a0c2e7ba9e02566afc2782aedeb2391cbca3ec11d2260a7a42b8e21f22d3f2400554a2cc59584ba0e19d4a5c40867690fc6 WHIRLPOOL 6fa03914a227f9f829d69ba30c919d56414311ee26c7283c4b83b869a4c41bee2b4394d7bf79735f5d4a10c175fb3e75ed71031cbc490ccb1c0982c86d2765c5
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.13.4.tar.bz2 4272429 SHA256 8ea9041bebccb4ceef13373236d297ed13a3a2c804f2409d5cdb8028fe97707b SHA512 fe2d11618ab95d49598d977e7148c8d0fdbc49810b42f7f6e20bc8f550f2c67927002262467248bf91825d447e6e9c6eab5b4f870a19dfb71e298bd1aa09828e WHIRLPOOL 23d758bf78e134e22a6fa93e4a0c8ed257548ac33dc4ba043e8cbec8678bdbaeff1da2639a34cb084eafae6870a8ada6f298e3dd0c99606c03ea47ccd7778320
-DIST shorewall-docs-html-5.0.14.tar.bz2 4290508 SHA256 28fdb0d0b50e9304b19a035b1bdd6b0231f54afeecde93d0ffff1409849db6cf SHA512 b2ea483c926f45b87164a7835634d534b074a05d8e2afc4cd83496b6d34d84c6032ed6f4c23e36df6073df3efd5b28a51c993f2fd411eac64a050ebb5cb6ff73 WHIRLPOOL 5fd436a5513811c8e690112207e74de78ea1b83ced9a3b9fa143474bceec893b4624e84ddcf265e5b353d042e6eaa1fcfa8475f624dc2562a0565b0674ca730a
+DIST shorewall-docs-html-5.0.14.1.tar.bz2 4290473 SHA256 3ac58a4a178be09bf63a95409c38f8ba560c20968330c39e19be496d173724a8 SHA512 5bc6fadebca8510845a135021a1aad7f2cbb69e64b2159ef46b752971fb76d4b541f63af5dc42546cb304431235e0de6bd4be6ebccf0a616c557d48cfc01c80d WHIRLPOOL a13690b613acd23cc1b7f0951ba7ae25b4235fef82e1a05fcb828d028665b5f002bcd60971ab4b9e908341d6b62ed5ebc8ce8dc157018777e360f04001071544
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.13.4.tar.bz2 40765 SHA256 b03b6969a9d7f312eb5eef5b08ccca4fd875b1b604de43d1c3351ed1e790b0ee SHA512 d90ea2b44e6f50d7a4d0957a8f5e4eb7b6da4e206ae9f6f8ccf22f1c5c07d3c41a1a45d6805a6fef361b1a35a78823d7ba9c592d891cbe7736d305405c8c0b14 WHIRLPOOL bd472da0991d724bb13d9cd028e69e57de97db2f7a6f948271f5b23849519d86e76603ccf2ddf09c8e932723c9a4e1fbd48736a8347a0bf933d59ca1d2a69156
-DIST shorewall-init-5.0.14.tar.bz2 41536 SHA256 7d1e736cf7dda9eb476d4443104ba7fd9b902a9b1cf5a41b0fe10bc95d051dde SHA512 7bbf5d5cdd50cb766d506de96e63f77560cfb21b13c16bfebbf16b7a327939d16a90eb2041405725bd0bcc37d13bc1dde82cde321610fd9f22e171c0db639f7c WHIRLPOOL de211437729b23d7ccc8b1b8622ba7ad05ab45cd9a7eb0d11644fe9a086427554826bf08cb170a2cd1e5ae5af661210e99675de1fba283696d7a7cf9f21c9897
+DIST shorewall-init-5.0.14.1.tar.bz2 41707 SHA256 3d535888f17c1b1e35830c8bb1692caddec9693327c1fed6d45e0f6b48045680 SHA512 901d8db51bdcee49fa557ebd962ed249b92588d1e0fad8ebd1d3f05fe2dfb835ead252300a8ac1ae67a436e004a8a583f356a636a622f9bd7429655ac48ad129 WHIRLPOOL 626e1c4d654188dd3dffb506f0e38a4e785c4ee1c7ac9c4db866e488758b5dc20d341a133b199d7880c16c04db346b4f582b30742ab633be2734fc2870cdf676
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.13.4.tar.bz2 57203 SHA256 cfcc95c4b4d7a2c0af7d37e193fac6d00d98544e41445dc092ed888671e45ac1 SHA512 cf711f6552337419b24b1f6156297eaafc636d293dd7f7c93dff64f3abaa41ba0e69e2eeba4fd9739bf0aafb785849245886648d6d53da85b8d9c1439f58960d WHIRLPOOL 26c69b913a52d97eb9b50bca407a0d9445953e212bff5509e0b50b5b06bf53651e81a89be79dc80800a7a586cc9945ee4fb15f3ab1ca4ca43f841c7927f73c3e
-DIST shorewall-lite-5.0.14.tar.bz2 57987 SHA256 08576c48f43e8eed145fbd9c810553c929316f9ad090d3f40cf8911437fb2fc1 SHA512 f545c7fb2b56940f42dd16b8b93c81a4e0dd183708f31fd99a647e83f4d493a0a246332f3421b261f33fe134369e511bc6a535df2e6da74655ee203926dd8e0b WHIRLPOOL 43abe36ad5bc1dcbe51ef50c173c8845ab7d24c91be66e4ae43831265b7d6dc655afc65cb90be9f82aae6d5783fa5e9133859ce7397b73abca81725d8c5e487b
+DIST shorewall-lite-5.0.14.1.tar.bz2 58098 SHA256 0feb7d71e62b28af5942f5ffd1f67857277efc31bbad8cd47ff3de082d19b8c4 SHA512 ffd4472e531a75055e04ef53bc9a5e1219ad5e7cfe3502bb1beef190ed64746c825c7cf6234149fe102947135cd987f8760dbc2ceb9c92b811dc8bf2f6369bc9 WHIRLPOOL c0401cb350c3ef40172c95db9d7fbd3388c10eb07e742317559b673dd3a03bcb2ce0207f1500b1efda2afb7a97ac063fe2075ecba9bc95aea051908aa5ed1225
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.13.4.tar.bz2 233740 SHA256 f092a46d55cbfc72624b47b4ba60cba7b179b6c44e58b0ae220564293471aa1f SHA512 4b820948b5d46f2a02c58a7d4837ce32782d3486a52dfbd2d1c84102367ac72abee5f764236b6570d0c38fc293ce0411913cecfaa541bd85528f441b18b56783 WHIRLPOOL f91031414ae2ae1c46acdca86f7e2d659cf699c2b1d8e0ff393cba905fbe8b0ab494e2bc0f09bcd91267fe893d477019434ce2c6ec8ae758e13e768831e02f02
-DIST shorewall6-5.0.14.tar.bz2 239638 SHA256 99ebb3151ad08adf151511cde34f0aaf72e6288c750f557581ca079dc150ae37 SHA512 b9ac7ba20131aa041be735eb9eed1c12f672524755bc05a3d3547101774da2a41d886804e21c7db23580f3327ba397e4452a3734563120f9936d567df1dd455e WHIRLPOOL 89aef2373f726da9636f380b2f46f7257e9e5d634cc0e78cd4770c6d32ff1b936971e5ec0a4c07887ac9e65a98a18e75bffb6f86cf4d5bd1a8c96b2242517e99
+DIST shorewall6-5.0.14.1.tar.bz2 239885 SHA256 cca8a1aa064882c6a921a46d16c2d124fb165dddbeaf43f68adc644a961af53d SHA512 341350cbdde4bafd38e53f91bccea905dd1d3f6fb19bf8561a0b3cd61352e8aa084da9944a77d54201313bc2a552a4a21ae09eda57cacedf82e7d511230f5de1 WHIRLPOOL cc8a5dcda1ffb32351d15fd7a1bb7aa25a664618893bbaff6a9bcad91c0c3a64bf5a70b829a3b0cbed0f513a19036b255fab673d48c14df785d03473eaf5ba79
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.13.4.tar.bz2 56604 SHA256 89ed17364d4aa1f5db65adf7dac2d26cc78836e9b046c10b56e37a08a2bb3d4f SHA512 19d0d6be14f5ab781d42ca1c1e87806c50ae2a33fc5343b79c0c15b67cb1ee8c2bd8ae4137f4b08a9bbcf0dc25d953dc7be14c9257f66ebbb00e143356040042 WHIRLPOOL 67e37914332ca6a121468b002e2908a9db726af2bea9ffa0bf20270f03a0d5c9797886338dba68856f98ade65fe578272e7271efea9c456634d4e4ecc7fe62bb
-DIST shorewall6-lite-5.0.14.tar.bz2 57426 SHA256 35790cbb60d3d5b29e28da361ff25d3fcd8a1ba5b0e43e4c106c4788e7525603 SHA512 2c1b19443c3e495fc499f27b5e7612c3fcbb60ee59154c6845380eaf6f454a4f11947dc8e85505e50ae7e63ed200b547b37c3dc8076fcfd496ff497f9695257f WHIRLPOOL e097cd0504e3e30df81fe9561ca2ab19b01c4ff7d0d508ccdcf85fe2974c422835d92c2251216a23b71bd040210fe71694d932275ce89521ecc74d0561a9238f
+DIST shorewall6-lite-5.0.14.1.tar.bz2 57544 SHA256 89c90b063dfc52b5d7b55e3abb02966f3abd43613be5006dfe692d2a8f4195b4 SHA512 95dbf1ffd84e90576d122c43531d78b0b501165cae7aaa9c60cec01521c2a1f39f69220b4dcd0731574250169af1a9bd5e6fb08a068bcd11ffa51be5cff95d25 WHIRLPOOL dcfbc49dcf46db152665a9b86d479c2b3505d5ebf91f5cdb1d862a00a86003ea6e290b1df5c16747f9fcb4b2ace7d2c7d47f68faa4a8e83f46f0c1eef643114f

diff --git a/net-firewall/shorewall/shorewall-5.0.14.ebuild b/net-firewall/shorewall/shorewall-5.0.14.1.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.0.14.ebuild
rename to net-firewall/shorewall/shorewall-5.0.14.1.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-12-20 14:19 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-12-20 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     9c4e10b857ec2410fcea99c61558424dda3a05ad
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 14:15:41 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 14:18:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4e10b8

net-firewall/shorewall: Drop old.

Package-Manager: Portage-2.3.2, Repoman-2.3.1

 net-firewall/shorewall/Manifest                  |   7 -
 net-firewall/shorewall/shorewall-5.0.13.4.ebuild | 452 -----------------------
 2 files changed, 459 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 50a7448..807ee4a 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,14 @@
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
-DIST shorewall-5.0.13.4.tar.bz2 511274 SHA256 af85e73247655969588699e5b2f199b161adf19477ce13c3a97764a7aa1b6daa SHA512 b77ad3fbe285a6a8b988e3cdb8826b131dc6a7d94b136ba14d07d0173654144ea8bca162cda8cecb2e3249634194ba4f4eefda73be51c69f754c53b05d4ca95d WHIRLPOOL 95e00c92e02c5f9314331bc7a4ec675a565b978b265d222a5d45ef601732f281413324395a81d5f9647d773fab0b29219b7f86546e987c04791a7ce6250783ff
 DIST shorewall-5.0.14.1.tar.bz2 523476 SHA256 cb4b303d42dd99c3ab28acaf99446aff5f9273b8393dc8e9b6123f3dd427afd1 SHA512 709f784aaf9a558024ca31fa4e2fef29aa012b3fd074dccd97854f02dad512e05c29b184ec0ea733d21c81f6a078d7b2c77671744e7fb5f21dc34198135cfd50 WHIRLPOOL 1a55fb6a1a490a0a28c2175119ebe41555390dd5e702a3e599591248d3dae316830eec5e9e213eacc5120f1102ab5bcdfa6b1259df33370a4af960234e00dd5d
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
-DIST shorewall-core-5.0.13.4.tar.bz2 63124 SHA256 f8340cc9b0bd6aed85d3305887b565c8f93066316037d5962443ca1296d0643b SHA512 b4d3ab1fd99f9536e3ec22a6fcf6c1ca283a5d493cf5ae3ffdd15524bc9f1ab91329decb1faa2d334746a0bf9fc523fbbacb759cd48fbcff6fab6acb71dfb8ed WHIRLPOOL 81cbd0a5501806881e462796ab17a2964f30edd95a3b07e671ac1d9b2df7580e55839331817127beb5f5b487904147a8c83dcc72555136fe045086a7fd7e0b16
 DIST shorewall-core-5.0.14.1.tar.bz2 63788 SHA256 a856a07ab61734db3c259962edefa3a891106430b5efc20a41d55b15431de9bd SHA512 de8d841a93d2b1d1d1a9024634c63a0c2e7ba9e02566afc2782aedeb2391cbca3ec11d2260a7a42b8e21f22d3f2400554a2cc59584ba0e19d4a5c40867690fc6 WHIRLPOOL 6fa03914a227f9f829d69ba30c919d56414311ee26c7283c4b83b869a4c41bee2b4394d7bf79735f5d4a10c175fb3e75ed71031cbc490ccb1c0982c86d2765c5
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
-DIST shorewall-docs-html-5.0.13.4.tar.bz2 4272429 SHA256 8ea9041bebccb4ceef13373236d297ed13a3a2c804f2409d5cdb8028fe97707b SHA512 fe2d11618ab95d49598d977e7148c8d0fdbc49810b42f7f6e20bc8f550f2c67927002262467248bf91825d447e6e9c6eab5b4f870a19dfb71e298bd1aa09828e WHIRLPOOL 23d758bf78e134e22a6fa93e4a0c8ed257548ac33dc4ba043e8cbec8678bdbaeff1da2639a34cb084eafae6870a8ada6f298e3dd0c99606c03ea47ccd7778320
 DIST shorewall-docs-html-5.0.14.1.tar.bz2 4290473 SHA256 3ac58a4a178be09bf63a95409c38f8ba560c20968330c39e19be496d173724a8 SHA512 5bc6fadebca8510845a135021a1aad7f2cbb69e64b2159ef46b752971fb76d4b541f63af5dc42546cb304431235e0de6bd4be6ebccf0a616c557d48cfc01c80d WHIRLPOOL a13690b613acd23cc1b7f0951ba7ae25b4235fef82e1a05fcb828d028665b5f002bcd60971ab4b9e908341d6b62ed5ebc8ce8dc157018777e360f04001071544
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
-DIST shorewall-init-5.0.13.4.tar.bz2 40765 SHA256 b03b6969a9d7f312eb5eef5b08ccca4fd875b1b604de43d1c3351ed1e790b0ee SHA512 d90ea2b44e6f50d7a4d0957a8f5e4eb7b6da4e206ae9f6f8ccf22f1c5c07d3c41a1a45d6805a6fef361b1a35a78823d7ba9c592d891cbe7736d305405c8c0b14 WHIRLPOOL bd472da0991d724bb13d9cd028e69e57de97db2f7a6f948271f5b23849519d86e76603ccf2ddf09c8e932723c9a4e1fbd48736a8347a0bf933d59ca1d2a69156
 DIST shorewall-init-5.0.14.1.tar.bz2 41707 SHA256 3d535888f17c1b1e35830c8bb1692caddec9693327c1fed6d45e0f6b48045680 SHA512 901d8db51bdcee49fa557ebd962ed249b92588d1e0fad8ebd1d3f05fe2dfb835ead252300a8ac1ae67a436e004a8a583f356a636a622f9bd7429655ac48ad129 WHIRLPOOL 626e1c4d654188dd3dffb506f0e38a4e785c4ee1c7ac9c4db866e488758b5dc20d341a133b199d7880c16c04db346b4f582b30742ab633be2734fc2870cdf676
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
-DIST shorewall-lite-5.0.13.4.tar.bz2 57203 SHA256 cfcc95c4b4d7a2c0af7d37e193fac6d00d98544e41445dc092ed888671e45ac1 SHA512 cf711f6552337419b24b1f6156297eaafc636d293dd7f7c93dff64f3abaa41ba0e69e2eeba4fd9739bf0aafb785849245886648d6d53da85b8d9c1439f58960d WHIRLPOOL 26c69b913a52d97eb9b50bca407a0d9445953e212bff5509e0b50b5b06bf53651e81a89be79dc80800a7a586cc9945ee4fb15f3ab1ca4ca43f841c7927f73c3e
 DIST shorewall-lite-5.0.14.1.tar.bz2 58098 SHA256 0feb7d71e62b28af5942f5ffd1f67857277efc31bbad8cd47ff3de082d19b8c4 SHA512 ffd4472e531a75055e04ef53bc9a5e1219ad5e7cfe3502bb1beef190ed64746c825c7cf6234149fe102947135cd987f8760dbc2ceb9c92b811dc8bf2f6369bc9 WHIRLPOOL c0401cb350c3ef40172c95db9d7fbd3388c10eb07e742317559b673dd3a03bcb2ce0207f1500b1efda2afb7a97ac063fe2075ecba9bc95aea051908aa5ed1225
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
-DIST shorewall6-5.0.13.4.tar.bz2 233740 SHA256 f092a46d55cbfc72624b47b4ba60cba7b179b6c44e58b0ae220564293471aa1f SHA512 4b820948b5d46f2a02c58a7d4837ce32782d3486a52dfbd2d1c84102367ac72abee5f764236b6570d0c38fc293ce0411913cecfaa541bd85528f441b18b56783 WHIRLPOOL f91031414ae2ae1c46acdca86f7e2d659cf699c2b1d8e0ff393cba905fbe8b0ab494e2bc0f09bcd91267fe893d477019434ce2c6ec8ae758e13e768831e02f02
 DIST shorewall6-5.0.14.1.tar.bz2 239885 SHA256 cca8a1aa064882c6a921a46d16c2d124fb165dddbeaf43f68adc644a961af53d SHA512 341350cbdde4bafd38e53f91bccea905dd1d3f6fb19bf8561a0b3cd61352e8aa084da9944a77d54201313bc2a552a4a21ae09eda57cacedf82e7d511230f5de1 WHIRLPOOL cc8a5dcda1ffb32351d15fd7a1bb7aa25a664618893bbaff6a9bcad91c0c3a64bf5a70b829a3b0cbed0f513a19036b255fab673d48c14df785d03473eaf5ba79
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
-DIST shorewall6-lite-5.0.13.4.tar.bz2 56604 SHA256 89ed17364d4aa1f5db65adf7dac2d26cc78836e9b046c10b56e37a08a2bb3d4f SHA512 19d0d6be14f5ab781d42ca1c1e87806c50ae2a33fc5343b79c0c15b67cb1ee8c2bd8ae4137f4b08a9bbcf0dc25d953dc7be14c9257f66ebbb00e143356040042 WHIRLPOOL 67e37914332ca6a121468b002e2908a9db726af2bea9ffa0bf20270f03a0d5c9797886338dba68856f98ade65fe578272e7271efea9c456634d4e4ecc7fe62bb
 DIST shorewall6-lite-5.0.14.1.tar.bz2 57544 SHA256 89c90b063dfc52b5d7b55e3abb02966f3abd43613be5006dfe692d2a8f4195b4 SHA512 95dbf1ffd84e90576d122c43531d78b0b501165cae7aaa9c60cec01521c2a1f39f69220b4dcd0731574250169af1a9bd5e6fb08a068bcd11ffa51be5cff95d25 WHIRLPOOL dcfbc49dcf46db152665a9b86d479c2b3505d5ebf91f5cdb1d862a00a86003ea6e290b1df5c16747f9fcb4b2ace7d2c7d47f68faa4a8e83f46f0c1eef643114f

diff --git a/net-firewall/shorewall/shorewall-5.0.13.4.ebuild b/net-firewall/shorewall/shorewall-5.0.13.4.ebuild
deleted file mode 100644
index 54d3b67..00000000
--- a/net-firewall/shorewall/shorewall-5.0.13.4.ebuild
+++ /dev/null
@@ -1,452 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-12-20 14:19 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-12-20 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a0ad7dc0cec9195f4cbbb1c5b3f3b0a4115a96ad
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 14:18:22 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 14:18:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ad7dc0

net-firewall/shorewall: Bump to v5.0.15.1

Package-Manager: Portage-2.3.2, Repoman-2.3.1

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.0.15.1.ebuild | 452 +++++++++++++++++++++++
 2 files changed, 459 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 807ee4a..2a1a64e 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
 DIST shorewall-5.0.14.1.tar.bz2 523476 SHA256 cb4b303d42dd99c3ab28acaf99446aff5f9273b8393dc8e9b6123f3dd427afd1 SHA512 709f784aaf9a558024ca31fa4e2fef29aa012b3fd074dccd97854f02dad512e05c29b184ec0ea733d21c81f6a078d7b2c77671744e7fb5f21dc34198135cfd50 WHIRLPOOL 1a55fb6a1a490a0a28c2175119ebe41555390dd5e702a3e599591248d3dae316830eec5e9e213eacc5120f1102ab5bcdfa6b1259df33370a4af960234e00dd5d
+DIST shorewall-5.0.15.1.tar.bz2 525204 SHA256 e430743712563935955f4b76949ea4e4688ca108292fb02ba67cb3f78c500364 SHA512 db36a85517c977c38ec6a96ad695945e570462503c94836f2046735609102092b286ae5a9329fead96778dd67d1f400c96ae042d69c3ee1670784a7a0350a96b WHIRLPOOL ba5e1b67c4893b4f59fa2b88953d1f172b412097cc42d5335b894bb245c1aeb5b4fb2d7bdb04fbda35214795cd5312d191ff50727352368553e363abf2a5ab33
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.14.1.tar.bz2 63788 SHA256 a856a07ab61734db3c259962edefa3a891106430b5efc20a41d55b15431de9bd SHA512 de8d841a93d2b1d1d1a9024634c63a0c2e7ba9e02566afc2782aedeb2391cbca3ec11d2260a7a42b8e21f22d3f2400554a2cc59584ba0e19d4a5c40867690fc6 WHIRLPOOL 6fa03914a227f9f829d69ba30c919d56414311ee26c7283c4b83b869a4c41bee2b4394d7bf79735f5d4a10c175fb3e75ed71031cbc490ccb1c0982c86d2765c5
+DIST shorewall-core-5.0.15.1.tar.bz2 64407 SHA256 9b64f9260f7a9c56421da0f1cc40db4cc751f3d4b87c8f8c2168f5c3e961e4cb SHA512 dea47e41d5545500406bce7d5adf62834e713b8533c9f1bb3e0a932ba19fc43d01b429ee1dcbb53168de8d80a4c16be83935508c32aed8f39f74d4115c5393a4 WHIRLPOOL 40be1658a33bbfa9f9fd7aa6d7c7a5c703af7999d81dab7aaab705ef89834c61004f4fd38139d1607d3709a3fb25014ee3f3c33123d2de63b89e23ab2bf3ba98
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.14.1.tar.bz2 4290473 SHA256 3ac58a4a178be09bf63a95409c38f8ba560c20968330c39e19be496d173724a8 SHA512 5bc6fadebca8510845a135021a1aad7f2cbb69e64b2159ef46b752971fb76d4b541f63af5dc42546cb304431235e0de6bd4be6ebccf0a616c557d48cfc01c80d WHIRLPOOL a13690b613acd23cc1b7f0951ba7ae25b4235fef82e1a05fcb828d028665b5f002bcd60971ab4b9e908341d6b62ed5ebc8ce8dc157018777e360f04001071544
+DIST shorewall-docs-html-5.0.15.1.tar.bz2 4290901 SHA256 47b1e594f14b9f022671e5fb4b4def31513f1d250a2cd99e16713fdcd399bde6 SHA512 78d0541ac3ed705c4c6fb954601b7dc929c681601d17301af44f2b3535239b5c3bd64fe1586ef0ff435a05cc4b3672d393028b48809c9d550f6329bab33470b2 WHIRLPOOL 2580b3ff97067465b0c4d13475384d424df21e45cc083ebd800228644a24ac74a6de3e94bb3311305668a957f7ae5bc4e31803a8de8b52a14ef35922ace68947
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.14.1.tar.bz2 41707 SHA256 3d535888f17c1b1e35830c8bb1692caddec9693327c1fed6d45e0f6b48045680 SHA512 901d8db51bdcee49fa557ebd962ed249b92588d1e0fad8ebd1d3f05fe2dfb835ead252300a8ac1ae67a436e004a8a583f356a636a622f9bd7429655ac48ad129 WHIRLPOOL 626e1c4d654188dd3dffb506f0e38a4e785c4ee1c7ac9c4db866e488758b5dc20d341a133b199d7880c16c04db346b4f582b30742ab633be2734fc2870cdf676
+DIST shorewall-init-5.0.15.1.tar.bz2 42337 SHA256 23638b2fb942b8b48bf158b557d9245803523236aa77e55c890c6cf958070556 SHA512 961beebbee3828b7ef72ecf0d95d160f20a8c6811623bd00a9c296fd24f0b73dca338904c4c10bbd72bd2c9deb5f6ebc02fc7c5505454b92e268cb8deb917164 WHIRLPOOL 4c0c2ba60858cff16ef23c161bf30f1a855a183f8e5254df603a3b0ea9d55aa67d3e7fe2e9a83c4ac013364209cfef5e53a92a66b0d6a6f7fbf064285eba5eec
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.14.1.tar.bz2 58098 SHA256 0feb7d71e62b28af5942f5ffd1f67857277efc31bbad8cd47ff3de082d19b8c4 SHA512 ffd4472e531a75055e04ef53bc9a5e1219ad5e7cfe3502bb1beef190ed64746c825c7cf6234149fe102947135cd987f8760dbc2ceb9c92b811dc8bf2f6369bc9 WHIRLPOOL c0401cb350c3ef40172c95db9d7fbd3388c10eb07e742317559b673dd3a03bcb2ce0207f1500b1efda2afb7a97ac063fe2075ecba9bc95aea051908aa5ed1225
+DIST shorewall-lite-5.0.15.1.tar.bz2 58722 SHA256 fa1d4d6d54397fb43e3f1d3422eaca1b793490bab6a6976c320ae4ad2804fe66 SHA512 bc19d5e35841e179e595513a810a76c1774f4c67f4029b83bb05af6775694d4c7229647b597951c4bb87c7481aeb8e4577c61f1a910429e8a84ea0f1312635ec WHIRLPOOL ddb014563a346abb5239b7fa53255eac80a87aaf522bba1be3b5cfa5dae3717f0a4596cef97b8848f9ba279893f0e24c71af0422529a2ca11c3ad462526ea5cf
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.14.1.tar.bz2 239885 SHA256 cca8a1aa064882c6a921a46d16c2d124fb165dddbeaf43f68adc644a961af53d SHA512 341350cbdde4bafd38e53f91bccea905dd1d3f6fb19bf8561a0b3cd61352e8aa084da9944a77d54201313bc2a552a4a21ae09eda57cacedf82e7d511230f5de1 WHIRLPOOL cc8a5dcda1ffb32351d15fd7a1bb7aa25a664618893bbaff6a9bcad91c0c3a64bf5a70b829a3b0cbed0f513a19036b255fab673d48c14df785d03473eaf5ba79
+DIST shorewall6-5.0.15.1.tar.bz2 240733 SHA256 384909552423acfd3a6f804fca3be4d49e5ec20114ae69d0d2678155133a7d43 SHA512 8cf63f49ea7acfb5c74c456c8dda476e9eec6b1c6144a32331b7b71f376d8c40460372cf25ce4894ca1d5f276007c5004acfda2519aabd3b9f91c8c70d285dfe WHIRLPOOL 37910bf6264287fa54ab4b8ee9f921060c4716859cfaaecd7fe7e572bf12ae42d592f9d8f81d22508a5d1cf9fc96dfa520fc28800f21bed2d805923c1dd62f03
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.14.1.tar.bz2 57544 SHA256 89c90b063dfc52b5d7b55e3abb02966f3abd43613be5006dfe692d2a8f4195b4 SHA512 95dbf1ffd84e90576d122c43531d78b0b501165cae7aaa9c60cec01521c2a1f39f69220b4dcd0731574250169af1a9bd5e6fb08a068bcd11ffa51be5cff95d25 WHIRLPOOL dcfbc49dcf46db152665a9b86d479c2b3505d5ebf91f5cdb1d862a00a86003ea6e290b1df5c16747f9fcb4b2ace7d2c7d47f68faa4a8e83f46f0c1eef643114f
+DIST shorewall6-lite-5.0.15.1.tar.bz2 58141 SHA256 71ee147dd1190745b79bcbbd4f42b90deb704628fc15c8cdf7badbfd7dd49bd7 SHA512 a3da765cb45b82fb435fcd9d833371692b49f1c5f00d1c30a0b979c0186a0b8965633900590ae0370de7e93b710ed605d5293a6316d6a738c22f5432e37ecfbd WHIRLPOOL e0645316ab9257495ad616735eeb116b80386cfeb99fb53b566b4888b0a8c8403aacffb7ff86dc9380ed43b3954f83110fe91a3516958daa975cddc086f69741

diff --git a/net-firewall/shorewall/shorewall-5.0.15.1.ebuild b/net-firewall/shorewall/shorewall-5.0.15.1.ebuild
new file mode 100644
index 00000000..54d3b67
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.15.1.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2016-12-27 23:37 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2016-12-27 23:37 UTC (permalink / raw
  To: gentoo-commits

commit:     ccae46010c4fb12a00a07c550ed21d847a48b3b0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 23:35:10 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 23:37:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccae4601

net-firewall/shorewall: Bump to v5.0.15.2

Package-Manager: Portage-2.3.2, Repoman-2.3.1

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.0.15.2.ebuild | 452 +++++++++++++++++++++++
 2 files changed, 459 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 2a1a64e..11e2c50 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
 DIST shorewall-5.0.14.1.tar.bz2 523476 SHA256 cb4b303d42dd99c3ab28acaf99446aff5f9273b8393dc8e9b6123f3dd427afd1 SHA512 709f784aaf9a558024ca31fa4e2fef29aa012b3fd074dccd97854f02dad512e05c29b184ec0ea733d21c81f6a078d7b2c77671744e7fb5f21dc34198135cfd50 WHIRLPOOL 1a55fb6a1a490a0a28c2175119ebe41555390dd5e702a3e599591248d3dae316830eec5e9e213eacc5120f1102ab5bcdfa6b1259df33370a4af960234e00dd5d
 DIST shorewall-5.0.15.1.tar.bz2 525204 SHA256 e430743712563935955f4b76949ea4e4688ca108292fb02ba67cb3f78c500364 SHA512 db36a85517c977c38ec6a96ad695945e570462503c94836f2046735609102092b286ae5a9329fead96778dd67d1f400c96ae042d69c3ee1670784a7a0350a96b WHIRLPOOL ba5e1b67c4893b4f59fa2b88953d1f172b412097cc42d5335b894bb245c1aeb5b4fb2d7bdb04fbda35214795cd5312d191ff50727352368553e363abf2a5ab33
+DIST shorewall-5.0.15.2.tar.bz2 525530 SHA256 303e2c05d078c5d76f994bc175558a7dc407d5ce55fe5a68ff39b9254069fcf8 SHA512 b43f0aef59407182a24e55f22b7e62446a6fbc94beae9a553d9dd6482cd092d8c6f89987f10ada768ea9d6185d8e3fd6dadf0e4c897d02f08689a4f4a4dd2a4c WHIRLPOOL 36b9de6cb8725d8873191bf0e9bdf605696442f4e077bb1e520a061007ea23952b3bab1a95ee2e4d030c5f01886b373c331e0ad5a40b1844045da3f86c1bdf43
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.14.1.tar.bz2 63788 SHA256 a856a07ab61734db3c259962edefa3a891106430b5efc20a41d55b15431de9bd SHA512 de8d841a93d2b1d1d1a9024634c63a0c2e7ba9e02566afc2782aedeb2391cbca3ec11d2260a7a42b8e21f22d3f2400554a2cc59584ba0e19d4a5c40867690fc6 WHIRLPOOL 6fa03914a227f9f829d69ba30c919d56414311ee26c7283c4b83b869a4c41bee2b4394d7bf79735f5d4a10c175fb3e75ed71031cbc490ccb1c0982c86d2765c5
 DIST shorewall-core-5.0.15.1.tar.bz2 64407 SHA256 9b64f9260f7a9c56421da0f1cc40db4cc751f3d4b87c8f8c2168f5c3e961e4cb SHA512 dea47e41d5545500406bce7d5adf62834e713b8533c9f1bb3e0a932ba19fc43d01b429ee1dcbb53168de8d80a4c16be83935508c32aed8f39f74d4115c5393a4 WHIRLPOOL 40be1658a33bbfa9f9fd7aa6d7c7a5c703af7999d81dab7aaab705ef89834c61004f4fd38139d1607d3709a3fb25014ee3f3c33123d2de63b89e23ab2bf3ba98
+DIST shorewall-core-5.0.15.2.tar.bz2 64735 SHA256 0a96a13f6cc5bed6b96ff37c9c9e65be364e20a79bd7fa7908066b977a4fa34b SHA512 f1cf9dd3985eacf4eddbd3458b6ec9e2f074758a6f7bb799a891c2afc8639c884c65f67cf5689df82934e2dde933f663b0c35370596ed5f0740d138b0f65fc23 WHIRLPOOL da8bcc15a7ba63bb16996e08779a7020cce1b993417b23097ead43322520c0550b12173e3bd565c127af2470fb57030d96926f3003affd96b314f1820cc81354
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.14.1.tar.bz2 4290473 SHA256 3ac58a4a178be09bf63a95409c38f8ba560c20968330c39e19be496d173724a8 SHA512 5bc6fadebca8510845a135021a1aad7f2cbb69e64b2159ef46b752971fb76d4b541f63af5dc42546cb304431235e0de6bd4be6ebccf0a616c557d48cfc01c80d WHIRLPOOL a13690b613acd23cc1b7f0951ba7ae25b4235fef82e1a05fcb828d028665b5f002bcd60971ab4b9e908341d6b62ed5ebc8ce8dc157018777e360f04001071544
 DIST shorewall-docs-html-5.0.15.1.tar.bz2 4290901 SHA256 47b1e594f14b9f022671e5fb4b4def31513f1d250a2cd99e16713fdcd399bde6 SHA512 78d0541ac3ed705c4c6fb954601b7dc929c681601d17301af44f2b3535239b5c3bd64fe1586ef0ff435a05cc4b3672d393028b48809c9d550f6329bab33470b2 WHIRLPOOL 2580b3ff97067465b0c4d13475384d424df21e45cc083ebd800228644a24ac74a6de3e94bb3311305668a957f7ae5bc4e31803a8de8b52a14ef35922ace68947
+DIST shorewall-docs-html-5.0.15.2.tar.bz2 4290912 SHA256 9a66880af93abda6c0da4b48e3eb4c5358702aa908d4b2bd97e6e79cca68db27 SHA512 8729249b231d8ecd960112bb4c3e10063d8d2f5f1b0c80ad71488c25baa1342b166667c191e8a62edeb59e1845cc501e5bd5dd7a7aed6a99c533423b0e121f65 WHIRLPOOL 27deb6a59049a6263cf31c4af45558ad0c2c53f499568fc398416509f2f83e846efc4ebb86a904a3ab7b2d2d3a4a3ed9d398d050d9f46c50f25c50423143f7f5
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.14.1.tar.bz2 41707 SHA256 3d535888f17c1b1e35830c8bb1692caddec9693327c1fed6d45e0f6b48045680 SHA512 901d8db51bdcee49fa557ebd962ed249b92588d1e0fad8ebd1d3f05fe2dfb835ead252300a8ac1ae67a436e004a8a583f356a636a622f9bd7429655ac48ad129 WHIRLPOOL 626e1c4d654188dd3dffb506f0e38a4e785c4ee1c7ac9c4db866e488758b5dc20d341a133b199d7880c16c04db346b4f582b30742ab633be2734fc2870cdf676
 DIST shorewall-init-5.0.15.1.tar.bz2 42337 SHA256 23638b2fb942b8b48bf158b557d9245803523236aa77e55c890c6cf958070556 SHA512 961beebbee3828b7ef72ecf0d95d160f20a8c6811623bd00a9c296fd24f0b73dca338904c4c10bbd72bd2c9deb5f6ebc02fc7c5505454b92e268cb8deb917164 WHIRLPOOL 4c0c2ba60858cff16ef23c161bf30f1a855a183f8e5254df603a3b0ea9d55aa67d3e7fe2e9a83c4ac013364209cfef5e53a92a66b0d6a6f7fbf064285eba5eec
+DIST shorewall-init-5.0.15.2.tar.bz2 42536 SHA256 dcca6ec1a48b42a86cebc7449d5591cede4d0d9c7696d1459a29f8cfddbfae9b SHA512 e52b374ba27c2f176e4a0d4d15bdc9f373de89be60c6b5fb6a0d3ea787f68a525fcf32d44fce8dac461673d88383f130bc9d3b258475ac7246aca1c9414ebd60 WHIRLPOOL d59fe8b220a3025ebbeda9988794d94d569c397bec0cbdce9d89e3c18516c222506cfad8cfc58f982137ef194551bc97accf5049439f434d045370a54256fc80
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.14.1.tar.bz2 58098 SHA256 0feb7d71e62b28af5942f5ffd1f67857277efc31bbad8cd47ff3de082d19b8c4 SHA512 ffd4472e531a75055e04ef53bc9a5e1219ad5e7cfe3502bb1beef190ed64746c825c7cf6234149fe102947135cd987f8760dbc2ceb9c92b811dc8bf2f6369bc9 WHIRLPOOL c0401cb350c3ef40172c95db9d7fbd3388c10eb07e742317559b673dd3a03bcb2ce0207f1500b1efda2afb7a97ac063fe2075ecba9bc95aea051908aa5ed1225
 DIST shorewall-lite-5.0.15.1.tar.bz2 58722 SHA256 fa1d4d6d54397fb43e3f1d3422eaca1b793490bab6a6976c320ae4ad2804fe66 SHA512 bc19d5e35841e179e595513a810a76c1774f4c67f4029b83bb05af6775694d4c7229647b597951c4bb87c7481aeb8e4577c61f1a910429e8a84ea0f1312635ec WHIRLPOOL ddb014563a346abb5239b7fa53255eac80a87aaf522bba1be3b5cfa5dae3717f0a4596cef97b8848f9ba279893f0e24c71af0422529a2ca11c3ad462526ea5cf
+DIST shorewall-lite-5.0.15.2.tar.bz2 58936 SHA256 c423f762c22e7398c4ed0c9adb45405e88fd18e7d5dfe32e9ba700e69d455702 SHA512 1d4c9b51d3cc05a0b6d0428564999433c3fad072203cb1a0436b7e7e0e059125ed142bbc475fbed2acf58e64ce33cb98fa7c8c08a54f206e0d9a41320a5203f0 WHIRLPOOL e47d36aeb5ff5bdf4be4145105fabd2ea3b1a17793d1d8f5db68948c8e7e483df8ebd5cbc67128f7a147f97923cc269a9bedd32452fd80a93f9d6e69a5289da2
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.14.1.tar.bz2 239885 SHA256 cca8a1aa064882c6a921a46d16c2d124fb165dddbeaf43f68adc644a961af53d SHA512 341350cbdde4bafd38e53f91bccea905dd1d3f6fb19bf8561a0b3cd61352e8aa084da9944a77d54201313bc2a552a4a21ae09eda57cacedf82e7d511230f5de1 WHIRLPOOL cc8a5dcda1ffb32351d15fd7a1bb7aa25a664618893bbaff6a9bcad91c0c3a64bf5a70b829a3b0cbed0f513a19036b255fab673d48c14df785d03473eaf5ba79
 DIST shorewall6-5.0.15.1.tar.bz2 240733 SHA256 384909552423acfd3a6f804fca3be4d49e5ec20114ae69d0d2678155133a7d43 SHA512 8cf63f49ea7acfb5c74c456c8dda476e9eec6b1c6144a32331b7b71f376d8c40460372cf25ce4894ca1d5f276007c5004acfda2519aabd3b9f91c8c70d285dfe WHIRLPOOL 37910bf6264287fa54ab4b8ee9f921060c4716859cfaaecd7fe7e572bf12ae42d592f9d8f81d22508a5d1cf9fc96dfa520fc28800f21bed2d805923c1dd62f03
+DIST shorewall6-5.0.15.2.tar.bz2 240944 SHA256 06467ef58d9e15962db81d65dc5be95f353e271f3fc50d759abdf13c4b420237 SHA512 e675ecef9ee71f1036a11a9ee5029d375bfe66c84ecdb0382fce21ecae3b75333344329cb35b0616cd2adbd5ef95f4994594af3386f1ed60ec078bc6e1184e08 WHIRLPOOL b99c40817ffd76e324fab278143a3f12000d6cbd8a90a3b1fa30d7ce7fea62f5da008cf0b625230d8d27928c8884c770bb9286e95f9f41d2fe105d6612453cd6
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.14.1.tar.bz2 57544 SHA256 89c90b063dfc52b5d7b55e3abb02966f3abd43613be5006dfe692d2a8f4195b4 SHA512 95dbf1ffd84e90576d122c43531d78b0b501165cae7aaa9c60cec01521c2a1f39f69220b4dcd0731574250169af1a9bd5e6fb08a068bcd11ffa51be5cff95d25 WHIRLPOOL dcfbc49dcf46db152665a9b86d479c2b3505d5ebf91f5cdb1d862a00a86003ea6e290b1df5c16747f9fcb4b2ace7d2c7d47f68faa4a8e83f46f0c1eef643114f
 DIST shorewall6-lite-5.0.15.1.tar.bz2 58141 SHA256 71ee147dd1190745b79bcbbd4f42b90deb704628fc15c8cdf7badbfd7dd49bd7 SHA512 a3da765cb45b82fb435fcd9d833371692b49f1c5f00d1c30a0b979c0186a0b8965633900590ae0370de7e93b710ed605d5293a6316d6a738c22f5432e37ecfbd WHIRLPOOL e0645316ab9257495ad616735eeb116b80386cfeb99fb53b566b4888b0a8c8403aacffb7ff86dc9380ed43b3954f83110fe91a3516958daa975cddc086f69741
+DIST shorewall6-lite-5.0.15.2.tar.bz2 58372 SHA256 943aee1c2e9c987e79e9566e7fa658e5f0681a3604639b4e749c4ee1784d3f7f SHA512 68a644ba594f2c8c3d8090e1b69e142c4a5cb068a15531e1dcccde0d58ec2a0f023791a53c3aa1fa7d8ee43110d3eb23a07b6c15b7ce1bc3238aa07f30d19001 WHIRLPOOL ebbd8453b1abba9222529321e763e38a64cdc9bc7c03a355315f2ce47cb1398bb0bc1eca57ede08edf9d72de938eb2a99c45aafa56beb4419b40363c794e41eb

diff --git a/net-firewall/shorewall/shorewall-5.0.15.2.ebuild b/net-firewall/shorewall/shorewall-5.0.15.2.ebuild
new file mode 100644
index 00000000..54d3b67
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.15.2.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-01-02 18:42 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-01-02 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     8f64eb4c3a77623891f0845b224573ce6eb98596
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 18:42:15 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 18:42:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f64eb4c

net-firewall/shorewall: Stable for amd64. Retroactively mark stable for the remaining arches using the ALLARCHES policy

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-firewall/shorewall/shorewall-5.0.15.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.15.2.ebuild b/net-firewall/shorewall/shorewall-5.0.15.2.ebuild
index 54d3b67..8e6cf58 100644
--- a/net-firewall/shorewall/shorewall-5.0.15.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-01-10 23:52 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-01-10 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     ec3c0b3b0353ab80f8a6af2df72e006151d6825a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 23:48:56 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 23:48:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec3c0b3b

net-firewall/shorewall: Bump to v5.0.15.3

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.0.15.3.ebuild | 452 +++++++++++++++++++++++
 2 files changed, 459 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 11e2c50..062f988 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -2,27 +2,34 @@ DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4b
 DIST shorewall-5.0.14.1.tar.bz2 523476 SHA256 cb4b303d42dd99c3ab28acaf99446aff5f9273b8393dc8e9b6123f3dd427afd1 SHA512 709f784aaf9a558024ca31fa4e2fef29aa012b3fd074dccd97854f02dad512e05c29b184ec0ea733d21c81f6a078d7b2c77671744e7fb5f21dc34198135cfd50 WHIRLPOOL 1a55fb6a1a490a0a28c2175119ebe41555390dd5e702a3e599591248d3dae316830eec5e9e213eacc5120f1102ab5bcdfa6b1259df33370a4af960234e00dd5d
 DIST shorewall-5.0.15.1.tar.bz2 525204 SHA256 e430743712563935955f4b76949ea4e4688ca108292fb02ba67cb3f78c500364 SHA512 db36a85517c977c38ec6a96ad695945e570462503c94836f2046735609102092b286ae5a9329fead96778dd67d1f400c96ae042d69c3ee1670784a7a0350a96b WHIRLPOOL ba5e1b67c4893b4f59fa2b88953d1f172b412097cc42d5335b894bb245c1aeb5b4fb2d7bdb04fbda35214795cd5312d191ff50727352368553e363abf2a5ab33
 DIST shorewall-5.0.15.2.tar.bz2 525530 SHA256 303e2c05d078c5d76f994bc175558a7dc407d5ce55fe5a68ff39b9254069fcf8 SHA512 b43f0aef59407182a24e55f22b7e62446a6fbc94beae9a553d9dd6482cd092d8c6f89987f10ada768ea9d6185d8e3fd6dadf0e4c897d02f08689a4f4a4dd2a4c WHIRLPOOL 36b9de6cb8725d8873191bf0e9bdf605696442f4e077bb1e520a061007ea23952b3bab1a95ee2e4d030c5f01886b373c331e0ad5a40b1844045da3f86c1bdf43
+DIST shorewall-5.0.15.3.tar.bz2 525470 SHA256 c71c42e9697057b39ae27593725d2fcc5829cc8eab78ef2109a1f16ed89534db SHA512 a0990a23870740e96d86dc5f02aa55d0f762e030a0a08ba9ce8801065712a1908889d9d82052cdeefcd14d851462217fd0096101a4535de96d5ff141a8ec7faa WHIRLPOOL f95ce4cbf856a8d4d635cf926408e782c44317ea4866c476b5ba8372f62fac1b16651a4b3ce8266e2bd8ff211254e2c6fa32dfef5e381c540e12651c7c695a2b
 DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
 DIST shorewall-core-5.0.14.1.tar.bz2 63788 SHA256 a856a07ab61734db3c259962edefa3a891106430b5efc20a41d55b15431de9bd SHA512 de8d841a93d2b1d1d1a9024634c63a0c2e7ba9e02566afc2782aedeb2391cbca3ec11d2260a7a42b8e21f22d3f2400554a2cc59584ba0e19d4a5c40867690fc6 WHIRLPOOL 6fa03914a227f9f829d69ba30c919d56414311ee26c7283c4b83b869a4c41bee2b4394d7bf79735f5d4a10c175fb3e75ed71031cbc490ccb1c0982c86d2765c5
 DIST shorewall-core-5.0.15.1.tar.bz2 64407 SHA256 9b64f9260f7a9c56421da0f1cc40db4cc751f3d4b87c8f8c2168f5c3e961e4cb SHA512 dea47e41d5545500406bce7d5adf62834e713b8533c9f1bb3e0a932ba19fc43d01b429ee1dcbb53168de8d80a4c16be83935508c32aed8f39f74d4115c5393a4 WHIRLPOOL 40be1658a33bbfa9f9fd7aa6d7c7a5c703af7999d81dab7aaab705ef89834c61004f4fd38139d1607d3709a3fb25014ee3f3c33123d2de63b89e23ab2bf3ba98
 DIST shorewall-core-5.0.15.2.tar.bz2 64735 SHA256 0a96a13f6cc5bed6b96ff37c9c9e65be364e20a79bd7fa7908066b977a4fa34b SHA512 f1cf9dd3985eacf4eddbd3458b6ec9e2f074758a6f7bb799a891c2afc8639c884c65f67cf5689df82934e2dde933f663b0c35370596ed5f0740d138b0f65fc23 WHIRLPOOL da8bcc15a7ba63bb16996e08779a7020cce1b993417b23097ead43322520c0550b12173e3bd565c127af2470fb57030d96926f3003affd96b314f1820cc81354
+DIST shorewall-core-5.0.15.3.tar.bz2 65108 SHA256 0d174d9aabd3608e000a4536470b35d15a856d7394f5e8bd22ef410d8501b989 SHA512 4a5cca151bc5e8e538e7cb0f4d36461e32232bc7d94e72f82ddefc8c4d5622f14d8c625892295275b41b5ca99dc5217e3fafbf9c1d25d872117f78eed621575c WHIRLPOOL 71f0011684a1bfadaa5439eaa4e0852189262381a1a39b6c17e6f3ee0d4e397faf6ec5516b0288ac9a80896d56f275ae1c85b385adf69d98b4a780a60491e7bf
 DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
 DIST shorewall-docs-html-5.0.14.1.tar.bz2 4290473 SHA256 3ac58a4a178be09bf63a95409c38f8ba560c20968330c39e19be496d173724a8 SHA512 5bc6fadebca8510845a135021a1aad7f2cbb69e64b2159ef46b752971fb76d4b541f63af5dc42546cb304431235e0de6bd4be6ebccf0a616c557d48cfc01c80d WHIRLPOOL a13690b613acd23cc1b7f0951ba7ae25b4235fef82e1a05fcb828d028665b5f002bcd60971ab4b9e908341d6b62ed5ebc8ce8dc157018777e360f04001071544
 DIST shorewall-docs-html-5.0.15.1.tar.bz2 4290901 SHA256 47b1e594f14b9f022671e5fb4b4def31513f1d250a2cd99e16713fdcd399bde6 SHA512 78d0541ac3ed705c4c6fb954601b7dc929c681601d17301af44f2b3535239b5c3bd64fe1586ef0ff435a05cc4b3672d393028b48809c9d550f6329bab33470b2 WHIRLPOOL 2580b3ff97067465b0c4d13475384d424df21e45cc083ebd800228644a24ac74a6de3e94bb3311305668a957f7ae5bc4e31803a8de8b52a14ef35922ace68947
 DIST shorewall-docs-html-5.0.15.2.tar.bz2 4290912 SHA256 9a66880af93abda6c0da4b48e3eb4c5358702aa908d4b2bd97e6e79cca68db27 SHA512 8729249b231d8ecd960112bb4c3e10063d8d2f5f1b0c80ad71488c25baa1342b166667c191e8a62edeb59e1845cc501e5bd5dd7a7aed6a99c533423b0e121f65 WHIRLPOOL 27deb6a59049a6263cf31c4af45558ad0c2c53f499568fc398416509f2f83e846efc4ebb86a904a3ab7b2d2d3a4a3ed9d398d050d9f46c50f25c50423143f7f5
+DIST shorewall-docs-html-5.0.15.3.tar.bz2 4290905 SHA256 5e519eb6956fb51058e7c977f7130ab4c91b519097c624c83de980808e555849 SHA512 bca31dcb50246aa081512ee61c6e46545361777c9b033912023624872d7fb8fb4fc0b0b821fd0422698fab9000b4f087b8f4ef6799ee2d55b5f3cfbf81276a87 WHIRLPOOL 84c6c3777cfd228ef98880c84832fd5e23ae46fb38397783ad3dacd93eb57e5e0dc662014d3c9e98a1cd4647e3b84a84ecd3564be098a3ca20820215ae4b13db
 DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
 DIST shorewall-init-5.0.14.1.tar.bz2 41707 SHA256 3d535888f17c1b1e35830c8bb1692caddec9693327c1fed6d45e0f6b48045680 SHA512 901d8db51bdcee49fa557ebd962ed249b92588d1e0fad8ebd1d3f05fe2dfb835ead252300a8ac1ae67a436e004a8a583f356a636a622f9bd7429655ac48ad129 WHIRLPOOL 626e1c4d654188dd3dffb506f0e38a4e785c4ee1c7ac9c4db866e488758b5dc20d341a133b199d7880c16c04db346b4f582b30742ab633be2734fc2870cdf676
 DIST shorewall-init-5.0.15.1.tar.bz2 42337 SHA256 23638b2fb942b8b48bf158b557d9245803523236aa77e55c890c6cf958070556 SHA512 961beebbee3828b7ef72ecf0d95d160f20a8c6811623bd00a9c296fd24f0b73dca338904c4c10bbd72bd2c9deb5f6ebc02fc7c5505454b92e268cb8deb917164 WHIRLPOOL 4c0c2ba60858cff16ef23c161bf30f1a855a183f8e5254df603a3b0ea9d55aa67d3e7fe2e9a83c4ac013364209cfef5e53a92a66b0d6a6f7fbf064285eba5eec
 DIST shorewall-init-5.0.15.2.tar.bz2 42536 SHA256 dcca6ec1a48b42a86cebc7449d5591cede4d0d9c7696d1459a29f8cfddbfae9b SHA512 e52b374ba27c2f176e4a0d4d15bdc9f373de89be60c6b5fb6a0d3ea787f68a525fcf32d44fce8dac461673d88383f130bc9d3b258475ac7246aca1c9414ebd60 WHIRLPOOL d59fe8b220a3025ebbeda9988794d94d569c397bec0cbdce9d89e3c18516c222506cfad8cfc58f982137ef194551bc97accf5049439f434d045370a54256fc80
+DIST shorewall-init-5.0.15.3.tar.bz2 42608 SHA256 00fc0f1bd04010626debf8b076b5b4e9a7451eff9d813ee6bf9cd507679a6443 SHA512 fae316724fe64cc93e20f08e221959156f59abc0b9349f830f6f4f8ba6be9f0a4ffedf68db5ee18b1a765c4ab51a3c9cb8153b70f1319b2b3bde38086208c628 WHIRLPOOL 35a5b06fe158ff4d173dec2246cdd329bcd573021b7e49db70065f9ea4ac3e5ca0321ed7ada9347eb0753fb68dfbd37ed6d65c599b005b25f024ffafe6a5882e
 DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
 DIST shorewall-lite-5.0.14.1.tar.bz2 58098 SHA256 0feb7d71e62b28af5942f5ffd1f67857277efc31bbad8cd47ff3de082d19b8c4 SHA512 ffd4472e531a75055e04ef53bc9a5e1219ad5e7cfe3502bb1beef190ed64746c825c7cf6234149fe102947135cd987f8760dbc2ceb9c92b811dc8bf2f6369bc9 WHIRLPOOL c0401cb350c3ef40172c95db9d7fbd3388c10eb07e742317559b673dd3a03bcb2ce0207f1500b1efda2afb7a97ac063fe2075ecba9bc95aea051908aa5ed1225
 DIST shorewall-lite-5.0.15.1.tar.bz2 58722 SHA256 fa1d4d6d54397fb43e3f1d3422eaca1b793490bab6a6976c320ae4ad2804fe66 SHA512 bc19d5e35841e179e595513a810a76c1774f4c67f4029b83bb05af6775694d4c7229647b597951c4bb87c7481aeb8e4577c61f1a910429e8a84ea0f1312635ec WHIRLPOOL ddb014563a346abb5239b7fa53255eac80a87aaf522bba1be3b5cfa5dae3717f0a4596cef97b8848f9ba279893f0e24c71af0422529a2ca11c3ad462526ea5cf
 DIST shorewall-lite-5.0.15.2.tar.bz2 58936 SHA256 c423f762c22e7398c4ed0c9adb45405e88fd18e7d5dfe32e9ba700e69d455702 SHA512 1d4c9b51d3cc05a0b6d0428564999433c3fad072203cb1a0436b7e7e0e059125ed142bbc475fbed2acf58e64ce33cb98fa7c8c08a54f206e0d9a41320a5203f0 WHIRLPOOL e47d36aeb5ff5bdf4be4145105fabd2ea3b1a17793d1d8f5db68948c8e7e483df8ebd5cbc67128f7a147f97923cc269a9bedd32452fd80a93f9d6e69a5289da2
+DIST shorewall-lite-5.0.15.3.tar.bz2 59024 SHA256 5e32b0346edea2ceef4930b80e1a5797048c4e419c96a870499ea0d6336e9eef SHA512 c71957f243e5e93810f04bfb4154a6bc0ae96ea7040753d15a4856d3b7d153871e29394b07ff1fba92a7f832a3880a6e58ac55303ae7c81e5df8ace7fadd8129 WHIRLPOOL b864fb2f776540d26e578ba038368ae9d014979fff9008ce9241d1acd893ac41df46696a2513866c280cd86d363257e8b9b1f2f47237c13f54d489a034adc5a6
 DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
 DIST shorewall6-5.0.14.1.tar.bz2 239885 SHA256 cca8a1aa064882c6a921a46d16c2d124fb165dddbeaf43f68adc644a961af53d SHA512 341350cbdde4bafd38e53f91bccea905dd1d3f6fb19bf8561a0b3cd61352e8aa084da9944a77d54201313bc2a552a4a21ae09eda57cacedf82e7d511230f5de1 WHIRLPOOL cc8a5dcda1ffb32351d15fd7a1bb7aa25a664618893bbaff6a9bcad91c0c3a64bf5a70b829a3b0cbed0f513a19036b255fab673d48c14df785d03473eaf5ba79
 DIST shorewall6-5.0.15.1.tar.bz2 240733 SHA256 384909552423acfd3a6f804fca3be4d49e5ec20114ae69d0d2678155133a7d43 SHA512 8cf63f49ea7acfb5c74c456c8dda476e9eec6b1c6144a32331b7b71f376d8c40460372cf25ce4894ca1d5f276007c5004acfda2519aabd3b9f91c8c70d285dfe WHIRLPOOL 37910bf6264287fa54ab4b8ee9f921060c4716859cfaaecd7fe7e572bf12ae42d592f9d8f81d22508a5d1cf9fc96dfa520fc28800f21bed2d805923c1dd62f03
 DIST shorewall6-5.0.15.2.tar.bz2 240944 SHA256 06467ef58d9e15962db81d65dc5be95f353e271f3fc50d759abdf13c4b420237 SHA512 e675ecef9ee71f1036a11a9ee5029d375bfe66c84ecdb0382fce21ecae3b75333344329cb35b0616cd2adbd5ef95f4994594af3386f1ed60ec078bc6e1184e08 WHIRLPOOL b99c40817ffd76e324fab278143a3f12000d6cbd8a90a3b1fa30d7ce7fea62f5da008cf0b625230d8d27928c8884c770bb9286e95f9f41d2fe105d6612453cd6
+DIST shorewall6-5.0.15.3.tar.bz2 241045 SHA256 79b91e33b24ac620a682e91c48ca18590dbac33e36c0fea37bdb2b1f3db47d7e SHA512 141fe6e23883d71f3d1fb8cb3d305a5eb439170430d71c9a066feb2acd734d4db54f386c91345c91c14f017ca5b4da7b08ad521e580545632411ae4c43d99e5b WHIRLPOOL 03c2f0731f988d094c96dd74271437c8bddc494b780980edab914c77944ded0343d6df0b94b871e33508d293f9ccfde89e4023a56b0ca2866433aa1c87ac2595
 DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
 DIST shorewall6-lite-5.0.14.1.tar.bz2 57544 SHA256 89c90b063dfc52b5d7b55e3abb02966f3abd43613be5006dfe692d2a8f4195b4 SHA512 95dbf1ffd84e90576d122c43531d78b0b501165cae7aaa9c60cec01521c2a1f39f69220b4dcd0731574250169af1a9bd5e6fb08a068bcd11ffa51be5cff95d25 WHIRLPOOL dcfbc49dcf46db152665a9b86d479c2b3505d5ebf91f5cdb1d862a00a86003ea6e290b1df5c16747f9fcb4b2ace7d2c7d47f68faa4a8e83f46f0c1eef643114f
 DIST shorewall6-lite-5.0.15.1.tar.bz2 58141 SHA256 71ee147dd1190745b79bcbbd4f42b90deb704628fc15c8cdf7badbfd7dd49bd7 SHA512 a3da765cb45b82fb435fcd9d833371692b49f1c5f00d1c30a0b979c0186a0b8965633900590ae0370de7e93b710ed605d5293a6316d6a738c22f5432e37ecfbd WHIRLPOOL e0645316ab9257495ad616735eeb116b80386cfeb99fb53b566b4888b0a8c8403aacffb7ff86dc9380ed43b3954f83110fe91a3516958daa975cddc086f69741
 DIST shorewall6-lite-5.0.15.2.tar.bz2 58372 SHA256 943aee1c2e9c987e79e9566e7fa658e5f0681a3604639b4e749c4ee1784d3f7f SHA512 68a644ba594f2c8c3d8090e1b69e142c4a5cb068a15531e1dcccde0d58ec2a0f023791a53c3aa1fa7d8ee43110d3eb23a07b6c15b7ce1bc3238aa07f30d19001 WHIRLPOOL ebbd8453b1abba9222529321e763e38a64cdc9bc7c03a355315f2ce47cb1398bb0bc1eca57ede08edf9d72de938eb2a99c45aafa56beb4419b40363c794e41eb
+DIST shorewall6-lite-5.0.15.3.tar.bz2 58442 SHA256 822e6fbf3f2f7bef8db2424f6c40ad03b492ce7305d95b123ad2b1d1329e396a SHA512 f8bf47f2d39857df9579b8bacc32ef87159b5502cd4fed1761fca21d14a902122c30d87ce2a8af9a309c32d826238c5f966416cccc6bb1fe93271f45902d867d WHIRLPOOL 40d37102e415c3b13560159cd994a9baeeefa96f641e5bf6133212a084ff5bc2a54abcbe34901f35b5d0faef671b908fa19a873f0a98d8e074f6731bfae46ec1

diff --git a/net-firewall/shorewall/shorewall-5.0.15.3.ebuild b/net-firewall/shorewall/shorewall-5.0.15.3.ebuild
new file mode 100644
index 00000000..f468988
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.15.3.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-02-24 11:38 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-02-24 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     b3e88b9debc75882dc4c01ccd36ad38a0001edd6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 11:38:07 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 11:38:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e88b9d

net-firewall/shorewall: Maintainer stabilization under ALLARCHES policy

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-firewall/shorewall/shorewall-5.0.15.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.15.3.ebuild b/net-firewall/shorewall/shorewall-5.0.15.3.ebuild
index f468988523..57b4b24542 100644
--- a/net-firewall/shorewall/shorewall-5.0.15.3.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.15.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="6"
 
 inherit linux-info prefix systemd versionator
 
@@ -67,7 +67,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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-03-30  6:43 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-03-30  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c9bce56bc98be5ba07f5bf8beb9b7fac5526e246
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 06:40:32 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 06:40:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9bce56b

net-firewall/shorewall: Cleanup old version

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                  |   7 -
 net-firewall/shorewall/shorewall-5.0.15.2.ebuild | 451 -----------------------
 2 files changed, 458 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 96489cb62ec..9e8959bcdf2 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-DIST shorewall-5.0.15.2.tar.bz2 525530 SHA256 303e2c05d078c5d76f994bc175558a7dc407d5ce55fe5a68ff39b9254069fcf8 SHA512 b43f0aef59407182a24e55f22b7e62446a6fbc94beae9a553d9dd6482cd092d8c6f89987f10ada768ea9d6185d8e3fd6dadf0e4c897d02f08689a4f4a4dd2a4c WHIRLPOOL 36b9de6cb8725d8873191bf0e9bdf605696442f4e077bb1e520a061007ea23952b3bab1a95ee2e4d030c5f01886b373c331e0ad5a40b1844045da3f86c1bdf43
 DIST shorewall-5.0.15.3.tar.bz2 525470 SHA256 c71c42e9697057b39ae27593725d2fcc5829cc8eab78ef2109a1f16ed89534db SHA512 a0990a23870740e96d86dc5f02aa55d0f762e030a0a08ba9ce8801065712a1908889d9d82052cdeefcd14d851462217fd0096101a4535de96d5ff141a8ec7faa WHIRLPOOL f95ce4cbf856a8d4d635cf926408e782c44317ea4866c476b5ba8372f62fac1b16651a4b3ce8266e2bd8ff211254e2c6fa32dfef5e381c540e12651c7c695a2b
-DIST shorewall-core-5.0.15.2.tar.bz2 64735 SHA256 0a96a13f6cc5bed6b96ff37c9c9e65be364e20a79bd7fa7908066b977a4fa34b SHA512 f1cf9dd3985eacf4eddbd3458b6ec9e2f074758a6f7bb799a891c2afc8639c884c65f67cf5689df82934e2dde933f663b0c35370596ed5f0740d138b0f65fc23 WHIRLPOOL da8bcc15a7ba63bb16996e08779a7020cce1b993417b23097ead43322520c0550b12173e3bd565c127af2470fb57030d96926f3003affd96b314f1820cc81354
 DIST shorewall-core-5.0.15.3.tar.bz2 65108 SHA256 0d174d9aabd3608e000a4536470b35d15a856d7394f5e8bd22ef410d8501b989 SHA512 4a5cca151bc5e8e538e7cb0f4d36461e32232bc7d94e72f82ddefc8c4d5622f14d8c625892295275b41b5ca99dc5217e3fafbf9c1d25d872117f78eed621575c WHIRLPOOL 71f0011684a1bfadaa5439eaa4e0852189262381a1a39b6c17e6f3ee0d4e397faf6ec5516b0288ac9a80896d56f275ae1c85b385adf69d98b4a780a60491e7bf
-DIST shorewall-docs-html-5.0.15.2.tar.bz2 4290912 SHA256 9a66880af93abda6c0da4b48e3eb4c5358702aa908d4b2bd97e6e79cca68db27 SHA512 8729249b231d8ecd960112bb4c3e10063d8d2f5f1b0c80ad71488c25baa1342b166667c191e8a62edeb59e1845cc501e5bd5dd7a7aed6a99c533423b0e121f65 WHIRLPOOL 27deb6a59049a6263cf31c4af45558ad0c2c53f499568fc398416509f2f83e846efc4ebb86a904a3ab7b2d2d3a4a3ed9d398d050d9f46c50f25c50423143f7f5
 DIST shorewall-docs-html-5.0.15.3.tar.bz2 4290905 SHA256 5e519eb6956fb51058e7c977f7130ab4c91b519097c624c83de980808e555849 SHA512 bca31dcb50246aa081512ee61c6e46545361777c9b033912023624872d7fb8fb4fc0b0b821fd0422698fab9000b4f087b8f4ef6799ee2d55b5f3cfbf81276a87 WHIRLPOOL 84c6c3777cfd228ef98880c84832fd5e23ae46fb38397783ad3dacd93eb57e5e0dc662014d3c9e98a1cd4647e3b84a84ecd3564be098a3ca20820215ae4b13db
-DIST shorewall-init-5.0.15.2.tar.bz2 42536 SHA256 dcca6ec1a48b42a86cebc7449d5591cede4d0d9c7696d1459a29f8cfddbfae9b SHA512 e52b374ba27c2f176e4a0d4d15bdc9f373de89be60c6b5fb6a0d3ea787f68a525fcf32d44fce8dac461673d88383f130bc9d3b258475ac7246aca1c9414ebd60 WHIRLPOOL d59fe8b220a3025ebbeda9988794d94d569c397bec0cbdce9d89e3c18516c222506cfad8cfc58f982137ef194551bc97accf5049439f434d045370a54256fc80
 DIST shorewall-init-5.0.15.3.tar.bz2 42608 SHA256 00fc0f1bd04010626debf8b076b5b4e9a7451eff9d813ee6bf9cd507679a6443 SHA512 fae316724fe64cc93e20f08e221959156f59abc0b9349f830f6f4f8ba6be9f0a4ffedf68db5ee18b1a765c4ab51a3c9cb8153b70f1319b2b3bde38086208c628 WHIRLPOOL 35a5b06fe158ff4d173dec2246cdd329bcd573021b7e49db70065f9ea4ac3e5ca0321ed7ada9347eb0753fb68dfbd37ed6d65c599b005b25f024ffafe6a5882e
-DIST shorewall-lite-5.0.15.2.tar.bz2 58936 SHA256 c423f762c22e7398c4ed0c9adb45405e88fd18e7d5dfe32e9ba700e69d455702 SHA512 1d4c9b51d3cc05a0b6d0428564999433c3fad072203cb1a0436b7e7e0e059125ed142bbc475fbed2acf58e64ce33cb98fa7c8c08a54f206e0d9a41320a5203f0 WHIRLPOOL e47d36aeb5ff5bdf4be4145105fabd2ea3b1a17793d1d8f5db68948c8e7e483df8ebd5cbc67128f7a147f97923cc269a9bedd32452fd80a93f9d6e69a5289da2
 DIST shorewall-lite-5.0.15.3.tar.bz2 59024 SHA256 5e32b0346edea2ceef4930b80e1a5797048c4e419c96a870499ea0d6336e9eef SHA512 c71957f243e5e93810f04bfb4154a6bc0ae96ea7040753d15a4856d3b7d153871e29394b07ff1fba92a7f832a3880a6e58ac55303ae7c81e5df8ace7fadd8129 WHIRLPOOL b864fb2f776540d26e578ba038368ae9d014979fff9008ce9241d1acd893ac41df46696a2513866c280cd86d363257e8b9b1f2f47237c13f54d489a034adc5a6
-DIST shorewall6-5.0.15.2.tar.bz2 240944 SHA256 06467ef58d9e15962db81d65dc5be95f353e271f3fc50d759abdf13c4b420237 SHA512 e675ecef9ee71f1036a11a9ee5029d375bfe66c84ecdb0382fce21ecae3b75333344329cb35b0616cd2adbd5ef95f4994594af3386f1ed60ec078bc6e1184e08 WHIRLPOOL b99c40817ffd76e324fab278143a3f12000d6cbd8a90a3b1fa30d7ce7fea62f5da008cf0b625230d8d27928c8884c770bb9286e95f9f41d2fe105d6612453cd6
 DIST shorewall6-5.0.15.3.tar.bz2 241045 SHA256 79b91e33b24ac620a682e91c48ca18590dbac33e36c0fea37bdb2b1f3db47d7e SHA512 141fe6e23883d71f3d1fb8cb3d305a5eb439170430d71c9a066feb2acd734d4db54f386c91345c91c14f017ca5b4da7b08ad521e580545632411ae4c43d99e5b WHIRLPOOL 03c2f0731f988d094c96dd74271437c8bddc494b780980edab914c77944ded0343d6df0b94b871e33508d293f9ccfde89e4023a56b0ca2866433aa1c87ac2595
-DIST shorewall6-lite-5.0.15.2.tar.bz2 58372 SHA256 943aee1c2e9c987e79e9566e7fa658e5f0681a3604639b4e749c4ee1784d3f7f SHA512 68a644ba594f2c8c3d8090e1b69e142c4a5cb068a15531e1dcccde0d58ec2a0f023791a53c3aa1fa7d8ee43110d3eb23a07b6c15b7ce1bc3238aa07f30d19001 WHIRLPOOL ebbd8453b1abba9222529321e763e38a64cdc9bc7c03a355315f2ce47cb1398bb0bc1eca57ede08edf9d72de938eb2a99c45aafa56beb4419b40363c794e41eb
 DIST shorewall6-lite-5.0.15.3.tar.bz2 58442 SHA256 822e6fbf3f2f7bef8db2424f6c40ad03b492ce7305d95b123ad2b1d1329e396a SHA512 f8bf47f2d39857df9579b8bacc32ef87159b5502cd4fed1761fca21d14a902122c30d87ce2a8af9a309c32d826238c5f966416cccc6bb1fe93271f45902d867d WHIRLPOOL 40d37102e415c3b13560159cd994a9baeeefa96f641e5bf6133212a084ff5bc2a54abcbe34901f35b5d0faef671b908fa19a873f0a98d8e074f6731bfae46ec1

diff --git a/net-firewall/shorewall/shorewall-5.0.15.2.ebuild b/net-firewall/shorewall/shorewall-5.0.15.2.ebuild
deleted file mode 100644
index 1d35b606845..00000000000
--- a/net-firewall/shorewall/shorewall-5.0.15.2.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-03-30  6:43 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-03-30  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     30f2181a526344cc26f3fb59c40756a6efdaef75
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 06:43:35 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 06:43:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f2181a

net-firewall/shorewall: Bump to v5.0.15.6

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.0.15.6.ebuild | 451 +++++++++++++++++++++++
 2 files changed, 458 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 9e8959bcdf2..56704e09bc2 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.0.15.3.tar.bz2 525470 SHA256 c71c42e9697057b39ae27593725d2fcc5829cc8eab78ef2109a1f16ed89534db SHA512 a0990a23870740e96d86dc5f02aa55d0f762e030a0a08ba9ce8801065712a1908889d9d82052cdeefcd14d851462217fd0096101a4535de96d5ff141a8ec7faa WHIRLPOOL f95ce4cbf856a8d4d635cf926408e782c44317ea4866c476b5ba8372f62fac1b16651a4b3ce8266e2bd8ff211254e2c6fa32dfef5e381c540e12651c7c695a2b
+DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
 DIST shorewall-core-5.0.15.3.tar.bz2 65108 SHA256 0d174d9aabd3608e000a4536470b35d15a856d7394f5e8bd22ef410d8501b989 SHA512 4a5cca151bc5e8e538e7cb0f4d36461e32232bc7d94e72f82ddefc8c4d5622f14d8c625892295275b41b5ca99dc5217e3fafbf9c1d25d872117f78eed621575c WHIRLPOOL 71f0011684a1bfadaa5439eaa4e0852189262381a1a39b6c17e6f3ee0d4e397faf6ec5516b0288ac9a80896d56f275ae1c85b385adf69d98b4a780a60491e7bf
+DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-docs-html-5.0.15.3.tar.bz2 4290905 SHA256 5e519eb6956fb51058e7c977f7130ab4c91b519097c624c83de980808e555849 SHA512 bca31dcb50246aa081512ee61c6e46545361777c9b033912023624872d7fb8fb4fc0b0b821fd0422698fab9000b4f087b8f4ef6799ee2d55b5f3cfbf81276a87 WHIRLPOOL 84c6c3777cfd228ef98880c84832fd5e23ae46fb38397783ad3dacd93eb57e5e0dc662014d3c9e98a1cd4647e3b84a84ecd3564be098a3ca20820215ae4b13db
+DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-init-5.0.15.3.tar.bz2 42608 SHA256 00fc0f1bd04010626debf8b076b5b4e9a7451eff9d813ee6bf9cd507679a6443 SHA512 fae316724fe64cc93e20f08e221959156f59abc0b9349f830f6f4f8ba6be9f0a4ffedf68db5ee18b1a765c4ab51a3c9cb8153b70f1319b2b3bde38086208c628 WHIRLPOOL 35a5b06fe158ff4d173dec2246cdd329bcd573021b7e49db70065f9ea4ac3e5ca0321ed7ada9347eb0753fb68dfbd37ed6d65c599b005b25f024ffafe6a5882e
+DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-lite-5.0.15.3.tar.bz2 59024 SHA256 5e32b0346edea2ceef4930b80e1a5797048c4e419c96a870499ea0d6336e9eef SHA512 c71957f243e5e93810f04bfb4154a6bc0ae96ea7040753d15a4856d3b7d153871e29394b07ff1fba92a7f832a3880a6e58ac55303ae7c81e5df8ace7fadd8129 WHIRLPOOL b864fb2f776540d26e578ba038368ae9d014979fff9008ce9241d1acd893ac41df46696a2513866c280cd86d363257e8b9b1f2f47237c13f54d489a034adc5a6
+DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall6-5.0.15.3.tar.bz2 241045 SHA256 79b91e33b24ac620a682e91c48ca18590dbac33e36c0fea37bdb2b1f3db47d7e SHA512 141fe6e23883d71f3d1fb8cb3d305a5eb439170430d71c9a066feb2acd734d4db54f386c91345c91c14f017ca5b4da7b08ad521e580545632411ae4c43d99e5b WHIRLPOOL 03c2f0731f988d094c96dd74271437c8bddc494b780980edab914c77944ded0343d6df0b94b871e33508d293f9ccfde89e4023a56b0ca2866433aa1c87ac2595
+DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-lite-5.0.15.3.tar.bz2 58442 SHA256 822e6fbf3f2f7bef8db2424f6c40ad03b492ce7305d95b123ad2b1d1329e396a SHA512 f8bf47f2d39857df9579b8bacc32ef87159b5502cd4fed1761fca21d14a902122c30d87ce2a8af9a309c32d826238c5f966416cccc6bb1fe93271f45902d867d WHIRLPOOL 40d37102e415c3b13560159cd994a9baeeefa96f641e5bf6133212a084ff5bc2a54abcbe34901f35b5d0faef671b908fa19a873f0a98d8e074f6731bfae46ec1
+DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae

diff --git a/net-firewall/shorewall/shorewall-5.0.15.6.ebuild b/net-firewall/shorewall/shorewall-5.0.15.6.ebuild
new file mode 100644
index 00000000000..654e667040f
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.15.6.ebuild
@@ -0,0 +1,451 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
+	!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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-04-16  4:29 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-04-16  4:29 UTC (permalink / raw
  To: gentoo-commits

commit:     5862b864b74019bf4ca7ad584a04be777caa313e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 04:29:10 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 04:29:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5862b864

net-firewall/shorewall: Maintainer stabilization under ALLARCHES policy

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/shorewall-5.0.15.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.15.6.ebuild b/net-firewall/shorewall/shorewall-5.0.15.6.ebuild
index 654e667040f..a4bccb68b78 100644
--- a/net-firewall/shorewall/shorewall-5.0.15.6.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.15.6.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-04-16 13:05 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-04-16 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     20a634de3881aebc5cd63e45d6972dc920da7bce
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 13:05:21 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 13:05:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a634de

net-firewall/shorewall: Rev bump to re-add selinux support (bug #615656)

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../shorewall/shorewall-5.0.15.6-r1.ebuild         | 452 +++++++++++++++++++++
 1 file changed, 452 insertions(+)

diff --git a/net-firewall/shorewall/shorewall-5.0.15.6-r1.ebuild b/net-firewall/shorewall/shorewall-5.0.15.6-r1.ebuild
new file mode 100644
index 00000000000..10b6b3ef2c1
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.0.15.6-r1.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-05-09 22:40 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-05-09 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     a95cded1c56a40637a76d683cbad85dcaa13cc97
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 22:39:40 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue May  9 22:39:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95cded1

net-firewall/shorewall: Maintainer stabilization under ALLARCHES policy

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/shorewall-5.0.15.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.0.15.6-r1.ebuild b/net-firewall/shorewall/shorewall-5.0.15.6-r1.ebuild
index 10b6b3ef2c1..12fbc431021 100644
--- a/net-firewall/shorewall/shorewall-5.0.15.6-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.15.6-r1.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-05-27 15:30 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-05-27 15:30 UTC (permalink / raw
  To: gentoo-commits

commit:     96cfef114c55637320e3c34a5f34b2b7f7d90f25
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 15:30:34 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat May 27 15:30:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96cfef11

net-firewall/shorewall: Bump to v5.1.4.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.4.1.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 46444ec74ac..3f73710063b 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.0.15.3.tar.bz2 525470 SHA256 c71c42e9697057b39ae27593725d2fcc5829cc8eab78ef2109a1f16ed89534db SHA512 a0990a23870740e96d86dc5f02aa55d0f762e030a0a08ba9ce8801065712a1908889d9d82052cdeefcd14d851462217fd0096101a4535de96d5ff141a8ec7faa WHIRLPOOL f95ce4cbf856a8d4d635cf926408e782c44317ea4866c476b5ba8372f62fac1b16651a4b3ce8266e2bd8ff211254e2c6fa32dfef5e381c540e12651c7c695a2b
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
+DIST shorewall-5.1.4.1.tar.bz2 510816 SHA256 c561dd91c4b88ef087a6d172bafb4ac5d01c0055c47b855568536a0c422ff232 SHA512 4650e2ec73dcf6c38cf2992fefdbd2e302a34a9687a933d8a375d227df2621db96c9a2e54ebbfac50014152caffc0736a7bc1192f479c69c56f78f7874bc09b3 WHIRLPOOL 065cbd0f4e07a09e5326968680919de7fb988db092a406b0e809335374e8c5e68c0c8e4abeb4b8bd7dbb727869bcb7e0dc65bc38c33d783ff355943966183287
 DIST shorewall-5.1.4.tar.bz2 509894 SHA256 e25cfac5ea16309d5b24f1d4b9612ca2f3ba724f6d09acd8a99de697d0972f29 SHA512 67da4db601981071d030c3e2000899ea599b6b69465c9b778fc7d6afed0a4dec4c52f3d5cbfcd54ca4fdce64af19ba24508a6144fa19445a53939348bf6b96ac WHIRLPOOL 2223b8018264b36fb5b5e60dc19cf01105fa8fcc049087471518b01830a2a6c86206bdaaac03bb31fc47bf7c659c0857baa3a7ff37c22e902557bcfcbb8bf60f
 DIST shorewall-core-5.0.15.3.tar.bz2 65108 SHA256 0d174d9aabd3608e000a4536470b35d15a856d7394f5e8bd22ef410d8501b989 SHA512 4a5cca151bc5e8e538e7cb0f4d36461e32232bc7d94e72f82ddefc8c4d5622f14d8c625892295275b41b5ca99dc5217e3fafbf9c1d25d872117f78eed621575c WHIRLPOOL 71f0011684a1bfadaa5439eaa4e0852189262381a1a39b6c17e6f3ee0d4e397faf6ec5516b0288ac9a80896d56f275ae1c85b385adf69d98b4a780a60491e7bf
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
+DIST shorewall-core-5.1.4.1.tar.bz2 75813 SHA256 3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629 SHA512 118378698e0fa1216b52ace92fe9eae0f7d32c39becbc50837a895d7367674b2c973b1633c8919045d9d16dd2a5fdbedb9d62ff1513547ee4770a2e9116d8b1e WHIRLPOOL 02ef5428faeb68f2ca3cf6c1e00ab15d0146d5ad931942528ba1832ce96e490df67976a40ed576014f30f06e2e4869ba691c1606d57b22364ab2e6b7ed32a019
 DIST shorewall-core-5.1.4.tar.bz2 75254 SHA256 3a4c287fed059e476fbfa0ccaf10d99cbb2c512a502b0bdb391dbf76ad6cad8a SHA512 f11c53465d8b9cd68f757377bb547e056e88220220fde915a871dbd18ffbde0044efe91b6acbeaf353f9a7f9b12a2b2a48b5bb372a4cbe59307f6b927214a1db WHIRLPOOL 01b0fb3b2f19ff7057f903106e049c751aebcdc208759e01c389e28c28de2dac9827126303343aab254fcb10d7d5d22c43bd4949aeec9d054477751e6fe0e901
 DIST shorewall-docs-html-5.0.15.3.tar.bz2 4290905 SHA256 5e519eb6956fb51058e7c977f7130ab4c91b519097c624c83de980808e555849 SHA512 bca31dcb50246aa081512ee61c6e46545361777c9b033912023624872d7fb8fb4fc0b0b821fd0422698fab9000b4f087b8f4ef6799ee2d55b5f3cfbf81276a87 WHIRLPOOL 84c6c3777cfd228ef98880c84832fd5e23ae46fb38397783ad3dacd93eb57e5e0dc662014d3c9e98a1cd4647e3b84a84ecd3564be098a3ca20820215ae4b13db
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
+DIST shorewall-docs-html-5.1.4.1.tar.bz2 4284060 SHA256 0d077e38503832e75f5432d4a1b1c478f0ef02576c8aeb00480a3a101ec9a105 SHA512 ccc36bae8daacf3dca75002bee207abba667bd9a467afbde7f6cb1c18fa5d33fa53a4f93dfabfe0e85fd479449ebff2d12851cba5b494b7f3ce256cd79328687 WHIRLPOOL fa3c5a2abd61d005003f090492801a7a2c88512d28ed3ba174d4ecc998236132e7d923f780de30edcad44fe5fcc684bba13441f5fb9a1974d915607b4fd62eda
 DIST shorewall-docs-html-5.1.4.tar.bz2 4284146 SHA256 c17bf2f6f7448a89a97afa00425a503d1cc202a042af096bbacec6b66ced22e0 SHA512 5be7f4f5725e5a4ff2c8314ff869a9d902184f1050b26dda1be0febdd4d7dc997a45a5f286d9857539241e1bc9bfc1910fa89005672619c61c1628d565cb6478 WHIRLPOOL 0b64bce92e26ef2a22a2b48b54fd5ac3c4be15946ba936ebf0875f38c3401b19f24b572a14d811a5fd0b3b175f8d8400c85fd434db8bf3e53bf785ae56514a29
 DIST shorewall-init-5.0.15.3.tar.bz2 42608 SHA256 00fc0f1bd04010626debf8b076b5b4e9a7451eff9d813ee6bf9cd507679a6443 SHA512 fae316724fe64cc93e20f08e221959156f59abc0b9349f830f6f4f8ba6be9f0a4ffedf68db5ee18b1a765c4ab51a3c9cb8153b70f1319b2b3bde38086208c628 WHIRLPOOL 35a5b06fe158ff4d173dec2246cdd329bcd573021b7e49db70065f9ea4ac3e5ca0321ed7ada9347eb0753fb68dfbd37ed6d65c599b005b25f024ffafe6a5882e
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
+DIST shorewall-init-5.1.4.1.tar.bz2 30878 SHA256 c61b83601d3a4bb10e2bd8705682ddbed5ab3adcdc6074bc1ca4cb8d030e84e9 SHA512 4b9fa872a1ce0535d9c9054ad8e9750f7f797c4fd14777c77554c5218162882973fe1caf22c7242b6b38b4a5c2a122e901851757e86a560ea5f8030be063b70a WHIRLPOOL 76a360c00dc9c28576cb121360372b1218c7a9c399e89ae3366458e5aa2f5f20c7845fc4a49de5a55619e7589372c5b07eeea195604e4a4eac380739659611f1
 DIST shorewall-init-5.1.4.tar.bz2 30353 SHA256 f8d75ff55bf2264a8961f16dbd8cd69054f7e1f3e4eb5e52a9f1aab2096fdaca SHA512 de9c712bd35adf6156bf51fb1a7482b7d8019feba6e1c596eb16bc15cd8ebd834b674895c285f9e9b0b359fa807e338678a29977b4009a8584ab5e11073f5c3e WHIRLPOOL 4cab6192321768b377d531d6424ed5aef7ec2c1ad54313a8799711d7733a0d5becd1c7d02be17c1e9c59b06189e43493a16d5dac7e05edc25c7e0f1c63f0395d
 DIST shorewall-lite-5.0.15.3.tar.bz2 59024 SHA256 5e32b0346edea2ceef4930b80e1a5797048c4e419c96a870499ea0d6336e9eef SHA512 c71957f243e5e93810f04bfb4154a6bc0ae96ea7040753d15a4856d3b7d153871e29394b07ff1fba92a7f832a3880a6e58ac55303ae7c81e5df8ace7fadd8129 WHIRLPOOL b864fb2f776540d26e578ba038368ae9d014979fff9008ce9241d1acd893ac41df46696a2513866c280cd86d363257e8b9b1f2f47237c13f54d489a034adc5a6
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
+DIST shorewall-lite-5.1.4.1.tar.bz2 36647 SHA256 e90d419ed8a6da615c3a0d6fdcb9481f8e71f89c2bdcff09ab027198ca2ce293 SHA512 c06e365d06c484e7ef673e5a8597d70996f1008a00163aae2d7a53d0d720739a8b0317a093b3e75487ef1c8a02ac4c4c542480757226a974671f82ab08353896 WHIRLPOOL 0077886083aadcc5973c6f515da8e99fdbbcc4e64e0e4cc4893a47cda7afc17331d2ff175da314aa38dc0186ea074bee65facacc5dc7212c0c8836cbfc0c9a02
 DIST shorewall-lite-5.1.4.tar.bz2 36155 SHA256 293ec572444ec5ff1119dd2cab0bc1fcc3e5ff5483ddea5d08cff566035bb363 SHA512 5093fe0d85049b7495bfefbc2525c935db21e10731389451f787c7fd0e9c7fa0258a6de1100633db1056562d912e68639e22285260a642fa40806360ab89f352 WHIRLPOOL f63315b05535ba7185b3ff2d4955c22c8e3e97a83e24cf04936c0436d369b389e96ee1483261e1a520ae13611c7e38b070f93861a5a06ef84b522105f18a3712
 DIST shorewall6-5.0.15.3.tar.bz2 241045 SHA256 79b91e33b24ac620a682e91c48ca18590dbac33e36c0fea37bdb2b1f3db47d7e SHA512 141fe6e23883d71f3d1fb8cb3d305a5eb439170430d71c9a066feb2acd734d4db54f386c91345c91c14f017ca5b4da7b08ad521e580545632411ae4c43d99e5b WHIRLPOOL 03c2f0731f988d094c96dd74271437c8bddc494b780980edab914c77944ded0343d6df0b94b871e33508d293f9ccfde89e4023a56b0ca2866433aa1c87ac2595
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
+DIST shorewall6-5.1.4.1.tar.bz2 224863 SHA256 e3da805b4aa1e8c483f1bb451cb47a869e1977b213a86145a82d42e9bc12ea36 SHA512 3b5c228693936103eb1479e5b0968c5a7d24d94beea410b3ad79f9e7e3b32cca286384b91ee3b09ce006758d27f9b2efe22c589d07d05eeef9ef981818da0b80 WHIRLPOOL 810739511bfb730c6040c8cd9a8a06c836e085a70ea5b4e148d3d364d92648e194ce2b4f1e4a0535a0860a138d87744ddacb229312100242e36828f7e348514f
 DIST shorewall6-5.1.4.tar.bz2 224287 SHA256 bac38ea334dcc5ce7e505ee3a484ca2b739e119c030e815839455c41114b3ebb SHA512 1e7c3fbe91d5ca3f06a0e31bbe7659c29e3c4e2c6d87ec0eb449e09c321b7eb16458cfc73e054dd6f04deb9dc4e45da8279d611bd8424f36624e4027a7cc3c19 WHIRLPOOL 0eba307ed1a453f28f7dbd3ffaa6d25ed68f7cf2f836ed6bb6d8945b0af6bccc88310baa58864fd87475a63f589cad4882f832acfb6436dd73ba511b9edd3287
 DIST shorewall6-lite-5.0.15.3.tar.bz2 58442 SHA256 822e6fbf3f2f7bef8db2424f6c40ad03b492ce7305d95b123ad2b1d1329e396a SHA512 f8bf47f2d39857df9579b8bacc32ef87159b5502cd4fed1761fca21d14a902122c30d87ce2a8af9a309c32d826238c5f966416cccc6bb1fe93271f45902d867d WHIRLPOOL 40d37102e415c3b13560159cd994a9baeeefa96f641e5bf6133212a084ff5bc2a54abcbe34901f35b5d0faef671b908fa19a873f0a98d8e074f6731bfae46ec1
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
+DIST shorewall6-lite-5.1.4.1.tar.bz2 36362 SHA256 29a2f2be295b4f995b38e663b771660ccdc6321134bcfbd0f9378f9bb1237e3c SHA512 b616c5886b5bc274e88052359ca4c8aa6df60a9706958698eac7fc362f1c893de00ed2272535d61a88cb6a786bae9b7cba64a835833a9f81c991fb2ffed8244b WHIRLPOOL 519aee8ad997c14f4337824d40c38cbf7ba2d2ac7db0964c2557816e0d4c4dca24ed2ac69341473e899d0e9e84d367a9e6f42b2484221257bdd55b40c73ee201
 DIST shorewall6-lite-5.1.4.tar.bz2 35837 SHA256 732fe79096e164c641f3e3744e840ac4ac7ed5e6777a0beeb402d237f48a3b24 SHA512 987f925bd4559064878dfef11026d4a8938c9656be5c3587346ed8e6157bfb7890dd9a6a3fcbdd8eeb4a859c657aa3235279fa6e0de15740c8a4d22323038ce5 WHIRLPOOL fb0cab6f0b89c23a7f9db08cd50ee18b2f0cbeca305470ec5275b8298f7db62aa6dbccaaf52b3e07379049b7c1dbe856b6d8e0cd2780a2c055e3208b65e6d44d

diff --git a/net-firewall/shorewall/shorewall-5.1.4.1.ebuild b/net-firewall/shorewall/shorewall-5.1.4.1.ebuild
new file mode 100644
index 00000000000..ea2ef11ce09
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.4.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-06-13 15:56 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-06-13 15:56 UTC (permalink / raw
  To: gentoo-commits

commit:     4470b7e5be45fa96fb2d70f41d54f892d6b3713a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 15:54:58 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 15:54:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4470b7e5

net-firewall/shorewall: Bump to v5.1.4.2

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.1.4.ebuild => shorewall-5.1.4.2.ebuild}   |  8 --------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 3f73710063b..4d7cf069bec 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,28 @@
 DIST shorewall-5.0.15.3.tar.bz2 525470 SHA256 c71c42e9697057b39ae27593725d2fcc5829cc8eab78ef2109a1f16ed89534db SHA512 a0990a23870740e96d86dc5f02aa55d0f762e030a0a08ba9ce8801065712a1908889d9d82052cdeefcd14d851462217fd0096101a4535de96d5ff141a8ec7faa WHIRLPOOL f95ce4cbf856a8d4d635cf926408e782c44317ea4866c476b5ba8372f62fac1b16651a4b3ce8266e2bd8ff211254e2c6fa32dfef5e381c540e12651c7c695a2b
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
 DIST shorewall-5.1.4.1.tar.bz2 510816 SHA256 c561dd91c4b88ef087a6d172bafb4ac5d01c0055c47b855568536a0c422ff232 SHA512 4650e2ec73dcf6c38cf2992fefdbd2e302a34a9687a933d8a375d227df2621db96c9a2e54ebbfac50014152caffc0736a7bc1192f479c69c56f78f7874bc09b3 WHIRLPOOL 065cbd0f4e07a09e5326968680919de7fb988db092a406b0e809335374e8c5e68c0c8e4abeb4b8bd7dbb727869bcb7e0dc65bc38c33d783ff355943966183287
-DIST shorewall-5.1.4.tar.bz2 509894 SHA256 e25cfac5ea16309d5b24f1d4b9612ca2f3ba724f6d09acd8a99de697d0972f29 SHA512 67da4db601981071d030c3e2000899ea599b6b69465c9b778fc7d6afed0a4dec4c52f3d5cbfcd54ca4fdce64af19ba24508a6144fa19445a53939348bf6b96ac WHIRLPOOL 2223b8018264b36fb5b5e60dc19cf01105fa8fcc049087471518b01830a2a6c86206bdaaac03bb31fc47bf7c659c0857baa3a7ff37c22e902557bcfcbb8bf60f
+DIST shorewall-5.1.4.2.tar.bz2 511131 SHA256 df3ff7199c2fdf031030221b9aa23d2b80e4cafa1fe663ddedeaf901b6d013b1 SHA512 ccbc000341e21a82e22157717f8356b785f166928f26c63b5b35deadfd7e8c9674b2c4d47b2a1e67cad37b1bdb3080f2a27add05135fa4f1cdbc860b988bc90b WHIRLPOOL e12d3968f7d34cd41ead3a15f13092668743a4a488f242368feb843b8751bb13a3bb90a2094c76f3137de649fd5329dc6f9f1a34398d0301b6885380217255c4
 DIST shorewall-core-5.0.15.3.tar.bz2 65108 SHA256 0d174d9aabd3608e000a4536470b35d15a856d7394f5e8bd22ef410d8501b989 SHA512 4a5cca151bc5e8e538e7cb0f4d36461e32232bc7d94e72f82ddefc8c4d5622f14d8c625892295275b41b5ca99dc5217e3fafbf9c1d25d872117f78eed621575c WHIRLPOOL 71f0011684a1bfadaa5439eaa4e0852189262381a1a39b6c17e6f3ee0d4e397faf6ec5516b0288ac9a80896d56f275ae1c85b385adf69d98b4a780a60491e7bf
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.1.tar.bz2 75813 SHA256 3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629 SHA512 118378698e0fa1216b52ace92fe9eae0f7d32c39becbc50837a895d7367674b2c973b1633c8919045d9d16dd2a5fdbedb9d62ff1513547ee4770a2e9116d8b1e WHIRLPOOL 02ef5428faeb68f2ca3cf6c1e00ab15d0146d5ad931942528ba1832ce96e490df67976a40ed576014f30f06e2e4869ba691c1606d57b22364ab2e6b7ed32a019
-DIST shorewall-core-5.1.4.tar.bz2 75254 SHA256 3a4c287fed059e476fbfa0ccaf10d99cbb2c512a502b0bdb391dbf76ad6cad8a SHA512 f11c53465d8b9cd68f757377bb547e056e88220220fde915a871dbd18ffbde0044efe91b6acbeaf353f9a7f9b12a2b2a48b5bb372a4cbe59307f6b927214a1db WHIRLPOOL 01b0fb3b2f19ff7057f903106e049c751aebcdc208759e01c389e28c28de2dac9827126303343aab254fcb10d7d5d22c43bd4949aeec9d054477751e6fe0e901
+DIST shorewall-core-5.1.4.2.tar.bz2 75953 SHA256 19a8790fcd60a5ea77e306f219d68920bb3f9287610cd53825776153df13bba0 SHA512 049463e094d8d8229f4ce13c75de5c8be46947ffea3a0bfbb12888a8dea606dfe8191fc32f1d2f7cdae40569a9d9967d790c0699d038353d3065cbc118a1aad1 WHIRLPOOL 5b665b2dae433961421594f95456583f44253f7e24379c1cbc81ad0871f2e1f432dd54d759f4f4a16f9317e6ca4a73c5c5d5d9b51a897bb053309bfee91fa8e1
 DIST shorewall-docs-html-5.0.15.3.tar.bz2 4290905 SHA256 5e519eb6956fb51058e7c977f7130ab4c91b519097c624c83de980808e555849 SHA512 bca31dcb50246aa081512ee61c6e46545361777c9b033912023624872d7fb8fb4fc0b0b821fd0422698fab9000b4f087b8f4ef6799ee2d55b5f3cfbf81276a87 WHIRLPOOL 84c6c3777cfd228ef98880c84832fd5e23ae46fb38397783ad3dacd93eb57e5e0dc662014d3c9e98a1cd4647e3b84a84ecd3564be098a3ca20820215ae4b13db
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.1.tar.bz2 4284060 SHA256 0d077e38503832e75f5432d4a1b1c478f0ef02576c8aeb00480a3a101ec9a105 SHA512 ccc36bae8daacf3dca75002bee207abba667bd9a467afbde7f6cb1c18fa5d33fa53a4f93dfabfe0e85fd479449ebff2d12851cba5b494b7f3ce256cd79328687 WHIRLPOOL fa3c5a2abd61d005003f090492801a7a2c88512d28ed3ba174d4ecc998236132e7d923f780de30edcad44fe5fcc684bba13441f5fb9a1974d915607b4fd62eda
-DIST shorewall-docs-html-5.1.4.tar.bz2 4284146 SHA256 c17bf2f6f7448a89a97afa00425a503d1cc202a042af096bbacec6b66ced22e0 SHA512 5be7f4f5725e5a4ff2c8314ff869a9d902184f1050b26dda1be0febdd4d7dc997a45a5f286d9857539241e1bc9bfc1910fa89005672619c61c1628d565cb6478 WHIRLPOOL 0b64bce92e26ef2a22a2b48b54fd5ac3c4be15946ba936ebf0875f38c3401b19f24b572a14d811a5fd0b3b175f8d8400c85fd434db8bf3e53bf785ae56514a29
+DIST shorewall-docs-html-5.1.4.2.tar.bz2 4284341 SHA256 547f9e4e9c181d592c251acaf8a7fa41b4b9f1bf1ef975cdc75eb3cba1921d87 SHA512 f6697a22fe3f8288334ddf8b94b7ca3baef50126ba349cde80d124f43a28bd9db65d75dbb6dbeaf8fb05de262c33c6fc99588de923e0de6ae9a18b429fa7de5c WHIRLPOOL 1b6084a577da4613db5e1a357b1126eccc7a6fb5a32475e3ecea3b765d7182e1e9b5f4310fdcd9a43e1cde92c4c1abbfa71ada31515e92f37804f7db6eb9f2b8
 DIST shorewall-init-5.0.15.3.tar.bz2 42608 SHA256 00fc0f1bd04010626debf8b076b5b4e9a7451eff9d813ee6bf9cd507679a6443 SHA512 fae316724fe64cc93e20f08e221959156f59abc0b9349f830f6f4f8ba6be9f0a4ffedf68db5ee18b1a765c4ab51a3c9cb8153b70f1319b2b3bde38086208c628 WHIRLPOOL 35a5b06fe158ff4d173dec2246cdd329bcd573021b7e49db70065f9ea4ac3e5ca0321ed7ada9347eb0753fb68dfbd37ed6d65c599b005b25f024ffafe6a5882e
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.1.tar.bz2 30878 SHA256 c61b83601d3a4bb10e2bd8705682ddbed5ab3adcdc6074bc1ca4cb8d030e84e9 SHA512 4b9fa872a1ce0535d9c9054ad8e9750f7f797c4fd14777c77554c5218162882973fe1caf22c7242b6b38b4a5c2a122e901851757e86a560ea5f8030be063b70a WHIRLPOOL 76a360c00dc9c28576cb121360372b1218c7a9c399e89ae3366458e5aa2f5f20c7845fc4a49de5a55619e7589372c5b07eeea195604e4a4eac380739659611f1
-DIST shorewall-init-5.1.4.tar.bz2 30353 SHA256 f8d75ff55bf2264a8961f16dbd8cd69054f7e1f3e4eb5e52a9f1aab2096fdaca SHA512 de9c712bd35adf6156bf51fb1a7482b7d8019feba6e1c596eb16bc15cd8ebd834b674895c285f9e9b0b359fa807e338678a29977b4009a8584ab5e11073f5c3e WHIRLPOOL 4cab6192321768b377d531d6424ed5aef7ec2c1ad54313a8799711d7733a0d5becd1c7d02be17c1e9c59b06189e43493a16d5dac7e05edc25c7e0f1c63f0395d
+DIST shorewall-init-5.1.4.2.tar.bz2 31032 SHA256 cfd0c94be02238463e6f511de0f86bfddbd127922cd62ee61d42a7f7d85658b3 SHA512 d68ab7ab9d1c92c8169dd11537f9cefe1693c9ca22ac4e95f16f71037885a296b49e3cc91291be868671f2416418a6a661524cf073f915a67f6e3e3e86e659aa WHIRLPOOL 6f6fd1c3f8a6523801e2984fe8545f20066730b0319fd68afdfb82a8a5d9cb1f46e1984c26c7887706c83d75b355173c6521f2cb1e69fb6db4b3f1493b4e1294
 DIST shorewall-lite-5.0.15.3.tar.bz2 59024 SHA256 5e32b0346edea2ceef4930b80e1a5797048c4e419c96a870499ea0d6336e9eef SHA512 c71957f243e5e93810f04bfb4154a6bc0ae96ea7040753d15a4856d3b7d153871e29394b07ff1fba92a7f832a3880a6e58ac55303ae7c81e5df8ace7fadd8129 WHIRLPOOL b864fb2f776540d26e578ba038368ae9d014979fff9008ce9241d1acd893ac41df46696a2513866c280cd86d363257e8b9b1f2f47237c13f54d489a034adc5a6
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.1.tar.bz2 36647 SHA256 e90d419ed8a6da615c3a0d6fdcb9481f8e71f89c2bdcff09ab027198ca2ce293 SHA512 c06e365d06c484e7ef673e5a8597d70996f1008a00163aae2d7a53d0d720739a8b0317a093b3e75487ef1c8a02ac4c4c542480757226a974671f82ab08353896 WHIRLPOOL 0077886083aadcc5973c6f515da8e99fdbbcc4e64e0e4cc4893a47cda7afc17331d2ff175da314aa38dc0186ea074bee65facacc5dc7212c0c8836cbfc0c9a02
-DIST shorewall-lite-5.1.4.tar.bz2 36155 SHA256 293ec572444ec5ff1119dd2cab0bc1fcc3e5ff5483ddea5d08cff566035bb363 SHA512 5093fe0d85049b7495bfefbc2525c935db21e10731389451f787c7fd0e9c7fa0258a6de1100633db1056562d912e68639e22285260a642fa40806360ab89f352 WHIRLPOOL f63315b05535ba7185b3ff2d4955c22c8e3e97a83e24cf04936c0436d369b389e96ee1483261e1a520ae13611c7e38b070f93861a5a06ef84b522105f18a3712
+DIST shorewall-lite-5.1.4.2.tar.bz2 36855 SHA256 6e79e312262592aef05011359e75f5021811ee46017b600cb17d2e144c2d0279 SHA512 5f5a1596c74d2f3136d67ffc730deabb04ff269b2d01fe02d20118bb93ea13b244b6aab2040dbb5ccd7536ea99b5aabfb3aa66ad6b58ec732cd374de01c1aee4 WHIRLPOOL 54166cfde56a233ad93d736d9376507ded9fa1ee6ff9f20ff7df267d107de6700a9b8ef1a639fa4572e361c21e1aa5d732a826f9b0cea870c7fcc0402f7ef849
 DIST shorewall6-5.0.15.3.tar.bz2 241045 SHA256 79b91e33b24ac620a682e91c48ca18590dbac33e36c0fea37bdb2b1f3db47d7e SHA512 141fe6e23883d71f3d1fb8cb3d305a5eb439170430d71c9a066feb2acd734d4db54f386c91345c91c14f017ca5b4da7b08ad521e580545632411ae4c43d99e5b WHIRLPOOL 03c2f0731f988d094c96dd74271437c8bddc494b780980edab914c77944ded0343d6df0b94b871e33508d293f9ccfde89e4023a56b0ca2866433aa1c87ac2595
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.1.tar.bz2 224863 SHA256 e3da805b4aa1e8c483f1bb451cb47a869e1977b213a86145a82d42e9bc12ea36 SHA512 3b5c228693936103eb1479e5b0968c5a7d24d94beea410b3ad79f9e7e3b32cca286384b91ee3b09ce006758d27f9b2efe22c589d07d05eeef9ef981818da0b80 WHIRLPOOL 810739511bfb730c6040c8cd9a8a06c836e085a70ea5b4e148d3d364d92648e194ce2b4f1e4a0535a0860a138d87744ddacb229312100242e36828f7e348514f
-DIST shorewall6-5.1.4.tar.bz2 224287 SHA256 bac38ea334dcc5ce7e505ee3a484ca2b739e119c030e815839455c41114b3ebb SHA512 1e7c3fbe91d5ca3f06a0e31bbe7659c29e3c4e2c6d87ec0eb449e09c321b7eb16458cfc73e054dd6f04deb9dc4e45da8279d611bd8424f36624e4027a7cc3c19 WHIRLPOOL 0eba307ed1a453f28f7dbd3ffaa6d25ed68f7cf2f836ed6bb6d8945b0af6bccc88310baa58864fd87475a63f589cad4882f832acfb6436dd73ba511b9edd3287
+DIST shorewall6-5.1.4.2.tar.bz2 224891 SHA256 0934ed42b5dafeab294dc004e72c7361820a4485bdc5005cfdaf3fd628adaea0 SHA512 6ba1dc59797ce9be447536dd0fab5963d5baafaae69bc207c7b93035da89ec88528e5d679ce39925acafa6da559e0273f16f268be4218d01ad4c4a3d894917c1 WHIRLPOOL 581839a3d08377fcdca7881a039d492e799cbc26d917bf53a3047774373205eda29a22aaf15c8b7613253df45f9c134cf46333e79c2057e5b5248241c6fcecbb
 DIST shorewall6-lite-5.0.15.3.tar.bz2 58442 SHA256 822e6fbf3f2f7bef8db2424f6c40ad03b492ce7305d95b123ad2b1d1329e396a SHA512 f8bf47f2d39857df9579b8bacc32ef87159b5502cd4fed1761fca21d14a902122c30d87ce2a8af9a309c32d826238c5f966416cccc6bb1fe93271f45902d867d WHIRLPOOL 40d37102e415c3b13560159cd994a9baeeefa96f641e5bf6133212a084ff5bc2a54abcbe34901f35b5d0faef671b908fa19a873f0a98d8e074f6731bfae46ec1
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.1.tar.bz2 36362 SHA256 29a2f2be295b4f995b38e663b771660ccdc6321134bcfbd0f9378f9bb1237e3c SHA512 b616c5886b5bc274e88052359ca4c8aa6df60a9706958698eac7fc362f1c893de00ed2272535d61a88cb6a786bae9b7cba64a835833a9f81c991fb2ffed8244b WHIRLPOOL 519aee8ad997c14f4337824d40c38cbf7ba2d2ac7db0964c2557816e0d4c4dca24ed2ac69341473e899d0e9e84d367a9e6f42b2484221257bdd55b40c73ee201
-DIST shorewall6-lite-5.1.4.tar.bz2 35837 SHA256 732fe79096e164c641f3e3744e840ac4ac7ed5e6777a0beeb402d237f48a3b24 SHA512 987f925bd4559064878dfef11026d4a8938c9656be5c3587346ed8e6157bfb7890dd9a6a3fcbdd8eeb4a859c657aa3235279fa6e0de15740c8a4d22323038ce5 WHIRLPOOL fb0cab6f0b89c23a7f9db08cd50ee18b2f0cbeca305470ec5275b8298f7db62aa6dbccaaf52b3e07379049b7c1dbe856b6d8e0cd2780a2c055e3208b65e6d44d
+DIST shorewall6-lite-5.1.4.2.tar.bz2 36561 SHA256 121f360799b68c283d4e1e9be3f2eb1fa75d735b5f0a4daf78e58c020cf99e59 SHA512 e3b05e82eeeaaf68d39e951b91c803bd13e8a5cae15634fc62b65bd537b8b9585fb4dcb3aac9b04df696c98bba94cfd39c8ded149da40db51073cfa0338608f1 WHIRLPOOL bd3242aedf0fafbbf5b2e2020b0d41d813515efe872607d85385478d16c3805bb19d87c548fef579412d312cdc3cd4dfe67f1967d14d8ae39fda3eee4783a8fd

diff --git a/net-firewall/shorewall/shorewall-5.1.4.ebuild b/net-firewall/shorewall/shorewall-5.1.4.2.ebuild
similarity index 96%
rename from net-firewall/shorewall/shorewall-5.1.4.ebuild
rename to net-firewall/shorewall/shorewall-5.1.4.2.ebuild
index 819098422c0..ea2ef11ce09 100644
--- a/net-firewall/shorewall/shorewall-5.1.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.4.2.ebuild
@@ -173,10 +173,6 @@ src_prepare() {
 		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
 		cp "${FILESDIR}"/shorewall.initd-r2 "${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"
-
-		# Patch LOGFORMAT to default value (=the value when LOGFORMAT isn't set)
-		# to keep existing tools which processes the logs working
-		sed -i -e 's/LOGFORMAT=.*/LOGFORMAT="Shorewall:%s:%s:"/' "${S}"/${MY_PN_IPV4}/configfiles/shorewall.conf || die "Failed to patch shorewall.conf"
 		eend 0
 	fi
 
@@ -188,10 +184,6 @@ src_prepare() {
 		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
 		cp "${FILESDIR}"/shorewall.initd-r2 "${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"
-
-		# Patch LOGFORMAT to default value (=the value when LOGFORMAT isn't set)
-		# to keep existing tools which processes the logs working
-		sed -i -e 's/LOGFORMAT=.*/LOGFORMAT="Shorewall:%s:%s:"/' "${S}"/${MY_PN_IPV6}/configfiles/shorewall6.conf || die "Failed to patch shorewall6.conf"
 		eend 0
 	fi
 


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-06-13 15:57 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-06-13 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     51e43041b881ae9357e261b1af6c80b652732537
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 15:57:10 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 15:57:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e43041

net-firewall/shorewall: Cleanup old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                  |   7 -
 net-firewall/shorewall/shorewall-5.0.15.3.ebuild | 451 -----------------------
 net-firewall/shorewall/shorewall-5.0.15.6.ebuild | 451 -----------------------
 3 files changed, 909 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 4d7cf069bec..4b37c638356 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,21 @@
-DIST shorewall-5.0.15.3.tar.bz2 525470 SHA256 c71c42e9697057b39ae27593725d2fcc5829cc8eab78ef2109a1f16ed89534db SHA512 a0990a23870740e96d86dc5f02aa55d0f762e030a0a08ba9ce8801065712a1908889d9d82052cdeefcd14d851462217fd0096101a4535de96d5ff141a8ec7faa WHIRLPOOL f95ce4cbf856a8d4d635cf926408e782c44317ea4866c476b5ba8372f62fac1b16651a4b3ce8266e2bd8ff211254e2c6fa32dfef5e381c540e12651c7c695a2b
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
 DIST shorewall-5.1.4.1.tar.bz2 510816 SHA256 c561dd91c4b88ef087a6d172bafb4ac5d01c0055c47b855568536a0c422ff232 SHA512 4650e2ec73dcf6c38cf2992fefdbd2e302a34a9687a933d8a375d227df2621db96c9a2e54ebbfac50014152caffc0736a7bc1192f479c69c56f78f7874bc09b3 WHIRLPOOL 065cbd0f4e07a09e5326968680919de7fb988db092a406b0e809335374e8c5e68c0c8e4abeb4b8bd7dbb727869bcb7e0dc65bc38c33d783ff355943966183287
 DIST shorewall-5.1.4.2.tar.bz2 511131 SHA256 df3ff7199c2fdf031030221b9aa23d2b80e4cafa1fe663ddedeaf901b6d013b1 SHA512 ccbc000341e21a82e22157717f8356b785f166928f26c63b5b35deadfd7e8c9674b2c4d47b2a1e67cad37b1bdb3080f2a27add05135fa4f1cdbc860b988bc90b WHIRLPOOL e12d3968f7d34cd41ead3a15f13092668743a4a488f242368feb843b8751bb13a3bb90a2094c76f3137de649fd5329dc6f9f1a34398d0301b6885380217255c4
-DIST shorewall-core-5.0.15.3.tar.bz2 65108 SHA256 0d174d9aabd3608e000a4536470b35d15a856d7394f5e8bd22ef410d8501b989 SHA512 4a5cca151bc5e8e538e7cb0f4d36461e32232bc7d94e72f82ddefc8c4d5622f14d8c625892295275b41b5ca99dc5217e3fafbf9c1d25d872117f78eed621575c WHIRLPOOL 71f0011684a1bfadaa5439eaa4e0852189262381a1a39b6c17e6f3ee0d4e397faf6ec5516b0288ac9a80896d56f275ae1c85b385adf69d98b4a780a60491e7bf
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.1.tar.bz2 75813 SHA256 3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629 SHA512 118378698e0fa1216b52ace92fe9eae0f7d32c39becbc50837a895d7367674b2c973b1633c8919045d9d16dd2a5fdbedb9d62ff1513547ee4770a2e9116d8b1e WHIRLPOOL 02ef5428faeb68f2ca3cf6c1e00ab15d0146d5ad931942528ba1832ce96e490df67976a40ed576014f30f06e2e4869ba691c1606d57b22364ab2e6b7ed32a019
 DIST shorewall-core-5.1.4.2.tar.bz2 75953 SHA256 19a8790fcd60a5ea77e306f219d68920bb3f9287610cd53825776153df13bba0 SHA512 049463e094d8d8229f4ce13c75de5c8be46947ffea3a0bfbb12888a8dea606dfe8191fc32f1d2f7cdae40569a9d9967d790c0699d038353d3065cbc118a1aad1 WHIRLPOOL 5b665b2dae433961421594f95456583f44253f7e24379c1cbc81ad0871f2e1f432dd54d759f4f4a16f9317e6ca4a73c5c5d5d9b51a897bb053309bfee91fa8e1
-DIST shorewall-docs-html-5.0.15.3.tar.bz2 4290905 SHA256 5e519eb6956fb51058e7c977f7130ab4c91b519097c624c83de980808e555849 SHA512 bca31dcb50246aa081512ee61c6e46545361777c9b033912023624872d7fb8fb4fc0b0b821fd0422698fab9000b4f087b8f4ef6799ee2d55b5f3cfbf81276a87 WHIRLPOOL 84c6c3777cfd228ef98880c84832fd5e23ae46fb38397783ad3dacd93eb57e5e0dc662014d3c9e98a1cd4647e3b84a84ecd3564be098a3ca20820215ae4b13db
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.1.tar.bz2 4284060 SHA256 0d077e38503832e75f5432d4a1b1c478f0ef02576c8aeb00480a3a101ec9a105 SHA512 ccc36bae8daacf3dca75002bee207abba667bd9a467afbde7f6cb1c18fa5d33fa53a4f93dfabfe0e85fd479449ebff2d12851cba5b494b7f3ce256cd79328687 WHIRLPOOL fa3c5a2abd61d005003f090492801a7a2c88512d28ed3ba174d4ecc998236132e7d923f780de30edcad44fe5fcc684bba13441f5fb9a1974d915607b4fd62eda
 DIST shorewall-docs-html-5.1.4.2.tar.bz2 4284341 SHA256 547f9e4e9c181d592c251acaf8a7fa41b4b9f1bf1ef975cdc75eb3cba1921d87 SHA512 f6697a22fe3f8288334ddf8b94b7ca3baef50126ba349cde80d124f43a28bd9db65d75dbb6dbeaf8fb05de262c33c6fc99588de923e0de6ae9a18b429fa7de5c WHIRLPOOL 1b6084a577da4613db5e1a357b1126eccc7a6fb5a32475e3ecea3b765d7182e1e9b5f4310fdcd9a43e1cde92c4c1abbfa71ada31515e92f37804f7db6eb9f2b8
-DIST shorewall-init-5.0.15.3.tar.bz2 42608 SHA256 00fc0f1bd04010626debf8b076b5b4e9a7451eff9d813ee6bf9cd507679a6443 SHA512 fae316724fe64cc93e20f08e221959156f59abc0b9349f830f6f4f8ba6be9f0a4ffedf68db5ee18b1a765c4ab51a3c9cb8153b70f1319b2b3bde38086208c628 WHIRLPOOL 35a5b06fe158ff4d173dec2246cdd329bcd573021b7e49db70065f9ea4ac3e5ca0321ed7ada9347eb0753fb68dfbd37ed6d65c599b005b25f024ffafe6a5882e
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.1.tar.bz2 30878 SHA256 c61b83601d3a4bb10e2bd8705682ddbed5ab3adcdc6074bc1ca4cb8d030e84e9 SHA512 4b9fa872a1ce0535d9c9054ad8e9750f7f797c4fd14777c77554c5218162882973fe1caf22c7242b6b38b4a5c2a122e901851757e86a560ea5f8030be063b70a WHIRLPOOL 76a360c00dc9c28576cb121360372b1218c7a9c399e89ae3366458e5aa2f5f20c7845fc4a49de5a55619e7589372c5b07eeea195604e4a4eac380739659611f1
 DIST shorewall-init-5.1.4.2.tar.bz2 31032 SHA256 cfd0c94be02238463e6f511de0f86bfddbd127922cd62ee61d42a7f7d85658b3 SHA512 d68ab7ab9d1c92c8169dd11537f9cefe1693c9ca22ac4e95f16f71037885a296b49e3cc91291be868671f2416418a6a661524cf073f915a67f6e3e3e86e659aa WHIRLPOOL 6f6fd1c3f8a6523801e2984fe8545f20066730b0319fd68afdfb82a8a5d9cb1f46e1984c26c7887706c83d75b355173c6521f2cb1e69fb6db4b3f1493b4e1294
-DIST shorewall-lite-5.0.15.3.tar.bz2 59024 SHA256 5e32b0346edea2ceef4930b80e1a5797048c4e419c96a870499ea0d6336e9eef SHA512 c71957f243e5e93810f04bfb4154a6bc0ae96ea7040753d15a4856d3b7d153871e29394b07ff1fba92a7f832a3880a6e58ac55303ae7c81e5df8ace7fadd8129 WHIRLPOOL b864fb2f776540d26e578ba038368ae9d014979fff9008ce9241d1acd893ac41df46696a2513866c280cd86d363257e8b9b1f2f47237c13f54d489a034adc5a6
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.1.tar.bz2 36647 SHA256 e90d419ed8a6da615c3a0d6fdcb9481f8e71f89c2bdcff09ab027198ca2ce293 SHA512 c06e365d06c484e7ef673e5a8597d70996f1008a00163aae2d7a53d0d720739a8b0317a093b3e75487ef1c8a02ac4c4c542480757226a974671f82ab08353896 WHIRLPOOL 0077886083aadcc5973c6f515da8e99fdbbcc4e64e0e4cc4893a47cda7afc17331d2ff175da314aa38dc0186ea074bee65facacc5dc7212c0c8836cbfc0c9a02
 DIST shorewall-lite-5.1.4.2.tar.bz2 36855 SHA256 6e79e312262592aef05011359e75f5021811ee46017b600cb17d2e144c2d0279 SHA512 5f5a1596c74d2f3136d67ffc730deabb04ff269b2d01fe02d20118bb93ea13b244b6aab2040dbb5ccd7536ea99b5aabfb3aa66ad6b58ec732cd374de01c1aee4 WHIRLPOOL 54166cfde56a233ad93d736d9376507ded9fa1ee6ff9f20ff7df267d107de6700a9b8ef1a639fa4572e361c21e1aa5d732a826f9b0cea870c7fcc0402f7ef849
-DIST shorewall6-5.0.15.3.tar.bz2 241045 SHA256 79b91e33b24ac620a682e91c48ca18590dbac33e36c0fea37bdb2b1f3db47d7e SHA512 141fe6e23883d71f3d1fb8cb3d305a5eb439170430d71c9a066feb2acd734d4db54f386c91345c91c14f017ca5b4da7b08ad521e580545632411ae4c43d99e5b WHIRLPOOL 03c2f0731f988d094c96dd74271437c8bddc494b780980edab914c77944ded0343d6df0b94b871e33508d293f9ccfde89e4023a56b0ca2866433aa1c87ac2595
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.1.tar.bz2 224863 SHA256 e3da805b4aa1e8c483f1bb451cb47a869e1977b213a86145a82d42e9bc12ea36 SHA512 3b5c228693936103eb1479e5b0968c5a7d24d94beea410b3ad79f9e7e3b32cca286384b91ee3b09ce006758d27f9b2efe22c589d07d05eeef9ef981818da0b80 WHIRLPOOL 810739511bfb730c6040c8cd9a8a06c836e085a70ea5b4e148d3d364d92648e194ce2b4f1e4a0535a0860a138d87744ddacb229312100242e36828f7e348514f
 DIST shorewall6-5.1.4.2.tar.bz2 224891 SHA256 0934ed42b5dafeab294dc004e72c7361820a4485bdc5005cfdaf3fd628adaea0 SHA512 6ba1dc59797ce9be447536dd0fab5963d5baafaae69bc207c7b93035da89ec88528e5d679ce39925acafa6da559e0273f16f268be4218d01ad4c4a3d894917c1 WHIRLPOOL 581839a3d08377fcdca7881a039d492e799cbc26d917bf53a3047774373205eda29a22aaf15c8b7613253df45f9c134cf46333e79c2057e5b5248241c6fcecbb
-DIST shorewall6-lite-5.0.15.3.tar.bz2 58442 SHA256 822e6fbf3f2f7bef8db2424f6c40ad03b492ce7305d95b123ad2b1d1329e396a SHA512 f8bf47f2d39857df9579b8bacc32ef87159b5502cd4fed1761fca21d14a902122c30d87ce2a8af9a309c32d826238c5f966416cccc6bb1fe93271f45902d867d WHIRLPOOL 40d37102e415c3b13560159cd994a9baeeefa96f641e5bf6133212a084ff5bc2a54abcbe34901f35b5d0faef671b908fa19a873f0a98d8e074f6731bfae46ec1
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.1.tar.bz2 36362 SHA256 29a2f2be295b4f995b38e663b771660ccdc6321134bcfbd0f9378f9bb1237e3c SHA512 b616c5886b5bc274e88052359ca4c8aa6df60a9706958698eac7fc362f1c893de00ed2272535d61a88cb6a786bae9b7cba64a835833a9f81c991fb2ffed8244b WHIRLPOOL 519aee8ad997c14f4337824d40c38cbf7ba2d2ac7db0964c2557816e0d4c4dca24ed2ac69341473e899d0e9e84d367a9e6f42b2484221257bdd55b40c73ee201
 DIST shorewall6-lite-5.1.4.2.tar.bz2 36561 SHA256 121f360799b68c283d4e1e9be3f2eb1fa75d735b5f0a4daf78e58c020cf99e59 SHA512 e3b05e82eeeaaf68d39e951b91c803bd13e8a5cae15634fc62b65bd537b8b9585fb4dcb3aac9b04df696c98bba94cfd39c8ded149da40db51073cfa0338608f1 WHIRLPOOL bd3242aedf0fafbbf5b2e2020b0d41d813515efe872607d85385478d16c3805bb19d87c548fef579412d312cdc3cd4dfe67f1967d14d8ae39fda3eee4783a8fd

diff --git a/net-firewall/shorewall/shorewall-5.0.15.3.ebuild b/net-firewall/shorewall/shorewall-5.0.15.3.ebuild
deleted file mode 100644
index a4bccb68b78..00000000000
--- a/net-firewall/shorewall/shorewall-5.0.15.3.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "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 "  http://www.shorewall.net/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.0.15.6.ebuild b/net-firewall/shorewall/shorewall-5.0.15.6.ebuild
deleted file mode 100644
index a4bccb68b78..00000000000
--- a/net-firewall/shorewall/shorewall-5.0.15.6.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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 )
-	!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."
-
-	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
-
-	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 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-06-20  8:11 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-06-20  8:11 UTC (permalink / raw
  To: gentoo-commits

commit:     6cb4e71a0b5ad097bcc92708e23f55783348fd90
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 07:47:51 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 08:11:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb4e71a

net-firewall/shorewall: Bump to v5.1.4.3

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.4.3.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 4b37c638356..16b1d11f286 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
 DIST shorewall-5.1.4.1.tar.bz2 510816 SHA256 c561dd91c4b88ef087a6d172bafb4ac5d01c0055c47b855568536a0c422ff232 SHA512 4650e2ec73dcf6c38cf2992fefdbd2e302a34a9687a933d8a375d227df2621db96c9a2e54ebbfac50014152caffc0736a7bc1192f479c69c56f78f7874bc09b3 WHIRLPOOL 065cbd0f4e07a09e5326968680919de7fb988db092a406b0e809335374e8c5e68c0c8e4abeb4b8bd7dbb727869bcb7e0dc65bc38c33d783ff355943966183287
 DIST shorewall-5.1.4.2.tar.bz2 511131 SHA256 df3ff7199c2fdf031030221b9aa23d2b80e4cafa1fe663ddedeaf901b6d013b1 SHA512 ccbc000341e21a82e22157717f8356b785f166928f26c63b5b35deadfd7e8c9674b2c4d47b2a1e67cad37b1bdb3080f2a27add05135fa4f1cdbc860b988bc90b WHIRLPOOL e12d3968f7d34cd41ead3a15f13092668743a4a488f242368feb843b8751bb13a3bb90a2094c76f3137de649fd5329dc6f9f1a34398d0301b6885380217255c4
+DIST shorewall-5.1.4.3.tar.bz2 511450 SHA256 29238dfc996353acbfdb039f485e2acf22c7c039f8b9ab28a2d7ce827c935d3e SHA512 623b4e266b4ea5aaedb6fa05fb190e64ea8c94a32382b1548dc6c80dd251e5a9695c39fb14316b24dd07eda728b864bbff575e759ba4fcd70e82cabd9f046f77 WHIRLPOOL 66c07064ef491a2a336bd0832498fc1b18b17f3660f5f2b0efd6361c1405d93e816c809f3572f92b1ab678305f459a5f6065b380bdca6f5233113037bfc98f89
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.1.tar.bz2 75813 SHA256 3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629 SHA512 118378698e0fa1216b52ace92fe9eae0f7d32c39becbc50837a895d7367674b2c973b1633c8919045d9d16dd2a5fdbedb9d62ff1513547ee4770a2e9116d8b1e WHIRLPOOL 02ef5428faeb68f2ca3cf6c1e00ab15d0146d5ad931942528ba1832ce96e490df67976a40ed576014f30f06e2e4869ba691c1606d57b22364ab2e6b7ed32a019
 DIST shorewall-core-5.1.4.2.tar.bz2 75953 SHA256 19a8790fcd60a5ea77e306f219d68920bb3f9287610cd53825776153df13bba0 SHA512 049463e094d8d8229f4ce13c75de5c8be46947ffea3a0bfbb12888a8dea606dfe8191fc32f1d2f7cdae40569a9d9967d790c0699d038353d3065cbc118a1aad1 WHIRLPOOL 5b665b2dae433961421594f95456583f44253f7e24379c1cbc81ad0871f2e1f432dd54d759f4f4a16f9317e6ca4a73c5c5d5d9b51a897bb053309bfee91fa8e1
+DIST shorewall-core-5.1.4.3.tar.bz2 76112 SHA256 6d283b8b380db5d94c39325cf44fe9b71cb2f5bb0e4ea8941aef33e802b1e5d6 SHA512 d6969fbe579c20918ca132111cf2ba8f2db4b397afe5d47b1fab796571203ea96b423379ab5403354aac5a7b6d83aeb1f5160124c2cdb33993fa3160fe156097 WHIRLPOOL 76b650a42c40a35fa3c30b02ae02bc0ca8f607be093e43357f491686aca75941266cb195650c8711232d13b6e5dd9c86c555d38c59a094ef3578ce86d0139086
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.1.tar.bz2 4284060 SHA256 0d077e38503832e75f5432d4a1b1c478f0ef02576c8aeb00480a3a101ec9a105 SHA512 ccc36bae8daacf3dca75002bee207abba667bd9a467afbde7f6cb1c18fa5d33fa53a4f93dfabfe0e85fd479449ebff2d12851cba5b494b7f3ce256cd79328687 WHIRLPOOL fa3c5a2abd61d005003f090492801a7a2c88512d28ed3ba174d4ecc998236132e7d923f780de30edcad44fe5fcc684bba13441f5fb9a1974d915607b4fd62eda
 DIST shorewall-docs-html-5.1.4.2.tar.bz2 4284341 SHA256 547f9e4e9c181d592c251acaf8a7fa41b4b9f1bf1ef975cdc75eb3cba1921d87 SHA512 f6697a22fe3f8288334ddf8b94b7ca3baef50126ba349cde80d124f43a28bd9db65d75dbb6dbeaf8fb05de262c33c6fc99588de923e0de6ae9a18b429fa7de5c WHIRLPOOL 1b6084a577da4613db5e1a357b1126eccc7a6fb5a32475e3ecea3b765d7182e1e9b5f4310fdcd9a43e1cde92c4c1abbfa71ada31515e92f37804f7db6eb9f2b8
+DIST shorewall-docs-html-5.1.4.3.tar.bz2 4284526 SHA256 3af6ad0464db41388080c9277fca6bbed3a935f000ab29987c5e948015efab1b SHA512 2b8523babe1cb28d07c033c53328785254100a5712f316fc279f06128dafb46924e72e4c9c648b20cedd2c4837c8396613a5a7628787a312b227f3d7427d2e72 WHIRLPOOL 1e394cb221f6bdb87666b468fefe117538a0adb0d1375cdb46563a976628922b7cf4a2a4cdf19d0cfb36d9aa890d605a5cf8c3a4981de3c3d10b314bb42132ce
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.1.tar.bz2 30878 SHA256 c61b83601d3a4bb10e2bd8705682ddbed5ab3adcdc6074bc1ca4cb8d030e84e9 SHA512 4b9fa872a1ce0535d9c9054ad8e9750f7f797c4fd14777c77554c5218162882973fe1caf22c7242b6b38b4a5c2a122e901851757e86a560ea5f8030be063b70a WHIRLPOOL 76a360c00dc9c28576cb121360372b1218c7a9c399e89ae3366458e5aa2f5f20c7845fc4a49de5a55619e7589372c5b07eeea195604e4a4eac380739659611f1
 DIST shorewall-init-5.1.4.2.tar.bz2 31032 SHA256 cfd0c94be02238463e6f511de0f86bfddbd127922cd62ee61d42a7f7d85658b3 SHA512 d68ab7ab9d1c92c8169dd11537f9cefe1693c9ca22ac4e95f16f71037885a296b49e3cc91291be868671f2416418a6a661524cf073f915a67f6e3e3e86e659aa WHIRLPOOL 6f6fd1c3f8a6523801e2984fe8545f20066730b0319fd68afdfb82a8a5d9cb1f46e1984c26c7887706c83d75b355173c6521f2cb1e69fb6db4b3f1493b4e1294
+DIST shorewall-init-5.1.4.3.tar.bz2 31194 SHA256 0ceeabf339f3d49eeb88fc40ba382e5c57ef3491af0dc4476ea7e8a255194e56 SHA512 c8197525cce8b9bd9efd81b65d512bfa292060d2696c8c24648f81a3703885c84dfbc0c1ebd4bcd8da7e981dd6a891f64123409457a6623e5f2b81dca453ddd1 WHIRLPOOL 05914583e9244ef677f5530aec82e77e31c2d284d6f5324aed59c583b02d3488c7e8b3e24518bd0574bad6d5ee5366037e29d4767e29f54b6d88f6f38be56a30
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.1.tar.bz2 36647 SHA256 e90d419ed8a6da615c3a0d6fdcb9481f8e71f89c2bdcff09ab027198ca2ce293 SHA512 c06e365d06c484e7ef673e5a8597d70996f1008a00163aae2d7a53d0d720739a8b0317a093b3e75487ef1c8a02ac4c4c542480757226a974671f82ab08353896 WHIRLPOOL 0077886083aadcc5973c6f515da8e99fdbbcc4e64e0e4cc4893a47cda7afc17331d2ff175da314aa38dc0186ea074bee65facacc5dc7212c0c8836cbfc0c9a02
 DIST shorewall-lite-5.1.4.2.tar.bz2 36855 SHA256 6e79e312262592aef05011359e75f5021811ee46017b600cb17d2e144c2d0279 SHA512 5f5a1596c74d2f3136d67ffc730deabb04ff269b2d01fe02d20118bb93ea13b244b6aab2040dbb5ccd7536ea99b5aabfb3aa66ad6b58ec732cd374de01c1aee4 WHIRLPOOL 54166cfde56a233ad93d736d9376507ded9fa1ee6ff9f20ff7df267d107de6700a9b8ef1a639fa4572e361c21e1aa5d732a826f9b0cea870c7fcc0402f7ef849
+DIST shorewall-lite-5.1.4.3.tar.bz2 37027 SHA256 7dc4bf0eeb3914feebfb83347bb947f666522dc597e31bddcca3c7552894255c SHA512 00ec62b2645847237293d150b3f74d728f9f718c390fa9b74483a3ded2e082c7d0aa5e154d93330dc1d9133df456aff2a91196a57a90b3079c4f43d30e1ff8cc WHIRLPOOL 5d47c7175878cff55d50abe19daadcd550bb96616654a63b3c708ab6c723745a5c845000578a1eb17c0767ae1402390a582b1a487a50dcd5b5898715631d692e
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.1.tar.bz2 224863 SHA256 e3da805b4aa1e8c483f1bb451cb47a869e1977b213a86145a82d42e9bc12ea36 SHA512 3b5c228693936103eb1479e5b0968c5a7d24d94beea410b3ad79f9e7e3b32cca286384b91ee3b09ce006758d27f9b2efe22c589d07d05eeef9ef981818da0b80 WHIRLPOOL 810739511bfb730c6040c8cd9a8a06c836e085a70ea5b4e148d3d364d92648e194ce2b4f1e4a0535a0860a138d87744ddacb229312100242e36828f7e348514f
 DIST shorewall6-5.1.4.2.tar.bz2 224891 SHA256 0934ed42b5dafeab294dc004e72c7361820a4485bdc5005cfdaf3fd628adaea0 SHA512 6ba1dc59797ce9be447536dd0fab5963d5baafaae69bc207c7b93035da89ec88528e5d679ce39925acafa6da559e0273f16f268be4218d01ad4c4a3d894917c1 WHIRLPOOL 581839a3d08377fcdca7881a039d492e799cbc26d917bf53a3047774373205eda29a22aaf15c8b7613253df45f9c134cf46333e79c2057e5b5248241c6fcecbb
+DIST shorewall6-5.1.4.3.tar.bz2 225040 SHA256 c2ab0aaa42015883291c568067927f7bf00d273f56cb9d2d979bc995b6ca8b59 SHA512 867ab06dc800109a10ec7ac9897369d43fd0f74024cc4cd7e697c15a36294ef5bc0269a5fe406e848a8a614f75c6c33a1fa7078c1af97401e646981788a96bf8 WHIRLPOOL bc2e7fb00e566fd818a881791c157e6f14474964598458740f43d1a823919d3a105b3026a912d8cb2ae70cc5b267072f6574486ee08f91a5903fe92eb565f5f7
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.1.tar.bz2 36362 SHA256 29a2f2be295b4f995b38e663b771660ccdc6321134bcfbd0f9378f9bb1237e3c SHA512 b616c5886b5bc274e88052359ca4c8aa6df60a9706958698eac7fc362f1c893de00ed2272535d61a88cb6a786bae9b7cba64a835833a9f81c991fb2ffed8244b WHIRLPOOL 519aee8ad997c14f4337824d40c38cbf7ba2d2ac7db0964c2557816e0d4c4dca24ed2ac69341473e899d0e9e84d367a9e6f42b2484221257bdd55b40c73ee201
 DIST shorewall6-lite-5.1.4.2.tar.bz2 36561 SHA256 121f360799b68c283d4e1e9be3f2eb1fa75d735b5f0a4daf78e58c020cf99e59 SHA512 e3b05e82eeeaaf68d39e951b91c803bd13e8a5cae15634fc62b65bd537b8b9585fb4dcb3aac9b04df696c98bba94cfd39c8ded149da40db51073cfa0338608f1 WHIRLPOOL bd3242aedf0fafbbf5b2e2020b0d41d813515efe872607d85385478d16c3805bb19d87c548fef579412d312cdc3cd4dfe67f1967d14d8ae39fda3eee4783a8fd
+DIST shorewall6-lite-5.1.4.3.tar.bz2 36731 SHA256 b3cb5efe633859f073071552907b503f0ce097e98202e930434540158d5acf92 SHA512 e861bcb17fe528311c1576a37b014aa01c29fcbe9e19bd19bf021420d75b7a6b505bfb159cc065174a82c4ba18fccc9db5d15a34cfbd2371da02466355ce19ff WHIRLPOOL d84a2edd711c029c3b0cd4d4188069dcb71c450d1e5627be147d0ffc7f309f922e76631b4000911a9c40cb418fb90a60289e09d7f3fdf01227ab6a2df993f5e7

diff --git a/net-firewall/shorewall/shorewall-5.1.4.3.ebuild b/net-firewall/shorewall/shorewall-5.1.4.3.ebuild
new file mode 100644
index 00000000000..ea2ef11ce09
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.4.3.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-06-26  1:16 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-06-26  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     64c9bd1b32d03a0f4f1751a066b807daee029e81
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 01:16:47 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 01:16:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c9bd1b

net-firewall/shorewall: Bump to v5.1.4.4

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.4.4.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 16b1d11f286..2f681aed287 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -2,27 +2,34 @@ DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b3
 DIST shorewall-5.1.4.1.tar.bz2 510816 SHA256 c561dd91c4b88ef087a6d172bafb4ac5d01c0055c47b855568536a0c422ff232 SHA512 4650e2ec73dcf6c38cf2992fefdbd2e302a34a9687a933d8a375d227df2621db96c9a2e54ebbfac50014152caffc0736a7bc1192f479c69c56f78f7874bc09b3 WHIRLPOOL 065cbd0f4e07a09e5326968680919de7fb988db092a406b0e809335374e8c5e68c0c8e4abeb4b8bd7dbb727869bcb7e0dc65bc38c33d783ff355943966183287
 DIST shorewall-5.1.4.2.tar.bz2 511131 SHA256 df3ff7199c2fdf031030221b9aa23d2b80e4cafa1fe663ddedeaf901b6d013b1 SHA512 ccbc000341e21a82e22157717f8356b785f166928f26c63b5b35deadfd7e8c9674b2c4d47b2a1e67cad37b1bdb3080f2a27add05135fa4f1cdbc860b988bc90b WHIRLPOOL e12d3968f7d34cd41ead3a15f13092668743a4a488f242368feb843b8751bb13a3bb90a2094c76f3137de649fd5329dc6f9f1a34398d0301b6885380217255c4
 DIST shorewall-5.1.4.3.tar.bz2 511450 SHA256 29238dfc996353acbfdb039f485e2acf22c7c039f8b9ab28a2d7ce827c935d3e SHA512 623b4e266b4ea5aaedb6fa05fb190e64ea8c94a32382b1548dc6c80dd251e5a9695c39fb14316b24dd07eda728b864bbff575e759ba4fcd70e82cabd9f046f77 WHIRLPOOL 66c07064ef491a2a336bd0832498fc1b18b17f3660f5f2b0efd6361c1405d93e816c809f3572f92b1ab678305f459a5f6065b380bdca6f5233113037bfc98f89
+DIST shorewall-5.1.4.4.tar.bz2 511611 SHA256 fe71c2a2efdc45b594ecc097115322c2203fe31b3098efa4023eff429ff2c55f SHA512 14c7a8cb750b37b72adba28ae00619d4e27fdc73801f1462705754ddbb47727d60425021018bdefdef6c373f2310a774569a88728125e52fd59cf10d94ee4aea WHIRLPOOL 0ef8b315f577c4c8612ad5f842dc8b5e3f4248445cda56136f733fc78d8217d6b5607ff9ed17d43cdd81109b3e493b640ce7bf7e9d33750eaff1cd0effac5c37
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.1.tar.bz2 75813 SHA256 3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629 SHA512 118378698e0fa1216b52ace92fe9eae0f7d32c39becbc50837a895d7367674b2c973b1633c8919045d9d16dd2a5fdbedb9d62ff1513547ee4770a2e9116d8b1e WHIRLPOOL 02ef5428faeb68f2ca3cf6c1e00ab15d0146d5ad931942528ba1832ce96e490df67976a40ed576014f30f06e2e4869ba691c1606d57b22364ab2e6b7ed32a019
 DIST shorewall-core-5.1.4.2.tar.bz2 75953 SHA256 19a8790fcd60a5ea77e306f219d68920bb3f9287610cd53825776153df13bba0 SHA512 049463e094d8d8229f4ce13c75de5c8be46947ffea3a0bfbb12888a8dea606dfe8191fc32f1d2f7cdae40569a9d9967d790c0699d038353d3065cbc118a1aad1 WHIRLPOOL 5b665b2dae433961421594f95456583f44253f7e24379c1cbc81ad0871f2e1f432dd54d759f4f4a16f9317e6ca4a73c5c5d5d9b51a897bb053309bfee91fa8e1
 DIST shorewall-core-5.1.4.3.tar.bz2 76112 SHA256 6d283b8b380db5d94c39325cf44fe9b71cb2f5bb0e4ea8941aef33e802b1e5d6 SHA512 d6969fbe579c20918ca132111cf2ba8f2db4b397afe5d47b1fab796571203ea96b423379ab5403354aac5a7b6d83aeb1f5160124c2cdb33993fa3160fe156097 WHIRLPOOL 76b650a42c40a35fa3c30b02ae02bc0ca8f607be093e43357f491686aca75941266cb195650c8711232d13b6e5dd9c86c555d38c59a094ef3578ce86d0139086
+DIST shorewall-core-5.1.4.4.tar.bz2 76206 SHA256 e5fddd7f25b717bce6cc3a9e50d72cb172335d113c58aaef4496004297db6a13 SHA512 24a9a0176d3b1c3dede7428393b9e04a37329053fff95f15102a04d97fb95b30a11c7e0d550a457a29b07291c9347c9b96969ea1b03b68858b3e022f29fd908a WHIRLPOOL 1ff57177c352bd828a0f113267ea154ff5288eb83caa556b07fe85784de896e227f89bae47e7eaaecb76f1a2dbd0fdc87c95f20f8706ef480504a2c5cba0ad2b
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.1.tar.bz2 4284060 SHA256 0d077e38503832e75f5432d4a1b1c478f0ef02576c8aeb00480a3a101ec9a105 SHA512 ccc36bae8daacf3dca75002bee207abba667bd9a467afbde7f6cb1c18fa5d33fa53a4f93dfabfe0e85fd479449ebff2d12851cba5b494b7f3ce256cd79328687 WHIRLPOOL fa3c5a2abd61d005003f090492801a7a2c88512d28ed3ba174d4ecc998236132e7d923f780de30edcad44fe5fcc684bba13441f5fb9a1974d915607b4fd62eda
 DIST shorewall-docs-html-5.1.4.2.tar.bz2 4284341 SHA256 547f9e4e9c181d592c251acaf8a7fa41b4b9f1bf1ef975cdc75eb3cba1921d87 SHA512 f6697a22fe3f8288334ddf8b94b7ca3baef50126ba349cde80d124f43a28bd9db65d75dbb6dbeaf8fb05de262c33c6fc99588de923e0de6ae9a18b429fa7de5c WHIRLPOOL 1b6084a577da4613db5e1a357b1126eccc7a6fb5a32475e3ecea3b765d7182e1e9b5f4310fdcd9a43e1cde92c4c1abbfa71ada31515e92f37804f7db6eb9f2b8
 DIST shorewall-docs-html-5.1.4.3.tar.bz2 4284526 SHA256 3af6ad0464db41388080c9277fca6bbed3a935f000ab29987c5e948015efab1b SHA512 2b8523babe1cb28d07c033c53328785254100a5712f316fc279f06128dafb46924e72e4c9c648b20cedd2c4837c8396613a5a7628787a312b227f3d7427d2e72 WHIRLPOOL 1e394cb221f6bdb87666b468fefe117538a0adb0d1375cdb46563a976628922b7cf4a2a4cdf19d0cfb36d9aa890d605a5cf8c3a4981de3c3d10b314bb42132ce
+DIST shorewall-docs-html-5.1.4.4.tar.bz2 4280886 SHA256 892d704fe4b15b4f8fe5cd7bee8d456122bfc25f8d514d6efdb767b071e9991a SHA512 15c66e82c40de0a0edad798dc0acda45323160720d806a2759dd82816270e175a5891270b0198f1533f4092b8744629b3c8389f0093869a63d66af2a1d7ff9f1 WHIRLPOOL 20cf5de986eb07e0693671454904f87d2cbf4a66895029d94e96f3ed4d3ef312e69ce4ecbdd8fb876ef02b982803f6042848ed807ad4ee240eac67d4b6c64782
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.1.tar.bz2 30878 SHA256 c61b83601d3a4bb10e2bd8705682ddbed5ab3adcdc6074bc1ca4cb8d030e84e9 SHA512 4b9fa872a1ce0535d9c9054ad8e9750f7f797c4fd14777c77554c5218162882973fe1caf22c7242b6b38b4a5c2a122e901851757e86a560ea5f8030be063b70a WHIRLPOOL 76a360c00dc9c28576cb121360372b1218c7a9c399e89ae3366458e5aa2f5f20c7845fc4a49de5a55619e7589372c5b07eeea195604e4a4eac380739659611f1
 DIST shorewall-init-5.1.4.2.tar.bz2 31032 SHA256 cfd0c94be02238463e6f511de0f86bfddbd127922cd62ee61d42a7f7d85658b3 SHA512 d68ab7ab9d1c92c8169dd11537f9cefe1693c9ca22ac4e95f16f71037885a296b49e3cc91291be868671f2416418a6a661524cf073f915a67f6e3e3e86e659aa WHIRLPOOL 6f6fd1c3f8a6523801e2984fe8545f20066730b0319fd68afdfb82a8a5d9cb1f46e1984c26c7887706c83d75b355173c6521f2cb1e69fb6db4b3f1493b4e1294
 DIST shorewall-init-5.1.4.3.tar.bz2 31194 SHA256 0ceeabf339f3d49eeb88fc40ba382e5c57ef3491af0dc4476ea7e8a255194e56 SHA512 c8197525cce8b9bd9efd81b65d512bfa292060d2696c8c24648f81a3703885c84dfbc0c1ebd4bcd8da7e981dd6a891f64123409457a6623e5f2b81dca453ddd1 WHIRLPOOL 05914583e9244ef677f5530aec82e77e31c2d284d6f5324aed59c583b02d3488c7e8b3e24518bd0574bad6d5ee5366037e29d4767e29f54b6d88f6f38be56a30
+DIST shorewall-init-5.1.4.4.tar.bz2 31258 SHA256 7ba1d2910fdb5dea4078aae96b469e228e20934e3637d6d3d7f6a5f89f535eb2 SHA512 b49bb7787a3c0a748af15d5d98b63beaaea4f4b8448e48b2064a10197a74d087107d6bdd70dcfd9211ddb2e58d6e97991591c2f617648b87401bc53f76e3a5ea WHIRLPOOL f0121eff5ff1fe6ad1a191a1a764925d8bc2ca6b847e3442f334190d048e6b8c38e42283b33d8e542321d3d606f0ba28b204ff31e49dce9fd4067abefd498a29
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.1.tar.bz2 36647 SHA256 e90d419ed8a6da615c3a0d6fdcb9481f8e71f89c2bdcff09ab027198ca2ce293 SHA512 c06e365d06c484e7ef673e5a8597d70996f1008a00163aae2d7a53d0d720739a8b0317a093b3e75487ef1c8a02ac4c4c542480757226a974671f82ab08353896 WHIRLPOOL 0077886083aadcc5973c6f515da8e99fdbbcc4e64e0e4cc4893a47cda7afc17331d2ff175da314aa38dc0186ea074bee65facacc5dc7212c0c8836cbfc0c9a02
 DIST shorewall-lite-5.1.4.2.tar.bz2 36855 SHA256 6e79e312262592aef05011359e75f5021811ee46017b600cb17d2e144c2d0279 SHA512 5f5a1596c74d2f3136d67ffc730deabb04ff269b2d01fe02d20118bb93ea13b244b6aab2040dbb5ccd7536ea99b5aabfb3aa66ad6b58ec732cd374de01c1aee4 WHIRLPOOL 54166cfde56a233ad93d736d9376507ded9fa1ee6ff9f20ff7df267d107de6700a9b8ef1a639fa4572e361c21e1aa5d732a826f9b0cea870c7fcc0402f7ef849
 DIST shorewall-lite-5.1.4.3.tar.bz2 37027 SHA256 7dc4bf0eeb3914feebfb83347bb947f666522dc597e31bddcca3c7552894255c SHA512 00ec62b2645847237293d150b3f74d728f9f718c390fa9b74483a3ded2e082c7d0aa5e154d93330dc1d9133df456aff2a91196a57a90b3079c4f43d30e1ff8cc WHIRLPOOL 5d47c7175878cff55d50abe19daadcd550bb96616654a63b3c708ab6c723745a5c845000578a1eb17c0767ae1402390a582b1a487a50dcd5b5898715631d692e
+DIST shorewall-lite-5.1.4.4.tar.bz2 37096 SHA256 38c956fa2ecbda9c625f8d511673158f70e126e11017b1945006ac2c6d66a3ba SHA512 d29a8676e1e117fca5fc1068bb180c88b5560535c46e6ae089a0f0646939cfe6c9c990ec02a35fd21ac62f8435a1e34f6bcbca8b09f7ef09c65a901d59bfe107 WHIRLPOOL 0d380427ce07f26f0882f8011391ca94f8db17137961595a920b241a7ba0529268cd1d96ec50be3204f4e2a6b46e1b29d21cb845551a61a66313d16f84ac8123
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.1.tar.bz2 224863 SHA256 e3da805b4aa1e8c483f1bb451cb47a869e1977b213a86145a82d42e9bc12ea36 SHA512 3b5c228693936103eb1479e5b0968c5a7d24d94beea410b3ad79f9e7e3b32cca286384b91ee3b09ce006758d27f9b2efe22c589d07d05eeef9ef981818da0b80 WHIRLPOOL 810739511bfb730c6040c8cd9a8a06c836e085a70ea5b4e148d3d364d92648e194ce2b4f1e4a0535a0860a138d87744ddacb229312100242e36828f7e348514f
 DIST shorewall6-5.1.4.2.tar.bz2 224891 SHA256 0934ed42b5dafeab294dc004e72c7361820a4485bdc5005cfdaf3fd628adaea0 SHA512 6ba1dc59797ce9be447536dd0fab5963d5baafaae69bc207c7b93035da89ec88528e5d679ce39925acafa6da559e0273f16f268be4218d01ad4c4a3d894917c1 WHIRLPOOL 581839a3d08377fcdca7881a039d492e799cbc26d917bf53a3047774373205eda29a22aaf15c8b7613253df45f9c134cf46333e79c2057e5b5248241c6fcecbb
 DIST shorewall6-5.1.4.3.tar.bz2 225040 SHA256 c2ab0aaa42015883291c568067927f7bf00d273f56cb9d2d979bc995b6ca8b59 SHA512 867ab06dc800109a10ec7ac9897369d43fd0f74024cc4cd7e697c15a36294ef5bc0269a5fe406e848a8a614f75c6c33a1fa7078c1af97401e646981788a96bf8 WHIRLPOOL bc2e7fb00e566fd818a881791c157e6f14474964598458740f43d1a823919d3a105b3026a912d8cb2ae70cc5b267072f6574486ee08f91a5903fe92eb565f5f7
+DIST shorewall6-5.1.4.4.tar.bz2 224995 SHA256 17ffd91eab228766c8fae80d7087a7a229de62f2a7e93e71e22807b647e9165d SHA512 dbc73ca2805f022a06594192ecef35a33874e0099e306d7e1b052765a5bb2e1a51008f2e08f66d505b2b6e36d8f0da730ec77f1b625abae0403af88030d878ac WHIRLPOOL f91d1db40956ad289014ff7156b74246cf12504ff0b84f46ea641e06fc2d55c417357f2c812e78c48f3ea29a4635e408b20946ebcf6ce35a2bcd0de20128e212
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.1.tar.bz2 36362 SHA256 29a2f2be295b4f995b38e663b771660ccdc6321134bcfbd0f9378f9bb1237e3c SHA512 b616c5886b5bc274e88052359ca4c8aa6df60a9706958698eac7fc362f1c893de00ed2272535d61a88cb6a786bae9b7cba64a835833a9f81c991fb2ffed8244b WHIRLPOOL 519aee8ad997c14f4337824d40c38cbf7ba2d2ac7db0964c2557816e0d4c4dca24ed2ac69341473e899d0e9e84d367a9e6f42b2484221257bdd55b40c73ee201
 DIST shorewall6-lite-5.1.4.2.tar.bz2 36561 SHA256 121f360799b68c283d4e1e9be3f2eb1fa75d735b5f0a4daf78e58c020cf99e59 SHA512 e3b05e82eeeaaf68d39e951b91c803bd13e8a5cae15634fc62b65bd537b8b9585fb4dcb3aac9b04df696c98bba94cfd39c8ded149da40db51073cfa0338608f1 WHIRLPOOL bd3242aedf0fafbbf5b2e2020b0d41d813515efe872607d85385478d16c3805bb19d87c548fef579412d312cdc3cd4dfe67f1967d14d8ae39fda3eee4783a8fd
 DIST shorewall6-lite-5.1.4.3.tar.bz2 36731 SHA256 b3cb5efe633859f073071552907b503f0ce097e98202e930434540158d5acf92 SHA512 e861bcb17fe528311c1576a37b014aa01c29fcbe9e19bd19bf021420d75b7a6b505bfb159cc065174a82c4ba18fccc9db5d15a34cfbd2371da02466355ce19ff WHIRLPOOL d84a2edd711c029c3b0cd4d4188069dcb71c450d1e5627be147d0ffc7f309f922e76631b4000911a9c40cb418fb90a60289e09d7f3fdf01227ab6a2df993f5e7
+DIST shorewall6-lite-5.1.4.4.tar.bz2 36797 SHA256 2372bc0e9c6e253c1e4db82353d6e4eb4b2a4353a57834e00b775fad99c22af0 SHA512 a1b2ff1f509e6560a94cd5d4f7f3ae3aff456bf19720a5e967b5a609bab3aa2c15a0d5e5b9b9fd54e9e3a551eb6d2da57f993f87354909d045e8f8b31bc073c4 WHIRLPOOL db463165743c799776221d25148311404a687a79377ae5672c7e80d01e1854a3be6b20ebbc17b5d0abd2cd931116ca9a19dbd02249a33f36ef13b32d0a50c556

diff --git a/net-firewall/shorewall/shorewall-5.1.4.4.ebuild b/net-firewall/shorewall/shorewall-5.1.4.4.ebuild
new file mode 100644
index 00000000000..ea2ef11ce09
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.4.4.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-07-03 15:17 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-07-03 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ca541dc7b1f790bbe504c3e82de0a5b65c554cb4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 15:17:13 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 15:17:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca541dc7

net-firewall/shorewall: Bump to v5.1.5

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.1.5.ebuild | 456 ++++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index d870089c639..5be60d4c751 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
 DIST shorewall-5.1.4.4.tar.bz2 511611 SHA256 fe71c2a2efdc45b594ecc097115322c2203fe31b3098efa4023eff429ff2c55f SHA512 14c7a8cb750b37b72adba28ae00619d4e27fdc73801f1462705754ddbb47727d60425021018bdefdef6c373f2310a774569a88728125e52fd59cf10d94ee4aea WHIRLPOOL 0ef8b315f577c4c8612ad5f842dc8b5e3f4248445cda56136f733fc78d8217d6b5607ff9ed17d43cdd81109b3e493b640ce7bf7e9d33750eaff1cd0effac5c37
+DIST shorewall-5.1.5.tar.bz2 519297 SHA256 8604f07fcfde07afc6215988d47229a135d1a30da412974fda127af13aef3899 SHA512 54c02d34f3d79aa210ca18c99de5f51dc404b1104f0456dfc12d0917bcabb4bf76bd6ff98ba78ee36a7e35adfcc37c6bbe9d0c878a96f4380b0ab5b3e59946b6 WHIRLPOOL 9825cf31b1144cc1c47d7e6a6b1a75c3a897db122d2fd49039ac75a57db5aabc5575e4f838b3fe32247d83983ef20d124db4ff7f4e3efc3484ec83937bf6ae4b
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.4.tar.bz2 76206 SHA256 e5fddd7f25b717bce6cc3a9e50d72cb172335d113c58aaef4496004297db6a13 SHA512 24a9a0176d3b1c3dede7428393b9e04a37329053fff95f15102a04d97fb95b30a11c7e0d550a457a29b07291c9347c9b96969ea1b03b68858b3e022f29fd908a WHIRLPOOL 1ff57177c352bd828a0f113267ea154ff5288eb83caa556b07fe85784de896e227f89bae47e7eaaecb76f1a2dbd0fdc87c95f20f8706ef480504a2c5cba0ad2b
+DIST shorewall-core-5.1.5.tar.bz2 76964 SHA256 7ad44b91342538e10be438a2e2bfc987789191865ff57c61bb24e35bdb6b8301 SHA512 b9e18f853187d8e382fe1993d7094cc2ca4e982d12bf765c7a521f7d45fe002a5456816787d27107b38be3b9091f8fc20e3f6e0d5844593673677835ab09b571 WHIRLPOOL 22c253d442c1d2f8dc35ca86988104b9838154c55ddf3ef6fee518209cbca2cf14276817192ea330bad7026d56dab1c7e957e8ebfdef7b98c3ff17637bfc4f4c
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.4.tar.bz2 4280886 SHA256 892d704fe4b15b4f8fe5cd7bee8d456122bfc25f8d514d6efdb767b071e9991a SHA512 15c66e82c40de0a0edad798dc0acda45323160720d806a2759dd82816270e175a5891270b0198f1533f4092b8744629b3c8389f0093869a63d66af2a1d7ff9f1 WHIRLPOOL 20cf5de986eb07e0693671454904f87d2cbf4a66895029d94e96f3ed4d3ef312e69ce4ecbdd8fb876ef02b982803f6042848ed807ad4ee240eac67d4b6c64782
+DIST shorewall-docs-html-5.1.5.tar.bz2 4210862 SHA256 a1b6c59edff3f0222ed7eafbfd0d8f7873caa06316d4a1c28174e133051b8640 SHA512 0635f57916a71a823ee9e05ac6099447af6e1aaab1c6478b9800d15cfc57a0928ceed17a3347037a7cf4bf02cec25af6089f7a6e201cc158affac272d70fbd93 WHIRLPOOL 3598986c4fe1c98cbe95bb829ff240dc92d69e9f8f3892ef49749681f53841b1d202abb39601ff0cc9231bb994ee654796f52a87b4c2bc0afad0d60ebc9f6f8b
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.4.tar.bz2 31258 SHA256 7ba1d2910fdb5dea4078aae96b469e228e20934e3637d6d3d7f6a5f89f535eb2 SHA512 b49bb7787a3c0a748af15d5d98b63beaaea4f4b8448e48b2064a10197a74d087107d6bdd70dcfd9211ddb2e58d6e97991591c2f617648b87401bc53f76e3a5ea WHIRLPOOL f0121eff5ff1fe6ad1a191a1a764925d8bc2ca6b847e3442f334190d048e6b8c38e42283b33d8e542321d3d606f0ba28b204ff31e49dce9fd4067abefd498a29
+DIST shorewall-init-5.1.5.tar.bz2 32080 SHA256 3b98742b38c5cd347e034c494d80a8b565406ceb3dee0df97a7c4ed30da30ea4 SHA512 ca4b4b04944401fdc7dfd257beefda001597d5e45e7b73b7eddb28fede558beba42cf65a71ffb65de4e8f46cb0391e7018634cc9af9cf3110f75791bd18443e8 WHIRLPOOL 6e22f543c422f97d34e51ef62e8619876326005216b12c967f65536485d3db71bd0288b7d4f5f9d9696b3806aef8767fcaff5ae5e4908d196b6a481e8bba874b
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.4.tar.bz2 37096 SHA256 38c956fa2ecbda9c625f8d511673158f70e126e11017b1945006ac2c6d66a3ba SHA512 d29a8676e1e117fca5fc1068bb180c88b5560535c46e6ae089a0f0646939cfe6c9c990ec02a35fd21ac62f8435a1e34f6bcbca8b09f7ef09c65a901d59bfe107 WHIRLPOOL 0d380427ce07f26f0882f8011391ca94f8db17137961595a920b241a7ba0529268cd1d96ec50be3204f4e2a6b46e1b29d21cb845551a61a66313d16f84ac8123
+DIST shorewall-lite-5.1.5.tar.bz2 37871 SHA256 c15e4adc0cea595b90d82361d8d6c2f8e1ac843a3918e75d53c2e480f013cb1b SHA512 e40647f06e61a5bd87d36d3591ca872cfcb850defe1954375009d6a2207ad7e912b94b1b891ac105b08cc80fa01eaa6ce83aa58925a86b5eeb79226e5c9754c0 WHIRLPOOL 1dd49ecc36d057df10e0f34f148432519dc49945c841492c9c6242b53011dd78079b2fb3802672dbaaf124339ccf66401421aeba1b3ff176c35b137191351c1b
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.4.tar.bz2 224995 SHA256 17ffd91eab228766c8fae80d7087a7a229de62f2a7e93e71e22807b647e9165d SHA512 dbc73ca2805f022a06594192ecef35a33874e0099e306d7e1b052765a5bb2e1a51008f2e08f66d505b2b6e36d8f0da730ec77f1b625abae0403af88030d878ac WHIRLPOOL f91d1db40956ad289014ff7156b74246cf12504ff0b84f46ea641e06fc2d55c417357f2c812e78c48f3ea29a4635e408b20946ebcf6ce35a2bcd0de20128e212
+DIST shorewall6-5.1.5.tar.bz2 187203 SHA256 aac997b2e335ef8d5d041f2b2f791e4dc6abe537f7f009a7b2ac11aabf9391f2 SHA512 6876f7a2f9820152e6bd15fc77b36f6734b5bb39895059f29497c231840c3eff3b973cf9976f0a63483379309341f158dae9e007e8f6de4c6a12833ec37ffbba WHIRLPOOL d51b2bc37bba659c6789dda13541a8f8816cba8163f3173f0aba5ba11f35f13b2fe231ea8189dd927b88107c92425cb0a0625caaf50be91f1384ec357a5d24e0
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.4.tar.bz2 36797 SHA256 2372bc0e9c6e253c1e4db82353d6e4eb4b2a4353a57834e00b775fad99c22af0 SHA512 a1b2ff1f509e6560a94cd5d4f7f3ae3aff456bf19720a5e967b5a609bab3aa2c15a0d5e5b9b9fd54e9e3a551eb6d2da57f993f87354909d045e8f8b31bc073c4 WHIRLPOOL db463165743c799776221d25148311404a687a79377ae5672c7e80d01e1854a3be6b20ebbc17b5d0abd2cd931116ca9a19dbd02249a33f36ef13b32d0a50c556
+DIST shorewall6-lite-5.1.5.tar.bz2 37557 SHA256 3399b83da651904d34267512b8054ff9b336b6a9d666e0b26e9cbf84cedf509f SHA512 efe0fc9c6109a04d08ca81dec086d9e33f4b6c1476904c5749c472ff0bad8d7b5115713ae76ea29e226733a990db67b7f8ae3d87464c08fe4a913d28c5e027dd WHIRLPOOL 302a6298f9ad0b2dac79442e4b9a2c6e2be08d2c8de42bc3a594fc256ee292a13fa95604865023b3483a030ee4ee796439693f54c8aa9d83af0fb2b07ba56b8b

diff --git a/net-firewall/shorewall/shorewall-5.1.5.ebuild b/net-firewall/shorewall/shorewall-5.1.5.ebuild
new file mode 100644
index 00000000000..ea2ef11ce09
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.5.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-07-03 15:17 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-07-03 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     960d586c1d269e2ad3a6d13521d6d73f462f93ff
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 15:14:17 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 15:14:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960d586c

net-firewall/shorewall: mark stable for the remaining arches using the ALLARCHES policy

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/shorewall-5.1.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.4.4.ebuild b/net-firewall/shorewall/shorewall-5.1.4.4.ebuild
index 39baf6313a8..20be5c54927 100644
--- a/net-firewall/shorewall/shorewall-5.1.4.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.4.4.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-07-03 15:17 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-07-03 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ce563e9b5cc41c2ca2459c66d213e3e31691653a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 15:15:21 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 15:15:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce563e9b

net-firewall/shorewall: Cleanup old versions

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                 |  21 --
 net-firewall/shorewall/shorewall-5.1.4.1.ebuild | 456 ------------------------
 net-firewall/shorewall/shorewall-5.1.4.2.ebuild | 456 ------------------------
 net-firewall/shorewall/shorewall-5.1.4.3.ebuild | 456 ------------------------
 4 files changed, 1389 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 2f681aed287..d870089c639 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,35 +1,14 @@
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
-DIST shorewall-5.1.4.1.tar.bz2 510816 SHA256 c561dd91c4b88ef087a6d172bafb4ac5d01c0055c47b855568536a0c422ff232 SHA512 4650e2ec73dcf6c38cf2992fefdbd2e302a34a9687a933d8a375d227df2621db96c9a2e54ebbfac50014152caffc0736a7bc1192f479c69c56f78f7874bc09b3 WHIRLPOOL 065cbd0f4e07a09e5326968680919de7fb988db092a406b0e809335374e8c5e68c0c8e4abeb4b8bd7dbb727869bcb7e0dc65bc38c33d783ff355943966183287
-DIST shorewall-5.1.4.2.tar.bz2 511131 SHA256 df3ff7199c2fdf031030221b9aa23d2b80e4cafa1fe663ddedeaf901b6d013b1 SHA512 ccbc000341e21a82e22157717f8356b785f166928f26c63b5b35deadfd7e8c9674b2c4d47b2a1e67cad37b1bdb3080f2a27add05135fa4f1cdbc860b988bc90b WHIRLPOOL e12d3968f7d34cd41ead3a15f13092668743a4a488f242368feb843b8751bb13a3bb90a2094c76f3137de649fd5329dc6f9f1a34398d0301b6885380217255c4
-DIST shorewall-5.1.4.3.tar.bz2 511450 SHA256 29238dfc996353acbfdb039f485e2acf22c7c039f8b9ab28a2d7ce827c935d3e SHA512 623b4e266b4ea5aaedb6fa05fb190e64ea8c94a32382b1548dc6c80dd251e5a9695c39fb14316b24dd07eda728b864bbff575e759ba4fcd70e82cabd9f046f77 WHIRLPOOL 66c07064ef491a2a336bd0832498fc1b18b17f3660f5f2b0efd6361c1405d93e816c809f3572f92b1ab678305f459a5f6065b380bdca6f5233113037bfc98f89
 DIST shorewall-5.1.4.4.tar.bz2 511611 SHA256 fe71c2a2efdc45b594ecc097115322c2203fe31b3098efa4023eff429ff2c55f SHA512 14c7a8cb750b37b72adba28ae00619d4e27fdc73801f1462705754ddbb47727d60425021018bdefdef6c373f2310a774569a88728125e52fd59cf10d94ee4aea WHIRLPOOL 0ef8b315f577c4c8612ad5f842dc8b5e3f4248445cda56136f733fc78d8217d6b5607ff9ed17d43cdd81109b3e493b640ce7bf7e9d33750eaff1cd0effac5c37
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
-DIST shorewall-core-5.1.4.1.tar.bz2 75813 SHA256 3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629 SHA512 118378698e0fa1216b52ace92fe9eae0f7d32c39becbc50837a895d7367674b2c973b1633c8919045d9d16dd2a5fdbedb9d62ff1513547ee4770a2e9116d8b1e WHIRLPOOL 02ef5428faeb68f2ca3cf6c1e00ab15d0146d5ad931942528ba1832ce96e490df67976a40ed576014f30f06e2e4869ba691c1606d57b22364ab2e6b7ed32a019
-DIST shorewall-core-5.1.4.2.tar.bz2 75953 SHA256 19a8790fcd60a5ea77e306f219d68920bb3f9287610cd53825776153df13bba0 SHA512 049463e094d8d8229f4ce13c75de5c8be46947ffea3a0bfbb12888a8dea606dfe8191fc32f1d2f7cdae40569a9d9967d790c0699d038353d3065cbc118a1aad1 WHIRLPOOL 5b665b2dae433961421594f95456583f44253f7e24379c1cbc81ad0871f2e1f432dd54d759f4f4a16f9317e6ca4a73c5c5d5d9b51a897bb053309bfee91fa8e1
-DIST shorewall-core-5.1.4.3.tar.bz2 76112 SHA256 6d283b8b380db5d94c39325cf44fe9b71cb2f5bb0e4ea8941aef33e802b1e5d6 SHA512 d6969fbe579c20918ca132111cf2ba8f2db4b397afe5d47b1fab796571203ea96b423379ab5403354aac5a7b6d83aeb1f5160124c2cdb33993fa3160fe156097 WHIRLPOOL 76b650a42c40a35fa3c30b02ae02bc0ca8f607be093e43357f491686aca75941266cb195650c8711232d13b6e5dd9c86c555d38c59a094ef3578ce86d0139086
 DIST shorewall-core-5.1.4.4.tar.bz2 76206 SHA256 e5fddd7f25b717bce6cc3a9e50d72cb172335d113c58aaef4496004297db6a13 SHA512 24a9a0176d3b1c3dede7428393b9e04a37329053fff95f15102a04d97fb95b30a11c7e0d550a457a29b07291c9347c9b96969ea1b03b68858b3e022f29fd908a WHIRLPOOL 1ff57177c352bd828a0f113267ea154ff5288eb83caa556b07fe85784de896e227f89bae47e7eaaecb76f1a2dbd0fdc87c95f20f8706ef480504a2c5cba0ad2b
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
-DIST shorewall-docs-html-5.1.4.1.tar.bz2 4284060 SHA256 0d077e38503832e75f5432d4a1b1c478f0ef02576c8aeb00480a3a101ec9a105 SHA512 ccc36bae8daacf3dca75002bee207abba667bd9a467afbde7f6cb1c18fa5d33fa53a4f93dfabfe0e85fd479449ebff2d12851cba5b494b7f3ce256cd79328687 WHIRLPOOL fa3c5a2abd61d005003f090492801a7a2c88512d28ed3ba174d4ecc998236132e7d923f780de30edcad44fe5fcc684bba13441f5fb9a1974d915607b4fd62eda
-DIST shorewall-docs-html-5.1.4.2.tar.bz2 4284341 SHA256 547f9e4e9c181d592c251acaf8a7fa41b4b9f1bf1ef975cdc75eb3cba1921d87 SHA512 f6697a22fe3f8288334ddf8b94b7ca3baef50126ba349cde80d124f43a28bd9db65d75dbb6dbeaf8fb05de262c33c6fc99588de923e0de6ae9a18b429fa7de5c WHIRLPOOL 1b6084a577da4613db5e1a357b1126eccc7a6fb5a32475e3ecea3b765d7182e1e9b5f4310fdcd9a43e1cde92c4c1abbfa71ada31515e92f37804f7db6eb9f2b8
-DIST shorewall-docs-html-5.1.4.3.tar.bz2 4284526 SHA256 3af6ad0464db41388080c9277fca6bbed3a935f000ab29987c5e948015efab1b SHA512 2b8523babe1cb28d07c033c53328785254100a5712f316fc279f06128dafb46924e72e4c9c648b20cedd2c4837c8396613a5a7628787a312b227f3d7427d2e72 WHIRLPOOL 1e394cb221f6bdb87666b468fefe117538a0adb0d1375cdb46563a976628922b7cf4a2a4cdf19d0cfb36d9aa890d605a5cf8c3a4981de3c3d10b314bb42132ce
 DIST shorewall-docs-html-5.1.4.4.tar.bz2 4280886 SHA256 892d704fe4b15b4f8fe5cd7bee8d456122bfc25f8d514d6efdb767b071e9991a SHA512 15c66e82c40de0a0edad798dc0acda45323160720d806a2759dd82816270e175a5891270b0198f1533f4092b8744629b3c8389f0093869a63d66af2a1d7ff9f1 WHIRLPOOL 20cf5de986eb07e0693671454904f87d2cbf4a66895029d94e96f3ed4d3ef312e69ce4ecbdd8fb876ef02b982803f6042848ed807ad4ee240eac67d4b6c64782
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
-DIST shorewall-init-5.1.4.1.tar.bz2 30878 SHA256 c61b83601d3a4bb10e2bd8705682ddbed5ab3adcdc6074bc1ca4cb8d030e84e9 SHA512 4b9fa872a1ce0535d9c9054ad8e9750f7f797c4fd14777c77554c5218162882973fe1caf22c7242b6b38b4a5c2a122e901851757e86a560ea5f8030be063b70a WHIRLPOOL 76a360c00dc9c28576cb121360372b1218c7a9c399e89ae3366458e5aa2f5f20c7845fc4a49de5a55619e7589372c5b07eeea195604e4a4eac380739659611f1
-DIST shorewall-init-5.1.4.2.tar.bz2 31032 SHA256 cfd0c94be02238463e6f511de0f86bfddbd127922cd62ee61d42a7f7d85658b3 SHA512 d68ab7ab9d1c92c8169dd11537f9cefe1693c9ca22ac4e95f16f71037885a296b49e3cc91291be868671f2416418a6a661524cf073f915a67f6e3e3e86e659aa WHIRLPOOL 6f6fd1c3f8a6523801e2984fe8545f20066730b0319fd68afdfb82a8a5d9cb1f46e1984c26c7887706c83d75b355173c6521f2cb1e69fb6db4b3f1493b4e1294
-DIST shorewall-init-5.1.4.3.tar.bz2 31194 SHA256 0ceeabf339f3d49eeb88fc40ba382e5c57ef3491af0dc4476ea7e8a255194e56 SHA512 c8197525cce8b9bd9efd81b65d512bfa292060d2696c8c24648f81a3703885c84dfbc0c1ebd4bcd8da7e981dd6a891f64123409457a6623e5f2b81dca453ddd1 WHIRLPOOL 05914583e9244ef677f5530aec82e77e31c2d284d6f5324aed59c583b02d3488c7e8b3e24518bd0574bad6d5ee5366037e29d4767e29f54b6d88f6f38be56a30
 DIST shorewall-init-5.1.4.4.tar.bz2 31258 SHA256 7ba1d2910fdb5dea4078aae96b469e228e20934e3637d6d3d7f6a5f89f535eb2 SHA512 b49bb7787a3c0a748af15d5d98b63beaaea4f4b8448e48b2064a10197a74d087107d6bdd70dcfd9211ddb2e58d6e97991591c2f617648b87401bc53f76e3a5ea WHIRLPOOL f0121eff5ff1fe6ad1a191a1a764925d8bc2ca6b847e3442f334190d048e6b8c38e42283b33d8e542321d3d606f0ba28b204ff31e49dce9fd4067abefd498a29
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
-DIST shorewall-lite-5.1.4.1.tar.bz2 36647 SHA256 e90d419ed8a6da615c3a0d6fdcb9481f8e71f89c2bdcff09ab027198ca2ce293 SHA512 c06e365d06c484e7ef673e5a8597d70996f1008a00163aae2d7a53d0d720739a8b0317a093b3e75487ef1c8a02ac4c4c542480757226a974671f82ab08353896 WHIRLPOOL 0077886083aadcc5973c6f515da8e99fdbbcc4e64e0e4cc4893a47cda7afc17331d2ff175da314aa38dc0186ea074bee65facacc5dc7212c0c8836cbfc0c9a02
-DIST shorewall-lite-5.1.4.2.tar.bz2 36855 SHA256 6e79e312262592aef05011359e75f5021811ee46017b600cb17d2e144c2d0279 SHA512 5f5a1596c74d2f3136d67ffc730deabb04ff269b2d01fe02d20118bb93ea13b244b6aab2040dbb5ccd7536ea99b5aabfb3aa66ad6b58ec732cd374de01c1aee4 WHIRLPOOL 54166cfde56a233ad93d736d9376507ded9fa1ee6ff9f20ff7df267d107de6700a9b8ef1a639fa4572e361c21e1aa5d732a826f9b0cea870c7fcc0402f7ef849
-DIST shorewall-lite-5.1.4.3.tar.bz2 37027 SHA256 7dc4bf0eeb3914feebfb83347bb947f666522dc597e31bddcca3c7552894255c SHA512 00ec62b2645847237293d150b3f74d728f9f718c390fa9b74483a3ded2e082c7d0aa5e154d93330dc1d9133df456aff2a91196a57a90b3079c4f43d30e1ff8cc WHIRLPOOL 5d47c7175878cff55d50abe19daadcd550bb96616654a63b3c708ab6c723745a5c845000578a1eb17c0767ae1402390a582b1a487a50dcd5b5898715631d692e
 DIST shorewall-lite-5.1.4.4.tar.bz2 37096 SHA256 38c956fa2ecbda9c625f8d511673158f70e126e11017b1945006ac2c6d66a3ba SHA512 d29a8676e1e117fca5fc1068bb180c88b5560535c46e6ae089a0f0646939cfe6c9c990ec02a35fd21ac62f8435a1e34f6bcbca8b09f7ef09c65a901d59bfe107 WHIRLPOOL 0d380427ce07f26f0882f8011391ca94f8db17137961595a920b241a7ba0529268cd1d96ec50be3204f4e2a6b46e1b29d21cb845551a61a66313d16f84ac8123
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
-DIST shorewall6-5.1.4.1.tar.bz2 224863 SHA256 e3da805b4aa1e8c483f1bb451cb47a869e1977b213a86145a82d42e9bc12ea36 SHA512 3b5c228693936103eb1479e5b0968c5a7d24d94beea410b3ad79f9e7e3b32cca286384b91ee3b09ce006758d27f9b2efe22c589d07d05eeef9ef981818da0b80 WHIRLPOOL 810739511bfb730c6040c8cd9a8a06c836e085a70ea5b4e148d3d364d92648e194ce2b4f1e4a0535a0860a138d87744ddacb229312100242e36828f7e348514f
-DIST shorewall6-5.1.4.2.tar.bz2 224891 SHA256 0934ed42b5dafeab294dc004e72c7361820a4485bdc5005cfdaf3fd628adaea0 SHA512 6ba1dc59797ce9be447536dd0fab5963d5baafaae69bc207c7b93035da89ec88528e5d679ce39925acafa6da559e0273f16f268be4218d01ad4c4a3d894917c1 WHIRLPOOL 581839a3d08377fcdca7881a039d492e799cbc26d917bf53a3047774373205eda29a22aaf15c8b7613253df45f9c134cf46333e79c2057e5b5248241c6fcecbb
-DIST shorewall6-5.1.4.3.tar.bz2 225040 SHA256 c2ab0aaa42015883291c568067927f7bf00d273f56cb9d2d979bc995b6ca8b59 SHA512 867ab06dc800109a10ec7ac9897369d43fd0f74024cc4cd7e697c15a36294ef5bc0269a5fe406e848a8a614f75c6c33a1fa7078c1af97401e646981788a96bf8 WHIRLPOOL bc2e7fb00e566fd818a881791c157e6f14474964598458740f43d1a823919d3a105b3026a912d8cb2ae70cc5b267072f6574486ee08f91a5903fe92eb565f5f7
 DIST shorewall6-5.1.4.4.tar.bz2 224995 SHA256 17ffd91eab228766c8fae80d7087a7a229de62f2a7e93e71e22807b647e9165d SHA512 dbc73ca2805f022a06594192ecef35a33874e0099e306d7e1b052765a5bb2e1a51008f2e08f66d505b2b6e36d8f0da730ec77f1b625abae0403af88030d878ac WHIRLPOOL f91d1db40956ad289014ff7156b74246cf12504ff0b84f46ea641e06fc2d55c417357f2c812e78c48f3ea29a4635e408b20946ebcf6ce35a2bcd0de20128e212
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
-DIST shorewall6-lite-5.1.4.1.tar.bz2 36362 SHA256 29a2f2be295b4f995b38e663b771660ccdc6321134bcfbd0f9378f9bb1237e3c SHA512 b616c5886b5bc274e88052359ca4c8aa6df60a9706958698eac7fc362f1c893de00ed2272535d61a88cb6a786bae9b7cba64a835833a9f81c991fb2ffed8244b WHIRLPOOL 519aee8ad997c14f4337824d40c38cbf7ba2d2ac7db0964c2557816e0d4c4dca24ed2ac69341473e899d0e9e84d367a9e6f42b2484221257bdd55b40c73ee201
-DIST shorewall6-lite-5.1.4.2.tar.bz2 36561 SHA256 121f360799b68c283d4e1e9be3f2eb1fa75d735b5f0a4daf78e58c020cf99e59 SHA512 e3b05e82eeeaaf68d39e951b91c803bd13e8a5cae15634fc62b65bd537b8b9585fb4dcb3aac9b04df696c98bba94cfd39c8ded149da40db51073cfa0338608f1 WHIRLPOOL bd3242aedf0fafbbf5b2e2020b0d41d813515efe872607d85385478d16c3805bb19d87c548fef579412d312cdc3cd4dfe67f1967d14d8ae39fda3eee4783a8fd
-DIST shorewall6-lite-5.1.4.3.tar.bz2 36731 SHA256 b3cb5efe633859f073071552907b503f0ce097e98202e930434540158d5acf92 SHA512 e861bcb17fe528311c1576a37b014aa01c29fcbe9e19bd19bf021420d75b7a6b505bfb159cc065174a82c4ba18fccc9db5d15a34cfbd2371da02466355ce19ff WHIRLPOOL d84a2edd711c029c3b0cd4d4188069dcb71c450d1e5627be147d0ffc7f309f922e76631b4000911a9c40cb418fb90a60289e09d7f3fdf01227ab6a2df993f5e7
 DIST shorewall6-lite-5.1.4.4.tar.bz2 36797 SHA256 2372bc0e9c6e253c1e4db82353d6e4eb4b2a4353a57834e00b775fad99c22af0 SHA512 a1b2ff1f509e6560a94cd5d4f7f3ae3aff456bf19720a5e967b5a609bab3aa2c15a0d5e5b9b9fd54e9e3a551eb6d2da57f993f87354909d045e8f8b31bc073c4 WHIRLPOOL db463165743c799776221d25148311404a687a79377ae5672c7e80d01e1854a3be6b20ebbc17b5d0abd2cd931116ca9a19dbd02249a33f36ef13b32d0a50c556

diff --git a/net-firewall/shorewall/shorewall-5.1.4.1.ebuild b/net-firewall/shorewall/shorewall-5.1.4.1.ebuild
deleted file mode 100644
index ea2ef11ce09..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.4.1.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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.1.4.2.ebuild b/net-firewall/shorewall/shorewall-5.1.4.2.ebuild
deleted file mode 100644
index ea2ef11ce09..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.4.2.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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.1.4.3.ebuild b/net-firewall/shorewall/shorewall-5.1.4.3.ebuild
deleted file mode 100644
index ea2ef11ce09..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.4.3.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-07-03 15:17 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-07-03 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     4dbef38a5aa0873e952fbb41ebe3fa9dd305c95f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 15:12:48 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 15:12:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dbef38a

net-firewall/shorewall: amd64 stable

Stabilized by maintainer

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/shorewall-5.1.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.4.4.ebuild b/net-firewall/shorewall/shorewall-5.1.4.4.ebuild
index ea2ef11ce09..39baf6313a8 100644
--- a/net-firewall/shorewall/shorewall-5.1.4.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.4.4.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-07-24 17:20 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-07-24 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c6ca2ae91cda83b3492525962122da9f8ab01dc4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 17:20:26 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 17:20:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ca2ae9

net-firewall/shorewall: Bump to v5.1.5.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.5.1.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 5be60d4c751..a32bd14fc7b 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
 DIST shorewall-5.1.4.4.tar.bz2 511611 SHA256 fe71c2a2efdc45b594ecc097115322c2203fe31b3098efa4023eff429ff2c55f SHA512 14c7a8cb750b37b72adba28ae00619d4e27fdc73801f1462705754ddbb47727d60425021018bdefdef6c373f2310a774569a88728125e52fd59cf10d94ee4aea WHIRLPOOL 0ef8b315f577c4c8612ad5f842dc8b5e3f4248445cda56136f733fc78d8217d6b5607ff9ed17d43cdd81109b3e493b640ce7bf7e9d33750eaff1cd0effac5c37
+DIST shorewall-5.1.5.1.tar.bz2 519694 SHA256 ef07733c45cbdde4a11b9ce1895f1aeeb36e69146282b8b943f6eda438694a8a SHA512 ab2f8a55c6f03cb4834c5914d77cdfa19cba30e23160533c423cf8f1425b5929df379ed12fee5630e52f2b869bc21111788bffdd2ef3c5937c2e8139ec311817 WHIRLPOOL 7b9dd3ec05f84faae2e9760afb1c70371655bc12c9479603836a8a5fed3c3979ec23421eba1117aaa51fedffb806eca7bcb82e8f615c88e56cd63ee80d405f7f
 DIST shorewall-5.1.5.tar.bz2 519297 SHA256 8604f07fcfde07afc6215988d47229a135d1a30da412974fda127af13aef3899 SHA512 54c02d34f3d79aa210ca18c99de5f51dc404b1104f0456dfc12d0917bcabb4bf76bd6ff98ba78ee36a7e35adfcc37c6bbe9d0c878a96f4380b0ab5b3e59946b6 WHIRLPOOL 9825cf31b1144cc1c47d7e6a6b1a75c3a897db122d2fd49039ac75a57db5aabc5575e4f838b3fe32247d83983ef20d124db4ff7f4e3efc3484ec83937bf6ae4b
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.4.tar.bz2 76206 SHA256 e5fddd7f25b717bce6cc3a9e50d72cb172335d113c58aaef4496004297db6a13 SHA512 24a9a0176d3b1c3dede7428393b9e04a37329053fff95f15102a04d97fb95b30a11c7e0d550a457a29b07291c9347c9b96969ea1b03b68858b3e022f29fd908a WHIRLPOOL 1ff57177c352bd828a0f113267ea154ff5288eb83caa556b07fe85784de896e227f89bae47e7eaaecb76f1a2dbd0fdc87c95f20f8706ef480504a2c5cba0ad2b
+DIST shorewall-core-5.1.5.1.tar.bz2 77100 SHA256 8fe63431785ec1fa8c3ec5f9ba68647f4da9845168a84e410cf905804a6aae8a SHA512 9f3651bcccc84be172c12e27f7b352b706ed397c767e5092a76c45f705a7c53b5650e69eb810b4d00be2a7f37e9dd43f20748ba54a8ff868e84dddf2b3b8c965 WHIRLPOOL 47eaf747e2ffa7a7f81a948860ce3a65fafc17806abe29e2848bec426fcc55b20d9d4b1714f1561b82a8bd1c20996bf5166874b1ad1402a3765cc347b715e90f
 DIST shorewall-core-5.1.5.tar.bz2 76964 SHA256 7ad44b91342538e10be438a2e2bfc987789191865ff57c61bb24e35bdb6b8301 SHA512 b9e18f853187d8e382fe1993d7094cc2ca4e982d12bf765c7a521f7d45fe002a5456816787d27107b38be3b9091f8fc20e3f6e0d5844593673677835ab09b571 WHIRLPOOL 22c253d442c1d2f8dc35ca86988104b9838154c55ddf3ef6fee518209cbca2cf14276817192ea330bad7026d56dab1c7e957e8ebfdef7b98c3ff17637bfc4f4c
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.4.tar.bz2 4280886 SHA256 892d704fe4b15b4f8fe5cd7bee8d456122bfc25f8d514d6efdb767b071e9991a SHA512 15c66e82c40de0a0edad798dc0acda45323160720d806a2759dd82816270e175a5891270b0198f1533f4092b8744629b3c8389f0093869a63d66af2a1d7ff9f1 WHIRLPOOL 20cf5de986eb07e0693671454904f87d2cbf4a66895029d94e96f3ed4d3ef312e69ce4ecbdd8fb876ef02b982803f6042848ed807ad4ee240eac67d4b6c64782
+DIST shorewall-docs-html-5.1.5.1.tar.bz2 4218521 SHA256 c9da6309e72c530af253e90c50fe994d338ab887bc3603a4a140c6c781d3e2a8 SHA512 30e1e3049c2992588d5d542962d4a7f6c97d1a5db1a5a6d0bf0e0c291108a0f01555c72cb336dc859d9446f5be38f86d7c83288151e689ac7d7423fb55ef36e3 WHIRLPOOL d17f0db967ee2d3138b691d2131051f2f20cf8637495509c7a22c4fed005a3cc2fe5dda4e2fc67b05f1e1d8546d55d78c6b17d5912d287e2eec8afe6422e86ad
 DIST shorewall-docs-html-5.1.5.tar.bz2 4210862 SHA256 a1b6c59edff3f0222ed7eafbfd0d8f7873caa06316d4a1c28174e133051b8640 SHA512 0635f57916a71a823ee9e05ac6099447af6e1aaab1c6478b9800d15cfc57a0928ceed17a3347037a7cf4bf02cec25af6089f7a6e201cc158affac272d70fbd93 WHIRLPOOL 3598986c4fe1c98cbe95bb829ff240dc92d69e9f8f3892ef49749681f53841b1d202abb39601ff0cc9231bb994ee654796f52a87b4c2bc0afad0d60ebc9f6f8b
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.4.tar.bz2 31258 SHA256 7ba1d2910fdb5dea4078aae96b469e228e20934e3637d6d3d7f6a5f89f535eb2 SHA512 b49bb7787a3c0a748af15d5d98b63beaaea4f4b8448e48b2064a10197a74d087107d6bdd70dcfd9211ddb2e58d6e97991591c2f617648b87401bc53f76e3a5ea WHIRLPOOL f0121eff5ff1fe6ad1a191a1a764925d8bc2ca6b847e3442f334190d048e6b8c38e42283b33d8e542321d3d606f0ba28b204ff31e49dce9fd4067abefd498a29
+DIST shorewall-init-5.1.5.1.tar.bz2 32356 SHA256 44d1fefb6884e61e18d047e7ab41f267722bf85bef2dff1c4e58118be5087a0f SHA512 4cc3d06ee200c2d6a2f34915315194ec8a8e795239b43b6dbe7f92c43f3725bc33f68eebc87943933e0031f56a65e50578927ad8c5507f498433159dcbdb89fd WHIRLPOOL de79be3d062b28d120c79570aa8496cc9613fa2825dca137a77349bf891d28d51e31c34707d61fa8f406818b73c85e382b3266a7f40a5ce5ca61abd982c1fe90
 DIST shorewall-init-5.1.5.tar.bz2 32080 SHA256 3b98742b38c5cd347e034c494d80a8b565406ceb3dee0df97a7c4ed30da30ea4 SHA512 ca4b4b04944401fdc7dfd257beefda001597d5e45e7b73b7eddb28fede558beba42cf65a71ffb65de4e8f46cb0391e7018634cc9af9cf3110f75791bd18443e8 WHIRLPOOL 6e22f543c422f97d34e51ef62e8619876326005216b12c967f65536485d3db71bd0288b7d4f5f9d9696b3806aef8767fcaff5ae5e4908d196b6a481e8bba874b
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.4.tar.bz2 37096 SHA256 38c956fa2ecbda9c625f8d511673158f70e126e11017b1945006ac2c6d66a3ba SHA512 d29a8676e1e117fca5fc1068bb180c88b5560535c46e6ae089a0f0646939cfe6c9c990ec02a35fd21ac62f8435a1e34f6bcbca8b09f7ef09c65a901d59bfe107 WHIRLPOOL 0d380427ce07f26f0882f8011391ca94f8db17137961595a920b241a7ba0529268cd1d96ec50be3204f4e2a6b46e1b29d21cb845551a61a66313d16f84ac8123
+DIST shorewall-lite-5.1.5.1.tar.bz2 38154 SHA256 071a981a66c87304ebdfce20a650516840663c7a4f9ae4017c6645d705cac943 SHA512 504c3f16014ce00efe180894904b00493cbcf6af9e350e881ea1f499bbedf425d9e20b88e7aa3496ba78339e85973849cb9f3b3671a01515adde512876594ef1 WHIRLPOOL dcc96a662c2eb68abb8c1e84589785bd5fffc98cd6b1a1991cf702a47734bf76582a8d590994b12fa580f6c522d9909d1c33872fde5b9b0ce9886d4828f0e9ac
 DIST shorewall-lite-5.1.5.tar.bz2 37871 SHA256 c15e4adc0cea595b90d82361d8d6c2f8e1ac843a3918e75d53c2e480f013cb1b SHA512 e40647f06e61a5bd87d36d3591ca872cfcb850defe1954375009d6a2207ad7e912b94b1b891ac105b08cc80fa01eaa6ce83aa58925a86b5eeb79226e5c9754c0 WHIRLPOOL 1dd49ecc36d057df10e0f34f148432519dc49945c841492c9c6242b53011dd78079b2fb3802672dbaaf124339ccf66401421aeba1b3ff176c35b137191351c1b
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.4.tar.bz2 224995 SHA256 17ffd91eab228766c8fae80d7087a7a229de62f2a7e93e71e22807b647e9165d SHA512 dbc73ca2805f022a06594192ecef35a33874e0099e306d7e1b052765a5bb2e1a51008f2e08f66d505b2b6e36d8f0da730ec77f1b625abae0403af88030d878ac WHIRLPOOL f91d1db40956ad289014ff7156b74246cf12504ff0b84f46ea641e06fc2d55c417357f2c812e78c48f3ea29a4635e408b20946ebcf6ce35a2bcd0de20128e212
+DIST shorewall6-5.1.5.1.tar.bz2 187735 SHA256 15199281e09623b2e196062a07c3789a17c6b034fef6cf9501480681113227ef SHA512 01864eac5aa48fd096b19ea7923a051d635d18aeda47feaee2ae586996b430290a6f6eeeb2de68d97826bbd156dcda43bf1eae75cd7e47e64441752cb33fee5e WHIRLPOOL e807bf48446ad4576fe3cf493a4aeb34ee0964bb768d70924422d302aa0480aba1d2cdce420cf94571433f0e404bb04651db421cd36f265af5ddca600190297e
 DIST shorewall6-5.1.5.tar.bz2 187203 SHA256 aac997b2e335ef8d5d041f2b2f791e4dc6abe537f7f009a7b2ac11aabf9391f2 SHA512 6876f7a2f9820152e6bd15fc77b36f6734b5bb39895059f29497c231840c3eff3b973cf9976f0a63483379309341f158dae9e007e8f6de4c6a12833ec37ffbba WHIRLPOOL d51b2bc37bba659c6789dda13541a8f8816cba8163f3173f0aba5ba11f35f13b2fe231ea8189dd927b88107c92425cb0a0625caaf50be91f1384ec357a5d24e0
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.4.tar.bz2 36797 SHA256 2372bc0e9c6e253c1e4db82353d6e4eb4b2a4353a57834e00b775fad99c22af0 SHA512 a1b2ff1f509e6560a94cd5d4f7f3ae3aff456bf19720a5e967b5a609bab3aa2c15a0d5e5b9b9fd54e9e3a551eb6d2da57f993f87354909d045e8f8b31bc073c4 WHIRLPOOL db463165743c799776221d25148311404a687a79377ae5672c7e80d01e1854a3be6b20ebbc17b5d0abd2cd931116ca9a19dbd02249a33f36ef13b32d0a50c556
+DIST shorewall6-lite-5.1.5.1.tar.bz2 37868 SHA256 341493e5549edc90c6767afae295fd17ffa05889ce0dbf8624a9849ae636abb5 SHA512 5fff35a195d7d509a2a849525fb9947cbe613734637161818f0dce43c90bc5c2d357d52972e74dde2fe23757c49fcf1e6eff1bc39e31eab09bb929cf14871b30 WHIRLPOOL 590608a46ff4954bda7582ca69079b1ec68f6501b496e5f45f36d5fa64b37596d9ed8313977d8286586e8ba4d774048da5a624c2574b2e756ebe6d5d835132b4
 DIST shorewall6-lite-5.1.5.tar.bz2 37557 SHA256 3399b83da651904d34267512b8054ff9b336b6a9d666e0b26e9cbf84cedf509f SHA512 efe0fc9c6109a04d08ca81dec086d9e33f4b6c1476904c5749c472ff0bad8d7b5115713ae76ea29e226733a990db67b7f8ae3d87464c08fe4a913d28c5e027dd WHIRLPOOL 302a6298f9ad0b2dac79442e4b9a2c6e2be08d2c8de42bc3a594fc256ee292a13fa95604865023b3483a030ee4ee796439693f54c8aa9d83af0fb2b07ba56b8b

diff --git a/net-firewall/shorewall/shorewall-5.1.5.1.ebuild b/net-firewall/shorewall/shorewall-5.1.5.1.ebuild
new file mode 100644
index 00000000000..ea2ef11ce09
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.5.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-08-02 17:38 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-08-02 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e37b56864018d6cf8b1bd893f6a11d827a011ee4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  2 17:36:39 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 17:36:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37b5686

net-firewall/shorewall: Bump to v5.1.5.2

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.5.2.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a32bd14fc7b..eb067694e90 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,35 @@
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
 DIST shorewall-5.1.4.4.tar.bz2 511611 SHA256 fe71c2a2efdc45b594ecc097115322c2203fe31b3098efa4023eff429ff2c55f SHA512 14c7a8cb750b37b72adba28ae00619d4e27fdc73801f1462705754ddbb47727d60425021018bdefdef6c373f2310a774569a88728125e52fd59cf10d94ee4aea WHIRLPOOL 0ef8b315f577c4c8612ad5f842dc8b5e3f4248445cda56136f733fc78d8217d6b5607ff9ed17d43cdd81109b3e493b640ce7bf7e9d33750eaff1cd0effac5c37
 DIST shorewall-5.1.5.1.tar.bz2 519694 SHA256 ef07733c45cbdde4a11b9ce1895f1aeeb36e69146282b8b943f6eda438694a8a SHA512 ab2f8a55c6f03cb4834c5914d77cdfa19cba30e23160533c423cf8f1425b5929df379ed12fee5630e52f2b869bc21111788bffdd2ef3c5937c2e8139ec311817 WHIRLPOOL 7b9dd3ec05f84faae2e9760afb1c70371655bc12c9479603836a8a5fed3c3979ec23421eba1117aaa51fedffb806eca7bcb82e8f615c88e56cd63ee80d405f7f
+DIST shorewall-5.1.5.2.tar.bz2 520374 SHA256 ca33a7bc9c590638575edb8a530b76a9b0bd844877bef7df7c23646e839e137b SHA512 aed35f0a00944d70bb2bdab195f151e3770e73dabe07a59c1b6dd7fce5147866c73d44325df9ded475c37b258cf7c31c8d1348c58476fadd5b98217b7f0b3888 WHIRLPOOL ac0489f4ec152ff57a6da6be2c86b0fe45281ad9bb09e3fd53aba11b94252bb44ec5a71f069e2541b5c4912922fcfbbbce6004804c395e17929c78465a0cd102
 DIST shorewall-5.1.5.tar.bz2 519297 SHA256 8604f07fcfde07afc6215988d47229a135d1a30da412974fda127af13aef3899 SHA512 54c02d34f3d79aa210ca18c99de5f51dc404b1104f0456dfc12d0917bcabb4bf76bd6ff98ba78ee36a7e35adfcc37c6bbe9d0c878a96f4380b0ab5b3e59946b6 WHIRLPOOL 9825cf31b1144cc1c47d7e6a6b1a75c3a897db122d2fd49039ac75a57db5aabc5575e4f838b3fe32247d83983ef20d124db4ff7f4e3efc3484ec83937bf6ae4b
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.4.tar.bz2 76206 SHA256 e5fddd7f25b717bce6cc3a9e50d72cb172335d113c58aaef4496004297db6a13 SHA512 24a9a0176d3b1c3dede7428393b9e04a37329053fff95f15102a04d97fb95b30a11c7e0d550a457a29b07291c9347c9b96969ea1b03b68858b3e022f29fd908a WHIRLPOOL 1ff57177c352bd828a0f113267ea154ff5288eb83caa556b07fe85784de896e227f89bae47e7eaaecb76f1a2dbd0fdc87c95f20f8706ef480504a2c5cba0ad2b
 DIST shorewall-core-5.1.5.1.tar.bz2 77100 SHA256 8fe63431785ec1fa8c3ec5f9ba68647f4da9845168a84e410cf905804a6aae8a SHA512 9f3651bcccc84be172c12e27f7b352b706ed397c767e5092a76c45f705a7c53b5650e69eb810b4d00be2a7f37e9dd43f20748ba54a8ff868e84dddf2b3b8c965 WHIRLPOOL 47eaf747e2ffa7a7f81a948860ce3a65fafc17806abe29e2848bec426fcc55b20d9d4b1714f1561b82a8bd1c20996bf5166874b1ad1402a3765cc347b715e90f
+DIST shorewall-core-5.1.5.2.tar.bz2 77435 SHA256 24ca9c2e506cadda1fcbf621b376db0ebb3f3802cecc53d1518753a9cb77d450 SHA512 d4e0ef22d288e6addc2ce41813f2bab56fa142893ea495ef59dd1a636995e2a71e88477c38cac1004f055a7333ab0db27a334ca586b88558d6b781966712bff2 WHIRLPOOL 526495ae9a13a2e0dfc6dc7fffec0a7f8dd1be111be35ff2356bcf403c12c7e76993c82b2cb5b76541fa613856b23a5499b86a7a72b52062e7a21bd3b61e9082
 DIST shorewall-core-5.1.5.tar.bz2 76964 SHA256 7ad44b91342538e10be438a2e2bfc987789191865ff57c61bb24e35bdb6b8301 SHA512 b9e18f853187d8e382fe1993d7094cc2ca4e982d12bf765c7a521f7d45fe002a5456816787d27107b38be3b9091f8fc20e3f6e0d5844593673677835ab09b571 WHIRLPOOL 22c253d442c1d2f8dc35ca86988104b9838154c55ddf3ef6fee518209cbca2cf14276817192ea330bad7026d56dab1c7e957e8ebfdef7b98c3ff17637bfc4f4c
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.4.tar.bz2 4280886 SHA256 892d704fe4b15b4f8fe5cd7bee8d456122bfc25f8d514d6efdb767b071e9991a SHA512 15c66e82c40de0a0edad798dc0acda45323160720d806a2759dd82816270e175a5891270b0198f1533f4092b8744629b3c8389f0093869a63d66af2a1d7ff9f1 WHIRLPOOL 20cf5de986eb07e0693671454904f87d2cbf4a66895029d94e96f3ed4d3ef312e69ce4ecbdd8fb876ef02b982803f6042848ed807ad4ee240eac67d4b6c64782
 DIST shorewall-docs-html-5.1.5.1.tar.bz2 4218521 SHA256 c9da6309e72c530af253e90c50fe994d338ab887bc3603a4a140c6c781d3e2a8 SHA512 30e1e3049c2992588d5d542962d4a7f6c97d1a5db1a5a6d0bf0e0c291108a0f01555c72cb336dc859d9446f5be38f86d7c83288151e689ac7d7423fb55ef36e3 WHIRLPOOL d17f0db967ee2d3138b691d2131051f2f20cf8637495509c7a22c4fed005a3cc2fe5dda4e2fc67b05f1e1d8546d55d78c6b17d5912d287e2eec8afe6422e86ad
+DIST shorewall-docs-html-5.1.5.2.tar.bz2 4218574 SHA256 18a601050b6fcf6b5839ead037e96ee28ae85eb34262d7d614183cbee6169ef5 SHA512 a66161a601f5417bde8612a154c3886dbf81985e127955bbec213dcaa0e4778b2a3aabbf1dcf257d36db0806b5822bce5fa11a555da36427abbf0deb8f6f1501 WHIRLPOOL d8607b0c7ea3b7bd7b685e99895867f9e37bc2a0c8a5520a59311696fc0e2817452e36865c08e7b758a72fd9a546bf5ef6a47f4098f993cf8c95ad4e1f426dd8
 DIST shorewall-docs-html-5.1.5.tar.bz2 4210862 SHA256 a1b6c59edff3f0222ed7eafbfd0d8f7873caa06316d4a1c28174e133051b8640 SHA512 0635f57916a71a823ee9e05ac6099447af6e1aaab1c6478b9800d15cfc57a0928ceed17a3347037a7cf4bf02cec25af6089f7a6e201cc158affac272d70fbd93 WHIRLPOOL 3598986c4fe1c98cbe95bb829ff240dc92d69e9f8f3892ef49749681f53841b1d202abb39601ff0cc9231bb994ee654796f52a87b4c2bc0afad0d60ebc9f6f8b
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.4.tar.bz2 31258 SHA256 7ba1d2910fdb5dea4078aae96b469e228e20934e3637d6d3d7f6a5f89f535eb2 SHA512 b49bb7787a3c0a748af15d5d98b63beaaea4f4b8448e48b2064a10197a74d087107d6bdd70dcfd9211ddb2e58d6e97991591c2f617648b87401bc53f76e3a5ea WHIRLPOOL f0121eff5ff1fe6ad1a191a1a764925d8bc2ca6b847e3442f334190d048e6b8c38e42283b33d8e542321d3d606f0ba28b204ff31e49dce9fd4067abefd498a29
 DIST shorewall-init-5.1.5.1.tar.bz2 32356 SHA256 44d1fefb6884e61e18d047e7ab41f267722bf85bef2dff1c4e58118be5087a0f SHA512 4cc3d06ee200c2d6a2f34915315194ec8a8e795239b43b6dbe7f92c43f3725bc33f68eebc87943933e0031f56a65e50578927ad8c5507f498433159dcbdb89fd WHIRLPOOL de79be3d062b28d120c79570aa8496cc9613fa2825dca137a77349bf891d28d51e31c34707d61fa8f406818b73c85e382b3266a7f40a5ce5ca61abd982c1fe90
+DIST shorewall-init-5.1.5.2.tar.bz2 32646 SHA256 1ae9771f20ca3ede897fe0ee4443d65011dde37d6ecc146150ba22c980b6f272 SHA512 de67e167bbdd5e2860e01fb55f07b695011ce7473b98b374f605263eb0aa66e7de645cd7716526ecbf01bf8b65fb5e08294c85bf55ec45b54b78f1b66e80565c WHIRLPOOL d1f1d05b384b63b087e48afa90ded85e333d1ca1d8e90196de2540c8705239f55326ffa5d421f6c03e651e6d7076e18786ab47009c09f31de2cc6fe13910ac36
 DIST shorewall-init-5.1.5.tar.bz2 32080 SHA256 3b98742b38c5cd347e034c494d80a8b565406ceb3dee0df97a7c4ed30da30ea4 SHA512 ca4b4b04944401fdc7dfd257beefda001597d5e45e7b73b7eddb28fede558beba42cf65a71ffb65de4e8f46cb0391e7018634cc9af9cf3110f75791bd18443e8 WHIRLPOOL 6e22f543c422f97d34e51ef62e8619876326005216b12c967f65536485d3db71bd0288b7d4f5f9d9696b3806aef8767fcaff5ae5e4908d196b6a481e8bba874b
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.4.tar.bz2 37096 SHA256 38c956fa2ecbda9c625f8d511673158f70e126e11017b1945006ac2c6d66a3ba SHA512 d29a8676e1e117fca5fc1068bb180c88b5560535c46e6ae089a0f0646939cfe6c9c990ec02a35fd21ac62f8435a1e34f6bcbca8b09f7ef09c65a901d59bfe107 WHIRLPOOL 0d380427ce07f26f0882f8011391ca94f8db17137961595a920b241a7ba0529268cd1d96ec50be3204f4e2a6b46e1b29d21cb845551a61a66313d16f84ac8123
 DIST shorewall-lite-5.1.5.1.tar.bz2 38154 SHA256 071a981a66c87304ebdfce20a650516840663c7a4f9ae4017c6645d705cac943 SHA512 504c3f16014ce00efe180894904b00493cbcf6af9e350e881ea1f499bbedf425d9e20b88e7aa3496ba78339e85973849cb9f3b3671a01515adde512876594ef1 WHIRLPOOL dcc96a662c2eb68abb8c1e84589785bd5fffc98cd6b1a1991cf702a47734bf76582a8d590994b12fa580f6c522d9909d1c33872fde5b9b0ce9886d4828f0e9ac
+DIST shorewall-lite-5.1.5.2.tar.bz2 38424 SHA256 acf092c051ce4e19b0aa67b1828511ec446006133c4451d9c13f60275025a397 SHA512 300793d3a123ab63cde988667a53e931adf7f40e6987bb5b57a60376502ad4ec46316e45bc0c589f82f3fb118ee6f78a0646f7aa5ef522791eea10e7ff2430da WHIRLPOOL 2a8b775d87601cb4e792fe817e0d2e7eaaf6b162eb9ed762081ec502239d1dc33d3843e9742b532d582939dc143561de617246aeb27a83448625bc4935d78505
 DIST shorewall-lite-5.1.5.tar.bz2 37871 SHA256 c15e4adc0cea595b90d82361d8d6c2f8e1ac843a3918e75d53c2e480f013cb1b SHA512 e40647f06e61a5bd87d36d3591ca872cfcb850defe1954375009d6a2207ad7e912b94b1b891ac105b08cc80fa01eaa6ce83aa58925a86b5eeb79226e5c9754c0 WHIRLPOOL 1dd49ecc36d057df10e0f34f148432519dc49945c841492c9c6242b53011dd78079b2fb3802672dbaaf124339ccf66401421aeba1b3ff176c35b137191351c1b
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.4.tar.bz2 224995 SHA256 17ffd91eab228766c8fae80d7087a7a229de62f2a7e93e71e22807b647e9165d SHA512 dbc73ca2805f022a06594192ecef35a33874e0099e306d7e1b052765a5bb2e1a51008f2e08f66d505b2b6e36d8f0da730ec77f1b625abae0403af88030d878ac WHIRLPOOL f91d1db40956ad289014ff7156b74246cf12504ff0b84f46ea641e06fc2d55c417357f2c812e78c48f3ea29a4635e408b20946ebcf6ce35a2bcd0de20128e212
 DIST shorewall6-5.1.5.1.tar.bz2 187735 SHA256 15199281e09623b2e196062a07c3789a17c6b034fef6cf9501480681113227ef SHA512 01864eac5aa48fd096b19ea7923a051d635d18aeda47feaee2ae586996b430290a6f6eeeb2de68d97826bbd156dcda43bf1eae75cd7e47e64441752cb33fee5e WHIRLPOOL e807bf48446ad4576fe3cf493a4aeb34ee0964bb768d70924422d302aa0480aba1d2cdce420cf94571433f0e404bb04651db421cd36f265af5ddca600190297e
+DIST shorewall6-5.1.5.2.tar.bz2 188754 SHA256 c215a762ebb9c0a35be7463e1a2db2397ee1c01ab32c2224528f8de4a5ac9ac6 SHA512 1dbb7304f1f349ceb84a34c397a8c12e4fc5e9bdcd001d72881dbf76dda37e8e8448419f00c705e430f5f2e57cf3a7f9dc834cde6119d18cbeabf9d5a0e67e35 WHIRLPOOL 0daf72a3755b83b1ac3c6d90911149410cb9918f9ad312bd16f90c900880e32e852f5cb89791fdd68f14c1ae2389a365a23b94f430e227c687ab820d1b6d7619
 DIST shorewall6-5.1.5.tar.bz2 187203 SHA256 aac997b2e335ef8d5d041f2b2f791e4dc6abe537f7f009a7b2ac11aabf9391f2 SHA512 6876f7a2f9820152e6bd15fc77b36f6734b5bb39895059f29497c231840c3eff3b973cf9976f0a63483379309341f158dae9e007e8f6de4c6a12833ec37ffbba WHIRLPOOL d51b2bc37bba659c6789dda13541a8f8816cba8163f3173f0aba5ba11f35f13b2fe231ea8189dd927b88107c92425cb0a0625caaf50be91f1384ec357a5d24e0
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.4.tar.bz2 36797 SHA256 2372bc0e9c6e253c1e4db82353d6e4eb4b2a4353a57834e00b775fad99c22af0 SHA512 a1b2ff1f509e6560a94cd5d4f7f3ae3aff456bf19720a5e967b5a609bab3aa2c15a0d5e5b9b9fd54e9e3a551eb6d2da57f993f87354909d045e8f8b31bc073c4 WHIRLPOOL db463165743c799776221d25148311404a687a79377ae5672c7e80d01e1854a3be6b20ebbc17b5d0abd2cd931116ca9a19dbd02249a33f36ef13b32d0a50c556
 DIST shorewall6-lite-5.1.5.1.tar.bz2 37868 SHA256 341493e5549edc90c6767afae295fd17ffa05889ce0dbf8624a9849ae636abb5 SHA512 5fff35a195d7d509a2a849525fb9947cbe613734637161818f0dce43c90bc5c2d357d52972e74dde2fe23757c49fcf1e6eff1bc39e31eab09bb929cf14871b30 WHIRLPOOL 590608a46ff4954bda7582ca69079b1ec68f6501b496e5f45f36d5fa64b37596d9ed8313977d8286586e8ba4d774048da5a624c2574b2e756ebe6d5d835132b4
+DIST shorewall6-lite-5.1.5.2.tar.bz2 38137 SHA256 0b65ef615be93f921af6d8c11f702f2c46ba18d989fe12fe048732c53cf841de SHA512 e8961abdb7c105820d8420f623cbff72af33e2d35701bb0f81f2fad5364e91b88d5d1317d4ffc8e00c3b32d50c96f6c0dccda20cd981c5f6cc7aaf1662af8d27 WHIRLPOOL d3b04c2c6e9f3a10b8bbc0da1e5691dc3e428501ee52547e548eed05b14d54aec243111f711cb66ecc734efe5217dffa0230b1045296f90a60da88c390ba33bf
 DIST shorewall6-lite-5.1.5.tar.bz2 37557 SHA256 3399b83da651904d34267512b8054ff9b336b6a9d666e0b26e9cbf84cedf509f SHA512 efe0fc9c6109a04d08ca81dec086d9e33f4b6c1476904c5749c472ff0bad8d7b5115713ae76ea29e226733a990db67b7f8ae3d87464c08fe4a913d28c5e027dd WHIRLPOOL 302a6298f9ad0b2dac79442e4b9a2c6e2be08d2c8de42bc3a594fc256ee292a13fa95604865023b3483a030ee4ee796439693f54c8aa9d83af0fb2b07ba56b8b

diff --git a/net-firewall/shorewall/shorewall-5.1.5.2.ebuild b/net-firewall/shorewall/shorewall-5.1.5.2.ebuild
new file mode 100644
index 00000000000..ea2ef11ce09
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.5.2.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-08-20 20:07 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-08-20 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     353e9b5dfc86a52b605acbc6387889dc969134d6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 20:07:29 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 20:07:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353e9b5d

net-firewall/shorewall: Maintainer stabilization under ALLARCHES policy

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-firewall/shorewall/shorewall-5.1.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.5.2.ebuild b/net-firewall/shorewall/shorewall-5.1.5.2.ebuild
index ea2ef11ce09..20be5c54927 100644
--- a/net-firewall/shorewall/shorewall-5.1.5.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.5.2.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-09-05 16:43 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-09-05 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e812edf1d64cf056536897886508e8874b1010d5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  5 16:41:39 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 16:41:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e812edf1

net-firewall/shorewall: Bump to v5.1.6.1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.6.1.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index eb067694e90..58c612f2e7e 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -3,33 +3,40 @@ DIST shorewall-5.1.4.4.tar.bz2 511611 SHA256 fe71c2a2efdc45b594ecc097115322c2203
 DIST shorewall-5.1.5.1.tar.bz2 519694 SHA256 ef07733c45cbdde4a11b9ce1895f1aeeb36e69146282b8b943f6eda438694a8a SHA512 ab2f8a55c6f03cb4834c5914d77cdfa19cba30e23160533c423cf8f1425b5929df379ed12fee5630e52f2b869bc21111788bffdd2ef3c5937c2e8139ec311817 WHIRLPOOL 7b9dd3ec05f84faae2e9760afb1c70371655bc12c9479603836a8a5fed3c3979ec23421eba1117aaa51fedffb806eca7bcb82e8f615c88e56cd63ee80d405f7f
 DIST shorewall-5.1.5.2.tar.bz2 520374 SHA256 ca33a7bc9c590638575edb8a530b76a9b0bd844877bef7df7c23646e839e137b SHA512 aed35f0a00944d70bb2bdab195f151e3770e73dabe07a59c1b6dd7fce5147866c73d44325df9ded475c37b258cf7c31c8d1348c58476fadd5b98217b7f0b3888 WHIRLPOOL ac0489f4ec152ff57a6da6be2c86b0fe45281ad9bb09e3fd53aba11b94252bb44ec5a71f069e2541b5c4912922fcfbbbce6004804c395e17929c78465a0cd102
 DIST shorewall-5.1.5.tar.bz2 519297 SHA256 8604f07fcfde07afc6215988d47229a135d1a30da412974fda127af13aef3899 SHA512 54c02d34f3d79aa210ca18c99de5f51dc404b1104f0456dfc12d0917bcabb4bf76bd6ff98ba78ee36a7e35adfcc37c6bbe9d0c878a96f4380b0ab5b3e59946b6 WHIRLPOOL 9825cf31b1144cc1c47d7e6a6b1a75c3a897db122d2fd49039ac75a57db5aabc5575e4f838b3fe32247d83983ef20d124db4ff7f4e3efc3484ec83937bf6ae4b
+DIST shorewall-5.1.6.1.tar.bz2 522476 SHA256 90702872726c30434ef87c19be1742ae5f04b4e0b1f9ee7761810b618b38a05e SHA512 604ee6150add87a5c121e863ec3d65f454b6ae1724236c80c08e2ce3365512966126f9d28d07c7e6a273d5626e02e5625015f91f6a7166b830f6ccb667f731ba WHIRLPOOL f0e70c3949e9f9b59a5f5a19ee1023ecc6dc2ece2e420245f67fa2d7197939bc1197402366d8a560d7e29231accd5ea1456a005df30c7deaa82f25e01375ff2a
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.4.tar.bz2 76206 SHA256 e5fddd7f25b717bce6cc3a9e50d72cb172335d113c58aaef4496004297db6a13 SHA512 24a9a0176d3b1c3dede7428393b9e04a37329053fff95f15102a04d97fb95b30a11c7e0d550a457a29b07291c9347c9b96969ea1b03b68858b3e022f29fd908a WHIRLPOOL 1ff57177c352bd828a0f113267ea154ff5288eb83caa556b07fe85784de896e227f89bae47e7eaaecb76f1a2dbd0fdc87c95f20f8706ef480504a2c5cba0ad2b
 DIST shorewall-core-5.1.5.1.tar.bz2 77100 SHA256 8fe63431785ec1fa8c3ec5f9ba68647f4da9845168a84e410cf905804a6aae8a SHA512 9f3651bcccc84be172c12e27f7b352b706ed397c767e5092a76c45f705a7c53b5650e69eb810b4d00be2a7f37e9dd43f20748ba54a8ff868e84dddf2b3b8c965 WHIRLPOOL 47eaf747e2ffa7a7f81a948860ce3a65fafc17806abe29e2848bec426fcc55b20d9d4b1714f1561b82a8bd1c20996bf5166874b1ad1402a3765cc347b715e90f
 DIST shorewall-core-5.1.5.2.tar.bz2 77435 SHA256 24ca9c2e506cadda1fcbf621b376db0ebb3f3802cecc53d1518753a9cb77d450 SHA512 d4e0ef22d288e6addc2ce41813f2bab56fa142893ea495ef59dd1a636995e2a71e88477c38cac1004f055a7333ab0db27a334ca586b88558d6b781966712bff2 WHIRLPOOL 526495ae9a13a2e0dfc6dc7fffec0a7f8dd1be111be35ff2356bcf403c12c7e76993c82b2cb5b76541fa613856b23a5499b86a7a72b52062e7a21bd3b61e9082
 DIST shorewall-core-5.1.5.tar.bz2 76964 SHA256 7ad44b91342538e10be438a2e2bfc987789191865ff57c61bb24e35bdb6b8301 SHA512 b9e18f853187d8e382fe1993d7094cc2ca4e982d12bf765c7a521f7d45fe002a5456816787d27107b38be3b9091f8fc20e3f6e0d5844593673677835ab09b571 WHIRLPOOL 22c253d442c1d2f8dc35ca86988104b9838154c55ddf3ef6fee518209cbca2cf14276817192ea330bad7026d56dab1c7e957e8ebfdef7b98c3ff17637bfc4f4c
+DIST shorewall-core-5.1.6.1.tar.bz2 78891 SHA256 31b48d50ce9a6b256739679c03ea4c6c219149b34201e6637f0ed2ccc6dd3530 SHA512 090425813791bc78531a46c493a54cadc3ac6106963c87abb3c48f0863267f71bccad644209f2893f9f1ec06057595242f12fbd59312c7e8dd932f0c3bc29236 WHIRLPOOL c255fd892a299fe8ef56a923b4c8511df2cbc21ce8821f90257b2e9a1fd66a20ec2a5070365dc7a6b43e40c0b0645c845b122a67b4dbc6e71e8a9f1de919b13b
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.4.tar.bz2 4280886 SHA256 892d704fe4b15b4f8fe5cd7bee8d456122bfc25f8d514d6efdb767b071e9991a SHA512 15c66e82c40de0a0edad798dc0acda45323160720d806a2759dd82816270e175a5891270b0198f1533f4092b8744629b3c8389f0093869a63d66af2a1d7ff9f1 WHIRLPOOL 20cf5de986eb07e0693671454904f87d2cbf4a66895029d94e96f3ed4d3ef312e69ce4ecbdd8fb876ef02b982803f6042848ed807ad4ee240eac67d4b6c64782
 DIST shorewall-docs-html-5.1.5.1.tar.bz2 4218521 SHA256 c9da6309e72c530af253e90c50fe994d338ab887bc3603a4a140c6c781d3e2a8 SHA512 30e1e3049c2992588d5d542962d4a7f6c97d1a5db1a5a6d0bf0e0c291108a0f01555c72cb336dc859d9446f5be38f86d7c83288151e689ac7d7423fb55ef36e3 WHIRLPOOL d17f0db967ee2d3138b691d2131051f2f20cf8637495509c7a22c4fed005a3cc2fe5dda4e2fc67b05f1e1d8546d55d78c6b17d5912d287e2eec8afe6422e86ad
 DIST shorewall-docs-html-5.1.5.2.tar.bz2 4218574 SHA256 18a601050b6fcf6b5839ead037e96ee28ae85eb34262d7d614183cbee6169ef5 SHA512 a66161a601f5417bde8612a154c3886dbf81985e127955bbec213dcaa0e4778b2a3aabbf1dcf257d36db0806b5822bce5fa11a555da36427abbf0deb8f6f1501 WHIRLPOOL d8607b0c7ea3b7bd7b685e99895867f9e37bc2a0c8a5520a59311696fc0e2817452e36865c08e7b758a72fd9a546bf5ef6a47f4098f993cf8c95ad4e1f426dd8
 DIST shorewall-docs-html-5.1.5.tar.bz2 4210862 SHA256 a1b6c59edff3f0222ed7eafbfd0d8f7873caa06316d4a1c28174e133051b8640 SHA512 0635f57916a71a823ee9e05ac6099447af6e1aaab1c6478b9800d15cfc57a0928ceed17a3347037a7cf4bf02cec25af6089f7a6e201cc158affac272d70fbd93 WHIRLPOOL 3598986c4fe1c98cbe95bb829ff240dc92d69e9f8f3892ef49749681f53841b1d202abb39601ff0cc9231bb994ee654796f52a87b4c2bc0afad0d60ebc9f6f8b
+DIST shorewall-docs-html-5.1.6.1.tar.bz2 4218958 SHA256 db1d61b013f035a2e7d515f483d789fa160fe7a250e12e9efec5a79fb2ef1144 SHA512 c620209dd6fd9f044088e11e1adf8bee5c481bb27db76bfae5f42fae242dc139526cc457507251d5d00e55a652b358aa7ac3586ec10e28210e00f75932007277 WHIRLPOOL 36936c55029db3875f1a14014eb2c25845412f74bec22205a24919faa34c8b447539bbaa29189ed547bd63989ba20d1c4376fc5fd4d02d4c227f10d733fc0835
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.4.tar.bz2 31258 SHA256 7ba1d2910fdb5dea4078aae96b469e228e20934e3637d6d3d7f6a5f89f535eb2 SHA512 b49bb7787a3c0a748af15d5d98b63beaaea4f4b8448e48b2064a10197a74d087107d6bdd70dcfd9211ddb2e58d6e97991591c2f617648b87401bc53f76e3a5ea WHIRLPOOL f0121eff5ff1fe6ad1a191a1a764925d8bc2ca6b847e3442f334190d048e6b8c38e42283b33d8e542321d3d606f0ba28b204ff31e49dce9fd4067abefd498a29
 DIST shorewall-init-5.1.5.1.tar.bz2 32356 SHA256 44d1fefb6884e61e18d047e7ab41f267722bf85bef2dff1c4e58118be5087a0f SHA512 4cc3d06ee200c2d6a2f34915315194ec8a8e795239b43b6dbe7f92c43f3725bc33f68eebc87943933e0031f56a65e50578927ad8c5507f498433159dcbdb89fd WHIRLPOOL de79be3d062b28d120c79570aa8496cc9613fa2825dca137a77349bf891d28d51e31c34707d61fa8f406818b73c85e382b3266a7f40a5ce5ca61abd982c1fe90
 DIST shorewall-init-5.1.5.2.tar.bz2 32646 SHA256 1ae9771f20ca3ede897fe0ee4443d65011dde37d6ecc146150ba22c980b6f272 SHA512 de67e167bbdd5e2860e01fb55f07b695011ce7473b98b374f605263eb0aa66e7de645cd7716526ecbf01bf8b65fb5e08294c85bf55ec45b54b78f1b66e80565c WHIRLPOOL d1f1d05b384b63b087e48afa90ded85e333d1ca1d8e90196de2540c8705239f55326ffa5d421f6c03e651e6d7076e18786ab47009c09f31de2cc6fe13910ac36
 DIST shorewall-init-5.1.5.tar.bz2 32080 SHA256 3b98742b38c5cd347e034c494d80a8b565406ceb3dee0df97a7c4ed30da30ea4 SHA512 ca4b4b04944401fdc7dfd257beefda001597d5e45e7b73b7eddb28fede558beba42cf65a71ffb65de4e8f46cb0391e7018634cc9af9cf3110f75791bd18443e8 WHIRLPOOL 6e22f543c422f97d34e51ef62e8619876326005216b12c967f65536485d3db71bd0288b7d4f5f9d9696b3806aef8767fcaff5ae5e4908d196b6a481e8bba874b
+DIST shorewall-init-5.1.6.1.tar.bz2 34153 SHA256 ad20b348e32f6cc332521b07ef89a891978453e56cfe7fbe916d1f83ae594194 SHA512 f6ea4aad0c0da6da8436dcb27441088cefd8312e37cc6d62187fd8210790b2be5452cc06f1823f1958c53cdec2e4b14abc5be31a7c029739838f5bbc6d143a00 WHIRLPOOL b5d6f01c5670a60a3471f1fffbd341ca914c20d39516ad5bf63693c7ebda882c0fa572d5839f28ef94d40a95216a1b13573b470fe14676f0421aebde62769fd6
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.4.tar.bz2 37096 SHA256 38c956fa2ecbda9c625f8d511673158f70e126e11017b1945006ac2c6d66a3ba SHA512 d29a8676e1e117fca5fc1068bb180c88b5560535c46e6ae089a0f0646939cfe6c9c990ec02a35fd21ac62f8435a1e34f6bcbca8b09f7ef09c65a901d59bfe107 WHIRLPOOL 0d380427ce07f26f0882f8011391ca94f8db17137961595a920b241a7ba0529268cd1d96ec50be3204f4e2a6b46e1b29d21cb845551a61a66313d16f84ac8123
 DIST shorewall-lite-5.1.5.1.tar.bz2 38154 SHA256 071a981a66c87304ebdfce20a650516840663c7a4f9ae4017c6645d705cac943 SHA512 504c3f16014ce00efe180894904b00493cbcf6af9e350e881ea1f499bbedf425d9e20b88e7aa3496ba78339e85973849cb9f3b3671a01515adde512876594ef1 WHIRLPOOL dcc96a662c2eb68abb8c1e84589785bd5fffc98cd6b1a1991cf702a47734bf76582a8d590994b12fa580f6c522d9909d1c33872fde5b9b0ce9886d4828f0e9ac
 DIST shorewall-lite-5.1.5.2.tar.bz2 38424 SHA256 acf092c051ce4e19b0aa67b1828511ec446006133c4451d9c13f60275025a397 SHA512 300793d3a123ab63cde988667a53e931adf7f40e6987bb5b57a60376502ad4ec46316e45bc0c589f82f3fb118ee6f78a0646f7aa5ef522791eea10e7ff2430da WHIRLPOOL 2a8b775d87601cb4e792fe817e0d2e7eaaf6b162eb9ed762081ec502239d1dc33d3843e9742b532d582939dc143561de617246aeb27a83448625bc4935d78505
 DIST shorewall-lite-5.1.5.tar.bz2 37871 SHA256 c15e4adc0cea595b90d82361d8d6c2f8e1ac843a3918e75d53c2e480f013cb1b SHA512 e40647f06e61a5bd87d36d3591ca872cfcb850defe1954375009d6a2207ad7e912b94b1b891ac105b08cc80fa01eaa6ce83aa58925a86b5eeb79226e5c9754c0 WHIRLPOOL 1dd49ecc36d057df10e0f34f148432519dc49945c841492c9c6242b53011dd78079b2fb3802672dbaaf124339ccf66401421aeba1b3ff176c35b137191351c1b
+DIST shorewall-lite-5.1.6.1.tar.bz2 39930 SHA256 64424e0c69aff83fc02a73db5b1c7ee10fb916d317c027987ba40c8aff6ddd8f SHA512 69cfca2e703680238b32c8ffe3431a9267625faa3a03bed28593f0b0e8a5accc7d58ef4b91b77f87fc44e09f279d41e0302094e1d5255fc3ed1f6fc51863c07b WHIRLPOOL cb993586c09297aeaf8a37cbde8afa99f93687b62b1a5551e70e10ffa9633ba67077dc9323af583293c7e1d07b0ba558d2b1a124709fef147021bf9c5cffee9e
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.4.tar.bz2 224995 SHA256 17ffd91eab228766c8fae80d7087a7a229de62f2a7e93e71e22807b647e9165d SHA512 dbc73ca2805f022a06594192ecef35a33874e0099e306d7e1b052765a5bb2e1a51008f2e08f66d505b2b6e36d8f0da730ec77f1b625abae0403af88030d878ac WHIRLPOOL f91d1db40956ad289014ff7156b74246cf12504ff0b84f46ea641e06fc2d55c417357f2c812e78c48f3ea29a4635e408b20946ebcf6ce35a2bcd0de20128e212
 DIST shorewall6-5.1.5.1.tar.bz2 187735 SHA256 15199281e09623b2e196062a07c3789a17c6b034fef6cf9501480681113227ef SHA512 01864eac5aa48fd096b19ea7923a051d635d18aeda47feaee2ae586996b430290a6f6eeeb2de68d97826bbd156dcda43bf1eae75cd7e47e64441752cb33fee5e WHIRLPOOL e807bf48446ad4576fe3cf493a4aeb34ee0964bb768d70924422d302aa0480aba1d2cdce420cf94571433f0e404bb04651db421cd36f265af5ddca600190297e
 DIST shorewall6-5.1.5.2.tar.bz2 188754 SHA256 c215a762ebb9c0a35be7463e1a2db2397ee1c01ab32c2224528f8de4a5ac9ac6 SHA512 1dbb7304f1f349ceb84a34c397a8c12e4fc5e9bdcd001d72881dbf76dda37e8e8448419f00c705e430f5f2e57cf3a7f9dc834cde6119d18cbeabf9d5a0e67e35 WHIRLPOOL 0daf72a3755b83b1ac3c6d90911149410cb9918f9ad312bd16f90c900880e32e852f5cb89791fdd68f14c1ae2389a365a23b94f430e227c687ab820d1b6d7619
 DIST shorewall6-5.1.5.tar.bz2 187203 SHA256 aac997b2e335ef8d5d041f2b2f791e4dc6abe537f7f009a7b2ac11aabf9391f2 SHA512 6876f7a2f9820152e6bd15fc77b36f6734b5bb39895059f29497c231840c3eff3b973cf9976f0a63483379309341f158dae9e007e8f6de4c6a12833ec37ffbba WHIRLPOOL d51b2bc37bba659c6789dda13541a8f8816cba8163f3173f0aba5ba11f35f13b2fe231ea8189dd927b88107c92425cb0a0625caaf50be91f1384ec357a5d24e0
+DIST shorewall6-5.1.6.1.tar.bz2 191131 SHA256 4732c560aa9166b35fbefaeecf6dcedf9f5224e1f56a739b3b1d30724af3affc SHA512 a26acc30f81c7419d9cbb8fd9f0a95c4647e4247b5f4f6232fc414abdba85c85ad8b127f441137cffa1dd88e7bebfba8a785416f54df36f77a36a50b4971b0f1 WHIRLPOOL a9cbe284762ee8af930808c8bb25931860ea9014e00c5b1f2d99ae48ffd31fa96a92dd0bb7ab43bbc44a7d02c5e8e5c334d938db3414b1c0e7069175f04fe026
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.4.tar.bz2 36797 SHA256 2372bc0e9c6e253c1e4db82353d6e4eb4b2a4353a57834e00b775fad99c22af0 SHA512 a1b2ff1f509e6560a94cd5d4f7f3ae3aff456bf19720a5e967b5a609bab3aa2c15a0d5e5b9b9fd54e9e3a551eb6d2da57f993f87354909d045e8f8b31bc073c4 WHIRLPOOL db463165743c799776221d25148311404a687a79377ae5672c7e80d01e1854a3be6b20ebbc17b5d0abd2cd931116ca9a19dbd02249a33f36ef13b32d0a50c556
 DIST shorewall6-lite-5.1.5.1.tar.bz2 37868 SHA256 341493e5549edc90c6767afae295fd17ffa05889ce0dbf8624a9849ae636abb5 SHA512 5fff35a195d7d509a2a849525fb9947cbe613734637161818f0dce43c90bc5c2d357d52972e74dde2fe23757c49fcf1e6eff1bc39e31eab09bb929cf14871b30 WHIRLPOOL 590608a46ff4954bda7582ca69079b1ec68f6501b496e5f45f36d5fa64b37596d9ed8313977d8286586e8ba4d774048da5a624c2574b2e756ebe6d5d835132b4
 DIST shorewall6-lite-5.1.5.2.tar.bz2 38137 SHA256 0b65ef615be93f921af6d8c11f702f2c46ba18d989fe12fe048732c53cf841de SHA512 e8961abdb7c105820d8420f623cbff72af33e2d35701bb0f81f2fad5364e91b88d5d1317d4ffc8e00c3b32d50c96f6c0dccda20cd981c5f6cc7aaf1662af8d27 WHIRLPOOL d3b04c2c6e9f3a10b8bbc0da1e5691dc3e428501ee52547e548eed05b14d54aec243111f711cb66ecc734efe5217dffa0230b1045296f90a60da88c390ba33bf
 DIST shorewall6-lite-5.1.5.tar.bz2 37557 SHA256 3399b83da651904d34267512b8054ff9b336b6a9d666e0b26e9cbf84cedf509f SHA512 efe0fc9c6109a04d08ca81dec086d9e33f4b6c1476904c5749c472ff0bad8d7b5115713ae76ea29e226733a990db67b7f8ae3d87464c08fe4a913d28c5e027dd WHIRLPOOL 302a6298f9ad0b2dac79442e4b9a2c6e2be08d2c8de42bc3a594fc256ee292a13fa95604865023b3483a030ee4ee796439693f54c8aa9d83af0fb2b07ba56b8b
+DIST shorewall6-lite-5.1.6.1.tar.bz2 39636 SHA256 a25a1430a09d797991f0028f76f5252b86ef898801fc8eb3e6c8ca695d1d2a98 SHA512 eb059a1d991e72cd7b4522ddecb5557918803b5ce8c79552919d7c2798aaab96548b2dea5950f9c3311091950307496c034d63f5389f745b6282074d20d9afbc WHIRLPOOL 2ffae1f3afafcf576d11265562f9f22e6d58061b509d9ef7fceb57980b1d8c8a598efd39aaec5e3bdbff4004a39741eccb0fec8ed0417ff9f36a09e417bb9047

diff --git a/net-firewall/shorewall/shorewall-5.1.6.1.ebuild b/net-firewall/shorewall/shorewall-5.1.6.1.ebuild
new file mode 100644
index 00000000000..ea2ef11ce09
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.6.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-09-26 13:52 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-09-26 13:52 UTC (permalink / raw
  To: gentoo-commits

commit:     b0abaf7849e3c3f1859d58ce7958d9ca4ffa5204
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 13:52:18 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 13:52:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0abaf78

net-firewall/shorewall: Bump to v5.1.7.1

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.7.1.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 58e94ee7c98..04741e18e85 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.1.5.2.tar.bz2 520374 SHA256 ca33a7bc9c590638575edb8a530b76a9b0bd844877bef7df7c23646e839e137b SHA512 aed35f0a00944d70bb2bdab195f151e3770e73dabe07a59c1b6dd7fce5147866c73d44325df9ded475c37b258cf7c31c8d1348c58476fadd5b98217b7f0b3888 WHIRLPOOL ac0489f4ec152ff57a6da6be2c86b0fe45281ad9bb09e3fd53aba11b94252bb44ec5a71f069e2541b5c4912922fcfbbbce6004804c395e17929c78465a0cd102
 DIST shorewall-5.1.6.1.tar.bz2 522476 SHA256 90702872726c30434ef87c19be1742ae5f04b4e0b1f9ee7761810b618b38a05e SHA512 604ee6150add87a5c121e863ec3d65f454b6ae1724236c80c08e2ce3365512966126f9d28d07c7e6a273d5626e02e5625015f91f6a7166b830f6ccb667f731ba WHIRLPOOL f0e70c3949e9f9b59a5f5a19ee1023ecc6dc2ece2e420245f67fa2d7197939bc1197402366d8a560d7e29231accd5ea1456a005df30c7deaa82f25e01375ff2a
+DIST shorewall-5.1.7.1.tar.bz2 523943 SHA256 386223522c12c5279ec522efed137e3f1b5f638e396bbdef3e3d077104f8c053 SHA512 14ff5d4a19d355d489a6dd4ebdd1901112b8ac0cfdba1e0903ff9ac775fa02e3b923294b200dae1fb3113c7b7d43673b28877cf6dab8a07a844cb31b42393137 WHIRLPOOL 8717e3902fefcca580e189be80647caf39c76d1a0097f3d4e9ef5e2ff9f8c71b5a02e2b472d26abe57ce2f243b9ebba197a6fcbf84d566a7f49ff357f74e81a7
 DIST shorewall-5.1.7.tar.bz2 523676 SHA256 d19e6461fee8e497d3d569d69b4e0fed7736870171dd15ad8287e48facb25be0 SHA512 24f8dff494ee39926cb25680f62b2cd9073ab80b249ab57af5419af2211fc964d64e0bafb651879ba519677e0f844d5617cefe09f769369572c9c1a00149bce6 WHIRLPOOL 503fbf422b3888073cc64cdc4ba43c90a376b139252df3c146266d7da238b3aad92c1d778f5d1e8a45e4b9f1e6255e5c623c1b0530be68e95b184f7d56d0d21e
 DIST shorewall-core-5.1.5.2.tar.bz2 77435 SHA256 24ca9c2e506cadda1fcbf621b376db0ebb3f3802cecc53d1518753a9cb77d450 SHA512 d4e0ef22d288e6addc2ce41813f2bab56fa142893ea495ef59dd1a636995e2a71e88477c38cac1004f055a7333ab0db27a334ca586b88558d6b781966712bff2 WHIRLPOOL 526495ae9a13a2e0dfc6dc7fffec0a7f8dd1be111be35ff2356bcf403c12c7e76993c82b2cb5b76541fa613856b23a5499b86a7a72b52062e7a21bd3b61e9082
 DIST shorewall-core-5.1.6.1.tar.bz2 78891 SHA256 31b48d50ce9a6b256739679c03ea4c6c219149b34201e6637f0ed2ccc6dd3530 SHA512 090425813791bc78531a46c493a54cadc3ac6106963c87abb3c48f0863267f71bccad644209f2893f9f1ec06057595242f12fbd59312c7e8dd932f0c3bc29236 WHIRLPOOL c255fd892a299fe8ef56a923b4c8511df2cbc21ce8821f90257b2e9a1fd66a20ec2a5070365dc7a6b43e40c0b0645c845b122a67b4dbc6e71e8a9f1de919b13b
+DIST shorewall-core-5.1.7.1.tar.bz2 79801 SHA256 482d2d283cc891c7746c8f44cf745e7d54615f65e9eb67874a5c1d548f15c5ba SHA512 5a11a5f85518df3b57b77e16f8b8c7ff7b169a86d87ce21beb764e5a3e9651d1d07f4d5fe50ed0c15c22b7bd608aaca8aced9c0b892d7f50c712195fa22c77a9 WHIRLPOOL 62e6d98a376f90219b47b24432cf81f8654bed04b899136efedf0931b97543f9cdb6cd7459ea168a525c24477197fa0b61f5a21e0aadfc42893e42777983a4c4
 DIST shorewall-core-5.1.7.tar.bz2 79711 SHA256 c94baf58a61b79407fbaea84a6439d323b17d02912dd81838f7b5ed07ccf1340 SHA512 91836595a3f0df8db6d26eeef47207e94364748e55762de771340ed368ea10be2c445680a57a2864fdfa68b35da18ee256cc0f8dcf6c53494c39f09da8ae829d WHIRLPOOL 4fd47f0b46c2881917561b9234acc38548fb9d4a1ef1e2f706a8eaceeb1d44aa0753a93fecddb7ebc80be9e19c20fdd853c22ca2ab7ae21e092aba7e60921b58
 DIST shorewall-docs-html-5.1.5.2.tar.bz2 4218574 SHA256 18a601050b6fcf6b5839ead037e96ee28ae85eb34262d7d614183cbee6169ef5 SHA512 a66161a601f5417bde8612a154c3886dbf81985e127955bbec213dcaa0e4778b2a3aabbf1dcf257d36db0806b5822bce5fa11a555da36427abbf0deb8f6f1501 WHIRLPOOL d8607b0c7ea3b7bd7b685e99895867f9e37bc2a0c8a5520a59311696fc0e2817452e36865c08e7b758a72fd9a546bf5ef6a47f4098f993cf8c95ad4e1f426dd8
 DIST shorewall-docs-html-5.1.6.1.tar.bz2 4218958 SHA256 db1d61b013f035a2e7d515f483d789fa160fe7a250e12e9efec5a79fb2ef1144 SHA512 c620209dd6fd9f044088e11e1adf8bee5c481bb27db76bfae5f42fae242dc139526cc457507251d5d00e55a652b358aa7ac3586ec10e28210e00f75932007277 WHIRLPOOL 36936c55029db3875f1a14014eb2c25845412f74bec22205a24919faa34c8b447539bbaa29189ed547bd63989ba20d1c4376fc5fd4d02d4c227f10d733fc0835
+DIST shorewall-docs-html-5.1.7.1.tar.bz2 4219011 SHA256 4f7c5d85945aff85ba4287d0afd63fa476afae0f3b22ed1cdc661cf18f963001 SHA512 af1c97e4e23ba9a80963161124e26ee322b8ef8900457c5e98a34e8af795d3122bb3b54cf026148543e33c7045827d51d07b3af913d9472646e07bda339695c3 WHIRLPOOL b29a81f77a006aaaf8ea1881925dcdb102219d67657c529f733b996011743118a9c743a4496db673fd38a25c114703529698d1986f562be70c73ac47f25095d5
 DIST shorewall-docs-html-5.1.7.tar.bz2 4218629 SHA256 81a9906479bab465e61b420cc9904487ccb490f10bcaef4a5487ec5ff46a1428 SHA512 c24351701983c8b0e6b429094084cbfec1360eaaf4cae8c58b3513c3783957ae1b16a5b0443f07b6ccb4cbf5726324b7670f07dfe5fe1b0e58ec127d305baa4e WHIRLPOOL a31f6822011fb90e4e6b00f20f7f604a4cb4a6f67fc2563754bfb447a2fb2a09a86001412d3d47190f6ce388bdc321ec99fc32fd23015566fe0381f8a1f6a4c2
 DIST shorewall-init-5.1.5.2.tar.bz2 32646 SHA256 1ae9771f20ca3ede897fe0ee4443d65011dde37d6ecc146150ba22c980b6f272 SHA512 de67e167bbdd5e2860e01fb55f07b695011ce7473b98b374f605263eb0aa66e7de645cd7716526ecbf01bf8b65fb5e08294c85bf55ec45b54b78f1b66e80565c WHIRLPOOL d1f1d05b384b63b087e48afa90ded85e333d1ca1d8e90196de2540c8705239f55326ffa5d421f6c03e651e6d7076e18786ab47009c09f31de2cc6fe13910ac36
 DIST shorewall-init-5.1.6.1.tar.bz2 34153 SHA256 ad20b348e32f6cc332521b07ef89a891978453e56cfe7fbe916d1f83ae594194 SHA512 f6ea4aad0c0da6da8436dcb27441088cefd8312e37cc6d62187fd8210790b2be5452cc06f1823f1958c53cdec2e4b14abc5be31a7c029739838f5bbc6d143a00 WHIRLPOOL b5d6f01c5670a60a3471f1fffbd341ca914c20d39516ad5bf63693c7ebda882c0fa572d5839f28ef94d40a95216a1b13573b470fe14676f0421aebde62769fd6
+DIST shorewall-init-5.1.7.1.tar.bz2 35144 SHA256 e814448295918102fd83da6286925c59fc3387a211d9cf0e808509613e9b571b SHA512 dfbab688e60475e6e69279f4c48ce7492227ca3d541b171f2e4308793d7b6bd46cce7899a6ad0f1c48e817db576ddf3dea9d826d36ff5745f8f84c98cc6317f7 WHIRLPOOL d58ffd4fb4f643a6692f080f512b2be86bab43fe7701555408ecd5c34ead78374d960a6c6528579a7e68db53fdaa9bd7d1201f51a3bc3c0a4e6fee532bcea858
 DIST shorewall-init-5.1.7.tar.bz2 34955 SHA256 c0a0218d209846cde2581ecc93d70eb8ae26bea976647db2f1fa887140f10811 SHA512 3951b24a0e992c45021d5e79d5ab4a1480559ba321c4c5c57b40068373bb4b14f45edf525e9cc384657167330ef8f6cec46374c84a8dcc7fb641a88e27e40a4d WHIRLPOOL f319cf109987cf627794d60beabcf988a2cb2a54abacdd84a46e60344960ed9371adeb6367fd3318ebe9e24a562a199a3ed98edca31a1e992757ab2db252f58e
 DIST shorewall-lite-5.1.5.2.tar.bz2 38424 SHA256 acf092c051ce4e19b0aa67b1828511ec446006133c4451d9c13f60275025a397 SHA512 300793d3a123ab63cde988667a53e931adf7f40e6987bb5b57a60376502ad4ec46316e45bc0c589f82f3fb118ee6f78a0646f7aa5ef522791eea10e7ff2430da WHIRLPOOL 2a8b775d87601cb4e792fe817e0d2e7eaaf6b162eb9ed762081ec502239d1dc33d3843e9742b532d582939dc143561de617246aeb27a83448625bc4935d78505
 DIST shorewall-lite-5.1.6.1.tar.bz2 39930 SHA256 64424e0c69aff83fc02a73db5b1c7ee10fb916d317c027987ba40c8aff6ddd8f SHA512 69cfca2e703680238b32c8ffe3431a9267625faa3a03bed28593f0b0e8a5accc7d58ef4b91b77f87fc44e09f279d41e0302094e1d5255fc3ed1f6fc51863c07b WHIRLPOOL cb993586c09297aeaf8a37cbde8afa99f93687b62b1a5551e70e10ffa9633ba67077dc9323af583293c7e1d07b0ba558d2b1a124709fef147021bf9c5cffee9e
+DIST shorewall-lite-5.1.7.1.tar.bz2 40847 SHA256 7e9f09a34eca462f58aaf3f43326a830d924d3868b6cb82a3d1f27875aee128c SHA512 5422c3a0fd53d37d615a81d1bc2273042ca1011ae64f357c295fb81b49962ab8a51343a7eb71819018fb6f1f3c9045b27a6b289974ad3bd436d8c85f24c5da63 WHIRLPOOL bf3baba44eda3457af584e0dcbe1e312dd2d890c9650523856b43a93f747b7ce0677ea0c5320ab51d1c4f733a5c4951505eae19223b4a9aeeaf5673a7eb6567f
 DIST shorewall-lite-5.1.7.tar.bz2 40648 SHA256 c55d2077bfc72f50bd49457984060d9cc0cabdefa26674662f8a68ccf1aad65f SHA512 a6ac156496aa52ff4bcaa4f6b72b3e0bcb93876a029a54f81989fd3d02ef2fbc9ebf870731912080c59e5f3afd56ebffc17fcaaf30716ad65693b72130e05500 WHIRLPOOL 974815a3ea8032638905da17fbc7f46441cb73cc4660f57f733fcd571a4ea606658db00c98518e914fe681a67effe19e5e681e0b1afccd5986bff7b6d86d68cb
 DIST shorewall6-5.1.5.2.tar.bz2 188754 SHA256 c215a762ebb9c0a35be7463e1a2db2397ee1c01ab32c2224528f8de4a5ac9ac6 SHA512 1dbb7304f1f349ceb84a34c397a8c12e4fc5e9bdcd001d72881dbf76dda37e8e8448419f00c705e430f5f2e57cf3a7f9dc834cde6119d18cbeabf9d5a0e67e35 WHIRLPOOL 0daf72a3755b83b1ac3c6d90911149410cb9918f9ad312bd16f90c900880e32e852f5cb89791fdd68f14c1ae2389a365a23b94f430e227c687ab820d1b6d7619
 DIST shorewall6-5.1.6.1.tar.bz2 191131 SHA256 4732c560aa9166b35fbefaeecf6dcedf9f5224e1f56a739b3b1d30724af3affc SHA512 a26acc30f81c7419d9cbb8fd9f0a95c4647e4247b5f4f6232fc414abdba85c85ad8b127f441137cffa1dd88e7bebfba8a785416f54df36f77a36a50b4971b0f1 WHIRLPOOL a9cbe284762ee8af930808c8bb25931860ea9014e00c5b1f2d99ae48ffd31fa96a92dd0bb7ab43bbc44a7d02c5e8e5c334d938db3414b1c0e7069175f04fe026
+DIST shorewall6-5.1.7.1.tar.bz2 191749 SHA256 d950eb1acdffa5d6af19f4f9cc81c76e293c75af26f847452ca53401f9d7093b SHA512 fdea35fb2b6d9e7418d2c2d9124a3c05e42080240aa6e2faa23ef004e2b4ef7e1a05f965d6cdf1c3b224a7c226724a3f2e68b597c026d3b8abdc0326cb545b2a WHIRLPOOL 2dcff81b201b601ad5d5dab38a39344f3dffcfc2e90fe8b39ef31b4f3070295871cc87b5b17e3f9651c9131c1df4702413cb8735d4953088f6df99a8a01ce568
 DIST shorewall6-5.1.7.tar.bz2 191614 SHA256 624fe000c881a75109f65f5fb11480a2f997b06237db546e51aeee2ed49dd10d SHA512 9423d6a141c61e1ca5546fd21e5db145c917d6e6825805ff404f5531449a0125f8288d0954e101231fa4d0a521e6db3993b4b312caba3188e41bc579eef350c3 WHIRLPOOL 7635d78eecf9f3e13b98e0577dff7687be34abdbeb8eee7d152ef1a0610dd9e82bf18024185ffe14caaa47053b809307e47b2aa111f7d03a8595a35d7c297ccf
 DIST shorewall6-lite-5.1.5.2.tar.bz2 38137 SHA256 0b65ef615be93f921af6d8c11f702f2c46ba18d989fe12fe048732c53cf841de SHA512 e8961abdb7c105820d8420f623cbff72af33e2d35701bb0f81f2fad5364e91b88d5d1317d4ffc8e00c3b32d50c96f6c0dccda20cd981c5f6cc7aaf1662af8d27 WHIRLPOOL d3b04c2c6e9f3a10b8bbc0da1e5691dc3e428501ee52547e548eed05b14d54aec243111f711cb66ecc734efe5217dffa0230b1045296f90a60da88c390ba33bf
 DIST shorewall6-lite-5.1.6.1.tar.bz2 39636 SHA256 a25a1430a09d797991f0028f76f5252b86ef898801fc8eb3e6c8ca695d1d2a98 SHA512 eb059a1d991e72cd7b4522ddecb5557918803b5ce8c79552919d7c2798aaab96548b2dea5950f9c3311091950307496c034d63f5389f745b6282074d20d9afbc WHIRLPOOL 2ffae1f3afafcf576d11265562f9f22e6d58061b509d9ef7fceb57980b1d8c8a598efd39aaec5e3bdbff4004a39741eccb0fec8ed0417ff9f36a09e417bb9047
+DIST shorewall6-lite-5.1.7.1.tar.bz2 40514 SHA256 a199a395ce4d23081338955c68fbf657c25e972b2656ef370544854074fa672c SHA512 a8fd7e33d1558fbebb53d1dc19c3784aac2d6095e1404c44030cd513cee5a6330632c50e86eedb0a6773b67acc77ca0d2fb26352c3f784abc8ac936d6f96c437 WHIRLPOOL 0276cbf74644205042dff963124e655fb8f0e14aca31f5550833f95ae84f1b569be77473324e8603b523d5dc67a0de74d6459b8634c2519af6eb5fc84276992e
 DIST shorewall6-lite-5.1.7.tar.bz2 40346 SHA256 2fa19a4c5046c05e4e5cf28d4b50dab0061f05f2a17cb0f8fd265812276cb975 SHA512 6e118b2fa369aa42dfade55b3b4c8855b3d950fd664c5cf2c22539c99e2065e8924e86970ea0f17b7b8930d1c28220bc425ef4329222f0c11feb872ba0145eb9 WHIRLPOOL 2f5be4d88e48e4ef535e60e050343ef78b2c4fdfa9918e79947e43107d3e8d46272c7c6f1134f4762b48894a9334daed2ddef4fa3843cf4670be54b9bb799714

diff --git a/net-firewall/shorewall/shorewall-5.1.7.1.ebuild b/net-firewall/shorewall/shorewall-5.1.7.1.ebuild
new file mode 100644
index 00000000000..3b7545ca47d
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.7.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-10-01 15:03 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-10-01 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     92523036f9678fa53bd6a4b1c3b570ae23e858f7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  1 15:03:19 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 15:03:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92523036

net-firewall/shorewall: Bump to v5.1.7.2

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.7.2.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 04741e18e85..299b7b55826 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,35 @@
 DIST shorewall-5.1.5.2.tar.bz2 520374 SHA256 ca33a7bc9c590638575edb8a530b76a9b0bd844877bef7df7c23646e839e137b SHA512 aed35f0a00944d70bb2bdab195f151e3770e73dabe07a59c1b6dd7fce5147866c73d44325df9ded475c37b258cf7c31c8d1348c58476fadd5b98217b7f0b3888 WHIRLPOOL ac0489f4ec152ff57a6da6be2c86b0fe45281ad9bb09e3fd53aba11b94252bb44ec5a71f069e2541b5c4912922fcfbbbce6004804c395e17929c78465a0cd102
 DIST shorewall-5.1.6.1.tar.bz2 522476 SHA256 90702872726c30434ef87c19be1742ae5f04b4e0b1f9ee7761810b618b38a05e SHA512 604ee6150add87a5c121e863ec3d65f454b6ae1724236c80c08e2ce3365512966126f9d28d07c7e6a273d5626e02e5625015f91f6a7166b830f6ccb667f731ba WHIRLPOOL f0e70c3949e9f9b59a5f5a19ee1023ecc6dc2ece2e420245f67fa2d7197939bc1197402366d8a560d7e29231accd5ea1456a005df30c7deaa82f25e01375ff2a
 DIST shorewall-5.1.7.1.tar.bz2 523943 SHA256 386223522c12c5279ec522efed137e3f1b5f638e396bbdef3e3d077104f8c053 SHA512 14ff5d4a19d355d489a6dd4ebdd1901112b8ac0cfdba1e0903ff9ac775fa02e3b923294b200dae1fb3113c7b7d43673b28877cf6dab8a07a844cb31b42393137 WHIRLPOOL 8717e3902fefcca580e189be80647caf39c76d1a0097f3d4e9ef5e2ff9f8c71b5a02e2b472d26abe57ce2f243b9ebba197a6fcbf84d566a7f49ff357f74e81a7
+DIST shorewall-5.1.7.2.tar.bz2 524263 SHA256 e7c4cde2d04894ddf6e8dd8a8f96e96e04574181807cfe9f78915fa0dfc836e4 SHA512 05599609b50189e300cd71eda6876ac5e8878a2d2ab7c1635afc1b79f1ab3c9bc92c1ac1758aa8996d10bb37783d1fa29c76adaa879ec93bc12669c3dbdbed9b WHIRLPOOL a2fcc48c9c51161c4a2ec692fa29215824a412056fdc15203892e6a9752c2239722462be89f26c4e7374ceb0131ba35df87847a3f16329438c57ec8f8dec0208
 DIST shorewall-5.1.7.tar.bz2 523676 SHA256 d19e6461fee8e497d3d569d69b4e0fed7736870171dd15ad8287e48facb25be0 SHA512 24f8dff494ee39926cb25680f62b2cd9073ab80b249ab57af5419af2211fc964d64e0bafb651879ba519677e0f844d5617cefe09f769369572c9c1a00149bce6 WHIRLPOOL 503fbf422b3888073cc64cdc4ba43c90a376b139252df3c146266d7da238b3aad92c1d778f5d1e8a45e4b9f1e6255e5c623c1b0530be68e95b184f7d56d0d21e
 DIST shorewall-core-5.1.5.2.tar.bz2 77435 SHA256 24ca9c2e506cadda1fcbf621b376db0ebb3f3802cecc53d1518753a9cb77d450 SHA512 d4e0ef22d288e6addc2ce41813f2bab56fa142893ea495ef59dd1a636995e2a71e88477c38cac1004f055a7333ab0db27a334ca586b88558d6b781966712bff2 WHIRLPOOL 526495ae9a13a2e0dfc6dc7fffec0a7f8dd1be111be35ff2356bcf403c12c7e76993c82b2cb5b76541fa613856b23a5499b86a7a72b52062e7a21bd3b61e9082
 DIST shorewall-core-5.1.6.1.tar.bz2 78891 SHA256 31b48d50ce9a6b256739679c03ea4c6c219149b34201e6637f0ed2ccc6dd3530 SHA512 090425813791bc78531a46c493a54cadc3ac6106963c87abb3c48f0863267f71bccad644209f2893f9f1ec06057595242f12fbd59312c7e8dd932f0c3bc29236 WHIRLPOOL c255fd892a299fe8ef56a923b4c8511df2cbc21ce8821f90257b2e9a1fd66a20ec2a5070365dc7a6b43e40c0b0645c845b122a67b4dbc6e71e8a9f1de919b13b
 DIST shorewall-core-5.1.7.1.tar.bz2 79801 SHA256 482d2d283cc891c7746c8f44cf745e7d54615f65e9eb67874a5c1d548f15c5ba SHA512 5a11a5f85518df3b57b77e16f8b8c7ff7b169a86d87ce21beb764e5a3e9651d1d07f4d5fe50ed0c15c22b7bd608aaca8aced9c0b892d7f50c712195fa22c77a9 WHIRLPOOL 62e6d98a376f90219b47b24432cf81f8654bed04b899136efedf0931b97543f9cdb6cd7459ea168a525c24477197fa0b61f5a21e0aadfc42893e42777983a4c4
+DIST shorewall-core-5.1.7.2.tar.bz2 80213 SHA256 c1f78229d9633ea6b35ec067c9724003e2929a39ae54ccd8e6875776d155cd70 SHA512 73c547d6985f17f5c2f2fe4a846a7db76fe514edbc03b7b2f191b437405ac6175cbe3dba615839bb46658031f7cd74ce26221cac42869818e5131b1836d43951 WHIRLPOOL e58a64514f50b375670908cea228610abab9bdb7a8300d04a3c728a70b662da144711e09124fa6149e61c941d165f93a65d162cedbc739eb670ddad4d86f76ff
 DIST shorewall-core-5.1.7.tar.bz2 79711 SHA256 c94baf58a61b79407fbaea84a6439d323b17d02912dd81838f7b5ed07ccf1340 SHA512 91836595a3f0df8db6d26eeef47207e94364748e55762de771340ed368ea10be2c445680a57a2864fdfa68b35da18ee256cc0f8dcf6c53494c39f09da8ae829d WHIRLPOOL 4fd47f0b46c2881917561b9234acc38548fb9d4a1ef1e2f706a8eaceeb1d44aa0753a93fecddb7ebc80be9e19c20fdd853c22ca2ab7ae21e092aba7e60921b58
 DIST shorewall-docs-html-5.1.5.2.tar.bz2 4218574 SHA256 18a601050b6fcf6b5839ead037e96ee28ae85eb34262d7d614183cbee6169ef5 SHA512 a66161a601f5417bde8612a154c3886dbf81985e127955bbec213dcaa0e4778b2a3aabbf1dcf257d36db0806b5822bce5fa11a555da36427abbf0deb8f6f1501 WHIRLPOOL d8607b0c7ea3b7bd7b685e99895867f9e37bc2a0c8a5520a59311696fc0e2817452e36865c08e7b758a72fd9a546bf5ef6a47f4098f993cf8c95ad4e1f426dd8
 DIST shorewall-docs-html-5.1.6.1.tar.bz2 4218958 SHA256 db1d61b013f035a2e7d515f483d789fa160fe7a250e12e9efec5a79fb2ef1144 SHA512 c620209dd6fd9f044088e11e1adf8bee5c481bb27db76bfae5f42fae242dc139526cc457507251d5d00e55a652b358aa7ac3586ec10e28210e00f75932007277 WHIRLPOOL 36936c55029db3875f1a14014eb2c25845412f74bec22205a24919faa34c8b447539bbaa29189ed547bd63989ba20d1c4376fc5fd4d02d4c227f10d733fc0835
 DIST shorewall-docs-html-5.1.7.1.tar.bz2 4219011 SHA256 4f7c5d85945aff85ba4287d0afd63fa476afae0f3b22ed1cdc661cf18f963001 SHA512 af1c97e4e23ba9a80963161124e26ee322b8ef8900457c5e98a34e8af795d3122bb3b54cf026148543e33c7045827d51d07b3af913d9472646e07bda339695c3 WHIRLPOOL b29a81f77a006aaaf8ea1881925dcdb102219d67657c529f733b996011743118a9c743a4496db673fd38a25c114703529698d1986f562be70c73ac47f25095d5
+DIST shorewall-docs-html-5.1.7.2.tar.bz2 4218919 SHA256 348e9bf9c97e97aa3f8f425e30da9f6c89d2b7c5a035a21ac4c3e792ef33ac95 SHA512 b9c85d228b65ecf6b9e29ba316b8cf878a06832bc94f62e2ca8793c02c95bae7be934dd45dc572b31d8e4cff00e1092c8c8681d7c1fc4759c5700a1b8f868f55 WHIRLPOOL 01c51b28a9bcbed7e9a8d257ef01ecc113ba0ad095fce02d6fc17b3b341fd5d340281dfe1db0699ae1ff81e990f9413436d9fa0920846ae9f4b4298a483bede3
 DIST shorewall-docs-html-5.1.7.tar.bz2 4218629 SHA256 81a9906479bab465e61b420cc9904487ccb490f10bcaef4a5487ec5ff46a1428 SHA512 c24351701983c8b0e6b429094084cbfec1360eaaf4cae8c58b3513c3783957ae1b16a5b0443f07b6ccb4cbf5726324b7670f07dfe5fe1b0e58ec127d305baa4e WHIRLPOOL a31f6822011fb90e4e6b00f20f7f604a4cb4a6f67fc2563754bfb447a2fb2a09a86001412d3d47190f6ce388bdc321ec99fc32fd23015566fe0381f8a1f6a4c2
 DIST shorewall-init-5.1.5.2.tar.bz2 32646 SHA256 1ae9771f20ca3ede897fe0ee4443d65011dde37d6ecc146150ba22c980b6f272 SHA512 de67e167bbdd5e2860e01fb55f07b695011ce7473b98b374f605263eb0aa66e7de645cd7716526ecbf01bf8b65fb5e08294c85bf55ec45b54b78f1b66e80565c WHIRLPOOL d1f1d05b384b63b087e48afa90ded85e333d1ca1d8e90196de2540c8705239f55326ffa5d421f6c03e651e6d7076e18786ab47009c09f31de2cc6fe13910ac36
 DIST shorewall-init-5.1.6.1.tar.bz2 34153 SHA256 ad20b348e32f6cc332521b07ef89a891978453e56cfe7fbe916d1f83ae594194 SHA512 f6ea4aad0c0da6da8436dcb27441088cefd8312e37cc6d62187fd8210790b2be5452cc06f1823f1958c53cdec2e4b14abc5be31a7c029739838f5bbc6d143a00 WHIRLPOOL b5d6f01c5670a60a3471f1fffbd341ca914c20d39516ad5bf63693c7ebda882c0fa572d5839f28ef94d40a95216a1b13573b470fe14676f0421aebde62769fd6
 DIST shorewall-init-5.1.7.1.tar.bz2 35144 SHA256 e814448295918102fd83da6286925c59fc3387a211d9cf0e808509613e9b571b SHA512 dfbab688e60475e6e69279f4c48ce7492227ca3d541b171f2e4308793d7b6bd46cce7899a6ad0f1c48e817db576ddf3dea9d826d36ff5745f8f84c98cc6317f7 WHIRLPOOL d58ffd4fb4f643a6692f080f512b2be86bab43fe7701555408ecd5c34ead78374d960a6c6528579a7e68db53fdaa9bd7d1201f51a3bc3c0a4e6fee532bcea858
+DIST shorewall-init-5.1.7.2.tar.bz2 35347 SHA256 f47900550045901a38a96fbcad6e401f86cc53ba0a94c44e1b3903b0e6358609 SHA512 9f295da51cbfe7c2fa3aab4029b18ff4bb9c4834d852e2a4cc3770fbed6eae79797000053ad7097ba831e01f710bf4c030d1f3b0cda93cb8da3dc3befa6ae0f4 WHIRLPOOL 1d47c4211959193334e921a82fe50b2cfb353ac6f3635bb96d1b8500a8dacaf2ddf2d62f96874dd3c2d9f4dd9d7e7f689fee4254b528bf1fe92a47fff5d8cca5
 DIST shorewall-init-5.1.7.tar.bz2 34955 SHA256 c0a0218d209846cde2581ecc93d70eb8ae26bea976647db2f1fa887140f10811 SHA512 3951b24a0e992c45021d5e79d5ab4a1480559ba321c4c5c57b40068373bb4b14f45edf525e9cc384657167330ef8f6cec46374c84a8dcc7fb641a88e27e40a4d WHIRLPOOL f319cf109987cf627794d60beabcf988a2cb2a54abacdd84a46e60344960ed9371adeb6367fd3318ebe9e24a562a199a3ed98edca31a1e992757ab2db252f58e
 DIST shorewall-lite-5.1.5.2.tar.bz2 38424 SHA256 acf092c051ce4e19b0aa67b1828511ec446006133c4451d9c13f60275025a397 SHA512 300793d3a123ab63cde988667a53e931adf7f40e6987bb5b57a60376502ad4ec46316e45bc0c589f82f3fb118ee6f78a0646f7aa5ef522791eea10e7ff2430da WHIRLPOOL 2a8b775d87601cb4e792fe817e0d2e7eaaf6b162eb9ed762081ec502239d1dc33d3843e9742b532d582939dc143561de617246aeb27a83448625bc4935d78505
 DIST shorewall-lite-5.1.6.1.tar.bz2 39930 SHA256 64424e0c69aff83fc02a73db5b1c7ee10fb916d317c027987ba40c8aff6ddd8f SHA512 69cfca2e703680238b32c8ffe3431a9267625faa3a03bed28593f0b0e8a5accc7d58ef4b91b77f87fc44e09f279d41e0302094e1d5255fc3ed1f6fc51863c07b WHIRLPOOL cb993586c09297aeaf8a37cbde8afa99f93687b62b1a5551e70e10ffa9633ba67077dc9323af583293c7e1d07b0ba558d2b1a124709fef147021bf9c5cffee9e
 DIST shorewall-lite-5.1.7.1.tar.bz2 40847 SHA256 7e9f09a34eca462f58aaf3f43326a830d924d3868b6cb82a3d1f27875aee128c SHA512 5422c3a0fd53d37d615a81d1bc2273042ca1011ae64f357c295fb81b49962ab8a51343a7eb71819018fb6f1f3c9045b27a6b289974ad3bd436d8c85f24c5da63 WHIRLPOOL bf3baba44eda3457af584e0dcbe1e312dd2d890c9650523856b43a93f747b7ce0677ea0c5320ab51d1c4f733a5c4951505eae19223b4a9aeeaf5673a7eb6567f
+DIST shorewall-lite-5.1.7.2.tar.bz2 41048 SHA256 e5f4f97031ef81ef599391279e18c26762f3db6dffc5fee33f3e93f37d92618c SHA512 385b072f93015259b6bb57a07c62815ac27c858c63254cd968240761a230e8b781207ee9f1cc9e6caab43e8f12c60e42cfcbaa6f938c964184b14e5d360bee83 WHIRLPOOL fe88d3f7df02164fe17f141dc1dfce9f082688ee133f93e8af63b4046981cf879560bff4a148fc21739f84d76bf3eda58906bf280fda81fc8bbec5f21f277535
 DIST shorewall-lite-5.1.7.tar.bz2 40648 SHA256 c55d2077bfc72f50bd49457984060d9cc0cabdefa26674662f8a68ccf1aad65f SHA512 a6ac156496aa52ff4bcaa4f6b72b3e0bcb93876a029a54f81989fd3d02ef2fbc9ebf870731912080c59e5f3afd56ebffc17fcaaf30716ad65693b72130e05500 WHIRLPOOL 974815a3ea8032638905da17fbc7f46441cb73cc4660f57f733fcd571a4ea606658db00c98518e914fe681a67effe19e5e681e0b1afccd5986bff7b6d86d68cb
 DIST shorewall6-5.1.5.2.tar.bz2 188754 SHA256 c215a762ebb9c0a35be7463e1a2db2397ee1c01ab32c2224528f8de4a5ac9ac6 SHA512 1dbb7304f1f349ceb84a34c397a8c12e4fc5e9bdcd001d72881dbf76dda37e8e8448419f00c705e430f5f2e57cf3a7f9dc834cde6119d18cbeabf9d5a0e67e35 WHIRLPOOL 0daf72a3755b83b1ac3c6d90911149410cb9918f9ad312bd16f90c900880e32e852f5cb89791fdd68f14c1ae2389a365a23b94f430e227c687ab820d1b6d7619
 DIST shorewall6-5.1.6.1.tar.bz2 191131 SHA256 4732c560aa9166b35fbefaeecf6dcedf9f5224e1f56a739b3b1d30724af3affc SHA512 a26acc30f81c7419d9cbb8fd9f0a95c4647e4247b5f4f6232fc414abdba85c85ad8b127f441137cffa1dd88e7bebfba8a785416f54df36f77a36a50b4971b0f1 WHIRLPOOL a9cbe284762ee8af930808c8bb25931860ea9014e00c5b1f2d99ae48ffd31fa96a92dd0bb7ab43bbc44a7d02c5e8e5c334d938db3414b1c0e7069175f04fe026
 DIST shorewall6-5.1.7.1.tar.bz2 191749 SHA256 d950eb1acdffa5d6af19f4f9cc81c76e293c75af26f847452ca53401f9d7093b SHA512 fdea35fb2b6d9e7418d2c2d9124a3c05e42080240aa6e2faa23ef004e2b4ef7e1a05f965d6cdf1c3b224a7c226724a3f2e68b597c026d3b8abdc0326cb545b2a WHIRLPOOL 2dcff81b201b601ad5d5dab38a39344f3dffcfc2e90fe8b39ef31b4f3070295871cc87b5b17e3f9651c9131c1df4702413cb8735d4953088f6df99a8a01ce568
+DIST shorewall6-5.1.7.2.tar.bz2 192087 SHA256 8cddd2baafe71ebfd9aa691400bc320ab0672791f5d8f1e82067d91c3586deba SHA512 2ce5beb6be5ce9a5f9b1f116468f2834188938c5893ca2a9fdc7d76ab43ed487a7dd59cca5a8098ecee06274c1c359543ff57f2d3efa5e4ed8fc728702f6a689 WHIRLPOOL db5b3569689d3dd05e82316e9d7851f72e18b7df1a84b768bf6ceb546bf470843d31834a0e3d5a40e6c83597b65633efc9507eb75709a66f1c1d7223162792c2
 DIST shorewall6-5.1.7.tar.bz2 191614 SHA256 624fe000c881a75109f65f5fb11480a2f997b06237db546e51aeee2ed49dd10d SHA512 9423d6a141c61e1ca5546fd21e5db145c917d6e6825805ff404f5531449a0125f8288d0954e101231fa4d0a521e6db3993b4b312caba3188e41bc579eef350c3 WHIRLPOOL 7635d78eecf9f3e13b98e0577dff7687be34abdbeb8eee7d152ef1a0610dd9e82bf18024185ffe14caaa47053b809307e47b2aa111f7d03a8595a35d7c297ccf
 DIST shorewall6-lite-5.1.5.2.tar.bz2 38137 SHA256 0b65ef615be93f921af6d8c11f702f2c46ba18d989fe12fe048732c53cf841de SHA512 e8961abdb7c105820d8420f623cbff72af33e2d35701bb0f81f2fad5364e91b88d5d1317d4ffc8e00c3b32d50c96f6c0dccda20cd981c5f6cc7aaf1662af8d27 WHIRLPOOL d3b04c2c6e9f3a10b8bbc0da1e5691dc3e428501ee52547e548eed05b14d54aec243111f711cb66ecc734efe5217dffa0230b1045296f90a60da88c390ba33bf
 DIST shorewall6-lite-5.1.6.1.tar.bz2 39636 SHA256 a25a1430a09d797991f0028f76f5252b86ef898801fc8eb3e6c8ca695d1d2a98 SHA512 eb059a1d991e72cd7b4522ddecb5557918803b5ce8c79552919d7c2798aaab96548b2dea5950f9c3311091950307496c034d63f5389f745b6282074d20d9afbc WHIRLPOOL 2ffae1f3afafcf576d11265562f9f22e6d58061b509d9ef7fceb57980b1d8c8a598efd39aaec5e3bdbff4004a39741eccb0fec8ed0417ff9f36a09e417bb9047
 DIST shorewall6-lite-5.1.7.1.tar.bz2 40514 SHA256 a199a395ce4d23081338955c68fbf657c25e972b2656ef370544854074fa672c SHA512 a8fd7e33d1558fbebb53d1dc19c3784aac2d6095e1404c44030cd513cee5a6330632c50e86eedb0a6773b67acc77ca0d2fb26352c3f784abc8ac936d6f96c437 WHIRLPOOL 0276cbf74644205042dff963124e655fb8f0e14aca31f5550833f95ae84f1b569be77473324e8603b523d5dc67a0de74d6459b8634c2519af6eb5fc84276992e
+DIST shorewall6-lite-5.1.7.2.tar.bz2 40737 SHA256 bf22e67559ebdeff464cd910b97578a4c82f5fcc87bc77aeeb9fb4a5ca2a71be SHA512 9125d4380b91f0bcaaedfef6bd5ba89ada0391bf322cd1a00deb239eebc2e818a994844a653daa2e8784bb21ad7ed51798fcaa129e28da08c66de4163fe13bdc WHIRLPOOL 12c5e8036ae08d312ee52af40157f7ad8c18e0ccc8475845b22a3ce7647a73105b8a2f9034851f3e547ed6c47b2a7f0ef566de6dc96a19a20b1da429cd90a170
 DIST shorewall6-lite-5.1.7.tar.bz2 40346 SHA256 2fa19a4c5046c05e4e5cf28d4b50dab0061f05f2a17cb0f8fd265812276cb975 SHA512 6e118b2fa369aa42dfade55b3b4c8855b3d950fd664c5cf2c22539c99e2065e8924e86970ea0f17b7b8930d1c28220bc425ef4329222f0c11feb872ba0145eb9 WHIRLPOOL 2f5be4d88e48e4ef535e60e050343ef78b2c4fdfa9918e79947e43107d3e8d46272c7c6f1134f4762b48894a9334daed2ddef4fa3843cf4670be54b9bb799714

diff --git a/net-firewall/shorewall/shorewall-5.1.7.2.ebuild b/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
new file mode 100644
index 00000000000..3b7545ca47d
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-10-10 18:58 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-10-10 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     a8ec3ac1a04019a1a9b28ca030198049beb98955
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 18:58:20 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 18:58:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ec3ac1

net-firewall/shorewall: Maintainer stabilization under ALLARCHES policy

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 net-firewall/shorewall/shorewall-5.1.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.7.2.ebuild b/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
index 3b7545ca47d..457de2d45f7 100644
--- a/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.7.2.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-11-09 18:53 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-11-09 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     bde26a11802a96146baed646aacc91166640eaf2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  9 18:51:20 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov  9 18:53:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde26a11

net-firewall/shorewall: Bump to v5.1.8.1

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.1.8.1.ebuild | 456 ++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 299b7b55826..ceb33398388 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -3,33 +3,40 @@ DIST shorewall-5.1.6.1.tar.bz2 522476 SHA256 90702872726c30434ef87c19be1742ae5f0
 DIST shorewall-5.1.7.1.tar.bz2 523943 SHA256 386223522c12c5279ec522efed137e3f1b5f638e396bbdef3e3d077104f8c053 SHA512 14ff5d4a19d355d489a6dd4ebdd1901112b8ac0cfdba1e0903ff9ac775fa02e3b923294b200dae1fb3113c7b7d43673b28877cf6dab8a07a844cb31b42393137 WHIRLPOOL 8717e3902fefcca580e189be80647caf39c76d1a0097f3d4e9ef5e2ff9f8c71b5a02e2b472d26abe57ce2f243b9ebba197a6fcbf84d566a7f49ff357f74e81a7
 DIST shorewall-5.1.7.2.tar.bz2 524263 SHA256 e7c4cde2d04894ddf6e8dd8a8f96e96e04574181807cfe9f78915fa0dfc836e4 SHA512 05599609b50189e300cd71eda6876ac5e8878a2d2ab7c1635afc1b79f1ab3c9bc92c1ac1758aa8996d10bb37783d1fa29c76adaa879ec93bc12669c3dbdbed9b WHIRLPOOL a2fcc48c9c51161c4a2ec692fa29215824a412056fdc15203892e6a9752c2239722462be89f26c4e7374ceb0131ba35df87847a3f16329438c57ec8f8dec0208
 DIST shorewall-5.1.7.tar.bz2 523676 SHA256 d19e6461fee8e497d3d569d69b4e0fed7736870171dd15ad8287e48facb25be0 SHA512 24f8dff494ee39926cb25680f62b2cd9073ab80b249ab57af5419af2211fc964d64e0bafb651879ba519677e0f844d5617cefe09f769369572c9c1a00149bce6 WHIRLPOOL 503fbf422b3888073cc64cdc4ba43c90a376b139252df3c146266d7da238b3aad92c1d778f5d1e8a45e4b9f1e6255e5c623c1b0530be68e95b184f7d56d0d21e
+DIST shorewall-5.1.8.1.tar.bz2 524305 SHA256 0ba4f22394d988a5714637444c248e542d5897e41ab5770907edf38e422fe2ff SHA512 3dfacf35134c4831db057bb11d11b10d0e8cd0eb0edf28f64a02a3970ebb33e9a2e2d1cc943432a14c7fa34779e812e704d43c8e6f1070bca30fcc470c7a215c WHIRLPOOL 0e549aa6d28d79ec8b9f448c2c5ef0a10a0ad930249d6be31e86ea9bf33501ac7ee544a628e408406018efaa5b80cdccd6e29f68ede9b506428fbf143deab733
 DIST shorewall-core-5.1.5.2.tar.bz2 77435 SHA256 24ca9c2e506cadda1fcbf621b376db0ebb3f3802cecc53d1518753a9cb77d450 SHA512 d4e0ef22d288e6addc2ce41813f2bab56fa142893ea495ef59dd1a636995e2a71e88477c38cac1004f055a7333ab0db27a334ca586b88558d6b781966712bff2 WHIRLPOOL 526495ae9a13a2e0dfc6dc7fffec0a7f8dd1be111be35ff2356bcf403c12c7e76993c82b2cb5b76541fa613856b23a5499b86a7a72b52062e7a21bd3b61e9082
 DIST shorewall-core-5.1.6.1.tar.bz2 78891 SHA256 31b48d50ce9a6b256739679c03ea4c6c219149b34201e6637f0ed2ccc6dd3530 SHA512 090425813791bc78531a46c493a54cadc3ac6106963c87abb3c48f0863267f71bccad644209f2893f9f1ec06057595242f12fbd59312c7e8dd932f0c3bc29236 WHIRLPOOL c255fd892a299fe8ef56a923b4c8511df2cbc21ce8821f90257b2e9a1fd66a20ec2a5070365dc7a6b43e40c0b0645c845b122a67b4dbc6e71e8a9f1de919b13b
 DIST shorewall-core-5.1.7.1.tar.bz2 79801 SHA256 482d2d283cc891c7746c8f44cf745e7d54615f65e9eb67874a5c1d548f15c5ba SHA512 5a11a5f85518df3b57b77e16f8b8c7ff7b169a86d87ce21beb764e5a3e9651d1d07f4d5fe50ed0c15c22b7bd608aaca8aced9c0b892d7f50c712195fa22c77a9 WHIRLPOOL 62e6d98a376f90219b47b24432cf81f8654bed04b899136efedf0931b97543f9cdb6cd7459ea168a525c24477197fa0b61f5a21e0aadfc42893e42777983a4c4
 DIST shorewall-core-5.1.7.2.tar.bz2 80213 SHA256 c1f78229d9633ea6b35ec067c9724003e2929a39ae54ccd8e6875776d155cd70 SHA512 73c547d6985f17f5c2f2fe4a846a7db76fe514edbc03b7b2f191b437405ac6175cbe3dba615839bb46658031f7cd74ce26221cac42869818e5131b1836d43951 WHIRLPOOL e58a64514f50b375670908cea228610abab9bdb7a8300d04a3c728a70b662da144711e09124fa6149e61c941d165f93a65d162cedbc739eb670ddad4d86f76ff
 DIST shorewall-core-5.1.7.tar.bz2 79711 SHA256 c94baf58a61b79407fbaea84a6439d323b17d02912dd81838f7b5ed07ccf1340 SHA512 91836595a3f0df8db6d26eeef47207e94364748e55762de771340ed368ea10be2c445680a57a2864fdfa68b35da18ee256cc0f8dcf6c53494c39f09da8ae829d WHIRLPOOL 4fd47f0b46c2881917561b9234acc38548fb9d4a1ef1e2f706a8eaceeb1d44aa0753a93fecddb7ebc80be9e19c20fdd853c22ca2ab7ae21e092aba7e60921b58
+DIST shorewall-core-5.1.8.1.tar.bz2 81130 SHA256 0caca8dbd969e88f3f875789b3ac31985a19d39916efe15f69766a6ddd8d97ac SHA512 480003ff87da59ea64cabc3fc15e12bef44180fcc47b71f9a08c225484dc401080271ddf2834574ca46992973f9d3567ddd14d977b670c48a453eb435c356ab6 WHIRLPOOL 173dee8d7e3cc89d092c844a040f75924c860a2c8b9a97fda21cac20ee9160c98597c54c830061ecc866f51b3d22fd78513ce06f39e176662bbf26133ac2d421
 DIST shorewall-docs-html-5.1.5.2.tar.bz2 4218574 SHA256 18a601050b6fcf6b5839ead037e96ee28ae85eb34262d7d614183cbee6169ef5 SHA512 a66161a601f5417bde8612a154c3886dbf81985e127955bbec213dcaa0e4778b2a3aabbf1dcf257d36db0806b5822bce5fa11a555da36427abbf0deb8f6f1501 WHIRLPOOL d8607b0c7ea3b7bd7b685e99895867f9e37bc2a0c8a5520a59311696fc0e2817452e36865c08e7b758a72fd9a546bf5ef6a47f4098f993cf8c95ad4e1f426dd8
 DIST shorewall-docs-html-5.1.6.1.tar.bz2 4218958 SHA256 db1d61b013f035a2e7d515f483d789fa160fe7a250e12e9efec5a79fb2ef1144 SHA512 c620209dd6fd9f044088e11e1adf8bee5c481bb27db76bfae5f42fae242dc139526cc457507251d5d00e55a652b358aa7ac3586ec10e28210e00f75932007277 WHIRLPOOL 36936c55029db3875f1a14014eb2c25845412f74bec22205a24919faa34c8b447539bbaa29189ed547bd63989ba20d1c4376fc5fd4d02d4c227f10d733fc0835
 DIST shorewall-docs-html-5.1.7.1.tar.bz2 4219011 SHA256 4f7c5d85945aff85ba4287d0afd63fa476afae0f3b22ed1cdc661cf18f963001 SHA512 af1c97e4e23ba9a80963161124e26ee322b8ef8900457c5e98a34e8af795d3122bb3b54cf026148543e33c7045827d51d07b3af913d9472646e07bda339695c3 WHIRLPOOL b29a81f77a006aaaf8ea1881925dcdb102219d67657c529f733b996011743118a9c743a4496db673fd38a25c114703529698d1986f562be70c73ac47f25095d5
 DIST shorewall-docs-html-5.1.7.2.tar.bz2 4218919 SHA256 348e9bf9c97e97aa3f8f425e30da9f6c89d2b7c5a035a21ac4c3e792ef33ac95 SHA512 b9c85d228b65ecf6b9e29ba316b8cf878a06832bc94f62e2ca8793c02c95bae7be934dd45dc572b31d8e4cff00e1092c8c8681d7c1fc4759c5700a1b8f868f55 WHIRLPOOL 01c51b28a9bcbed7e9a8d257ef01ecc113ba0ad095fce02d6fc17b3b341fd5d340281dfe1db0699ae1ff81e990f9413436d9fa0920846ae9f4b4298a483bede3
 DIST shorewall-docs-html-5.1.7.tar.bz2 4218629 SHA256 81a9906479bab465e61b420cc9904487ccb490f10bcaef4a5487ec5ff46a1428 SHA512 c24351701983c8b0e6b429094084cbfec1360eaaf4cae8c58b3513c3783957ae1b16a5b0443f07b6ccb4cbf5726324b7670f07dfe5fe1b0e58ec127d305baa4e WHIRLPOOL a31f6822011fb90e4e6b00f20f7f604a4cb4a6f67fc2563754bfb447a2fb2a09a86001412d3d47190f6ce388bdc321ec99fc32fd23015566fe0381f8a1f6a4c2
+DIST shorewall-docs-html-5.1.8.1.tar.bz2 4212495 SHA256 cf7aafa3b9c990205ceda790ecb006a6b17c5d0aea4d223a8da708f34fd91bd1 SHA512 665cc93d62bff6e18517ef959990fea6608de8246068a09f3548b855cafe08a9a6a7722a92bf8a2890889a0041ec5cb0647abe4f3afcaec857e309f2d33d6fd4 WHIRLPOOL 36e6099e5bd2790dc3952ba06c8f8e84737f505557a912fa0b58b2d603d66ba75aa2a14c4e8611d7186a44650d689cbfb5ec4012e0069732130e2d602f2e0e9f
 DIST shorewall-init-5.1.5.2.tar.bz2 32646 SHA256 1ae9771f20ca3ede897fe0ee4443d65011dde37d6ecc146150ba22c980b6f272 SHA512 de67e167bbdd5e2860e01fb55f07b695011ce7473b98b374f605263eb0aa66e7de645cd7716526ecbf01bf8b65fb5e08294c85bf55ec45b54b78f1b66e80565c WHIRLPOOL d1f1d05b384b63b087e48afa90ded85e333d1ca1d8e90196de2540c8705239f55326ffa5d421f6c03e651e6d7076e18786ab47009c09f31de2cc6fe13910ac36
 DIST shorewall-init-5.1.6.1.tar.bz2 34153 SHA256 ad20b348e32f6cc332521b07ef89a891978453e56cfe7fbe916d1f83ae594194 SHA512 f6ea4aad0c0da6da8436dcb27441088cefd8312e37cc6d62187fd8210790b2be5452cc06f1823f1958c53cdec2e4b14abc5be31a7c029739838f5bbc6d143a00 WHIRLPOOL b5d6f01c5670a60a3471f1fffbd341ca914c20d39516ad5bf63693c7ebda882c0fa572d5839f28ef94d40a95216a1b13573b470fe14676f0421aebde62769fd6
 DIST shorewall-init-5.1.7.1.tar.bz2 35144 SHA256 e814448295918102fd83da6286925c59fc3387a211d9cf0e808509613e9b571b SHA512 dfbab688e60475e6e69279f4c48ce7492227ca3d541b171f2e4308793d7b6bd46cce7899a6ad0f1c48e817db576ddf3dea9d826d36ff5745f8f84c98cc6317f7 WHIRLPOOL d58ffd4fb4f643a6692f080f512b2be86bab43fe7701555408ecd5c34ead78374d960a6c6528579a7e68db53fdaa9bd7d1201f51a3bc3c0a4e6fee532bcea858
 DIST shorewall-init-5.1.7.2.tar.bz2 35347 SHA256 f47900550045901a38a96fbcad6e401f86cc53ba0a94c44e1b3903b0e6358609 SHA512 9f295da51cbfe7c2fa3aab4029b18ff4bb9c4834d852e2a4cc3770fbed6eae79797000053ad7097ba831e01f710bf4c030d1f3b0cda93cb8da3dc3befa6ae0f4 WHIRLPOOL 1d47c4211959193334e921a82fe50b2cfb353ac6f3635bb96d1b8500a8dacaf2ddf2d62f96874dd3c2d9f4dd9d7e7f689fee4254b528bf1fe92a47fff5d8cca5
 DIST shorewall-init-5.1.7.tar.bz2 34955 SHA256 c0a0218d209846cde2581ecc93d70eb8ae26bea976647db2f1fa887140f10811 SHA512 3951b24a0e992c45021d5e79d5ab4a1480559ba321c4c5c57b40068373bb4b14f45edf525e9cc384657167330ef8f6cec46374c84a8dcc7fb641a88e27e40a4d WHIRLPOOL f319cf109987cf627794d60beabcf988a2cb2a54abacdd84a46e60344960ed9371adeb6367fd3318ebe9e24a562a199a3ed98edca31a1e992757ab2db252f58e
+DIST shorewall-init-5.1.8.1.tar.bz2 36268 SHA256 c2007f45efae58235c445e53cdab0ebef559adcdc6a84ac09125f1e57081c27d SHA512 67d9e7f7dda5615c826eae784c30ed36dfed0e7b0f7bd95088082f401998eb989ac9e39ab528300f075a1d6f4ad2eb3a7dcbfac5c785db79dc154821e2c5e86a WHIRLPOOL b82dab99fc44e27e6c1f420ea6512f4560f497f2df03d14e01d06c7661d8f6166539f2b6798ffa56ac85eec556411826c1ade182adeb9aea75ca60d56e7b6cfe
 DIST shorewall-lite-5.1.5.2.tar.bz2 38424 SHA256 acf092c051ce4e19b0aa67b1828511ec446006133c4451d9c13f60275025a397 SHA512 300793d3a123ab63cde988667a53e931adf7f40e6987bb5b57a60376502ad4ec46316e45bc0c589f82f3fb118ee6f78a0646f7aa5ef522791eea10e7ff2430da WHIRLPOOL 2a8b775d87601cb4e792fe817e0d2e7eaaf6b162eb9ed762081ec502239d1dc33d3843e9742b532d582939dc143561de617246aeb27a83448625bc4935d78505
 DIST shorewall-lite-5.1.6.1.tar.bz2 39930 SHA256 64424e0c69aff83fc02a73db5b1c7ee10fb916d317c027987ba40c8aff6ddd8f SHA512 69cfca2e703680238b32c8ffe3431a9267625faa3a03bed28593f0b0e8a5accc7d58ef4b91b77f87fc44e09f279d41e0302094e1d5255fc3ed1f6fc51863c07b WHIRLPOOL cb993586c09297aeaf8a37cbde8afa99f93687b62b1a5551e70e10ffa9633ba67077dc9323af583293c7e1d07b0ba558d2b1a124709fef147021bf9c5cffee9e
 DIST shorewall-lite-5.1.7.1.tar.bz2 40847 SHA256 7e9f09a34eca462f58aaf3f43326a830d924d3868b6cb82a3d1f27875aee128c SHA512 5422c3a0fd53d37d615a81d1bc2273042ca1011ae64f357c295fb81b49962ab8a51343a7eb71819018fb6f1f3c9045b27a6b289974ad3bd436d8c85f24c5da63 WHIRLPOOL bf3baba44eda3457af584e0dcbe1e312dd2d890c9650523856b43a93f747b7ce0677ea0c5320ab51d1c4f733a5c4951505eae19223b4a9aeeaf5673a7eb6567f
 DIST shorewall-lite-5.1.7.2.tar.bz2 41048 SHA256 e5f4f97031ef81ef599391279e18c26762f3db6dffc5fee33f3e93f37d92618c SHA512 385b072f93015259b6bb57a07c62815ac27c858c63254cd968240761a230e8b781207ee9f1cc9e6caab43e8f12c60e42cfcbaa6f938c964184b14e5d360bee83 WHIRLPOOL fe88d3f7df02164fe17f141dc1dfce9f082688ee133f93e8af63b4046981cf879560bff4a148fc21739f84d76bf3eda58906bf280fda81fc8bbec5f21f277535
 DIST shorewall-lite-5.1.7.tar.bz2 40648 SHA256 c55d2077bfc72f50bd49457984060d9cc0cabdefa26674662f8a68ccf1aad65f SHA512 a6ac156496aa52ff4bcaa4f6b72b3e0bcb93876a029a54f81989fd3d02ef2fbc9ebf870731912080c59e5f3afd56ebffc17fcaaf30716ad65693b72130e05500 WHIRLPOOL 974815a3ea8032638905da17fbc7f46441cb73cc4660f57f733fcd571a4ea606658db00c98518e914fe681a67effe19e5e681e0b1afccd5986bff7b6d86d68cb
+DIST shorewall-lite-5.1.8.1.tar.bz2 41954 SHA256 2efc424c1d4f737618f91864ba8e618328605514965e497660ee0ac9020b6048 SHA512 2e6716a8a7dc38e9b6b9abb85d14216b0ed4f63c8e360ac98ff5b40d0a9708cd0dbdc870c41693c135c959d1000f6880eabf7b0c4002ccd52c0e98f1ad3e1ccb WHIRLPOOL 7cc3ca69dd3aee3cc10bf85847d9d999e3539d4a31a029fb37e5c3f14c017f60b6a054c0eb41a799c02484cdb2ea8db193f14597f5bf7b31dce8bf15c45e5989
 DIST shorewall6-5.1.5.2.tar.bz2 188754 SHA256 c215a762ebb9c0a35be7463e1a2db2397ee1c01ab32c2224528f8de4a5ac9ac6 SHA512 1dbb7304f1f349ceb84a34c397a8c12e4fc5e9bdcd001d72881dbf76dda37e8e8448419f00c705e430f5f2e57cf3a7f9dc834cde6119d18cbeabf9d5a0e67e35 WHIRLPOOL 0daf72a3755b83b1ac3c6d90911149410cb9918f9ad312bd16f90c900880e32e852f5cb89791fdd68f14c1ae2389a365a23b94f430e227c687ab820d1b6d7619
 DIST shorewall6-5.1.6.1.tar.bz2 191131 SHA256 4732c560aa9166b35fbefaeecf6dcedf9f5224e1f56a739b3b1d30724af3affc SHA512 a26acc30f81c7419d9cbb8fd9f0a95c4647e4247b5f4f6232fc414abdba85c85ad8b127f441137cffa1dd88e7bebfba8a785416f54df36f77a36a50b4971b0f1 WHIRLPOOL a9cbe284762ee8af930808c8bb25931860ea9014e00c5b1f2d99ae48ffd31fa96a92dd0bb7ab43bbc44a7d02c5e8e5c334d938db3414b1c0e7069175f04fe026
 DIST shorewall6-5.1.7.1.tar.bz2 191749 SHA256 d950eb1acdffa5d6af19f4f9cc81c76e293c75af26f847452ca53401f9d7093b SHA512 fdea35fb2b6d9e7418d2c2d9124a3c05e42080240aa6e2faa23ef004e2b4ef7e1a05f965d6cdf1c3b224a7c226724a3f2e68b597c026d3b8abdc0326cb545b2a WHIRLPOOL 2dcff81b201b601ad5d5dab38a39344f3dffcfc2e90fe8b39ef31b4f3070295871cc87b5b17e3f9651c9131c1df4702413cb8735d4953088f6df99a8a01ce568
 DIST shorewall6-5.1.7.2.tar.bz2 192087 SHA256 8cddd2baafe71ebfd9aa691400bc320ab0672791f5d8f1e82067d91c3586deba SHA512 2ce5beb6be5ce9a5f9b1f116468f2834188938c5893ca2a9fdc7d76ab43ed487a7dd59cca5a8098ecee06274c1c359543ff57f2d3efa5e4ed8fc728702f6a689 WHIRLPOOL db5b3569689d3dd05e82316e9d7851f72e18b7df1a84b768bf6ceb546bf470843d31834a0e3d5a40e6c83597b65633efc9507eb75709a66f1c1d7223162792c2
 DIST shorewall6-5.1.7.tar.bz2 191614 SHA256 624fe000c881a75109f65f5fb11480a2f997b06237db546e51aeee2ed49dd10d SHA512 9423d6a141c61e1ca5546fd21e5db145c917d6e6825805ff404f5531449a0125f8288d0954e101231fa4d0a521e6db3993b4b312caba3188e41bc579eef350c3 WHIRLPOOL 7635d78eecf9f3e13b98e0577dff7687be34abdbeb8eee7d152ef1a0610dd9e82bf18024185ffe14caaa47053b809307e47b2aa111f7d03a8595a35d7c297ccf
+DIST shorewall6-5.1.8.1.tar.bz2 193412 SHA256 fde5b7a9eb0d4241ef3dfb8392b93f86a974c76cec8b05bd946bc12f509aca8e SHA512 9f4518444a8982eaaa9cd218742e4ab27b31e9b8799b4e483e30708bf13d68b444562f8cac6e98c170281d91c5bcb7730cb0f559146cd09e3b99a45dba68ef86 WHIRLPOOL 688e3f2a8538cc0a59d017a3e92c3a8d90a0372037bf8a0e7da2abb58d572fcb0b467f2149d330eb8eaa9d7fc8aefbe83411e55bd235ccd220601549392b097f
 DIST shorewall6-lite-5.1.5.2.tar.bz2 38137 SHA256 0b65ef615be93f921af6d8c11f702f2c46ba18d989fe12fe048732c53cf841de SHA512 e8961abdb7c105820d8420f623cbff72af33e2d35701bb0f81f2fad5364e91b88d5d1317d4ffc8e00c3b32d50c96f6c0dccda20cd981c5f6cc7aaf1662af8d27 WHIRLPOOL d3b04c2c6e9f3a10b8bbc0da1e5691dc3e428501ee52547e548eed05b14d54aec243111f711cb66ecc734efe5217dffa0230b1045296f90a60da88c390ba33bf
 DIST shorewall6-lite-5.1.6.1.tar.bz2 39636 SHA256 a25a1430a09d797991f0028f76f5252b86ef898801fc8eb3e6c8ca695d1d2a98 SHA512 eb059a1d991e72cd7b4522ddecb5557918803b5ce8c79552919d7c2798aaab96548b2dea5950f9c3311091950307496c034d63f5389f745b6282074d20d9afbc WHIRLPOOL 2ffae1f3afafcf576d11265562f9f22e6d58061b509d9ef7fceb57980b1d8c8a598efd39aaec5e3bdbff4004a39741eccb0fec8ed0417ff9f36a09e417bb9047
 DIST shorewall6-lite-5.1.7.1.tar.bz2 40514 SHA256 a199a395ce4d23081338955c68fbf657c25e972b2656ef370544854074fa672c SHA512 a8fd7e33d1558fbebb53d1dc19c3784aac2d6095e1404c44030cd513cee5a6330632c50e86eedb0a6773b67acc77ca0d2fb26352c3f784abc8ac936d6f96c437 WHIRLPOOL 0276cbf74644205042dff963124e655fb8f0e14aca31f5550833f95ae84f1b569be77473324e8603b523d5dc67a0de74d6459b8634c2519af6eb5fc84276992e
 DIST shorewall6-lite-5.1.7.2.tar.bz2 40737 SHA256 bf22e67559ebdeff464cd910b97578a4c82f5fcc87bc77aeeb9fb4a5ca2a71be SHA512 9125d4380b91f0bcaaedfef6bd5ba89ada0391bf322cd1a00deb239eebc2e818a994844a653daa2e8784bb21ad7ed51798fcaa129e28da08c66de4163fe13bdc WHIRLPOOL 12c5e8036ae08d312ee52af40157f7ad8c18e0ccc8475845b22a3ce7647a73105b8a2f9034851f3e547ed6c47b2a7f0ef566de6dc96a19a20b1da429cd90a170
 DIST shorewall6-lite-5.1.7.tar.bz2 40346 SHA256 2fa19a4c5046c05e4e5cf28d4b50dab0061f05f2a17cb0f8fd265812276cb975 SHA512 6e118b2fa369aa42dfade55b3b4c8855b3d950fd664c5cf2c22539c99e2065e8924e86970ea0f17b7b8930d1c28220bc425ef4329222f0c11feb872ba0145eb9 WHIRLPOOL 2f5be4d88e48e4ef535e60e050343ef78b2c4fdfa9918e79947e43107d3e8d46272c7c6f1134f4762b48894a9334daed2ddef4fa3843cf4670be54b9bb799714
+DIST shorewall6-lite-5.1.8.1.tar.bz2 41671 SHA256 7f1b99465df8f6bc47e0bc40e413b9323a5a9d0b2576709fd28366f0af5b852e SHA512 b10f503d179094095f8d5f1844c59ae678a304685fc9ed684dc92ba20f50416afba1da8a77bee1a15de4f328d1f3ffb977926361f814982737b6380e3dc6a1ec WHIRLPOOL d0994b703132e9909f75bfbbac194d901ad97d9d9b3147d900ec642dc69cfa815133c228215082def21d43c2d7707fbb554d65e6b410b0766dc419129d6c323a

diff --git a/net-firewall/shorewall/shorewall-5.1.8.1.ebuild b/net-firewall/shorewall/shorewall-5.1.8.1.ebuild
new file mode 100644
index 00000000000..3b7545ca47d
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.8.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-11-27  4:39 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-11-27  4:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c57afd348df1987b9db26674059098b45e57a0c1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 04:31:33 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 04:39:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57afd34

net-firewall/shorewall: Bump to v5.1.9

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-firewall/shorewall/Manifest               |  21 +-
 net-firewall/shorewall/shorewall-5.1.9.ebuild | 456 ++++++++++++++++++++++++++
 2 files changed, 470 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a6890552d1f..699d17f6365 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.1.7.2.tar.bz2 524263 SHA256 e7c4cde2d04894ddf6e8dd8a8f96e96e04574181807cfe9f78915fa0dfc836e4 SHA512 05599609b50189e300cd71eda6876ac5e8878a2d2ab7c1635afc1b79f1ab3c9bc92c1ac1758aa8996d10bb37783d1fa29c76adaa879ec93bc12669c3dbdbed9b WHIRLPOOL a2fcc48c9c51161c4a2ec692fa29215824a412056fdc15203892e6a9752c2239722462be89f26c4e7374ceb0131ba35df87847a3f16329438c57ec8f8dec0208
-DIST shorewall-5.1.8.1.tar.bz2 524305 SHA256 0ba4f22394d988a5714637444c248e542d5897e41ab5770907edf38e422fe2ff SHA512 3dfacf35134c4831db057bb11d11b10d0e8cd0eb0edf28f64a02a3970ebb33e9a2e2d1cc943432a14c7fa34779e812e704d43c8e6f1070bca30fcc470c7a215c WHIRLPOOL 0e549aa6d28d79ec8b9f448c2c5ef0a10a0ad930249d6be31e86ea9bf33501ac7ee544a628e408406018efaa5b80cdccd6e29f68ede9b506428fbf143deab733
+DIST shorewall-5.1.8.1.tar.bz2 524305 BLAKE2B a59b32d734bdbc62389d542ac8c6beb054266ec98f6d05a67126f3d85d1ff6143a55737a4cd38cabd581dd6df6fc2569e8bb9327d435debfbea5f0b03ded51a1 SHA512 3dfacf35134c4831db057bb11d11b10d0e8cd0eb0edf28f64a02a3970ebb33e9a2e2d1cc943432a14c7fa34779e812e704d43c8e6f1070bca30fcc470c7a215c
+DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
 DIST shorewall-core-5.1.7.2.tar.bz2 80213 SHA256 c1f78229d9633ea6b35ec067c9724003e2929a39ae54ccd8e6875776d155cd70 SHA512 73c547d6985f17f5c2f2fe4a846a7db76fe514edbc03b7b2f191b437405ac6175cbe3dba615839bb46658031f7cd74ce26221cac42869818e5131b1836d43951 WHIRLPOOL e58a64514f50b375670908cea228610abab9bdb7a8300d04a3c728a70b662da144711e09124fa6149e61c941d165f93a65d162cedbc739eb670ddad4d86f76ff
-DIST shorewall-core-5.1.8.1.tar.bz2 81130 SHA256 0caca8dbd969e88f3f875789b3ac31985a19d39916efe15f69766a6ddd8d97ac SHA512 480003ff87da59ea64cabc3fc15e12bef44180fcc47b71f9a08c225484dc401080271ddf2834574ca46992973f9d3567ddd14d977b670c48a453eb435c356ab6 WHIRLPOOL 173dee8d7e3cc89d092c844a040f75924c860a2c8b9a97fda21cac20ee9160c98597c54c830061ecc866f51b3d22fd78513ce06f39e176662bbf26133ac2d421
+DIST shorewall-core-5.1.8.1.tar.bz2 81130 BLAKE2B 6cd8a434b9da66b264c5c4bd48009ff52c55693e9f749a150acea9b9790ac863ebab8fb75e8032edea0b6ccc75f259b65edf002912550c4d691da3e646685f80 SHA512 480003ff87da59ea64cabc3fc15e12bef44180fcc47b71f9a08c225484dc401080271ddf2834574ca46992973f9d3567ddd14d977b670c48a453eb435c356ab6
+DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
 DIST shorewall-docs-html-5.1.7.2.tar.bz2 4218919 SHA256 348e9bf9c97e97aa3f8f425e30da9f6c89d2b7c5a035a21ac4c3e792ef33ac95 SHA512 b9c85d228b65ecf6b9e29ba316b8cf878a06832bc94f62e2ca8793c02c95bae7be934dd45dc572b31d8e4cff00e1092c8c8681d7c1fc4759c5700a1b8f868f55 WHIRLPOOL 01c51b28a9bcbed7e9a8d257ef01ecc113ba0ad095fce02d6fc17b3b341fd5d340281dfe1db0699ae1ff81e990f9413436d9fa0920846ae9f4b4298a483bede3
-DIST shorewall-docs-html-5.1.8.1.tar.bz2 4212495 SHA256 cf7aafa3b9c990205ceda790ecb006a6b17c5d0aea4d223a8da708f34fd91bd1 SHA512 665cc93d62bff6e18517ef959990fea6608de8246068a09f3548b855cafe08a9a6a7722a92bf8a2890889a0041ec5cb0647abe4f3afcaec857e309f2d33d6fd4 WHIRLPOOL 36e6099e5bd2790dc3952ba06c8f8e84737f505557a912fa0b58b2d603d66ba75aa2a14c4e8611d7186a44650d689cbfb5ec4012e0069732130e2d602f2e0e9f
+DIST shorewall-docs-html-5.1.8.1.tar.bz2 4212495 BLAKE2B be7e0da12b87f7f839c6c956d80e6bd5cfa4fe3cd6c9e9a651b1dcdc5530726daa31adf30f87a6f98f7ea980ab30cce32973211057f99a9dc81e5cf8d9b387e2 SHA512 665cc93d62bff6e18517ef959990fea6608de8246068a09f3548b855cafe08a9a6a7722a92bf8a2890889a0041ec5cb0647abe4f3afcaec857e309f2d33d6fd4
+DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
 DIST shorewall-init-5.1.7.2.tar.bz2 35347 SHA256 f47900550045901a38a96fbcad6e401f86cc53ba0a94c44e1b3903b0e6358609 SHA512 9f295da51cbfe7c2fa3aab4029b18ff4bb9c4834d852e2a4cc3770fbed6eae79797000053ad7097ba831e01f710bf4c030d1f3b0cda93cb8da3dc3befa6ae0f4 WHIRLPOOL 1d47c4211959193334e921a82fe50b2cfb353ac6f3635bb96d1b8500a8dacaf2ddf2d62f96874dd3c2d9f4dd9d7e7f689fee4254b528bf1fe92a47fff5d8cca5
-DIST shorewall-init-5.1.8.1.tar.bz2 36268 SHA256 c2007f45efae58235c445e53cdab0ebef559adcdc6a84ac09125f1e57081c27d SHA512 67d9e7f7dda5615c826eae784c30ed36dfed0e7b0f7bd95088082f401998eb989ac9e39ab528300f075a1d6f4ad2eb3a7dcbfac5c785db79dc154821e2c5e86a WHIRLPOOL b82dab99fc44e27e6c1f420ea6512f4560f497f2df03d14e01d06c7661d8f6166539f2b6798ffa56ac85eec556411826c1ade182adeb9aea75ca60d56e7b6cfe
+DIST shorewall-init-5.1.8.1.tar.bz2 36268 BLAKE2B dabe010dde8df66a1ca25fda0cf7c0984d6358774ab5b3c8124c9ad36ca9c750e6f3377c49021383035e00e37f6dab0263620e207e8edafb8305ee4c52c0cba5 SHA512 67d9e7f7dda5615c826eae784c30ed36dfed0e7b0f7bd95088082f401998eb989ac9e39ab528300f075a1d6f4ad2eb3a7dcbfac5c785db79dc154821e2c5e86a
+DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
 DIST shorewall-lite-5.1.7.2.tar.bz2 41048 SHA256 e5f4f97031ef81ef599391279e18c26762f3db6dffc5fee33f3e93f37d92618c SHA512 385b072f93015259b6bb57a07c62815ac27c858c63254cd968240761a230e8b781207ee9f1cc9e6caab43e8f12c60e42cfcbaa6f938c964184b14e5d360bee83 WHIRLPOOL fe88d3f7df02164fe17f141dc1dfce9f082688ee133f93e8af63b4046981cf879560bff4a148fc21739f84d76bf3eda58906bf280fda81fc8bbec5f21f277535
-DIST shorewall-lite-5.1.8.1.tar.bz2 41954 SHA256 2efc424c1d4f737618f91864ba8e618328605514965e497660ee0ac9020b6048 SHA512 2e6716a8a7dc38e9b6b9abb85d14216b0ed4f63c8e360ac98ff5b40d0a9708cd0dbdc870c41693c135c959d1000f6880eabf7b0c4002ccd52c0e98f1ad3e1ccb WHIRLPOOL 7cc3ca69dd3aee3cc10bf85847d9d999e3539d4a31a029fb37e5c3f14c017f60b6a054c0eb41a799c02484cdb2ea8db193f14597f5bf7b31dce8bf15c45e5989
+DIST shorewall-lite-5.1.8.1.tar.bz2 41954 BLAKE2B 78d5e32bff3fa860caf258570ce5a98ff7f6484a6d4076dc4537cc1ea9b28d35f7d6f7bfbe93046a89ae83d56529763cc0a4783a4280460d420ddc04ffb35706 SHA512 2e6716a8a7dc38e9b6b9abb85d14216b0ed4f63c8e360ac98ff5b40d0a9708cd0dbdc870c41693c135c959d1000f6880eabf7b0c4002ccd52c0e98f1ad3e1ccb
+DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.7.2.tar.bz2 192087 SHA256 8cddd2baafe71ebfd9aa691400bc320ab0672791f5d8f1e82067d91c3586deba SHA512 2ce5beb6be5ce9a5f9b1f116468f2834188938c5893ca2a9fdc7d76ab43ed487a7dd59cca5a8098ecee06274c1c359543ff57f2d3efa5e4ed8fc728702f6a689 WHIRLPOOL db5b3569689d3dd05e82316e9d7851f72e18b7df1a84b768bf6ceb546bf470843d31834a0e3d5a40e6c83597b65633efc9507eb75709a66f1c1d7223162792c2
-DIST shorewall6-5.1.8.1.tar.bz2 193412 SHA256 fde5b7a9eb0d4241ef3dfb8392b93f86a974c76cec8b05bd946bc12f509aca8e SHA512 9f4518444a8982eaaa9cd218742e4ab27b31e9b8799b4e483e30708bf13d68b444562f8cac6e98c170281d91c5bcb7730cb0f559146cd09e3b99a45dba68ef86 WHIRLPOOL 688e3f2a8538cc0a59d017a3e92c3a8d90a0372037bf8a0e7da2abb58d572fcb0b467f2149d330eb8eaa9d7fc8aefbe83411e55bd235ccd220601549392b097f
+DIST shorewall6-5.1.8.1.tar.bz2 193412 BLAKE2B fb32d234854afdc418d2d7aa95305042749b4aff9b0d6f445b2d88636db817720352ec7d295eb1c7bb2750d2363e7bd170872e2a3bdc553f82e27a8949cbb988 SHA512 9f4518444a8982eaaa9cd218742e4ab27b31e9b8799b4e483e30708bf13d68b444562f8cac6e98c170281d91c5bcb7730cb0f559146cd09e3b99a45dba68ef86
+DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.7.2.tar.bz2 40737 SHA256 bf22e67559ebdeff464cd910b97578a4c82f5fcc87bc77aeeb9fb4a5ca2a71be SHA512 9125d4380b91f0bcaaedfef6bd5ba89ada0391bf322cd1a00deb239eebc2e818a994844a653daa2e8784bb21ad7ed51798fcaa129e28da08c66de4163fe13bdc WHIRLPOOL 12c5e8036ae08d312ee52af40157f7ad8c18e0ccc8475845b22a3ce7647a73105b8a2f9034851f3e547ed6c47b2a7f0ef566de6dc96a19a20b1da429cd90a170
-DIST shorewall6-lite-5.1.8.1.tar.bz2 41671 SHA256 7f1b99465df8f6bc47e0bc40e413b9323a5a9d0b2576709fd28366f0af5b852e SHA512 b10f503d179094095f8d5f1844c59ae678a304685fc9ed684dc92ba20f50416afba1da8a77bee1a15de4f328d1f3ffb977926361f814982737b6380e3dc6a1ec WHIRLPOOL d0994b703132e9909f75bfbbac194d901ad97d9d9b3147d900ec642dc69cfa815133c228215082def21d43c2d7707fbb554d65e6b410b0766dc419129d6c323a
+DIST shorewall6-lite-5.1.8.1.tar.bz2 41671 BLAKE2B 47e4e192d441098f3fb5c2c569e35a78ce3464e7b29c2a1e8a75b70c3306a89c6415100d392c80ea6f1877648bb32bb0775a32466c33854d52da8369b0bc4bce SHA512 b10f503d179094095f8d5f1844c59ae678a304685fc9ed684dc92ba20f50416afba1da8a77bee1a15de4f328d1f3ffb977926361f814982737b6380e3dc6a1ec
+DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975

diff --git a/net-firewall/shorewall/shorewall-5.1.9.ebuild b/net-firewall/shorewall/shorewall-5.1.9.ebuild
new file mode 100644
index 00000000000..3b7545ca47d
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.9.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-12-14 15:41 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-12-14 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     d3c86bab341b5bd7cde4560bd3be027c69eceb3d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 15:39:00 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 15:41:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c86bab

net-firewall/shorewall: Maintainer stabilization under ALLARCHES policy

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 net-firewall/shorewall/shorewall-5.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.9.ebuild b/net-firewall/shorewall/shorewall-5.1.9.ebuild
index 3b7545ca47d..457de2d45f7 100644
--- a/net-firewall/shorewall/shorewall-5.1.9.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.9.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-12-18 21:49 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-12-18 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     4323c70f3a4ad12e2de769f987cf7344fcc7c34e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 21:37:04 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 21:37:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4323c70f

net-firewall/shorewall: Enforce <sys-apps/iproute2-4.13.0 due to new unsupported tc syntax

Bug: https://bugs.gentoo.org/640766
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/shorewall/shorewall-5.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.9.ebuild b/net-firewall/shorewall/shorewall-5.1.9.ebuild
index 457de2d45f7..3f5247ae95c 100644
--- a/net-firewall/shorewall/shorewall-5.1.9.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.9.ebuild
@@ -94,7 +94,7 @@ DEPEND=""
 
 RDEPEND="
 	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
+	<sys-apps/iproute2-4.13.0[-minimal]
 	>=sys-devel/bc-1.06.95
 	ipv4? (
 		>=dev-lang/perl-5.16


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-12-18 21:49 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-12-18 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     073d37ad2f0c4a34932298702ed332d43af1fa6d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 21:33:40 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 21:37:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073d37ad

net-firewall/shorewall: Cleanup old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/shorewall/Manifest                 |  14 -
 net-firewall/shorewall/shorewall-5.1.7.2.ebuild | 456 ------------------------
 net-firewall/shorewall/shorewall-5.1.8.1.ebuild | 456 ------------------------
 3 files changed, 926 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a85f9e14d61..4003c0b1d5e 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,7 @@
-DIST shorewall-5.1.7.2.tar.bz2 524263 BLAKE2B 58f6cf3b340a7c3c862da15a6b6ec26cef7e4b7bd66abef20bc899ed5a060527ebfc250d2e61e12c8db0f270ae1c3ba8f56014811aee82c93e83affccd78033b SHA512 05599609b50189e300cd71eda6876ac5e8878a2d2ab7c1635afc1b79f1ab3c9bc92c1ac1758aa8996d10bb37783d1fa29c76adaa879ec93bc12669c3dbdbed9b
-DIST shorewall-5.1.8.1.tar.bz2 524305 BLAKE2B a59b32d734bdbc62389d542ac8c6beb054266ec98f6d05a67126f3d85d1ff6143a55737a4cd38cabd581dd6df6fc2569e8bb9327d435debfbea5f0b03ded51a1 SHA512 3dfacf35134c4831db057bb11d11b10d0e8cd0eb0edf28f64a02a3970ebb33e9a2e2d1cc943432a14c7fa34779e812e704d43c8e6f1070bca30fcc470c7a215c
 DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
-DIST shorewall-core-5.1.7.2.tar.bz2 80213 BLAKE2B edf34ea8815a7f4d616df48040dc0dbbd898294d2a0a954757b013056a320510b50c819c5b6b05d7974322984b3bfc178129b00b0ff422e356fc5740dedcec21 SHA512 73c547d6985f17f5c2f2fe4a846a7db76fe514edbc03b7b2f191b437405ac6175cbe3dba615839bb46658031f7cd74ce26221cac42869818e5131b1836d43951
-DIST shorewall-core-5.1.8.1.tar.bz2 81130 BLAKE2B 6cd8a434b9da66b264c5c4bd48009ff52c55693e9f749a150acea9b9790ac863ebab8fb75e8032edea0b6ccc75f259b65edf002912550c4d691da3e646685f80 SHA512 480003ff87da59ea64cabc3fc15e12bef44180fcc47b71f9a08c225484dc401080271ddf2834574ca46992973f9d3567ddd14d977b670c48a453eb435c356ab6
 DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
-DIST shorewall-docs-html-5.1.7.2.tar.bz2 4218919 BLAKE2B 77a4859170f68d9b821622b7ecd1f6da58e5bda1613ccf12dcc15f901ccb0a2ee7993d3bdb1fdcdac48ec44cf2b77aa1c2e154673abb8afc9f91c6119e8030dc SHA512 b9c85d228b65ecf6b9e29ba316b8cf878a06832bc94f62e2ca8793c02c95bae7be934dd45dc572b31d8e4cff00e1092c8c8681d7c1fc4759c5700a1b8f868f55
-DIST shorewall-docs-html-5.1.8.1.tar.bz2 4212495 BLAKE2B be7e0da12b87f7f839c6c956d80e6bd5cfa4fe3cd6c9e9a651b1dcdc5530726daa31adf30f87a6f98f7ea980ab30cce32973211057f99a9dc81e5cf8d9b387e2 SHA512 665cc93d62bff6e18517ef959990fea6608de8246068a09f3548b855cafe08a9a6a7722a92bf8a2890889a0041ec5cb0647abe4f3afcaec857e309f2d33d6fd4
 DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
-DIST shorewall-init-5.1.7.2.tar.bz2 35347 BLAKE2B 48e9947deda3bf674244a584a68ef4a2b0354a4c9b55e1d38f1016aafe7601e6ddaae43ba5d65b2142f46a890603580dd4c384a06d3244a97ea91a4ac32274f6 SHA512 9f295da51cbfe7c2fa3aab4029b18ff4bb9c4834d852e2a4cc3770fbed6eae79797000053ad7097ba831e01f710bf4c030d1f3b0cda93cb8da3dc3befa6ae0f4
-DIST shorewall-init-5.1.8.1.tar.bz2 36268 BLAKE2B dabe010dde8df66a1ca25fda0cf7c0984d6358774ab5b3c8124c9ad36ca9c750e6f3377c49021383035e00e37f6dab0263620e207e8edafb8305ee4c52c0cba5 SHA512 67d9e7f7dda5615c826eae784c30ed36dfed0e7b0f7bd95088082f401998eb989ac9e39ab528300f075a1d6f4ad2eb3a7dcbfac5c785db79dc154821e2c5e86a
 DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
-DIST shorewall-lite-5.1.7.2.tar.bz2 41048 BLAKE2B c5c8d2d4b26f249f954e5f3b3ff3d12f36938575b1022e145ae35dc0e3114a826765aca05a8c8b123037a1d6a9e1264ca785477a67defc8f1d436c8c125168ac SHA512 385b072f93015259b6bb57a07c62815ac27c858c63254cd968240761a230e8b781207ee9f1cc9e6caab43e8f12c60e42cfcbaa6f938c964184b14e5d360bee83
-DIST shorewall-lite-5.1.8.1.tar.bz2 41954 BLAKE2B 78d5e32bff3fa860caf258570ce5a98ff7f6484a6d4076dc4537cc1ea9b28d35f7d6f7bfbe93046a89ae83d56529763cc0a4783a4280460d420ddc04ffb35706 SHA512 2e6716a8a7dc38e9b6b9abb85d14216b0ed4f63c8e360ac98ff5b40d0a9708cd0dbdc870c41693c135c959d1000f6880eabf7b0c4002ccd52c0e98f1ad3e1ccb
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
-DIST shorewall6-5.1.7.2.tar.bz2 192087 BLAKE2B 60327c82cb97a94a32ab3b5fb15f03cc7ce1e96d2a2f8a0a94c192170d285c0bb4da9b22f27b14aab631f23c687ced2054bd0854fc4ae29ac689d21fc75daf59 SHA512 2ce5beb6be5ce9a5f9b1f116468f2834188938c5893ca2a9fdc7d76ab43ed487a7dd59cca5a8098ecee06274c1c359543ff57f2d3efa5e4ed8fc728702f6a689
-DIST shorewall6-5.1.8.1.tar.bz2 193412 BLAKE2B fb32d234854afdc418d2d7aa95305042749b4aff9b0d6f445b2d88636db817720352ec7d295eb1c7bb2750d2363e7bd170872e2a3bdc553f82e27a8949cbb988 SHA512 9f4518444a8982eaaa9cd218742e4ab27b31e9b8799b4e483e30708bf13d68b444562f8cac6e98c170281d91c5bcb7730cb0f559146cd09e3b99a45dba68ef86
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
-DIST shorewall6-lite-5.1.7.2.tar.bz2 40737 BLAKE2B 61c7075e9c1879fc11998a866bde34171b562d390cd398b0c4c85c43b6a1489cc7c15c5ff96da75a1e5f4213cd9a3f55f9a536c9166d40abf9134f548a664975 SHA512 9125d4380b91f0bcaaedfef6bd5ba89ada0391bf322cd1a00deb239eebc2e818a994844a653daa2e8784bb21ad7ed51798fcaa129e28da08c66de4163fe13bdc
-DIST shorewall6-lite-5.1.8.1.tar.bz2 41671 BLAKE2B 47e4e192d441098f3fb5c2c569e35a78ce3464e7b29c2a1e8a75b70c3306a89c6415100d392c80ea6f1877648bb32bb0775a32466c33854d52da8369b0bc4bce SHA512 b10f503d179094095f8d5f1844c59ae678a304685fc9ed684dc92ba20f50416afba1da8a77bee1a15de4f328d1f3ffb977926361f814982737b6380e3dc6a1ec
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975

diff --git a/net-firewall/shorewall/shorewall-5.1.7.2.ebuild b/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
deleted file mode 100644
index 457de2d45f7..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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.1.8.1.ebuild b/net-firewall/shorewall/shorewall-5.1.8.1.ebuild
deleted file mode 100644
index 3b7545ca47d..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.8.1.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-12-21 22:08 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-12-21 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     18a1d077700fe6d06fab6107164948582dcd34cf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 22:08:04 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 22:08:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a1d077

net-firewall/shorewall: Maintainer stabilization under ALLARCHES policy

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/shorewall/shorewall-5.1.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
index 7b0058bd023..22419c59ec5 100644
--- a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.9-r1.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-12-29 17:49 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-12-29 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     d907ddbb532be503ec934083b1c398061e287266
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 16:31:42 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 17:48:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d907ddbb

net-firewall/shorewall: Bump to v5.1.10.1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.1.10.1.ebuild | 456 +++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 4003c0b1d5e..0342886e190 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
+DIST shorewall-5.1.10.1.tar.bz2 535652 BLAKE2B afeb0c79e5e191e923f0e44f9925ec32f2d97a5962dd6fcc75e28ded1b3b13f33ddcbd4f60f261b2b7b4cf2112ff9074545d88c8dfc02bf2147c3c0c2b941c97 SHA512 75b63b418bfacf3151f1833547ca187a9d87e1657bf02f9225d5067bc05a137cabb74709cf6d64c37e2f8fd8d5304154f265968e8b707ba08167d91be93f4ef5
 DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
+DIST shorewall-core-5.1.10.1.tar.bz2 83398 BLAKE2B 4c0f2321cecd35f7590cdb533e7ae08616f9f9c2a1e125382d568f681e0459dd9bf027c1f2a23531830ca9dbed181f5b57e0c688c6eb0eff5653fc199a78d4d2 SHA512 5f7b924505f3c78df2602c3dc637983f21b0f15383bf1b346205cb54ddf129c04a7a7e10617aeb624a2b1fc770d23b0f5e844db5ec639eab7af468942e3eda3e
 DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
+DIST shorewall-docs-html-5.1.10.1.tar.bz2 4279932 BLAKE2B 64ec2a5b544e3f8ded23271022599799190cce0653b35e7183f9e56ae94f6ecec1fd8633a7c5ccef4b5dafcef0cdfe59e317f2aab46e8dce6bec433545f2241f SHA512 22bbf18fabd63edc605b1f25c8a3a34e3677554beafa0b3e698d73675a566a134b8a6d1389fca4e2d98fe984ec92a3540ab1fc720ecd78a4b75587c53ce59cb0
 DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
+DIST shorewall-init-5.1.10.1.tar.bz2 38560 BLAKE2B 0f3e40914509814ed274840ce5effaa0c6fdc61d15ac94a15182adbece5a553e537191660f05aa5edb8443a89ee49f0ca98cc271bd56dc7b0a052ffbcd13029c SHA512 fa1ebdfd852e556a1e9bb3b550ad1e6fa9d256db39e8515d515f1d8a133c5956beb4e7fcc24da0dc776f1d418d2ca607232bbd2c6cc2585d00f858eb649af1fa
 DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
+DIST shorewall-lite-5.1.10.1.tar.bz2 44231 BLAKE2B 46cec387c7f7ccc862dba3575c272dbab038ada62aae32617d53262aff9751ebe95c6ba32ea365ee4a8d28e4775f3802282fe08fa07eeb7036e1064a1eaa3260 SHA512 8d25ca48fdf8a5f96060a3510b475144935ed15625847542f879e4cd1d6b5e7c9e7b333f299c59920f8cccb32685e9dd8f118942e0f8224c1c5deffffbaad146
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
+DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d46c39e2e7496ab81a3301f64e5ce3eaa5f741ade8a3a1d29c620b1970a8c9c835fa7e9c51c54737bfb38a94ed73be4546 SHA512 2a8c5f5c1b3ca85d873a9832bde3b2588c5158c6a5af129f2a5ee2fd18042e766e5c37e9246c2f42217527372a359fef2e1cb87e5591271669ab8759eb3b3c35
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
+DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975

diff --git a/net-firewall/shorewall/shorewall-5.1.10.1.ebuild b/net-firewall/shorewall/shorewall-5.1.10.1.ebuild
new file mode 100644
index 00000000000..d04ce070693
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.10.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-4.13.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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-12-30 19:02 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-12-30 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     76d41b34fa4149eb41cdb26c15aa5933520df202
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 19:01:48 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 19:02:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d41b34

net-firewall/shorewall: Fix sys-apps/iproute2 dependency

The previous sys-apps/iproute2 version restriction from commit 4323c70f3a4ad12e2de769f987cf7344fcc7c34e
was accidentally re-introduced with the bump to v5.1.10.1.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../shorewall/shorewall-5.1.10.1-r1.ebuild         | 456 +++++++++++++++++++++
 1 file changed, 456 insertions(+)

diff --git a/net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild
new file mode 100644
index 00000000000..3b7545ca47d
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.10.1-r1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-12-30 19:55 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-12-30 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e2f3c1e0c6f60396e458d2bef9c73d06fb860331
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 19:44:27 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 19:44:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f3c1e0

net-firewall/shorewall: sparc stable

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/shorewall/shorewall-5.1.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
index 22419c59ec5..f6ef8b56e58 100644
--- a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.9-r1.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2017-12-30 19:55 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2017-12-30 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     466f4b34171ed194324398b07c4e7f20435eaeff
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 19:45:01 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 19:45:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466f4b34

net-firewall/shorewall: Cleanup old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/shorewall/shorewall-5.1.9.ebuild | 456 --------------------------
 1 file changed, 456 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.9.ebuild b/net-firewall/shorewall/shorewall-5.1.9.ebuild
deleted file mode 100644
index 3f5247ae95c..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.9.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-4.13.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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-01-01 21:15 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-01-01 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     81d1473f58fd5b5505a032c5b011147557ba5fa5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 21:14:50 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 21:15:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d1473f

net-firewall/shorewall: Bump to v5.1.10.2

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.1.10.2.ebuild | 456 +++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 0342886e190..199db4ed828 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.1.10.1.tar.bz2 535652 BLAKE2B afeb0c79e5e191e923f0e44f9925ec32f2d97a5962dd6fcc75e28ded1b3b13f33ddcbd4f60f261b2b7b4cf2112ff9074545d88c8dfc02bf2147c3c0c2b941c97 SHA512 75b63b418bfacf3151f1833547ca187a9d87e1657bf02f9225d5067bc05a137cabb74709cf6d64c37e2f8fd8d5304154f265968e8b707ba08167d91be93f4ef5
+DIST shorewall-5.1.10.2.tar.bz2 535735 BLAKE2B 49594b997e90859db4fd94f3017ea47696579791cca881460fd916eba1c477d62f9ed2fbc25b22a3ff425084a169260cf6a6d00f1f59e574c996b97dfccb7232 SHA512 6f0d88ecef130be4283103ebf2c31ddad6791caf113448fcf29664a951067a070a7becf495e4a5cbe96aff81aff7d2028011421208e6d0dbbfa4608f3350f401
 DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
 DIST shorewall-core-5.1.10.1.tar.bz2 83398 BLAKE2B 4c0f2321cecd35f7590cdb533e7ae08616f9f9c2a1e125382d568f681e0459dd9bf027c1f2a23531830ca9dbed181f5b57e0c688c6eb0eff5653fc199a78d4d2 SHA512 5f7b924505f3c78df2602c3dc637983f21b0f15383bf1b346205cb54ddf129c04a7a7e10617aeb624a2b1fc770d23b0f5e844db5ec639eab7af468942e3eda3e
+DIST shorewall-core-5.1.10.2.tar.bz2 83729 BLAKE2B 774aab1eb21c73f5d1ad116b2fdbc91d7fe692124aad527c59fb2f88cfb38529d43fbf8a20e95d9b3679f8c5690a6d31bc3b474f0f9ccc65b2d160d809754021 SHA512 3977ee81d37107889c51a1d68c450073e16558ef84518a083932134abdbce195ca00f3149691dd42f224bea5f87d4d18a4456d440ac7759ab1418ebf54c76bef
 DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
 DIST shorewall-docs-html-5.1.10.1.tar.bz2 4279932 BLAKE2B 64ec2a5b544e3f8ded23271022599799190cce0653b35e7183f9e56ae94f6ecec1fd8633a7c5ccef4b5dafcef0cdfe59e317f2aab46e8dce6bec433545f2241f SHA512 22bbf18fabd63edc605b1f25c8a3a34e3677554beafa0b3e698d73675a566a134b8a6d1389fca4e2d98fe984ec92a3540ab1fc720ecd78a4b75587c53ce59cb0
+DIST shorewall-docs-html-5.1.10.2.tar.bz2 4280287 BLAKE2B 7db8c9d9f2f8793ab9c318f3d2a4983792b72e84d6b81f7509ce36143c8540aec805733e428d507d3effe43928f7b83404b59530aae99092e240db4b57b6df96 SHA512 8991d41c22d7c1771a328fa94cd76069a6e6d54c0db48866e3b5638f96ea9eeb91df96caff266a437017802fd2f85b09fbca89baa161eb8677b3035e41907234
 DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
 DIST shorewall-init-5.1.10.1.tar.bz2 38560 BLAKE2B 0f3e40914509814ed274840ce5effaa0c6fdc61d15ac94a15182adbece5a553e537191660f05aa5edb8443a89ee49f0ca98cc271bd56dc7b0a052ffbcd13029c SHA512 fa1ebdfd852e556a1e9bb3b550ad1e6fa9d256db39e8515d515f1d8a133c5956beb4e7fcc24da0dc776f1d418d2ca607232bbd2c6cc2585d00f858eb649af1fa
+DIST shorewall-init-5.1.10.2.tar.bz2 38857 BLAKE2B e82d22fd232a3990cb62548a7a637557326e2d6895516e41d9cc87d5b6ab9cc102a07e7590ab105ee8d12ab235db2e4a7e78f03220cbf3c03590b204f0c25867 SHA512 c18267d920033540169c7b02f1c09450e3dce6a6bbadc88c82897703f5706003ac59e766bd8cf09ff22ad47116028873cb6fc35d1d601e1e57e9175f8069a128
 DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
 DIST shorewall-lite-5.1.10.1.tar.bz2 44231 BLAKE2B 46cec387c7f7ccc862dba3575c272dbab038ada62aae32617d53262aff9751ebe95c6ba32ea365ee4a8d28e4775f3802282fe08fa07eeb7036e1064a1eaa3260 SHA512 8d25ca48fdf8a5f96060a3510b475144935ed15625847542f879e4cd1d6b5e7c9e7b333f299c59920f8cccb32685e9dd8f118942e0f8224c1c5deffffbaad146
+DIST shorewall-lite-5.1.10.2.tar.bz2 44515 BLAKE2B 44e9c432f818fe372841a5f80c39520142cbaee2d8fc5aa2573958b0c9321588266e63d0fbdf32d476e34fcc61cf896625e9c60b61e41129c7a6a2ce25143738 SHA512 9fa6809d79d90513512e11ee5d2a278d6a3104ce86f50073819276068f00159288f2f5dc38af6ef5f564d9bc47de7cc01c4a21aafb4860a029022410fd8b92e0
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d46c39e2e7496ab81a3301f64e5ce3eaa5f741ade8a3a1d29c620b1970a8c9c835fa7e9c51c54737bfb38a94ed73be4546 SHA512 2a8c5f5c1b3ca85d873a9832bde3b2588c5158c6a5af129f2a5ee2fd18042e766e5c37e9246c2f42217527372a359fef2e1cb87e5591271669ab8759eb3b3c35
+DIST shorewall6-5.1.10.2.tar.bz2 200310 BLAKE2B 3b5ae332b275388edfc42dc8abd6961ac1f77ccce75c75370a51ab835c516903c05781ed240854e8a54fac571bf08d0410e23d1a1bd29933fce1a06b60491e0c SHA512 9613869fd9452d5c3db0305b5a13b92f39c7881ffb0e15db6ebb1bf87df2e801616510f5685b5cadf9e4c49cc42276815c65f36f7599d6d2e2f7fa6590dc3820
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
+DIST shorewall6-lite-5.1.10.2.tar.bz2 44219 BLAKE2B a11f015021aa47f6421389dae127e7e42ed0941b31563f6251be1450e05f78a6504007bc4c2df1bf7ab0183fc285e85feb8c8b39407ef4299fca6b58847a43c1 SHA512 f067a45a635ddcd2c357953feaeefd881f1a57c4fd129c51ca62c025b8966da935961fc938e84070b93c278b5872c4dd58eaf7aff43bdcf1d838feed91141be8
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975

diff --git a/net-firewall/shorewall/shorewall-5.1.10.2.ebuild b/net-firewall/shorewall/shorewall-5.1.10.2.ebuild
new file mode 100644
index 00000000000..4e94df20e83
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.10.2.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-01-20 20:58 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-01-20 20:58 UTC (permalink / raw
  To: gentoo-commits

commit:     92df9a106eb7b6992945cb26e9a7482c1bf7ca69
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 20:58:27 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 20:58:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92df9a10

net-firewall/shorewall: Bump to v5.1.11.1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.1.11.1.ebuild | 456 +++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 199db4ed828..e05d33ffa18 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.1.10.1.tar.bz2 535652 BLAKE2B afeb0c79e5e191e923f0e44f9925ec32f2d97a5962dd6fcc75e28ded1b3b13f33ddcbd4f60f261b2b7b4cf2112ff9074545d88c8dfc02bf2147c3c0c2b941c97 SHA512 75b63b418bfacf3151f1833547ca187a9d87e1657bf02f9225d5067bc05a137cabb74709cf6d64c37e2f8fd8d5304154f265968e8b707ba08167d91be93f4ef5
 DIST shorewall-5.1.10.2.tar.bz2 535735 BLAKE2B 49594b997e90859db4fd94f3017ea47696579791cca881460fd916eba1c477d62f9ed2fbc25b22a3ff425084a169260cf6a6d00f1f59e574c996b97dfccb7232 SHA512 6f0d88ecef130be4283103ebf2c31ddad6791caf113448fcf29664a951067a070a7becf495e4a5cbe96aff81aff7d2028011421208e6d0dbbfa4608f3350f401
+DIST shorewall-5.1.11.1.tar.bz2 538193 BLAKE2B 88e2d83eab34edb8009469e1b9b30631f313e43f431287acdf2b6bdb4bdd4660717219c56968f0cfa95db8247e3f0078f9b90da0095f64f5995f55bce5d72658 SHA512 c8d273e9a387a1c68ca4b1790604a25b928ef015c4ac170d9633d62acac3b38f33e6cdb50f56343750c3b7d565c361d4f5f8cdc0e0fdf7feb594dc5460b3808a
 DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
 DIST shorewall-core-5.1.10.1.tar.bz2 83398 BLAKE2B 4c0f2321cecd35f7590cdb533e7ae08616f9f9c2a1e125382d568f681e0459dd9bf027c1f2a23531830ca9dbed181f5b57e0c688c6eb0eff5653fc199a78d4d2 SHA512 5f7b924505f3c78df2602c3dc637983f21b0f15383bf1b346205cb54ddf129c04a7a7e10617aeb624a2b1fc770d23b0f5e844db5ec639eab7af468942e3eda3e
 DIST shorewall-core-5.1.10.2.tar.bz2 83729 BLAKE2B 774aab1eb21c73f5d1ad116b2fdbc91d7fe692124aad527c59fb2f88cfb38529d43fbf8a20e95d9b3679f8c5690a6d31bc3b474f0f9ccc65b2d160d809754021 SHA512 3977ee81d37107889c51a1d68c450073e16558ef84518a083932134abdbce195ca00f3149691dd42f224bea5f87d4d18a4456d440ac7759ab1418ebf54c76bef
+DIST shorewall-core-5.1.11.1.tar.bz2 85004 BLAKE2B ae3f016b8d22ea93bbb4f49cae958ec44e443e92a8a39675fe3d8b75335dee38649806069f14458d7c3a7905734bbd5ca2677e6c4b640f2034108314173bacd0 SHA512 a87b857db961d001fc0ffe2f504df01e8b08ba05014986132e63dbe01e07411983a0c0b16b1e3618f2551d3d3a3fbb02d20569cb295ffd8ffc77ad65ff745b0b
 DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
 DIST shorewall-docs-html-5.1.10.1.tar.bz2 4279932 BLAKE2B 64ec2a5b544e3f8ded23271022599799190cce0653b35e7183f9e56ae94f6ecec1fd8633a7c5ccef4b5dafcef0cdfe59e317f2aab46e8dce6bec433545f2241f SHA512 22bbf18fabd63edc605b1f25c8a3a34e3677554beafa0b3e698d73675a566a134b8a6d1389fca4e2d98fe984ec92a3540ab1fc720ecd78a4b75587c53ce59cb0
 DIST shorewall-docs-html-5.1.10.2.tar.bz2 4280287 BLAKE2B 7db8c9d9f2f8793ab9c318f3d2a4983792b72e84d6b81f7509ce36143c8540aec805733e428d507d3effe43928f7b83404b59530aae99092e240db4b57b6df96 SHA512 8991d41c22d7c1771a328fa94cd76069a6e6d54c0db48866e3b5638f96ea9eeb91df96caff266a437017802fd2f85b09fbca89baa161eb8677b3035e41907234
+DIST shorewall-docs-html-5.1.11.1.tar.bz2 4280930 BLAKE2B 259c333d27e41201a808714df2a632a60cc61dd24bdf47472e71dc520f6c9ec04ed03f6f21f993649f727e023130a9562cb2bdcbe5b750f7dfaedea1d7feab1e SHA512 68f17e6f99192a8c47f377dbd298a84a77054d8c47e73c838e2f8eb68f9504ef73e60915d505fc33327ae4994db879414dce26f3b5dc2d637aea2aa42335daeb
 DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
 DIST shorewall-init-5.1.10.1.tar.bz2 38560 BLAKE2B 0f3e40914509814ed274840ce5effaa0c6fdc61d15ac94a15182adbece5a553e537191660f05aa5edb8443a89ee49f0ca98cc271bd56dc7b0a052ffbcd13029c SHA512 fa1ebdfd852e556a1e9bb3b550ad1e6fa9d256db39e8515d515f1d8a133c5956beb4e7fcc24da0dc776f1d418d2ca607232bbd2c6cc2585d00f858eb649af1fa
 DIST shorewall-init-5.1.10.2.tar.bz2 38857 BLAKE2B e82d22fd232a3990cb62548a7a637557326e2d6895516e41d9cc87d5b6ab9cc102a07e7590ab105ee8d12ab235db2e4a7e78f03220cbf3c03590b204f0c25867 SHA512 c18267d920033540169c7b02f1c09450e3dce6a6bbadc88c82897703f5706003ac59e766bd8cf09ff22ad47116028873cb6fc35d1d601e1e57e9175f8069a128
+DIST shorewall-init-5.1.11.1.tar.bz2 40093 BLAKE2B ec9fa6e83bc91d7c518dce08e6054806f38f7e66e63acbf55d82576c92c3bfa3c13ee72c26e42c890ef9e18d558bb40482f8111445d9a3650b85b73b4bf58eb2 SHA512 cbd45b8b5b88f7fca6065a7af372d43178035b25b317b4fe2d01a2d165e33638f0476874851541b4d134d986a8eb1a60bc1e8e9c1eed46a5a4ef4e9397698c4c
 DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
 DIST shorewall-lite-5.1.10.1.tar.bz2 44231 BLAKE2B 46cec387c7f7ccc862dba3575c272dbab038ada62aae32617d53262aff9751ebe95c6ba32ea365ee4a8d28e4775f3802282fe08fa07eeb7036e1064a1eaa3260 SHA512 8d25ca48fdf8a5f96060a3510b475144935ed15625847542f879e4cd1d6b5e7c9e7b333f299c59920f8cccb32685e9dd8f118942e0f8224c1c5deffffbaad146
 DIST shorewall-lite-5.1.10.2.tar.bz2 44515 BLAKE2B 44e9c432f818fe372841a5f80c39520142cbaee2d8fc5aa2573958b0c9321588266e63d0fbdf32d476e34fcc61cf896625e9c60b61e41129c7a6a2ce25143738 SHA512 9fa6809d79d90513512e11ee5d2a278d6a3104ce86f50073819276068f00159288f2f5dc38af6ef5f564d9bc47de7cc01c4a21aafb4860a029022410fd8b92e0
+DIST shorewall-lite-5.1.11.1.tar.bz2 45763 BLAKE2B e941407698418d3c317a97de5675c9877c917f71f10ee7db654722f163fdce852c84f6c5b4900e7ffdfbb5768349f28708a0fe3900cdb010b7a0e78d7ed3b2cc SHA512 4dd616c5fe2c7aa162a48f074d99f57c87c916c0ab2be9cb6f31d75a0c0a2f721fa9d198a99031ad68fdbb0d43852f65a1c3ea99abbbe27aea15dc928e9b7a13
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d46c39e2e7496ab81a3301f64e5ce3eaa5f741ade8a3a1d29c620b1970a8c9c835fa7e9c51c54737bfb38a94ed73be4546 SHA512 2a8c5f5c1b3ca85d873a9832bde3b2588c5158c6a5af129f2a5ee2fd18042e766e5c37e9246c2f42217527372a359fef2e1cb87e5591271669ab8759eb3b3c35
 DIST shorewall6-5.1.10.2.tar.bz2 200310 BLAKE2B 3b5ae332b275388edfc42dc8abd6961ac1f77ccce75c75370a51ab835c516903c05781ed240854e8a54fac571bf08d0410e23d1a1bd29933fce1a06b60491e0c SHA512 9613869fd9452d5c3db0305b5a13b92f39c7881ffb0e15db6ebb1bf87df2e801616510f5685b5cadf9e4c49cc42276815c65f36f7599d6d2e2f7fa6590dc3820
+DIST shorewall6-5.1.11.1.tar.bz2 202537 BLAKE2B 4cad90fc2ee4e9597cd289c14038bc2c24664ef226c0d855f1ea641a30c467e79f65318baff00523610a40cf4ae9e17d0a0174ebfb2aad733f891bf5ea484ee1 SHA512 26bdc061e72fc63935465acd9601a6f48d4aa851bef21820d1726b6f39c61bbba5b69ced5e298f932aedee01e4335d5e7cfc40fb16615983053d33c1d84bde83
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
 DIST shorewall6-lite-5.1.10.2.tar.bz2 44219 BLAKE2B a11f015021aa47f6421389dae127e7e42ed0941b31563f6251be1450e05f78a6504007bc4c2df1bf7ab0183fc285e85feb8c8b39407ef4299fca6b58847a43c1 SHA512 f067a45a635ddcd2c357953feaeefd881f1a57c4fd129c51ca62c025b8966da935961fc938e84070b93c278b5872c4dd58eaf7aff43bdcf1d838feed91141be8
+DIST shorewall6-lite-5.1.11.1.tar.bz2 45473 BLAKE2B c8a0972efa4cbf3fcf92c8576800521b4bf6a1d043d5bc8aa910dd4e8d7e1f54559caceb00b292810308ce6878bd3c4b161aa62e230891de3d96243fa8b59c2b SHA512 7988b5102a5ff8980ecfeb75d0f29eec796489c66f600592f0a5a1639e6e1c22076f9af30fa2e5bfa3d978839f9abb9732004bf2c12dc401849f33e8b5ef0dfb
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975

diff --git a/net-firewall/shorewall/shorewall-5.1.11.1.ebuild b/net-firewall/shorewall/shorewall-5.1.11.1.ebuild
new file mode 100644
index 00000000000..4e94df20e83
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.11.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-01-29  2:38 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-01-29  2:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5ee08f7bcc4f812c43f064a53bc5cd984c4e1c0b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 02:38:09 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 02:38:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee08f7b

net-firewall/shorewall: Bump to v5.1.11.2

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.1.11.2.ebuild | 456 +++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e05d33ffa18..86a4324585a 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,35 @@
 DIST shorewall-5.1.10.1.tar.bz2 535652 BLAKE2B afeb0c79e5e191e923f0e44f9925ec32f2d97a5962dd6fcc75e28ded1b3b13f33ddcbd4f60f261b2b7b4cf2112ff9074545d88c8dfc02bf2147c3c0c2b941c97 SHA512 75b63b418bfacf3151f1833547ca187a9d87e1657bf02f9225d5067bc05a137cabb74709cf6d64c37e2f8fd8d5304154f265968e8b707ba08167d91be93f4ef5
 DIST shorewall-5.1.10.2.tar.bz2 535735 BLAKE2B 49594b997e90859db4fd94f3017ea47696579791cca881460fd916eba1c477d62f9ed2fbc25b22a3ff425084a169260cf6a6d00f1f59e574c996b97dfccb7232 SHA512 6f0d88ecef130be4283103ebf2c31ddad6791caf113448fcf29664a951067a070a7becf495e4a5cbe96aff81aff7d2028011421208e6d0dbbfa4608f3350f401
 DIST shorewall-5.1.11.1.tar.bz2 538193 BLAKE2B 88e2d83eab34edb8009469e1b9b30631f313e43f431287acdf2b6bdb4bdd4660717219c56968f0cfa95db8247e3f0078f9b90da0095f64f5995f55bce5d72658 SHA512 c8d273e9a387a1c68ca4b1790604a25b928ef015c4ac170d9633d62acac3b38f33e6cdb50f56343750c3b7d565c361d4f5f8cdc0e0fdf7feb594dc5460b3808a
+DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
 DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
 DIST shorewall-core-5.1.10.1.tar.bz2 83398 BLAKE2B 4c0f2321cecd35f7590cdb533e7ae08616f9f9c2a1e125382d568f681e0459dd9bf027c1f2a23531830ca9dbed181f5b57e0c688c6eb0eff5653fc199a78d4d2 SHA512 5f7b924505f3c78df2602c3dc637983f21b0f15383bf1b346205cb54ddf129c04a7a7e10617aeb624a2b1fc770d23b0f5e844db5ec639eab7af468942e3eda3e
 DIST shorewall-core-5.1.10.2.tar.bz2 83729 BLAKE2B 774aab1eb21c73f5d1ad116b2fdbc91d7fe692124aad527c59fb2f88cfb38529d43fbf8a20e95d9b3679f8c5690a6d31bc3b474f0f9ccc65b2d160d809754021 SHA512 3977ee81d37107889c51a1d68c450073e16558ef84518a083932134abdbce195ca00f3149691dd42f224bea5f87d4d18a4456d440ac7759ab1418ebf54c76bef
 DIST shorewall-core-5.1.11.1.tar.bz2 85004 BLAKE2B ae3f016b8d22ea93bbb4f49cae958ec44e443e92a8a39675fe3d8b75335dee38649806069f14458d7c3a7905734bbd5ca2677e6c4b640f2034108314173bacd0 SHA512 a87b857db961d001fc0ffe2f504df01e8b08ba05014986132e63dbe01e07411983a0c0b16b1e3618f2551d3d3a3fbb02d20569cb295ffd8ffc77ad65ff745b0b
+DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
 DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
 DIST shorewall-docs-html-5.1.10.1.tar.bz2 4279932 BLAKE2B 64ec2a5b544e3f8ded23271022599799190cce0653b35e7183f9e56ae94f6ecec1fd8633a7c5ccef4b5dafcef0cdfe59e317f2aab46e8dce6bec433545f2241f SHA512 22bbf18fabd63edc605b1f25c8a3a34e3677554beafa0b3e698d73675a566a134b8a6d1389fca4e2d98fe984ec92a3540ab1fc720ecd78a4b75587c53ce59cb0
 DIST shorewall-docs-html-5.1.10.2.tar.bz2 4280287 BLAKE2B 7db8c9d9f2f8793ab9c318f3d2a4983792b72e84d6b81f7509ce36143c8540aec805733e428d507d3effe43928f7b83404b59530aae99092e240db4b57b6df96 SHA512 8991d41c22d7c1771a328fa94cd76069a6e6d54c0db48866e3b5638f96ea9eeb91df96caff266a437017802fd2f85b09fbca89baa161eb8677b3035e41907234
 DIST shorewall-docs-html-5.1.11.1.tar.bz2 4280930 BLAKE2B 259c333d27e41201a808714df2a632a60cc61dd24bdf47472e71dc520f6c9ec04ed03f6f21f993649f727e023130a9562cb2bdcbe5b750f7dfaedea1d7feab1e SHA512 68f17e6f99192a8c47f377dbd298a84a77054d8c47e73c838e2f8eb68f9504ef73e60915d505fc33327ae4994db879414dce26f3b5dc2d637aea2aa42335daeb
+DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
 DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
 DIST shorewall-init-5.1.10.1.tar.bz2 38560 BLAKE2B 0f3e40914509814ed274840ce5effaa0c6fdc61d15ac94a15182adbece5a553e537191660f05aa5edb8443a89ee49f0ca98cc271bd56dc7b0a052ffbcd13029c SHA512 fa1ebdfd852e556a1e9bb3b550ad1e6fa9d256db39e8515d515f1d8a133c5956beb4e7fcc24da0dc776f1d418d2ca607232bbd2c6cc2585d00f858eb649af1fa
 DIST shorewall-init-5.1.10.2.tar.bz2 38857 BLAKE2B e82d22fd232a3990cb62548a7a637557326e2d6895516e41d9cc87d5b6ab9cc102a07e7590ab105ee8d12ab235db2e4a7e78f03220cbf3c03590b204f0c25867 SHA512 c18267d920033540169c7b02f1c09450e3dce6a6bbadc88c82897703f5706003ac59e766bd8cf09ff22ad47116028873cb6fc35d1d601e1e57e9175f8069a128
 DIST shorewall-init-5.1.11.1.tar.bz2 40093 BLAKE2B ec9fa6e83bc91d7c518dce08e6054806f38f7e66e63acbf55d82576c92c3bfa3c13ee72c26e42c890ef9e18d558bb40482f8111445d9a3650b85b73b4bf58eb2 SHA512 cbd45b8b5b88f7fca6065a7af372d43178035b25b317b4fe2d01a2d165e33638f0476874851541b4d134d986a8eb1a60bc1e8e9c1eed46a5a4ef4e9397698c4c
+DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
 DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
 DIST shorewall-lite-5.1.10.1.tar.bz2 44231 BLAKE2B 46cec387c7f7ccc862dba3575c272dbab038ada62aae32617d53262aff9751ebe95c6ba32ea365ee4a8d28e4775f3802282fe08fa07eeb7036e1064a1eaa3260 SHA512 8d25ca48fdf8a5f96060a3510b475144935ed15625847542f879e4cd1d6b5e7c9e7b333f299c59920f8cccb32685e9dd8f118942e0f8224c1c5deffffbaad146
 DIST shorewall-lite-5.1.10.2.tar.bz2 44515 BLAKE2B 44e9c432f818fe372841a5f80c39520142cbaee2d8fc5aa2573958b0c9321588266e63d0fbdf32d476e34fcc61cf896625e9c60b61e41129c7a6a2ce25143738 SHA512 9fa6809d79d90513512e11ee5d2a278d6a3104ce86f50073819276068f00159288f2f5dc38af6ef5f564d9bc47de7cc01c4a21aafb4860a029022410fd8b92e0
 DIST shorewall-lite-5.1.11.1.tar.bz2 45763 BLAKE2B e941407698418d3c317a97de5675c9877c917f71f10ee7db654722f163fdce852c84f6c5b4900e7ffdfbb5768349f28708a0fe3900cdb010b7a0e78d7ed3b2cc SHA512 4dd616c5fe2c7aa162a48f074d99f57c87c916c0ab2be9cb6f31d75a0c0a2f721fa9d198a99031ad68fdbb0d43852f65a1c3ea99abbbe27aea15dc928e9b7a13
+DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d46c39e2e7496ab81a3301f64e5ce3eaa5f741ade8a3a1d29c620b1970a8c9c835fa7e9c51c54737bfb38a94ed73be4546 SHA512 2a8c5f5c1b3ca85d873a9832bde3b2588c5158c6a5af129f2a5ee2fd18042e766e5c37e9246c2f42217527372a359fef2e1cb87e5591271669ab8759eb3b3c35
 DIST shorewall6-5.1.10.2.tar.bz2 200310 BLAKE2B 3b5ae332b275388edfc42dc8abd6961ac1f77ccce75c75370a51ab835c516903c05781ed240854e8a54fac571bf08d0410e23d1a1bd29933fce1a06b60491e0c SHA512 9613869fd9452d5c3db0305b5a13b92f39c7881ffb0e15db6ebb1bf87df2e801616510f5685b5cadf9e4c49cc42276815c65f36f7599d6d2e2f7fa6590dc3820
 DIST shorewall6-5.1.11.1.tar.bz2 202537 BLAKE2B 4cad90fc2ee4e9597cd289c14038bc2c24664ef226c0d855f1ea641a30c467e79f65318baff00523610a40cf4ae9e17d0a0174ebfb2aad733f891bf5ea484ee1 SHA512 26bdc061e72fc63935465acd9601a6f48d4aa851bef21820d1726b6f39c61bbba5b69ced5e298f932aedee01e4335d5e7cfc40fb16615983053d33c1d84bde83
+DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
 DIST shorewall6-lite-5.1.10.2.tar.bz2 44219 BLAKE2B a11f015021aa47f6421389dae127e7e42ed0941b31563f6251be1450e05f78a6504007bc4c2df1bf7ab0183fc285e85feb8c8b39407ef4299fca6b58847a43c1 SHA512 f067a45a635ddcd2c357953feaeefd881f1a57c4fd129c51ca62c025b8966da935961fc938e84070b93c278b5872c4dd58eaf7aff43bdcf1d838feed91141be8
 DIST shorewall6-lite-5.1.11.1.tar.bz2 45473 BLAKE2B c8a0972efa4cbf3fcf92c8576800521b4bf6a1d043d5bc8aa910dd4e8d7e1f54559caceb00b292810308ce6878bd3c4b161aa62e230891de3d96243fa8b59c2b SHA512 7988b5102a5ff8980ecfeb75d0f29eec796489c66f600592f0a5a1639e6e1c22076f9af30fa2e5bfa3d978839f9abb9732004bf2c12dc401849f33e8b5ef0dfb
+DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975

diff --git a/net-firewall/shorewall/shorewall-5.1.11.2.ebuild b/net-firewall/shorewall/shorewall-5.1.11.2.ebuild
new file mode 100644
index 00000000000..4e94df20e83
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.11.2.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-02-01 20:49 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-02-01 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     5cbfaf89f31aea785e826b8f9a1242327a7d1491
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 20:48:38 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 20:48:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cbfaf89

net-firewall/shorewall: stable for x86. mark stable for the remaining arches using the ALLARCHES policy.

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 net-firewall/shorewall/shorewall-5.1.11.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.11.2.ebuild b/net-firewall/shorewall/shorewall-5.1.11.2.ebuild
index 4e94df20e83..20062dcd2fa 100644
--- a/net-firewall/shorewall/shorewall-5.1.11.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.11.2.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-02-09 14:30 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-02-09 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     e787b029427d8a31c6885e8ffee16fe21126013c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 14:29:34 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 14:30:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e787b029

net-firewall/shorewall: Bump to v5.1.12

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/shorewall/Manifest                |   7 +
 net-firewall/shorewall/shorewall-5.1.12.ebuild | 456 +++++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 86a4324585a..2befee6fa08 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -2,34 +2,41 @@ DIST shorewall-5.1.10.1.tar.bz2 535652 BLAKE2B afeb0c79e5e191e923f0e44f9925ec32f
 DIST shorewall-5.1.10.2.tar.bz2 535735 BLAKE2B 49594b997e90859db4fd94f3017ea47696579791cca881460fd916eba1c477d62f9ed2fbc25b22a3ff425084a169260cf6a6d00f1f59e574c996b97dfccb7232 SHA512 6f0d88ecef130be4283103ebf2c31ddad6791caf113448fcf29664a951067a070a7becf495e4a5cbe96aff81aff7d2028011421208e6d0dbbfa4608f3350f401
 DIST shorewall-5.1.11.1.tar.bz2 538193 BLAKE2B 88e2d83eab34edb8009469e1b9b30631f313e43f431287acdf2b6bdb4bdd4660717219c56968f0cfa95db8247e3f0078f9b90da0095f64f5995f55bce5d72658 SHA512 c8d273e9a387a1c68ca4b1790604a25b928ef015c4ac170d9633d62acac3b38f33e6cdb50f56343750c3b7d565c361d4f5f8cdc0e0fdf7feb594dc5460b3808a
 DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
+DIST shorewall-5.1.12.tar.bz2 553543 BLAKE2B 82e5236b7b3a7c28fb29a1f661ec9f4609b8d142c8d262c0dc93be25841d5ee9f2e9fe894664ad95f70627579c0e7c27941d1ca42bb610c2dbdb267e38007b5e SHA512 e4f45b24433b2ec34a2b3fdaa665104bd6b18fce4d1c51d47a29edf35dcb96fce233d12ebf8a23939ddfc3fa83edb3f3f776d2d89fd5b1bce710f738415577e0
 DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
 DIST shorewall-core-5.1.10.1.tar.bz2 83398 BLAKE2B 4c0f2321cecd35f7590cdb533e7ae08616f9f9c2a1e125382d568f681e0459dd9bf027c1f2a23531830ca9dbed181f5b57e0c688c6eb0eff5653fc199a78d4d2 SHA512 5f7b924505f3c78df2602c3dc637983f21b0f15383bf1b346205cb54ddf129c04a7a7e10617aeb624a2b1fc770d23b0f5e844db5ec639eab7af468942e3eda3e
 DIST shorewall-core-5.1.10.2.tar.bz2 83729 BLAKE2B 774aab1eb21c73f5d1ad116b2fdbc91d7fe692124aad527c59fb2f88cfb38529d43fbf8a20e95d9b3679f8c5690a6d31bc3b474f0f9ccc65b2d160d809754021 SHA512 3977ee81d37107889c51a1d68c450073e16558ef84518a083932134abdbce195ca00f3149691dd42f224bea5f87d4d18a4456d440ac7759ab1418ebf54c76bef
 DIST shorewall-core-5.1.11.1.tar.bz2 85004 BLAKE2B ae3f016b8d22ea93bbb4f49cae958ec44e443e92a8a39675fe3d8b75335dee38649806069f14458d7c3a7905734bbd5ca2677e6c4b640f2034108314173bacd0 SHA512 a87b857db961d001fc0ffe2f504df01e8b08ba05014986132e63dbe01e07411983a0c0b16b1e3618f2551d3d3a3fbb02d20569cb295ffd8ffc77ad65ff745b0b
 DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
+DIST shorewall-core-5.1.12.tar.bz2 85304 BLAKE2B b0d2459b6a4bad9fb4524777138269ec7188fc7ab56f58b1c1b0ab3ed60e164417e7b702065564e50107750ef48b6aba856e8e3f16585138eaba94ea73ad7e25 SHA512 9308f7c66ae0d2042d5607f10871718b3353f4587652a3588c27aa2e8fe951c2cf13979a79833c36bd6db8c51c6378b51ce894eb6c4cfc8be922dd0fe1610651
 DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
 DIST shorewall-docs-html-5.1.10.1.tar.bz2 4279932 BLAKE2B 64ec2a5b544e3f8ded23271022599799190cce0653b35e7183f9e56ae94f6ecec1fd8633a7c5ccef4b5dafcef0cdfe59e317f2aab46e8dce6bec433545f2241f SHA512 22bbf18fabd63edc605b1f25c8a3a34e3677554beafa0b3e698d73675a566a134b8a6d1389fca4e2d98fe984ec92a3540ab1fc720ecd78a4b75587c53ce59cb0
 DIST shorewall-docs-html-5.1.10.2.tar.bz2 4280287 BLAKE2B 7db8c9d9f2f8793ab9c318f3d2a4983792b72e84d6b81f7509ce36143c8540aec805733e428d507d3effe43928f7b83404b59530aae99092e240db4b57b6df96 SHA512 8991d41c22d7c1771a328fa94cd76069a6e6d54c0db48866e3b5638f96ea9eeb91df96caff266a437017802fd2f85b09fbca89baa161eb8677b3035e41907234
 DIST shorewall-docs-html-5.1.11.1.tar.bz2 4280930 BLAKE2B 259c333d27e41201a808714df2a632a60cc61dd24bdf47472e71dc520f6c9ec04ed03f6f21f993649f727e023130a9562cb2bdcbe5b750f7dfaedea1d7feab1e SHA512 68f17e6f99192a8c47f377dbd298a84a77054d8c47e73c838e2f8eb68f9504ef73e60915d505fc33327ae4994db879414dce26f3b5dc2d637aea2aa42335daeb
 DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
+DIST shorewall-docs-html-5.1.12.tar.bz2 4281100 BLAKE2B d1bd2aaf3865d752ef20240f6c28ea67af3f47bfa74875cd16ee204e9c1f232a26fec225183848cb705cc3c56d53f9f849b24db5dc2288ab8a01295575cf9223 SHA512 68b175cf75510a0f457ec91322cd1aecc5791d3ad64c8a278343d9103cb260e97097f31b8c3de708a491919657d5efe9eb03835a4b305bbf6e381d1f805a7f25
 DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
 DIST shorewall-init-5.1.10.1.tar.bz2 38560 BLAKE2B 0f3e40914509814ed274840ce5effaa0c6fdc61d15ac94a15182adbece5a553e537191660f05aa5edb8443a89ee49f0ca98cc271bd56dc7b0a052ffbcd13029c SHA512 fa1ebdfd852e556a1e9bb3b550ad1e6fa9d256db39e8515d515f1d8a133c5956beb4e7fcc24da0dc776f1d418d2ca607232bbd2c6cc2585d00f858eb649af1fa
 DIST shorewall-init-5.1.10.2.tar.bz2 38857 BLAKE2B e82d22fd232a3990cb62548a7a637557326e2d6895516e41d9cc87d5b6ab9cc102a07e7590ab105ee8d12ab235db2e4a7e78f03220cbf3c03590b204f0c25867 SHA512 c18267d920033540169c7b02f1c09450e3dce6a6bbadc88c82897703f5706003ac59e766bd8cf09ff22ad47116028873cb6fc35d1d601e1e57e9175f8069a128
 DIST shorewall-init-5.1.11.1.tar.bz2 40093 BLAKE2B ec9fa6e83bc91d7c518dce08e6054806f38f7e66e63acbf55d82576c92c3bfa3c13ee72c26e42c890ef9e18d558bb40482f8111445d9a3650b85b73b4bf58eb2 SHA512 cbd45b8b5b88f7fca6065a7af372d43178035b25b317b4fe2d01a2d165e33638f0476874851541b4d134d986a8eb1a60bc1e8e9c1eed46a5a4ef4e9397698c4c
 DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
+DIST shorewall-init-5.1.12.tar.bz2 40841 BLAKE2B d575dd636645c6ee264449ba94962148ae42ae2bd045ffa713edd3a66b1fc1721bb64bae4f63fb81c397219ed3e6090f7ce8e2abda19c6c675bf2a4f403c0b68 SHA512 a5a1cc64ce0f6cfff39535290a1110352522d93591efae81c43c2567b04370eab72c58094e393c410a002b0a539c434b2533219722707e6c8a5b544c1fc222a7
 DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
 DIST shorewall-lite-5.1.10.1.tar.bz2 44231 BLAKE2B 46cec387c7f7ccc862dba3575c272dbab038ada62aae32617d53262aff9751ebe95c6ba32ea365ee4a8d28e4775f3802282fe08fa07eeb7036e1064a1eaa3260 SHA512 8d25ca48fdf8a5f96060a3510b475144935ed15625847542f879e4cd1d6b5e7c9e7b333f299c59920f8cccb32685e9dd8f118942e0f8224c1c5deffffbaad146
 DIST shorewall-lite-5.1.10.2.tar.bz2 44515 BLAKE2B 44e9c432f818fe372841a5f80c39520142cbaee2d8fc5aa2573958b0c9321588266e63d0fbdf32d476e34fcc61cf896625e9c60b61e41129c7a6a2ce25143738 SHA512 9fa6809d79d90513512e11ee5d2a278d6a3104ce86f50073819276068f00159288f2f5dc38af6ef5f564d9bc47de7cc01c4a21aafb4860a029022410fd8b92e0
 DIST shorewall-lite-5.1.11.1.tar.bz2 45763 BLAKE2B e941407698418d3c317a97de5675c9877c917f71f10ee7db654722f163fdce852c84f6c5b4900e7ffdfbb5768349f28708a0fe3900cdb010b7a0e78d7ed3b2cc SHA512 4dd616c5fe2c7aa162a48f074d99f57c87c916c0ab2be9cb6f31d75a0c0a2f721fa9d198a99031ad68fdbb0d43852f65a1c3ea99abbbe27aea15dc928e9b7a13
 DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
+DIST shorewall-lite-5.1.12.tar.bz2 46523 BLAKE2B 803df174b9c05617ef9f8b4e208018db134bfc1e4d9c99976113dd62e271dbde4f1a34430da7193ffe8c9defde20abc14770a47448e85d9eeb89222e083d9793 SHA512 735eaa07d8e1139201256050b69153a9b23e186994e5c3273ece778893b1013e3c00b6c49958c7c4e18c1096eab7623b35c46eacf72fe4b45fc64ac6875f9905
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d46c39e2e7496ab81a3301f64e5ce3eaa5f741ade8a3a1d29c620b1970a8c9c835fa7e9c51c54737bfb38a94ed73be4546 SHA512 2a8c5f5c1b3ca85d873a9832bde3b2588c5158c6a5af129f2a5ee2fd18042e766e5c37e9246c2f42217527372a359fef2e1cb87e5591271669ab8759eb3b3c35
 DIST shorewall6-5.1.10.2.tar.bz2 200310 BLAKE2B 3b5ae332b275388edfc42dc8abd6961ac1f77ccce75c75370a51ab835c516903c05781ed240854e8a54fac571bf08d0410e23d1a1bd29933fce1a06b60491e0c SHA512 9613869fd9452d5c3db0305b5a13b92f39c7881ffb0e15db6ebb1bf87df2e801616510f5685b5cadf9e4c49cc42276815c65f36f7599d6d2e2f7fa6590dc3820
 DIST shorewall6-5.1.11.1.tar.bz2 202537 BLAKE2B 4cad90fc2ee4e9597cd289c14038bc2c24664ef226c0d855f1ea641a30c467e79f65318baff00523610a40cf4ae9e17d0a0174ebfb2aad733f891bf5ea484ee1 SHA512 26bdc061e72fc63935465acd9601a6f48d4aa851bef21820d1726b6f39c61bbba5b69ced5e298f932aedee01e4335d5e7cfc40fb16615983053d33c1d84bde83
 DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
+DIST shorewall6-5.1.12.tar.bz2 196455 BLAKE2B b4ef60bf903824178ea0e4e1fcd8861981a221f54d28388d8302ed011ee64f917a8ccde3200b4b195dc21e5d67ed7e2cd479a7b4326dd6060b64353db25f54e6 SHA512 074f6a06cd3e03bbc9262c183b9f45e50372dc8e7d583613db76ed0dff4847b759b5192b41f82870bafd4a83d8bf54906cbb38e6947142064766ea62294b8686
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
 DIST shorewall6-lite-5.1.10.2.tar.bz2 44219 BLAKE2B a11f015021aa47f6421389dae127e7e42ed0941b31563f6251be1450e05f78a6504007bc4c2df1bf7ab0183fc285e85feb8c8b39407ef4299fca6b58847a43c1 SHA512 f067a45a635ddcd2c357953feaeefd881f1a57c4fd129c51ca62c025b8966da935961fc938e84070b93c278b5872c4dd58eaf7aff43bdcf1d838feed91141be8
 DIST shorewall6-lite-5.1.11.1.tar.bz2 45473 BLAKE2B c8a0972efa4cbf3fcf92c8576800521b4bf6a1d043d5bc8aa910dd4e8d7e1f54559caceb00b292810308ce6878bd3c4b161aa62e230891de3d96243fa8b59c2b SHA512 7988b5102a5ff8980ecfeb75d0f29eec796489c66f600592f0a5a1639e6e1c22076f9af30fa2e5bfa3d978839f9abb9732004bf2c12dc401849f33e8b5ef0dfb
 DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
+DIST shorewall6-lite-5.1.12.tar.bz2 46172 BLAKE2B 4654d0277ccacfea2eeb199ba209ae9d7912b606c1f7734ef1d53db1d2ae78c53676581d754f4167fd4387853c75c80539dea24e687915548590c3bfa5700acf SHA512 d8d361236284aaa1025b4e9da67f265c187879998d8f4623566e60a139b8d7a43bf36f7101d3f4ce6123c7ac7db8975bccba69ec6482d3f763211c9f68ea1377
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975

diff --git a/net-firewall/shorewall/shorewall-5.1.12.ebuild b/net-firewall/shorewall/shorewall-5.1.12.ebuild
new file mode 100644
index 00000000000..4e94df20e83
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.12.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-02-12 23:32 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-02-12 23:32 UTC (permalink / raw
  To: gentoo-commits

commit:     99fe21ed46f29d23240350087ce99869bccc7efc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 23:06:17 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 23:32:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99fe21ed

net-firewall/shorewall: Bump to v5.1.12.1

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.1.12.ebuild => shorewall-5.1.12.1.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 2befee6fa08..65f4c92ec5a 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -2,41 +2,41 @@ DIST shorewall-5.1.10.1.tar.bz2 535652 BLAKE2B afeb0c79e5e191e923f0e44f9925ec32f
 DIST shorewall-5.1.10.2.tar.bz2 535735 BLAKE2B 49594b997e90859db4fd94f3017ea47696579791cca881460fd916eba1c477d62f9ed2fbc25b22a3ff425084a169260cf6a6d00f1f59e574c996b97dfccb7232 SHA512 6f0d88ecef130be4283103ebf2c31ddad6791caf113448fcf29664a951067a070a7becf495e4a5cbe96aff81aff7d2028011421208e6d0dbbfa4608f3350f401
 DIST shorewall-5.1.11.1.tar.bz2 538193 BLAKE2B 88e2d83eab34edb8009469e1b9b30631f313e43f431287acdf2b6bdb4bdd4660717219c56968f0cfa95db8247e3f0078f9b90da0095f64f5995f55bce5d72658 SHA512 c8d273e9a387a1c68ca4b1790604a25b928ef015c4ac170d9633d62acac3b38f33e6cdb50f56343750c3b7d565c361d4f5f8cdc0e0fdf7feb594dc5460b3808a
 DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
-DIST shorewall-5.1.12.tar.bz2 553543 BLAKE2B 82e5236b7b3a7c28fb29a1f661ec9f4609b8d142c8d262c0dc93be25841d5ee9f2e9fe894664ad95f70627579c0e7c27941d1ca42bb610c2dbdb267e38007b5e SHA512 e4f45b24433b2ec34a2b3fdaa665104bd6b18fce4d1c51d47a29edf35dcb96fce233d12ebf8a23939ddfc3fa83edb3f3f776d2d89fd5b1bce710f738415577e0
+DIST shorewall-5.1.12.1.tar.bz2 554575 BLAKE2B 1f49f5fb2dec41f6f1040c82c2a95bc1b658d3add16d385a0166fc3cb9fca8bdfcb594d620b969243b71420c9de15bc84ef4d0648dde9328794fb6383d0e6468 SHA512 7b79a0f849dc24680ab99bae4345857ef70d20cda5e089c74c339b5483cacdfbbff72ae671729bdba87d5940e66b32ccd5e00f6d62a3e2d65577edbf5a305986
 DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
 DIST shorewall-core-5.1.10.1.tar.bz2 83398 BLAKE2B 4c0f2321cecd35f7590cdb533e7ae08616f9f9c2a1e125382d568f681e0459dd9bf027c1f2a23531830ca9dbed181f5b57e0c688c6eb0eff5653fc199a78d4d2 SHA512 5f7b924505f3c78df2602c3dc637983f21b0f15383bf1b346205cb54ddf129c04a7a7e10617aeb624a2b1fc770d23b0f5e844db5ec639eab7af468942e3eda3e
 DIST shorewall-core-5.1.10.2.tar.bz2 83729 BLAKE2B 774aab1eb21c73f5d1ad116b2fdbc91d7fe692124aad527c59fb2f88cfb38529d43fbf8a20e95d9b3679f8c5690a6d31bc3b474f0f9ccc65b2d160d809754021 SHA512 3977ee81d37107889c51a1d68c450073e16558ef84518a083932134abdbce195ca00f3149691dd42f224bea5f87d4d18a4456d440ac7759ab1418ebf54c76bef
 DIST shorewall-core-5.1.11.1.tar.bz2 85004 BLAKE2B ae3f016b8d22ea93bbb4f49cae958ec44e443e92a8a39675fe3d8b75335dee38649806069f14458d7c3a7905734bbd5ca2677e6c4b640f2034108314173bacd0 SHA512 a87b857db961d001fc0ffe2f504df01e8b08ba05014986132e63dbe01e07411983a0c0b16b1e3618f2551d3d3a3fbb02d20569cb295ffd8ffc77ad65ff745b0b
 DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
-DIST shorewall-core-5.1.12.tar.bz2 85304 BLAKE2B b0d2459b6a4bad9fb4524777138269ec7188fc7ab56f58b1c1b0ab3ed60e164417e7b702065564e50107750ef48b6aba856e8e3f16585138eaba94ea73ad7e25 SHA512 9308f7c66ae0d2042d5607f10871718b3353f4587652a3588c27aa2e8fe951c2cf13979a79833c36bd6db8c51c6378b51ce894eb6c4cfc8be922dd0fe1610651
+DIST shorewall-core-5.1.12.1.tar.bz2 85905 BLAKE2B f867d690c0c3ef8582b5418cf2a45200b5298db9f978d2d5531a4fee157298017b38e98beec0c243aa1009a138e92faa8e19fcf38f88ed030781d4a149fdd26a SHA512 d3f8e347fe2b0c9590830d297e6cea8a830c16467e461fd1d422138850ab80d0eb67213c26f0ca594d04b86d99999bf47800c57b47ae25bd064aa56d9e70fa66
 DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
 DIST shorewall-docs-html-5.1.10.1.tar.bz2 4279932 BLAKE2B 64ec2a5b544e3f8ded23271022599799190cce0653b35e7183f9e56ae94f6ecec1fd8633a7c5ccef4b5dafcef0cdfe59e317f2aab46e8dce6bec433545f2241f SHA512 22bbf18fabd63edc605b1f25c8a3a34e3677554beafa0b3e698d73675a566a134b8a6d1389fca4e2d98fe984ec92a3540ab1fc720ecd78a4b75587c53ce59cb0
 DIST shorewall-docs-html-5.1.10.2.tar.bz2 4280287 BLAKE2B 7db8c9d9f2f8793ab9c318f3d2a4983792b72e84d6b81f7509ce36143c8540aec805733e428d507d3effe43928f7b83404b59530aae99092e240db4b57b6df96 SHA512 8991d41c22d7c1771a328fa94cd76069a6e6d54c0db48866e3b5638f96ea9eeb91df96caff266a437017802fd2f85b09fbca89baa161eb8677b3035e41907234
 DIST shorewall-docs-html-5.1.11.1.tar.bz2 4280930 BLAKE2B 259c333d27e41201a808714df2a632a60cc61dd24bdf47472e71dc520f6c9ec04ed03f6f21f993649f727e023130a9562cb2bdcbe5b750f7dfaedea1d7feab1e SHA512 68f17e6f99192a8c47f377dbd298a84a77054d8c47e73c838e2f8eb68f9504ef73e60915d505fc33327ae4994db879414dce26f3b5dc2d637aea2aa42335daeb
 DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
-DIST shorewall-docs-html-5.1.12.tar.bz2 4281100 BLAKE2B d1bd2aaf3865d752ef20240f6c28ea67af3f47bfa74875cd16ee204e9c1f232a26fec225183848cb705cc3c56d53f9f849b24db5dc2288ab8a01295575cf9223 SHA512 68b175cf75510a0f457ec91322cd1aecc5791d3ad64c8a278343d9103cb260e97097f31b8c3de708a491919657d5efe9eb03835a4b305bbf6e381d1f805a7f25
+DIST shorewall-docs-html-5.1.12.1.tar.bz2 4281459 BLAKE2B 4696dcf2ebe6a3a2c9078b4081393b040481f6769ecff381512a40d97d0ba52042b3e6f3c74361917b2623a4ecaae1c76409ef4f543eb6feaab2077f96250cb5 SHA512 96f6015c9ad4a42432143f5e2411d051bc55004c6479d53b6d8b071052f309aa30df858ac2452fe1d80f2e0071d05c2fa6eee12a70065726f9e775cc2f909575
 DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
 DIST shorewall-init-5.1.10.1.tar.bz2 38560 BLAKE2B 0f3e40914509814ed274840ce5effaa0c6fdc61d15ac94a15182adbece5a553e537191660f05aa5edb8443a89ee49f0ca98cc271bd56dc7b0a052ffbcd13029c SHA512 fa1ebdfd852e556a1e9bb3b550ad1e6fa9d256db39e8515d515f1d8a133c5956beb4e7fcc24da0dc776f1d418d2ca607232bbd2c6cc2585d00f858eb649af1fa
 DIST shorewall-init-5.1.10.2.tar.bz2 38857 BLAKE2B e82d22fd232a3990cb62548a7a637557326e2d6895516e41d9cc87d5b6ab9cc102a07e7590ab105ee8d12ab235db2e4a7e78f03220cbf3c03590b204f0c25867 SHA512 c18267d920033540169c7b02f1c09450e3dce6a6bbadc88c82897703f5706003ac59e766bd8cf09ff22ad47116028873cb6fc35d1d601e1e57e9175f8069a128
 DIST shorewall-init-5.1.11.1.tar.bz2 40093 BLAKE2B ec9fa6e83bc91d7c518dce08e6054806f38f7e66e63acbf55d82576c92c3bfa3c13ee72c26e42c890ef9e18d558bb40482f8111445d9a3650b85b73b4bf58eb2 SHA512 cbd45b8b5b88f7fca6065a7af372d43178035b25b317b4fe2d01a2d165e33638f0476874851541b4d134d986a8eb1a60bc1e8e9c1eed46a5a4ef4e9397698c4c
 DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
-DIST shorewall-init-5.1.12.tar.bz2 40841 BLAKE2B d575dd636645c6ee264449ba94962148ae42ae2bd045ffa713edd3a66b1fc1721bb64bae4f63fb81c397219ed3e6090f7ce8e2abda19c6c675bf2a4f403c0b68 SHA512 a5a1cc64ce0f6cfff39535290a1110352522d93591efae81c43c2567b04370eab72c58094e393c410a002b0a539c434b2533219722707e6c8a5b544c1fc222a7
+DIST shorewall-init-5.1.12.1.tar.bz2 41044 BLAKE2B e38a1f085e74720949ebca053c175fce405699120684b1165a00e5e357cef0b288dc9f0cfa7001795cd626226aed60f286e9939e537e5eaef0bf908f96db2c9a SHA512 e3394c5ca5edbe09941b9ef26e68a606673b13a3a3bf97e3d74a2f7c78cae50611a7f429ec322d3bf105b4b52fbef184cd286eb557af65515f0a6178e3431266
 DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
 DIST shorewall-lite-5.1.10.1.tar.bz2 44231 BLAKE2B 46cec387c7f7ccc862dba3575c272dbab038ada62aae32617d53262aff9751ebe95c6ba32ea365ee4a8d28e4775f3802282fe08fa07eeb7036e1064a1eaa3260 SHA512 8d25ca48fdf8a5f96060a3510b475144935ed15625847542f879e4cd1d6b5e7c9e7b333f299c59920f8cccb32685e9dd8f118942e0f8224c1c5deffffbaad146
 DIST shorewall-lite-5.1.10.2.tar.bz2 44515 BLAKE2B 44e9c432f818fe372841a5f80c39520142cbaee2d8fc5aa2573958b0c9321588266e63d0fbdf32d476e34fcc61cf896625e9c60b61e41129c7a6a2ce25143738 SHA512 9fa6809d79d90513512e11ee5d2a278d6a3104ce86f50073819276068f00159288f2f5dc38af6ef5f564d9bc47de7cc01c4a21aafb4860a029022410fd8b92e0
 DIST shorewall-lite-5.1.11.1.tar.bz2 45763 BLAKE2B e941407698418d3c317a97de5675c9877c917f71f10ee7db654722f163fdce852c84f6c5b4900e7ffdfbb5768349f28708a0fe3900cdb010b7a0e78d7ed3b2cc SHA512 4dd616c5fe2c7aa162a48f074d99f57c87c916c0ab2be9cb6f31d75a0c0a2f721fa9d198a99031ad68fdbb0d43852f65a1c3ea99abbbe27aea15dc928e9b7a13
 DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
-DIST shorewall-lite-5.1.12.tar.bz2 46523 BLAKE2B 803df174b9c05617ef9f8b4e208018db134bfc1e4d9c99976113dd62e271dbde4f1a34430da7193ffe8c9defde20abc14770a47448e85d9eeb89222e083d9793 SHA512 735eaa07d8e1139201256050b69153a9b23e186994e5c3273ece778893b1013e3c00b6c49958c7c4e18c1096eab7623b35c46eacf72fe4b45fc64ac6875f9905
+DIST shorewall-lite-5.1.12.1.tar.bz2 46683 BLAKE2B d8429721ce76bb6b73d8f49bd2ec75c484cd48e732b17c49923a40cb23647a6f2de84d0d8ed798ae2ea89d5ec0cc9a1c367a13175224320f7868298481261ad0 SHA512 37146a1d9bb82b6de69f46b727fb2fa66a0933e13799008716b74d882d28607329795911e9843e0bdf5e5324954c8a7fe14a0e4995184ee38d69ab9c3408deed
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d46c39e2e7496ab81a3301f64e5ce3eaa5f741ade8a3a1d29c620b1970a8c9c835fa7e9c51c54737bfb38a94ed73be4546 SHA512 2a8c5f5c1b3ca85d873a9832bde3b2588c5158c6a5af129f2a5ee2fd18042e766e5c37e9246c2f42217527372a359fef2e1cb87e5591271669ab8759eb3b3c35
 DIST shorewall6-5.1.10.2.tar.bz2 200310 BLAKE2B 3b5ae332b275388edfc42dc8abd6961ac1f77ccce75c75370a51ab835c516903c05781ed240854e8a54fac571bf08d0410e23d1a1bd29933fce1a06b60491e0c SHA512 9613869fd9452d5c3db0305b5a13b92f39c7881ffb0e15db6ebb1bf87df2e801616510f5685b5cadf9e4c49cc42276815c65f36f7599d6d2e2f7fa6590dc3820
 DIST shorewall6-5.1.11.1.tar.bz2 202537 BLAKE2B 4cad90fc2ee4e9597cd289c14038bc2c24664ef226c0d855f1ea641a30c467e79f65318baff00523610a40cf4ae9e17d0a0174ebfb2aad733f891bf5ea484ee1 SHA512 26bdc061e72fc63935465acd9601a6f48d4aa851bef21820d1726b6f39c61bbba5b69ced5e298f932aedee01e4335d5e7cfc40fb16615983053d33c1d84bde83
 DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
-DIST shorewall6-5.1.12.tar.bz2 196455 BLAKE2B b4ef60bf903824178ea0e4e1fcd8861981a221f54d28388d8302ed011ee64f917a8ccde3200b4b195dc21e5d67ed7e2cd479a7b4326dd6060b64353db25f54e6 SHA512 074f6a06cd3e03bbc9262c183b9f45e50372dc8e7d583613db76ed0dff4847b759b5192b41f82870bafd4a83d8bf54906cbb38e6947142064766ea62294b8686
+DIST shorewall6-5.1.12.1.tar.bz2 196607 BLAKE2B 35d29ccd73184b6905fffa60d209b4bd91cfe05bee73f7205f24ac178f78f74a2b847342c9f27435279fc2bfd7e5e840842d6c1333245f0a04b811d1fc2a94a5 SHA512 bd982de71d53cb1f669c293c825295a2eebe70f52b98bd0a172b13b119d5daa17a14ce9c79a97a41dbf740d4864bf5ee22b40c2bb22401bffb7a84fb911d88cc
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
 DIST shorewall6-lite-5.1.10.2.tar.bz2 44219 BLAKE2B a11f015021aa47f6421389dae127e7e42ed0941b31563f6251be1450e05f78a6504007bc4c2df1bf7ab0183fc285e85feb8c8b39407ef4299fca6b58847a43c1 SHA512 f067a45a635ddcd2c357953feaeefd881f1a57c4fd129c51ca62c025b8966da935961fc938e84070b93c278b5872c4dd58eaf7aff43bdcf1d838feed91141be8
 DIST shorewall6-lite-5.1.11.1.tar.bz2 45473 BLAKE2B c8a0972efa4cbf3fcf92c8576800521b4bf6a1d043d5bc8aa910dd4e8d7e1f54559caceb00b292810308ce6878bd3c4b161aa62e230891de3d96243fa8b59c2b SHA512 7988b5102a5ff8980ecfeb75d0f29eec796489c66f600592f0a5a1639e6e1c22076f9af30fa2e5bfa3d978839f9abb9732004bf2c12dc401849f33e8b5ef0dfb
 DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
-DIST shorewall6-lite-5.1.12.tar.bz2 46172 BLAKE2B 4654d0277ccacfea2eeb199ba209ae9d7912b606c1f7734ef1d53db1d2ae78c53676581d754f4167fd4387853c75c80539dea24e687915548590c3bfa5700acf SHA512 d8d361236284aaa1025b4e9da67f265c187879998d8f4623566e60a139b8d7a43bf36f7101d3f4ce6123c7ac7db8975bccba69ec6482d3f763211c9f68ea1377
+DIST shorewall6-lite-5.1.12.1.tar.bz2 46365 BLAKE2B eb3fdaabdc11d5d2694964d69ae452e52557eff6539a1eb0de3bf607252f52515d285c858b0a75b1ff35ef02c62031ab9c510517e9e5aaeb5f6b860b50156ce3 SHA512 1992cfbc2ca4c9e4b004e10c1b0bf73157da2cdf2fe03ecc8ad9a33e941d7881565c00bd68abec6e8711c58d8df03b0dc1c413639ef7015661fb4ef79151a78e
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975

diff --git a/net-firewall/shorewall/shorewall-5.1.12.ebuild b/net-firewall/shorewall/shorewall-5.1.12.1.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.1.12.ebuild
rename to net-firewall/shorewall/shorewall-5.1.12.1.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-02-22  0:34 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-02-22  0:34 UTC (permalink / raw
  To: gentoo-commits

commit:     ea1e0e9284663160b2b635c81c858eb1234447e0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 00:34:02 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 00:34:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1e0e92

net-firewall/shorewall: Bump to v5.1.12.2

Ebuild changes:
===============
- Move "keepdir" call for /var/lib/$PRODUCT after installation because
  install script cleans up any existing directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.1.12.2.ebuild | 456 +++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e07440d881e..5803f52be0d 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
 DIST shorewall-5.1.12.1.tar.bz2 554575 BLAKE2B 1f49f5fb2dec41f6f1040c82c2a95bc1b658d3add16d385a0166fc3cb9fca8bdfcb594d620b969243b71420c9de15bc84ef4d0648dde9328794fb6383d0e6468 SHA512 7b79a0f849dc24680ab99bae4345857ef70d20cda5e089c74c339b5483cacdfbbff72ae671729bdba87d5940e66b32ccd5e00f6d62a3e2d65577edbf5a305986
+DIST shorewall-5.1.12.2.tar.bz2 555472 BLAKE2B 4eaf7cf1256c4edd5d5bc134a501077d3705d6dd32717234d14566e556267d63181506e9498d50f168b0ebf9c2bebe50dc4087dcd8f2aea5834870fdfe1fb476 SHA512 7cfff999f245da3fa992cd67f18f8b13919e31d95da3dda1920cb0f883766bd5bf8e514a2db09f3fd386b7780dfdc0b811c4fbafa82f459f96dc78dd2e6fc4a4
 DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
 DIST shorewall-core-5.1.12.1.tar.bz2 85905 BLAKE2B f867d690c0c3ef8582b5418cf2a45200b5298db9f978d2d5531a4fee157298017b38e98beec0c243aa1009a138e92faa8e19fcf38f88ed030781d4a149fdd26a SHA512 d3f8e347fe2b0c9590830d297e6cea8a830c16467e461fd1d422138850ab80d0eb67213c26f0ca594d04b86d99999bf47800c57b47ae25bd064aa56d9e70fa66
+DIST shorewall-core-5.1.12.2.tar.bz2 86246 BLAKE2B c1e14fd42aadf97298ffe4ebee666ba1098142ef076a5086b45632b2f1063389756fadfbd4e35dd7958300da97d1c01e77fe234987119579d6e5588a409bbeff SHA512 457bf0db6c7b5d83895b471bcd40fa21f2f60007a819be4f9a805f79a0ba268b9ac522374519e8c95e21c99e80dbc27f8d7dc87ac078a9c8c8353cde526211fd
 DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
 DIST shorewall-docs-html-5.1.12.1.tar.bz2 4281459 BLAKE2B 4696dcf2ebe6a3a2c9078b4081393b040481f6769ecff381512a40d97d0ba52042b3e6f3c74361917b2623a4ecaae1c76409ef4f543eb6feaab2077f96250cb5 SHA512 96f6015c9ad4a42432143f5e2411d051bc55004c6479d53b6d8b071052f309aa30df858ac2452fe1d80f2e0071d05c2fa6eee12a70065726f9e775cc2f909575
+DIST shorewall-docs-html-5.1.12.2.tar.bz2 4281009 BLAKE2B 6b16fd7556e7985b95a9c7cbf3c2dc9e9bb6988989569558f09dc7210b14f4624a9d4d75682325a3e4427c9d7fde8c5285dbe0673259122c8b7a806e08f85bb2 SHA512 1460a06fccda7e32a0ebb9f7ce0628c7a50abed37d48148222aa587b87ece249f8e3722c6628590f3d47d3b5ec25e7d2cfc246b42777e15e8a11565dbdbec070
 DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
 DIST shorewall-init-5.1.12.1.tar.bz2 41044 BLAKE2B e38a1f085e74720949ebca053c175fce405699120684b1165a00e5e357cef0b288dc9f0cfa7001795cd626226aed60f286e9939e537e5eaef0bf908f96db2c9a SHA512 e3394c5ca5edbe09941b9ef26e68a606673b13a3a3bf97e3d74a2f7c78cae50611a7f429ec322d3bf105b4b52fbef184cd286eb557af65515f0a6178e3431266
+DIST shorewall-init-5.1.12.2.tar.bz2 41371 BLAKE2B 1ab0101c7d456aa21031d8aceab978e6cb98a5a14a30cb75fa46bef97ac0222418f94079433bb09e9d908eb44e9cd13a5a2bb42983054d4c09a96fe23fd83bd5 SHA512 ef6d3283023117f7c990d75f0569b06edb72568e7c6a848f9d77ef812951c54322771360bc2004fd6d74d0d9f3e8fc91b0b4ddeda6232e91173c5ca5b13d686e
 DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
 DIST shorewall-lite-5.1.12.1.tar.bz2 46683 BLAKE2B d8429721ce76bb6b73d8f49bd2ec75c484cd48e732b17c49923a40cb23647a6f2de84d0d8ed798ae2ea89d5ec0cc9a1c367a13175224320f7868298481261ad0 SHA512 37146a1d9bb82b6de69f46b727fb2fa66a0933e13799008716b74d882d28607329795911e9843e0bdf5e5324954c8a7fe14a0e4995184ee38d69ab9c3408deed
+DIST shorewall-lite-5.1.12.2.tar.bz2 47045 BLAKE2B 09d8881848fab61501e7bb5b993fb0dd2b58fc7323aa741bf6847e40c9ffdfaa0dca965785a8f7c18405b434fd0cea15c434b46f42988027bd99c881996e42ae SHA512 e9a2596430b89e6356ec211d6eb94d2815041c269603274f5c102249a0ec1b24d5d3787dbdc876045a0ba41af76afa514f13e6e199358e045ab4ecb4d2b5e2f5
 DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
 DIST shorewall6-5.1.12.1.tar.bz2 196607 BLAKE2B 35d29ccd73184b6905fffa60d209b4bd91cfe05bee73f7205f24ac178f78f74a2b847342c9f27435279fc2bfd7e5e840842d6c1333245f0a04b811d1fc2a94a5 SHA512 bd982de71d53cb1f669c293c825295a2eebe70f52b98bd0a172b13b119d5daa17a14ce9c79a97a41dbf740d4864bf5ee22b40c2bb22401bffb7a84fb911d88cc
+DIST shorewall6-5.1.12.2.tar.bz2 197371 BLAKE2B 3a171bc819e8d4cd757c843222168f8b5b5749baf064d53a42d4d2f8dfcc75e9d8782b5fc31a4a2d520bdc332164197c5c893de47e5abdad6a036ba06db2d1bf SHA512 fe99cd78cd96a8ad78b46ea9c41858c915eee33dea993054ac6ddfe6ab50d2e90fa7af4c9d1e8efdd8153b5ff37f9c8fc831447a5997e819c82f8497a24a1d52
 DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
 DIST shorewall6-lite-5.1.12.1.tar.bz2 46365 BLAKE2B eb3fdaabdc11d5d2694964d69ae452e52557eff6539a1eb0de3bf607252f52515d285c858b0a75b1ff35ef02c62031ab9c510517e9e5aaeb5f6b860b50156ce3 SHA512 1992cfbc2ca4c9e4b004e10c1b0bf73157da2cdf2fe03ecc8ad9a33e941d7881565c00bd68abec6e8711c58d8df03b0dc1c413639ef7015661fb4ef79151a78e
+DIST shorewall6-lite-5.1.12.2.tar.bz2 46746 BLAKE2B e38af0dff71fb3fc00ca7d7b5ba034650016060be3202f6284ff1ca82070eeb5e0e5cb448230b4e8614bdf0ddd71d28c3d0b022d30d6ed0ea0446c85e07cb0b3 SHA512 133409bf4dc004e4eb80c28e6e035331232dddd87b6fd512077947fcb05f10390360cb3f1918d441ed268f20f09c3bfd0a7952f9252cd8e39de9c6d617f2399d

diff --git a/net-firewall/shorewall/shorewall-5.1.12.2.ebuild b/net-firewall/shorewall/shorewall-5.1.12.2.ebuild
new file mode 100644
index 00000000000..d073bcb9296
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.12.2.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-03-05 14:07 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-03-05 14:07 UTC (permalink / raw
  To: gentoo-commits

commit:     f184852fcdc4af07a4a9d9ff633f5706b5b5a8f8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 14:07:11 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 14:07:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f184852f

net-firewall/shorewall: Bump to v5.1.12.3

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.1.12.3.ebuild | 456 +++++++++++++++++++++++
 2 files changed, 463 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 5803f52be0d..03a6492597c 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
 DIST shorewall-5.1.12.1.tar.bz2 554575 BLAKE2B 1f49f5fb2dec41f6f1040c82c2a95bc1b658d3add16d385a0166fc3cb9fca8bdfcb594d620b969243b71420c9de15bc84ef4d0648dde9328794fb6383d0e6468 SHA512 7b79a0f849dc24680ab99bae4345857ef70d20cda5e089c74c339b5483cacdfbbff72ae671729bdba87d5940e66b32ccd5e00f6d62a3e2d65577edbf5a305986
 DIST shorewall-5.1.12.2.tar.bz2 555472 BLAKE2B 4eaf7cf1256c4edd5d5bc134a501077d3705d6dd32717234d14566e556267d63181506e9498d50f168b0ebf9c2bebe50dc4087dcd8f2aea5834870fdfe1fb476 SHA512 7cfff999f245da3fa992cd67f18f8b13919e31d95da3dda1920cb0f883766bd5bf8e514a2db09f3fd386b7780dfdc0b811c4fbafa82f459f96dc78dd2e6fc4a4
+DIST shorewall-5.1.12.3.tar.bz2 554963 BLAKE2B dcf3334546b0c67e61b8d9a5a0710f92aad6169fd2386431abc254188837d939034d01c5f9a5cd80e1cbb10904c526d1ecc00f51b4c2e934c195b644f4715e77 SHA512 5c4c27b59fc0d0de7a5b47a84ffaf8effd664568b4f5e8e5b0f8170238873742c1507e3a20369643b5d0d83d696c2c4c476cd341f45fd71dec7a434a09e4f434
 DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
 DIST shorewall-core-5.1.12.1.tar.bz2 85905 BLAKE2B f867d690c0c3ef8582b5418cf2a45200b5298db9f978d2d5531a4fee157298017b38e98beec0c243aa1009a138e92faa8e19fcf38f88ed030781d4a149fdd26a SHA512 d3f8e347fe2b0c9590830d297e6cea8a830c16467e461fd1d422138850ab80d0eb67213c26f0ca594d04b86d99999bf47800c57b47ae25bd064aa56d9e70fa66
 DIST shorewall-core-5.1.12.2.tar.bz2 86246 BLAKE2B c1e14fd42aadf97298ffe4ebee666ba1098142ef076a5086b45632b2f1063389756fadfbd4e35dd7958300da97d1c01e77fe234987119579d6e5588a409bbeff SHA512 457bf0db6c7b5d83895b471bcd40fa21f2f60007a819be4f9a805f79a0ba268b9ac522374519e8c95e21c99e80dbc27f8d7dc87ac078a9c8c8353cde526211fd
+DIST shorewall-core-5.1.12.3.tar.bz2 86394 BLAKE2B 05ac5047bb498c787e627dcceeb2e543f4541d86b8fa956445307ef2ef41b933b5124b039a307c441c65fca595030de9caa4344d99fb503c6b001d6436f98a98 SHA512 8f88ebc94d475ca234c8a238e793fac9c7009d61f9a8936e84a0ceda5b6b48a70ef6aef5222eaa6c7d5235aecd2821b348c9cffb74e70d9f30b89bc109df3530
 DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
 DIST shorewall-docs-html-5.1.12.1.tar.bz2 4281459 BLAKE2B 4696dcf2ebe6a3a2c9078b4081393b040481f6769ecff381512a40d97d0ba52042b3e6f3c74361917b2623a4ecaae1c76409ef4f543eb6feaab2077f96250cb5 SHA512 96f6015c9ad4a42432143f5e2411d051bc55004c6479d53b6d8b071052f309aa30df858ac2452fe1d80f2e0071d05c2fa6eee12a70065726f9e775cc2f909575
 DIST shorewall-docs-html-5.1.12.2.tar.bz2 4281009 BLAKE2B 6b16fd7556e7985b95a9c7cbf3c2dc9e9bb6988989569558f09dc7210b14f4624a9d4d75682325a3e4427c9d7fde8c5285dbe0673259122c8b7a806e08f85bb2 SHA512 1460a06fccda7e32a0ebb9f7ce0628c7a50abed37d48148222aa587b87ece249f8e3722c6628590f3d47d3b5ec25e7d2cfc246b42777e15e8a11565dbdbec070
+DIST shorewall-docs-html-5.1.12.3.tar.bz2 4281525 BLAKE2B b3e13ebfe0447d13a36e462e47cc9448f25008032da66e652bf59ce7ee9c5aaf2df88acd059fc2f8c4ecbc2b793326d0ef911689c1d3c4295b3ccc8bc6d3dd44 SHA512 0e713d56894394614fd18ddcb83486b570083ea174e9142ed5f19a8051baeeb45c72905da8a9fd8c8e4dbba5a2dfbd548c99b85d873170c3c597f629bde3fe49
 DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
 DIST shorewall-init-5.1.12.1.tar.bz2 41044 BLAKE2B e38a1f085e74720949ebca053c175fce405699120684b1165a00e5e357cef0b288dc9f0cfa7001795cd626226aed60f286e9939e537e5eaef0bf908f96db2c9a SHA512 e3394c5ca5edbe09941b9ef26e68a606673b13a3a3bf97e3d74a2f7c78cae50611a7f429ec322d3bf105b4b52fbef184cd286eb557af65515f0a6178e3431266
 DIST shorewall-init-5.1.12.2.tar.bz2 41371 BLAKE2B 1ab0101c7d456aa21031d8aceab978e6cb98a5a14a30cb75fa46bef97ac0222418f94079433bb09e9d908eb44e9cd13a5a2bb42983054d4c09a96fe23fd83bd5 SHA512 ef6d3283023117f7c990d75f0569b06edb72568e7c6a848f9d77ef812951c54322771360bc2004fd6d74d0d9f3e8fc91b0b4ddeda6232e91173c5ca5b13d686e
+DIST shorewall-init-5.1.12.3.tar.bz2 41487 BLAKE2B 114fa4e647d1016f315a94f94dfe2aa923d6a14bbe4104eb27720b863cf8553a4121c99899621da529861272a12aa6b35b6d2f77e1754968f6b628ac7d5342a6 SHA512 a72a58e10f37e5400ef809abc601505d9c53031d82061c37d2bc4fc65ece0b5e886e4fa5a20ba7e794f6447be4adfd0e8e918d214e82bf75f734b858dacf9a46
 DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
 DIST shorewall-lite-5.1.12.1.tar.bz2 46683 BLAKE2B d8429721ce76bb6b73d8f49bd2ec75c484cd48e732b17c49923a40cb23647a6f2de84d0d8ed798ae2ea89d5ec0cc9a1c367a13175224320f7868298481261ad0 SHA512 37146a1d9bb82b6de69f46b727fb2fa66a0933e13799008716b74d882d28607329795911e9843e0bdf5e5324954c8a7fe14a0e4995184ee38d69ab9c3408deed
 DIST shorewall-lite-5.1.12.2.tar.bz2 47045 BLAKE2B 09d8881848fab61501e7bb5b993fb0dd2b58fc7323aa741bf6847e40c9ffdfaa0dca965785a8f7c18405b434fd0cea15c434b46f42988027bd99c881996e42ae SHA512 e9a2596430b89e6356ec211d6eb94d2815041c269603274f5c102249a0ec1b24d5d3787dbdc876045a0ba41af76afa514f13e6e199358e045ab4ecb4d2b5e2f5
+DIST shorewall-lite-5.1.12.3.tar.bz2 47161 BLAKE2B f9471cd473bad27ddad1f4e17b64f767edf53341bc0fbbcd1f6365a593bddde0a50e569790daa46cdd0818d9a87de59377f01a4924b24488f4fe98c594292834 SHA512 d665563613000d7d9c3d787347d730a61879e9f31da48414dbd7997e1921a5675ae4e91f7fb6a30714ee385964923007bc4828dbb7f5b59a2723ff9dffb8ec25
 DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
 DIST shorewall6-5.1.12.1.tar.bz2 196607 BLAKE2B 35d29ccd73184b6905fffa60d209b4bd91cfe05bee73f7205f24ac178f78f74a2b847342c9f27435279fc2bfd7e5e840842d6c1333245f0a04b811d1fc2a94a5 SHA512 bd982de71d53cb1f669c293c825295a2eebe70f52b98bd0a172b13b119d5daa17a14ce9c79a97a41dbf740d4864bf5ee22b40c2bb22401bffb7a84fb911d88cc
 DIST shorewall6-5.1.12.2.tar.bz2 197371 BLAKE2B 3a171bc819e8d4cd757c843222168f8b5b5749baf064d53a42d4d2f8dfcc75e9d8782b5fc31a4a2d520bdc332164197c5c893de47e5abdad6a036ba06db2d1bf SHA512 fe99cd78cd96a8ad78b46ea9c41858c915eee33dea993054ac6ddfe6ab50d2e90fa7af4c9d1e8efdd8153b5ff37f9c8fc831447a5997e819c82f8497a24a1d52
+DIST shorewall6-5.1.12.3.tar.bz2 197348 BLAKE2B f4e76d19c39f1068948a2a340e1b442ca87dfbbc76f68c4b63de0a6ecfab9ac0eb3e1eed7ddff05d9273f0dfc7ae19ed73c068949b8d6f358e08be9f67b2b1da SHA512 04877c4578b5eaca5a577fd2fa51f4aa90a29dda77316537d6ea8a07aa59667aaf5b76cd338f481291358360f66d33291ada8ff8d7ca908f24686dff19521e1f
 DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
 DIST shorewall6-lite-5.1.12.1.tar.bz2 46365 BLAKE2B eb3fdaabdc11d5d2694964d69ae452e52557eff6539a1eb0de3bf607252f52515d285c858b0a75b1ff35ef02c62031ab9c510517e9e5aaeb5f6b860b50156ce3 SHA512 1992cfbc2ca4c9e4b004e10c1b0bf73157da2cdf2fe03ecc8ad9a33e941d7881565c00bd68abec6e8711c58d8df03b0dc1c413639ef7015661fb4ef79151a78e
 DIST shorewall6-lite-5.1.12.2.tar.bz2 46746 BLAKE2B e38af0dff71fb3fc00ca7d7b5ba034650016060be3202f6284ff1ca82070eeb5e0e5cb448230b4e8614bdf0ddd71d28c3d0b022d30d6ed0ea0446c85e07cb0b3 SHA512 133409bf4dc004e4eb80c28e6e035331232dddd87b6fd512077947fcb05f10390360cb3f1918d441ed268f20f09c3bfd0a7952f9252cd8e39de9c6d617f2399d
+DIST shorewall6-lite-5.1.12.3.tar.bz2 46837 BLAKE2B 37158fb740673680edba992957bcbf836b57e01b66248dcd2630542c1f54347fdb92f4d31f1e20f969c58da8ceeb6af6a1b1414e0d97d666ae30c8b269298f83 SHA512 9bfc4dea894f51f35e366d9aed1380096865ecfd0fce913f2bb5e1c2154206359d41a4e9abd5f2e287c9c7fd9aaba9c74693296429727b30cc73a33b237b3874

diff --git a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild b/net-firewall/shorewall/shorewall-5.1.12.3.ebuild
new file mode 100644
index 00000000000..d073bcb9296
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.12.3.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# 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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-03-13 21:41 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-03-13 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     2c3185456702b40faf18b128190b63f7c6f00bac
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 21:40:11 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 21:40:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c318545

net-firewall/shorewall: stable for x86. mark stable for the remaining ...

arches using the ALLARCHES policy

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/shorewall/shorewall-5.1.12.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild b/net-firewall/shorewall/shorewall-5.1.12.3.ebuild
index d073bcb9296..0f6140661fb 100644
--- a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.12.3.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-03-13 21:41 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-03-13 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     601b58b75a969d64a12ebfbe128f7b0cceab7e6c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 21:41:12 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 21:41:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=601b58b7

net-firewall/shorewall: Cleanup old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/shorewall/Manifest                  |  21 --
 net-firewall/shorewall/shorewall-5.1.11.2.ebuild | 456 -----------------------
 net-firewall/shorewall/shorewall-5.1.12.1.ebuild | 456 -----------------------
 net-firewall/shorewall/shorewall-5.1.12.2.ebuild | 456 -----------------------
 4 files changed, 1389 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 03a6492597c..59e02568510 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,7 @@
-DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
-DIST shorewall-5.1.12.1.tar.bz2 554575 BLAKE2B 1f49f5fb2dec41f6f1040c82c2a95bc1b658d3add16d385a0166fc3cb9fca8bdfcb594d620b969243b71420c9de15bc84ef4d0648dde9328794fb6383d0e6468 SHA512 7b79a0f849dc24680ab99bae4345857ef70d20cda5e089c74c339b5483cacdfbbff72ae671729bdba87d5940e66b32ccd5e00f6d62a3e2d65577edbf5a305986
-DIST shorewall-5.1.12.2.tar.bz2 555472 BLAKE2B 4eaf7cf1256c4edd5d5bc134a501077d3705d6dd32717234d14566e556267d63181506e9498d50f168b0ebf9c2bebe50dc4087dcd8f2aea5834870fdfe1fb476 SHA512 7cfff999f245da3fa992cd67f18f8b13919e31d95da3dda1920cb0f883766bd5bf8e514a2db09f3fd386b7780dfdc0b811c4fbafa82f459f96dc78dd2e6fc4a4
 DIST shorewall-5.1.12.3.tar.bz2 554963 BLAKE2B dcf3334546b0c67e61b8d9a5a0710f92aad6169fd2386431abc254188837d939034d01c5f9a5cd80e1cbb10904c526d1ecc00f51b4c2e934c195b644f4715e77 SHA512 5c4c27b59fc0d0de7a5b47a84ffaf8effd664568b4f5e8e5b0f8170238873742c1507e3a20369643b5d0d83d696c2c4c476cd341f45fd71dec7a434a09e4f434
-DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
-DIST shorewall-core-5.1.12.1.tar.bz2 85905 BLAKE2B f867d690c0c3ef8582b5418cf2a45200b5298db9f978d2d5531a4fee157298017b38e98beec0c243aa1009a138e92faa8e19fcf38f88ed030781d4a149fdd26a SHA512 d3f8e347fe2b0c9590830d297e6cea8a830c16467e461fd1d422138850ab80d0eb67213c26f0ca594d04b86d99999bf47800c57b47ae25bd064aa56d9e70fa66
-DIST shorewall-core-5.1.12.2.tar.bz2 86246 BLAKE2B c1e14fd42aadf97298ffe4ebee666ba1098142ef076a5086b45632b2f1063389756fadfbd4e35dd7958300da97d1c01e77fe234987119579d6e5588a409bbeff SHA512 457bf0db6c7b5d83895b471bcd40fa21f2f60007a819be4f9a805f79a0ba268b9ac522374519e8c95e21c99e80dbc27f8d7dc87ac078a9c8c8353cde526211fd
 DIST shorewall-core-5.1.12.3.tar.bz2 86394 BLAKE2B 05ac5047bb498c787e627dcceeb2e543f4541d86b8fa956445307ef2ef41b933b5124b039a307c441c65fca595030de9caa4344d99fb503c6b001d6436f98a98 SHA512 8f88ebc94d475ca234c8a238e793fac9c7009d61f9a8936e84a0ceda5b6b48a70ef6aef5222eaa6c7d5235aecd2821b348c9cffb74e70d9f30b89bc109df3530
-DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
-DIST shorewall-docs-html-5.1.12.1.tar.bz2 4281459 BLAKE2B 4696dcf2ebe6a3a2c9078b4081393b040481f6769ecff381512a40d97d0ba52042b3e6f3c74361917b2623a4ecaae1c76409ef4f543eb6feaab2077f96250cb5 SHA512 96f6015c9ad4a42432143f5e2411d051bc55004c6479d53b6d8b071052f309aa30df858ac2452fe1d80f2e0071d05c2fa6eee12a70065726f9e775cc2f909575
-DIST shorewall-docs-html-5.1.12.2.tar.bz2 4281009 BLAKE2B 6b16fd7556e7985b95a9c7cbf3c2dc9e9bb6988989569558f09dc7210b14f4624a9d4d75682325a3e4427c9d7fde8c5285dbe0673259122c8b7a806e08f85bb2 SHA512 1460a06fccda7e32a0ebb9f7ce0628c7a50abed37d48148222aa587b87ece249f8e3722c6628590f3d47d3b5ec25e7d2cfc246b42777e15e8a11565dbdbec070
 DIST shorewall-docs-html-5.1.12.3.tar.bz2 4281525 BLAKE2B b3e13ebfe0447d13a36e462e47cc9448f25008032da66e652bf59ce7ee9c5aaf2df88acd059fc2f8c4ecbc2b793326d0ef911689c1d3c4295b3ccc8bc6d3dd44 SHA512 0e713d56894394614fd18ddcb83486b570083ea174e9142ed5f19a8051baeeb45c72905da8a9fd8c8e4dbba5a2dfbd548c99b85d873170c3c597f629bde3fe49
-DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
-DIST shorewall-init-5.1.12.1.tar.bz2 41044 BLAKE2B e38a1f085e74720949ebca053c175fce405699120684b1165a00e5e357cef0b288dc9f0cfa7001795cd626226aed60f286e9939e537e5eaef0bf908f96db2c9a SHA512 e3394c5ca5edbe09941b9ef26e68a606673b13a3a3bf97e3d74a2f7c78cae50611a7f429ec322d3bf105b4b52fbef184cd286eb557af65515f0a6178e3431266
-DIST shorewall-init-5.1.12.2.tar.bz2 41371 BLAKE2B 1ab0101c7d456aa21031d8aceab978e6cb98a5a14a30cb75fa46bef97ac0222418f94079433bb09e9d908eb44e9cd13a5a2bb42983054d4c09a96fe23fd83bd5 SHA512 ef6d3283023117f7c990d75f0569b06edb72568e7c6a848f9d77ef812951c54322771360bc2004fd6d74d0d9f3e8fc91b0b4ddeda6232e91173c5ca5b13d686e
 DIST shorewall-init-5.1.12.3.tar.bz2 41487 BLAKE2B 114fa4e647d1016f315a94f94dfe2aa923d6a14bbe4104eb27720b863cf8553a4121c99899621da529861272a12aa6b35b6d2f77e1754968f6b628ac7d5342a6 SHA512 a72a58e10f37e5400ef809abc601505d9c53031d82061c37d2bc4fc65ece0b5e886e4fa5a20ba7e794f6447be4adfd0e8e918d214e82bf75f734b858dacf9a46
-DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
-DIST shorewall-lite-5.1.12.1.tar.bz2 46683 BLAKE2B d8429721ce76bb6b73d8f49bd2ec75c484cd48e732b17c49923a40cb23647a6f2de84d0d8ed798ae2ea89d5ec0cc9a1c367a13175224320f7868298481261ad0 SHA512 37146a1d9bb82b6de69f46b727fb2fa66a0933e13799008716b74d882d28607329795911e9843e0bdf5e5324954c8a7fe14a0e4995184ee38d69ab9c3408deed
-DIST shorewall-lite-5.1.12.2.tar.bz2 47045 BLAKE2B 09d8881848fab61501e7bb5b993fb0dd2b58fc7323aa741bf6847e40c9ffdfaa0dca965785a8f7c18405b434fd0cea15c434b46f42988027bd99c881996e42ae SHA512 e9a2596430b89e6356ec211d6eb94d2815041c269603274f5c102249a0ec1b24d5d3787dbdc876045a0ba41af76afa514f13e6e199358e045ab4ecb4d2b5e2f5
 DIST shorewall-lite-5.1.12.3.tar.bz2 47161 BLAKE2B f9471cd473bad27ddad1f4e17b64f767edf53341bc0fbbcd1f6365a593bddde0a50e569790daa46cdd0818d9a87de59377f01a4924b24488f4fe98c594292834 SHA512 d665563613000d7d9c3d787347d730a61879e9f31da48414dbd7997e1921a5675ae4e91f7fb6a30714ee385964923007bc4828dbb7f5b59a2723ff9dffb8ec25
-DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
-DIST shorewall6-5.1.12.1.tar.bz2 196607 BLAKE2B 35d29ccd73184b6905fffa60d209b4bd91cfe05bee73f7205f24ac178f78f74a2b847342c9f27435279fc2bfd7e5e840842d6c1333245f0a04b811d1fc2a94a5 SHA512 bd982de71d53cb1f669c293c825295a2eebe70f52b98bd0a172b13b119d5daa17a14ce9c79a97a41dbf740d4864bf5ee22b40c2bb22401bffb7a84fb911d88cc
-DIST shorewall6-5.1.12.2.tar.bz2 197371 BLAKE2B 3a171bc819e8d4cd757c843222168f8b5b5749baf064d53a42d4d2f8dfcc75e9d8782b5fc31a4a2d520bdc332164197c5c893de47e5abdad6a036ba06db2d1bf SHA512 fe99cd78cd96a8ad78b46ea9c41858c915eee33dea993054ac6ddfe6ab50d2e90fa7af4c9d1e8efdd8153b5ff37f9c8fc831447a5997e819c82f8497a24a1d52
 DIST shorewall6-5.1.12.3.tar.bz2 197348 BLAKE2B f4e76d19c39f1068948a2a340e1b442ca87dfbbc76f68c4b63de0a6ecfab9ac0eb3e1eed7ddff05d9273f0dfc7ae19ed73c068949b8d6f358e08be9f67b2b1da SHA512 04877c4578b5eaca5a577fd2fa51f4aa90a29dda77316537d6ea8a07aa59667aaf5b76cd338f481291358360f66d33291ada8ff8d7ca908f24686dff19521e1f
-DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
-DIST shorewall6-lite-5.1.12.1.tar.bz2 46365 BLAKE2B eb3fdaabdc11d5d2694964d69ae452e52557eff6539a1eb0de3bf607252f52515d285c858b0a75b1ff35ef02c62031ab9c510517e9e5aaeb5f6b860b50156ce3 SHA512 1992cfbc2ca4c9e4b004e10c1b0bf73157da2cdf2fe03ecc8ad9a33e941d7881565c00bd68abec6e8711c58d8df03b0dc1c413639ef7015661fb4ef79151a78e
-DIST shorewall6-lite-5.1.12.2.tar.bz2 46746 BLAKE2B e38af0dff71fb3fc00ca7d7b5ba034650016060be3202f6284ff1ca82070eeb5e0e5cb448230b4e8614bdf0ddd71d28c3d0b022d30d6ed0ea0446c85e07cb0b3 SHA512 133409bf4dc004e4eb80c28e6e035331232dddd87b6fd512077947fcb05f10390360cb3f1918d441ed268f20f09c3bfd0a7952f9252cd8e39de9c6d617f2399d
 DIST shorewall6-lite-5.1.12.3.tar.bz2 46837 BLAKE2B 37158fb740673680edba992957bcbf836b57e01b66248dcd2630542c1f54347fdb92f4d31f1e20f969c58da8ceeb6af6a1b1414e0d97d666ae30c8b269298f83 SHA512 9bfc4dea894f51f35e366d9aed1380096865ecfd0fce913f2bb5e1c2154206359d41a4e9abd5f2e287c9c7fd9aaba9c74693296429727b30cc73a33b237b3874

diff --git a/net-firewall/shorewall/shorewall-5.1.11.2.ebuild b/net-firewall/shorewall/shorewall-5.1.11.2.ebuild
deleted file mode 100644
index 20062dcd2fa..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.11.2.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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.1.12.1.ebuild b/net-firewall/shorewall/shorewall-5.1.12.1.ebuild
deleted file mode 100644
index 4e94df20e83..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.12.1.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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.1.12.2.ebuild b/net-firewall/shorewall/shorewall-5.1.12.2.ebuild
deleted file mode 100644
index d073bcb9296..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.12.2.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# 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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-04-16 11:37 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-04-16 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     92130d6b3ac704ec894057b19e19ab435a6ce75b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 11:36:53 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 11:36:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92130d6b

net-firewall/shorewall: Bump to v5.1.12.4

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-firewall/shorewall/Manifest                  |   7 +
 net-firewall/shorewall/shorewall-5.1.12.4.ebuild | 459 +++++++++++++++++++++++
 2 files changed, 466 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 59e02568510..8b135748271 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.1.12.3.tar.bz2 554963 BLAKE2B dcf3334546b0c67e61b8d9a5a0710f92aad6169fd2386431abc254188837d939034d01c5f9a5cd80e1cbb10904c526d1ecc00f51b4c2e934c195b644f4715e77 SHA512 5c4c27b59fc0d0de7a5b47a84ffaf8effd664568b4f5e8e5b0f8170238873742c1507e3a20369643b5d0d83d696c2c4c476cd341f45fd71dec7a434a09e4f434
+DIST shorewall-5.1.12.4.tar.bz2 555854 BLAKE2B 697fb7dbe4217b3a8d7230b3d79cec94f33ff69975b9f52477def8424e2ed9c79614e5aff4a40e31c2c0c69bc32f88c40810b7b1e5381037df1cf225b8bf97ec SHA512 25038865df0b3a4d1bcdb14b58108cd0f42e8738c3415ef2ce6fcbf3b15fc651fa90ce6adcfc3c67d6e0dd18709c4862a3ca18f1976e6c96567db6cdae86e000
 DIST shorewall-core-5.1.12.3.tar.bz2 86394 BLAKE2B 05ac5047bb498c787e627dcceeb2e543f4541d86b8fa956445307ef2ef41b933b5124b039a307c441c65fca595030de9caa4344d99fb503c6b001d6436f98a98 SHA512 8f88ebc94d475ca234c8a238e793fac9c7009d61f9a8936e84a0ceda5b6b48a70ef6aef5222eaa6c7d5235aecd2821b348c9cffb74e70d9f30b89bc109df3530
+DIST shorewall-core-5.1.12.4.tar.bz2 86548 BLAKE2B 8384c2f8ec673db3f0fed04af702e1967d41133f3a066ba09cbd58199654878d4d6c73730a933525304d68f7834c80d5c2a2452a4dd6faa71e2580deadf3189e SHA512 f77ae4080fa81a3259ab620ba7615c4188e6bec0244e898702dc641aacd8ac54160331e270b3708d818bfa9452cf96014868199a48c28f15c50d128365cb62e6
 DIST shorewall-docs-html-5.1.12.3.tar.bz2 4281525 BLAKE2B b3e13ebfe0447d13a36e462e47cc9448f25008032da66e652bf59ce7ee9c5aaf2df88acd059fc2f8c4ecbc2b793326d0ef911689c1d3c4295b3ccc8bc6d3dd44 SHA512 0e713d56894394614fd18ddcb83486b570083ea174e9142ed5f19a8051baeeb45c72905da8a9fd8c8e4dbba5a2dfbd548c99b85d873170c3c597f629bde3fe49
+DIST shorewall-docs-html-5.1.12.4.tar.bz2 4281202 BLAKE2B 51624bf6a36766fa8f1aad9600885dc2b92f656ef3a7bc6cf3704a33d2e014af590bbe1621793bd77d291baa3441a0f493c27f838159ccbb15b0684ab26f4bef SHA512 e1592137013b463a7cbd28c7354f51b36460c054d55e1819198b72c600ccbdc8b3fee4bab33d7a71466397338bd38e0aa6312f1c182e79052f249c51d1017dc1
 DIST shorewall-init-5.1.12.3.tar.bz2 41487 BLAKE2B 114fa4e647d1016f315a94f94dfe2aa923d6a14bbe4104eb27720b863cf8553a4121c99899621da529861272a12aa6b35b6d2f77e1754968f6b628ac7d5342a6 SHA512 a72a58e10f37e5400ef809abc601505d9c53031d82061c37d2bc4fc65ece0b5e886e4fa5a20ba7e794f6447be4adfd0e8e918d214e82bf75f734b858dacf9a46
+DIST shorewall-init-5.1.12.4.tar.bz2 41541 BLAKE2B 149b31b2ffd37c64cfc69de7d2d3a39824ce427a98a84f4e96af02aad9e04f0973f862ea0b158245a1d806504dc0dac9a5a554776d9533a7c88dbf6c096d4d07 SHA512 971f0a7a25f49c289e9c9d6d564e05b7f2675d271ef95c15b06a4a4e878a74c5b13a1ea80411014a5130f53267df6691042b313c423db193b9cd6cde172ed359
 DIST shorewall-lite-5.1.12.3.tar.bz2 47161 BLAKE2B f9471cd473bad27ddad1f4e17b64f767edf53341bc0fbbcd1f6365a593bddde0a50e569790daa46cdd0818d9a87de59377f01a4924b24488f4fe98c594292834 SHA512 d665563613000d7d9c3d787347d730a61879e9f31da48414dbd7997e1921a5675ae4e91f7fb6a30714ee385964923007bc4828dbb7f5b59a2723ff9dffb8ec25
+DIST shorewall-lite-5.1.12.4.tar.bz2 47209 BLAKE2B ca39daa7a864b86cd9075f8604d053984ef8c451285520c568b83171163513bdbe7f910b21638f4f69e716d4bdbb4f148856b02dbe83392789d8b962669374e1 SHA512 1bcdb90fccc634103ff190be9a058abf1b5158d562702c8c1ad51e8edebc2939271f3279bcb0fd8ff7389ea175387ce5a090a0d9e5655524a11203b5c0d55604
 DIST shorewall6-5.1.12.3.tar.bz2 197348 BLAKE2B f4e76d19c39f1068948a2a340e1b442ca87dfbbc76f68c4b63de0a6ecfab9ac0eb3e1eed7ddff05d9273f0dfc7ae19ed73c068949b8d6f358e08be9f67b2b1da SHA512 04877c4578b5eaca5a577fd2fa51f4aa90a29dda77316537d6ea8a07aa59667aaf5b76cd338f481291358360f66d33291ada8ff8d7ca908f24686dff19521e1f
+DIST shorewall6-5.1.12.4.tar.bz2 197179 BLAKE2B 1c120388d0b8eafdbf6ec2fb64a8cc3e1e301dd109bb03f5dcfce60c534489210f669327eaa07bac5fbc7497e39c9167586f02017318ce9a2b054b4a39e4ae50 SHA512 9ff09b093f641452d3c5d615163336c903c74d4133cd620982760df6b8ee3acc704c460adb5db52b109f768d623152e47617c7d05742c2e6f19527c34eec9a61
 DIST shorewall6-lite-5.1.12.3.tar.bz2 46837 BLAKE2B 37158fb740673680edba992957bcbf836b57e01b66248dcd2630542c1f54347fdb92f4d31f1e20f969c58da8ceeb6af6a1b1414e0d97d666ae30c8b269298f83 SHA512 9bfc4dea894f51f35e366d9aed1380096865ecfd0fce913f2bb5e1c2154206359d41a4e9abd5f2e287c9c7fd9aaba9c74693296429727b30cc73a33b237b3874
+DIST shorewall6-lite-5.1.12.4.tar.bz2 46902 BLAKE2B 6e9bad615833beacbb0d4b779dc8479cad73c1964bc2220541419b99a7fc8dd1b57ca42d61d6ef708460beffa65106166dbd5c60a90ce7f4cdf60ce3a879defb SHA512 95b5b96b3744bd1a499d00b4f98d71b264369752e6fd9ede21717657785833d1124b97434fe33457bc6f80026b204eb9306d73af9eb8abf23840291ecc1caf32

diff --git a/net-firewall/shorewall/shorewall-5.1.12.4.ebuild b/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
new file mode 100644
index 00000000000..dba65373d60
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r2 "${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
+
+	# 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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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-r2 "${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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-05-04 15:24 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-05-04 15:24 UTC (permalink / raw
  To: gentoo-commits

commit:     cdbee8791a79203d81d34812f7673d8c7bed9a51
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri May  4 15:06:31 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri May  4 15:24:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbee879

net-firewall/shorewall: stable for x86. mark stable for the remaining ...

arches using the ALLARCHES policy.

Package-Manager: Portage-2.3.34, Repoman-2.3.9

 net-firewall/shorewall/shorewall-5.1.12.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.1.12.4.ebuild b/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
index dba65373d60..d7c5285f28b 100644
--- a/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.12.4.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-05-04 15:25 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-05-04 15:25 UTC (permalink / raw
  To: gentoo-commits

commit:     58bb3769a35780ad65b1b00029b00ad736faae37
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri May  4 15:07:25 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri May  4 15:24:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58bb3769

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.34, Repoman-2.3.9

 net-firewall/shorewall/Manifest                    |   7 -
 .../shorewall/shorewall-5.1.12.3-r1.ebuild         | 459 ---------------------
 2 files changed, 466 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 8b135748271..c8563a272b6 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-DIST shorewall-5.1.12.3.tar.bz2 554963 BLAKE2B dcf3334546b0c67e61b8d9a5a0710f92aad6169fd2386431abc254188837d939034d01c5f9a5cd80e1cbb10904c526d1ecc00f51b4c2e934c195b644f4715e77 SHA512 5c4c27b59fc0d0de7a5b47a84ffaf8effd664568b4f5e8e5b0f8170238873742c1507e3a20369643b5d0d83d696c2c4c476cd341f45fd71dec7a434a09e4f434
 DIST shorewall-5.1.12.4.tar.bz2 555854 BLAKE2B 697fb7dbe4217b3a8d7230b3d79cec94f33ff69975b9f52477def8424e2ed9c79614e5aff4a40e31c2c0c69bc32f88c40810b7b1e5381037df1cf225b8bf97ec SHA512 25038865df0b3a4d1bcdb14b58108cd0f42e8738c3415ef2ce6fcbf3b15fc651fa90ce6adcfc3c67d6e0dd18709c4862a3ca18f1976e6c96567db6cdae86e000
-DIST shorewall-core-5.1.12.3.tar.bz2 86394 BLAKE2B 05ac5047bb498c787e627dcceeb2e543f4541d86b8fa956445307ef2ef41b933b5124b039a307c441c65fca595030de9caa4344d99fb503c6b001d6436f98a98 SHA512 8f88ebc94d475ca234c8a238e793fac9c7009d61f9a8936e84a0ceda5b6b48a70ef6aef5222eaa6c7d5235aecd2821b348c9cffb74e70d9f30b89bc109df3530
 DIST shorewall-core-5.1.12.4.tar.bz2 86548 BLAKE2B 8384c2f8ec673db3f0fed04af702e1967d41133f3a066ba09cbd58199654878d4d6c73730a933525304d68f7834c80d5c2a2452a4dd6faa71e2580deadf3189e SHA512 f77ae4080fa81a3259ab620ba7615c4188e6bec0244e898702dc641aacd8ac54160331e270b3708d818bfa9452cf96014868199a48c28f15c50d128365cb62e6
-DIST shorewall-docs-html-5.1.12.3.tar.bz2 4281525 BLAKE2B b3e13ebfe0447d13a36e462e47cc9448f25008032da66e652bf59ce7ee9c5aaf2df88acd059fc2f8c4ecbc2b793326d0ef911689c1d3c4295b3ccc8bc6d3dd44 SHA512 0e713d56894394614fd18ddcb83486b570083ea174e9142ed5f19a8051baeeb45c72905da8a9fd8c8e4dbba5a2dfbd548c99b85d873170c3c597f629bde3fe49
 DIST shorewall-docs-html-5.1.12.4.tar.bz2 4281202 BLAKE2B 51624bf6a36766fa8f1aad9600885dc2b92f656ef3a7bc6cf3704a33d2e014af590bbe1621793bd77d291baa3441a0f493c27f838159ccbb15b0684ab26f4bef SHA512 e1592137013b463a7cbd28c7354f51b36460c054d55e1819198b72c600ccbdc8b3fee4bab33d7a71466397338bd38e0aa6312f1c182e79052f249c51d1017dc1
-DIST shorewall-init-5.1.12.3.tar.bz2 41487 BLAKE2B 114fa4e647d1016f315a94f94dfe2aa923d6a14bbe4104eb27720b863cf8553a4121c99899621da529861272a12aa6b35b6d2f77e1754968f6b628ac7d5342a6 SHA512 a72a58e10f37e5400ef809abc601505d9c53031d82061c37d2bc4fc65ece0b5e886e4fa5a20ba7e794f6447be4adfd0e8e918d214e82bf75f734b858dacf9a46
 DIST shorewall-init-5.1.12.4.tar.bz2 41541 BLAKE2B 149b31b2ffd37c64cfc69de7d2d3a39824ce427a98a84f4e96af02aad9e04f0973f862ea0b158245a1d806504dc0dac9a5a554776d9533a7c88dbf6c096d4d07 SHA512 971f0a7a25f49c289e9c9d6d564e05b7f2675d271ef95c15b06a4a4e878a74c5b13a1ea80411014a5130f53267df6691042b313c423db193b9cd6cde172ed359
-DIST shorewall-lite-5.1.12.3.tar.bz2 47161 BLAKE2B f9471cd473bad27ddad1f4e17b64f767edf53341bc0fbbcd1f6365a593bddde0a50e569790daa46cdd0818d9a87de59377f01a4924b24488f4fe98c594292834 SHA512 d665563613000d7d9c3d787347d730a61879e9f31da48414dbd7997e1921a5675ae4e91f7fb6a30714ee385964923007bc4828dbb7f5b59a2723ff9dffb8ec25
 DIST shorewall-lite-5.1.12.4.tar.bz2 47209 BLAKE2B ca39daa7a864b86cd9075f8604d053984ef8c451285520c568b83171163513bdbe7f910b21638f4f69e716d4bdbb4f148856b02dbe83392789d8b962669374e1 SHA512 1bcdb90fccc634103ff190be9a058abf1b5158d562702c8c1ad51e8edebc2939271f3279bcb0fd8ff7389ea175387ce5a090a0d9e5655524a11203b5c0d55604
-DIST shorewall6-5.1.12.3.tar.bz2 197348 BLAKE2B f4e76d19c39f1068948a2a340e1b442ca87dfbbc76f68c4b63de0a6ecfab9ac0eb3e1eed7ddff05d9273f0dfc7ae19ed73c068949b8d6f358e08be9f67b2b1da SHA512 04877c4578b5eaca5a577fd2fa51f4aa90a29dda77316537d6ea8a07aa59667aaf5b76cd338f481291358360f66d33291ada8ff8d7ca908f24686dff19521e1f
 DIST shorewall6-5.1.12.4.tar.bz2 197179 BLAKE2B 1c120388d0b8eafdbf6ec2fb64a8cc3e1e301dd109bb03f5dcfce60c534489210f669327eaa07bac5fbc7497e39c9167586f02017318ce9a2b054b4a39e4ae50 SHA512 9ff09b093f641452d3c5d615163336c903c74d4133cd620982760df6b8ee3acc704c460adb5db52b109f768d623152e47617c7d05742c2e6f19527c34eec9a61
-DIST shorewall6-lite-5.1.12.3.tar.bz2 46837 BLAKE2B 37158fb740673680edba992957bcbf836b57e01b66248dcd2630542c1f54347fdb92f4d31f1e20f969c58da8ceeb6af6a1b1414e0d97d666ae30c8b269298f83 SHA512 9bfc4dea894f51f35e366d9aed1380096865ecfd0fce913f2bb5e1c2154206359d41a4e9abd5f2e287c9c7fd9aaba9c74693296429727b30cc73a33b237b3874
 DIST shorewall6-lite-5.1.12.4.tar.bz2 46902 BLAKE2B 6e9bad615833beacbb0d4b779dc8479cad73c1964bc2220541419b99a7fc8dd1b57ca42d61d6ef708460beffa65106166dbd5c60a90ce7f4cdf60ce3a879defb SHA512 95b5b96b3744bd1a499d00b4f98d71b264369752e6fd9ede21717657785833d1124b97434fe33457bc6f80026b204eb9306d73af9eb8abf23840291ecc1caf32

diff --git a/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild
deleted file mode 100644
index d7c5285f28b..00000000000
--- a/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r2 "${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
-
-	# 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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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-r2 "${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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-05-08  7:57 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-05-08  7:57 UTC (permalink / raw
  To: gentoo-commits

commit:     31a8229b9d9e4d89b5abc7f90532c36eb63c7dc8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue May  8 07:56:02 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue May  8 07:57:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a8229b

net-firewall/shorewall: Bump to v5.2.0.2

Package-Manager: Portage-2.3.34, Repoman-2.3.9

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.0.2.ebuild | 459 ++++++++++++++++++++++++
 2 files changed, 466 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 0a5c0613425..5f035c376f1 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.1.12.4.tar.bz2 555854 BLAKE2B 697fb7dbe4217b3a8d7230b3d79cec94f33ff69975b9f52477def8424e2ed9c79614e5aff4a40e31c2c0c69bc32f88c40810b7b1e5381037df1cf225b8bf97ec SHA512 25038865df0b3a4d1bcdb14b58108cd0f42e8738c3415ef2ce6fcbf3b15fc651fa90ce6adcfc3c67d6e0dd18709c4862a3ca18f1976e6c96567db6cdae86e000
 DIST shorewall-5.2.0.1.tar.bz2 535180 BLAKE2B 4e7e1d1f43b1bd5a9e683d6ab4e0dde5201dce0616c66c38b518838210bcc69c31a5bb586933ac3d83f8852704166cb7376dd07d8ee4d74e777c483a5178db34 SHA512 9896836e709f728a2320c805cae588dbea37621587bbb0f11937be911c80d0302f63a230642089cdb9839cc55f16b67341392c5d76a71406e0cfadb7b99b4cc5
+DIST shorewall-5.2.0.2.tar.bz2 537374 BLAKE2B 650b3f23307be51b3a4ce75dcdfb3024ab476b5b5a2119b92181a8fc304ea6c4d1bdad342163eff4ea797d6dd18de0c0f1cf26d4de1e48f5fb0b384c25c85edf SHA512 e80525599956316fbd1421fce95e2e6adc0a2992ef1791b3d4d5a339100859c34396e19ee4f00f430f5808fc160c09e6f7a7f4f619bbbe21422524f1daaa1849
 DIST shorewall-core-5.1.12.4.tar.bz2 86548 BLAKE2B 8384c2f8ec673db3f0fed04af702e1967d41133f3a066ba09cbd58199654878d4d6c73730a933525304d68f7834c80d5c2a2452a4dd6faa71e2580deadf3189e SHA512 f77ae4080fa81a3259ab620ba7615c4188e6bec0244e898702dc641aacd8ac54160331e270b3708d818bfa9452cf96014868199a48c28f15c50d128365cb62e6
 DIST shorewall-core-5.2.0.1.tar.bz2 74523 BLAKE2B b4b204a9802a3fd0a69498acd7bb52a0fe0010a38df6feca5c98f15150e3924346911862745950269af60dd4ee2102a8e935a5c8d9f26edc8e726203bb8c3df2 SHA512 ebb184b33ade8111b961679c3aa90907ddc23410c17dd1fe49848425c465725a5f4c24f6bfbd158e759df6f651046db30120310a3edd7e594399721770cc9471
+DIST shorewall-core-5.2.0.2.tar.bz2 75108 BLAKE2B 2523d3fbdb0755c9c14195dedd0a4db2329b96a1ac5bde1eed1f0bb5623f89e18fab641d84074999b3058f73da75c9d306d372e02fac0bd735b0247256dad123 SHA512 1a6b94d25a09eeb464e4e35dee6e10a505d9fe271f034bc92763bed5c7bae44f88de68321f4b21bef4ef6e199d746d24fb4be077c676f96d9c84d8dfd453f370
 DIST shorewall-docs-html-5.1.12.4.tar.bz2 4281202 BLAKE2B 51624bf6a36766fa8f1aad9600885dc2b92f656ef3a7bc6cf3704a33d2e014af590bbe1621793bd77d291baa3441a0f493c27f838159ccbb15b0684ab26f4bef SHA512 e1592137013b463a7cbd28c7354f51b36460c054d55e1819198b72c600ccbdc8b3fee4bab33d7a71466397338bd38e0aa6312f1c182e79052f249c51d1017dc1
 DIST shorewall-docs-html-5.2.0.1.tar.bz2 4294859 BLAKE2B 317d1e014f94e040154617a355619317efed4c318e14a6c2a6cfabeb1ee2c5fb0bf49a7e9a80ca8ffbd5828798d33617fdcf18af0bc6ec8333a2a1b8231136c1 SHA512 52c5af9c682bbb233be3e779a45f7d09ca874849e6a118271bf90d6791cceaa31740dee8cdfd08a50807565fb9f8d6191ca1096ab31d1419b7088668c349c71c
+DIST shorewall-docs-html-5.2.0.2.tar.bz2 4294083 BLAKE2B 3ce667e656359f7d2f27bd03a47f2eae9f407a04f7b2921ad7099729164c40b3a88b2651052c3b28a3ab404953bef811da499f6acd4eb432648bf6d727124a20 SHA512 751f2c426e8abe9a5af396df39d4b67ccf674113b4b595916c6d44c14ace67f82ae2ffc84500b25d2876f0356b02c96383068d54fa97804afe464d2d5eccba31
 DIST shorewall-init-5.1.12.4.tar.bz2 41541 BLAKE2B 149b31b2ffd37c64cfc69de7d2d3a39824ce427a98a84f4e96af02aad9e04f0973f862ea0b158245a1d806504dc0dac9a5a554776d9533a7c88dbf6c096d4d07 SHA512 971f0a7a25f49c289e9c9d6d564e05b7f2675d271ef95c15b06a4a4e878a74c5b13a1ea80411014a5130f53267df6691042b313c423db193b9cd6cde172ed359
 DIST shorewall-init-5.2.0.1.tar.bz2 29381 BLAKE2B 6c0c937a8fd7499ce07f9ef0f1ef07c892e3d0585e2d29506377ca311ffa5939160aa62bd4e9602d346bfec2698865228ba69cdfbf6229520288485ced1e7f39 SHA512 ce9ba1a8bec5823650022f80db70b60930fa4b5c65462e4e8317f71ee467f75ff3af2b658c1d3bbe0cb7cb41acd4226cb2cfb657afde1375740c737f4528256f
+DIST shorewall-init-5.2.0.2.tar.bz2 29749 BLAKE2B c70067951d458bc54434214dc2b4764c0c52aca457a21c4c77d3ae6cc0586fc5ce325549f7a5df9c18c255113e7d71a4f687a6a72fc81528b7611a3edacab864 SHA512 1fef0feea7e36d2f12373e64d898129e2e49c66f3f182fad950f5aced6615ff2b59cea66c1d2c475e9a781c0faf50541642c71e69dda68fa41ab86509134b511
 DIST shorewall-lite-5.1.12.4.tar.bz2 47209 BLAKE2B ca39daa7a864b86cd9075f8604d053984ef8c451285520c568b83171163513bdbe7f910b21638f4f69e716d4bdbb4f148856b02dbe83392789d8b962669374e1 SHA512 1bcdb90fccc634103ff190be9a058abf1b5158d562702c8c1ad51e8edebc2939271f3279bcb0fd8ff7389ea175387ce5a090a0d9e5655524a11203b5c0d55604
 DIST shorewall-lite-5.2.0.1.tar.bz2 35244 BLAKE2B b4983c21bb46c684adecb4d771839bc4a31a6737827e68944e75752fc4296aa458f24f9cdba46f19d09308634b00368e7fe5ec7a6417c1348cc083f7d8d437c0 SHA512 5562c41993a6047b5a334ab26d296df836976749da24796f005e12afc1e987b4f784ec25ffe176c81b8e9f129930c91a5869335d15eca649bb7a03c214b700ad
+DIST shorewall-lite-5.2.0.2.tar.bz2 35577 BLAKE2B 462480b73a4cb70e2c09f7b1c4607cc748d1ff5d6ca511b2076edd7872865442ede343e3b26be2c46665a1c6beed5290584ccf0da6f93bc62ea1da1faf90abb3 SHA512 eb68b4b2b92a87c80f80b950bb5c2fc4f035f7650d786e4999d262bb21e2a5ee439e804aee4b3b0fb187b086ba4d899725a031f38d4138bec151969f9a874663
 DIST shorewall6-5.1.12.4.tar.bz2 197179 BLAKE2B 1c120388d0b8eafdbf6ec2fb64a8cc3e1e301dd109bb03f5dcfce60c534489210f669327eaa07bac5fbc7497e39c9167586f02017318ce9a2b054b4a39e4ae50 SHA512 9ff09b093f641452d3c5d615163336c903c74d4133cd620982760df6b8ee3acc704c460adb5db52b109f768d623152e47617c7d05742c2e6f19527c34eec9a61
 DIST shorewall6-5.2.0.1.tar.bz2 184727 BLAKE2B ff9502e2ff84af146ba42cbfe4a7e383e6e2c56f43cd53c21085908660c672d8e579fd8615f841a202bb6bd796d434f7a462d684e45496880599902a3a3a0acb SHA512 dd34968d2e074e0460aeb562a2c4ab857e6c9a680d4d9f41cf006bfddfffc647d472693401c6a8f03da25af2f1117ae61c640fa7db099af3e5b5cd27be74ecef
+DIST shorewall6-5.2.0.2.tar.bz2 186161 BLAKE2B 97414d6c8d3c6cf9100330ff6d9be9808f9aa354ab4c535429b8593dba0d5f328469bd42e928f33f66ba40a0e91dfcc45d47d2b405a6ccdc814fb1e2c9a977dc SHA512 ec551998f04cd9b1ac0c791cbdc45068b402d5be89e2fd0e1a6eb95b288b339ed49c23bac73e81f324e8c277b66772d2ef5b11aed7a4b085a5ed0047fb96b1da
 DIST shorewall6-lite-5.1.12.4.tar.bz2 46902 BLAKE2B 6e9bad615833beacbb0d4b779dc8479cad73c1964bc2220541419b99a7fc8dd1b57ca42d61d6ef708460beffa65106166dbd5c60a90ce7f4cdf60ce3a879defb SHA512 95b5b96b3744bd1a499d00b4f98d71b264369752e6fd9ede21717657785833d1124b97434fe33457bc6f80026b204eb9306d73af9eb8abf23840291ecc1caf32
 DIST shorewall6-lite-5.2.0.1.tar.bz2 34931 BLAKE2B 94155a21be8d8aba07d9742b2d92428285588dbf33f1b522644dd7be4a05dd25b93ad4d3bbc3fd147f544a7d9ce8bf01dbadaee642bcb014f43aef6ba61f1596 SHA512 dc2f1c61efd8673335b117771baf8cec2145b5afc4a6b74b80834daa321f22475e2ec9baa23358c5e2d4787b5ec1cc092b17617cdfe9a921bd0075328eb0cdd5
+DIST shorewall6-lite-5.2.0.2.tar.bz2 35311 BLAKE2B bb25abc719c776571273219df6a3ba89ffe2553efbb4e93755b3deabce9f34851024f72d5ab328ee9caa55ab3744e35f08013ae8fda19c480e6d907e7257f8fe SHA512 2c39805d17cd8d9710d175d583958cc25ac0f78351a36c36ff57e7a9c8db87bd64ddf5c27352c916d42db2a26864cb9e96f83e5b1677e24964e67315dc2fb086

diff --git a/net-firewall/shorewall/shorewall-5.2.0.2.ebuild b/net-firewall/shorewall/shorewall-5.2.0.2.ebuild
new file mode 100644
index 00000000000..a7f7766988a
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.0.2.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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
+
+	# 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
+	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
+	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
+	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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-05-16 23:12 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-05-16 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     38d99b94c9e32f42548357e749786928aa022652
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 21:36:30 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed May 16 23:11:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d99b94

net-firewall/shorewall: Bump to v5.2.0.3

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.0.3.ebuild | 459 ++++++++++++++++++++++++
 2 files changed, 466 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index f3201993340..97255359cca 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.1.12.4.tar.bz2 555854 BLAKE2B 697fb7dbe4217b3a8d7230b3d79cec94f33ff69975b9f52477def8424e2ed9c79614e5aff4a40e31c2c0c69bc32f88c40810b7b1e5381037df1cf225b8bf97ec SHA512 25038865df0b3a4d1bcdb14b58108cd0f42e8738c3415ef2ce6fcbf3b15fc651fa90ce6adcfc3c67d6e0dd18709c4862a3ca18f1976e6c96567db6cdae86e000
 DIST shorewall-5.2.0.2.tar.bz2 537374 BLAKE2B 650b3f23307be51b3a4ce75dcdfb3024ab476b5b5a2119b92181a8fc304ea6c4d1bdad342163eff4ea797d6dd18de0c0f1cf26d4de1e48f5fb0b384c25c85edf SHA512 e80525599956316fbd1421fce95e2e6adc0a2992ef1791b3d4d5a339100859c34396e19ee4f00f430f5808fc160c09e6f7a7f4f619bbbe21422524f1daaa1849
+DIST shorewall-5.2.0.3.tar.bz2 538053 BLAKE2B 1488177b2151c90790cc3f1d9dd186e502189cc483a908e477adf878d52feb423e4a64c7a39470555ac06329124f01fd5918dd4d0b404f0435ab3ad34be0bd18 SHA512 37ae7d0ea9ebb86f75cf9a4572ee84118aba87b2690c76457f76313502a3abd96b5f5b700d7c650d98db7f0655d8f2ba0a0fece269613bb153fa3a2f6158b05b
 DIST shorewall-core-5.1.12.4.tar.bz2 86548 BLAKE2B 8384c2f8ec673db3f0fed04af702e1967d41133f3a066ba09cbd58199654878d4d6c73730a933525304d68f7834c80d5c2a2452a4dd6faa71e2580deadf3189e SHA512 f77ae4080fa81a3259ab620ba7615c4188e6bec0244e898702dc641aacd8ac54160331e270b3708d818bfa9452cf96014868199a48c28f15c50d128365cb62e6
 DIST shorewall-core-5.2.0.2.tar.bz2 75108 BLAKE2B 2523d3fbdb0755c9c14195dedd0a4db2329b96a1ac5bde1eed1f0bb5623f89e18fab641d84074999b3058f73da75c9d306d372e02fac0bd735b0247256dad123 SHA512 1a6b94d25a09eeb464e4e35dee6e10a505d9fe271f034bc92763bed5c7bae44f88de68321f4b21bef4ef6e199d746d24fb4be077c676f96d9c84d8dfd453f370
+DIST shorewall-core-5.2.0.3.tar.bz2 75625 BLAKE2B fd8ae63da974088958ffb4a0a9b3d740556f60e1f73b50614af1fd337cf0c715cbd79f003085df1d6a2e1ad1203b8f322aea56e4808dbc920c3c09ef7011a4d5 SHA512 c67f0c64272c03650d4c3a727bcc0f9fc5771eb10e8b914e0c4709b4fda5ee1bea98a6e2a84eb43ee44a41005d8b05bf869ec7c61be582d3b82936f33a6d3d0a
 DIST shorewall-docs-html-5.1.12.4.tar.bz2 4281202 BLAKE2B 51624bf6a36766fa8f1aad9600885dc2b92f656ef3a7bc6cf3704a33d2e014af590bbe1621793bd77d291baa3441a0f493c27f838159ccbb15b0684ab26f4bef SHA512 e1592137013b463a7cbd28c7354f51b36460c054d55e1819198b72c600ccbdc8b3fee4bab33d7a71466397338bd38e0aa6312f1c182e79052f249c51d1017dc1
 DIST shorewall-docs-html-5.2.0.2.tar.bz2 4294083 BLAKE2B 3ce667e656359f7d2f27bd03a47f2eae9f407a04f7b2921ad7099729164c40b3a88b2651052c3b28a3ab404953bef811da499f6acd4eb432648bf6d727124a20 SHA512 751f2c426e8abe9a5af396df39d4b67ccf674113b4b595916c6d44c14ace67f82ae2ffc84500b25d2876f0356b02c96383068d54fa97804afe464d2d5eccba31
+DIST shorewall-docs-html-5.2.0.3.tar.bz2 4295064 BLAKE2B a4913ac5138a2ee1c0c8640a7e2ea4e40bd4324aee0ffd6d4b228b41065d4d4e9e55ef0d600fd93dca8cb3ee73aeb2df196496d68dd11b40b23ce7c96ec0f9d6 SHA512 1e887b7eb0c4d0a78be7857a537f7cfa1307b43feed6396c5db289de5a2ea13547e25311bdd1e1dd48cd460e12ff71ce1520f1ec0feab87753f10cfeb45873c1
 DIST shorewall-init-5.1.12.4.tar.bz2 41541 BLAKE2B 149b31b2ffd37c64cfc69de7d2d3a39824ce427a98a84f4e96af02aad9e04f0973f862ea0b158245a1d806504dc0dac9a5a554776d9533a7c88dbf6c096d4d07 SHA512 971f0a7a25f49c289e9c9d6d564e05b7f2675d271ef95c15b06a4a4e878a74c5b13a1ea80411014a5130f53267df6691042b313c423db193b9cd6cde172ed359
 DIST shorewall-init-5.2.0.2.tar.bz2 29749 BLAKE2B c70067951d458bc54434214dc2b4764c0c52aca457a21c4c77d3ae6cc0586fc5ce325549f7a5df9c18c255113e7d71a4f687a6a72fc81528b7611a3edacab864 SHA512 1fef0feea7e36d2f12373e64d898129e2e49c66f3f182fad950f5aced6615ff2b59cea66c1d2c475e9a781c0faf50541642c71e69dda68fa41ab86509134b511
+DIST shorewall-init-5.2.0.3.tar.bz2 30209 BLAKE2B 93e80935fd659b073e85ea0281f749a8bfebcc752e8fb1134af21a0bf262c7a7ba0f96ed8ce2aba37b592cd4bfef0a8e714dce25c3e1af9529c4acafe52502cd SHA512 988342ba1755373ecc89bf139eb6ca7a3fb78081a84e510a2827d174129bb24e06cb36fb474f9cce1056879997bc641152da18d8feb57429686a88e8cc1c8b9d
 DIST shorewall-lite-5.1.12.4.tar.bz2 47209 BLAKE2B ca39daa7a864b86cd9075f8604d053984ef8c451285520c568b83171163513bdbe7f910b21638f4f69e716d4bdbb4f148856b02dbe83392789d8b962669374e1 SHA512 1bcdb90fccc634103ff190be9a058abf1b5158d562702c8c1ad51e8edebc2939271f3279bcb0fd8ff7389ea175387ce5a090a0d9e5655524a11203b5c0d55604
 DIST shorewall-lite-5.2.0.2.tar.bz2 35577 BLAKE2B 462480b73a4cb70e2c09f7b1c4607cc748d1ff5d6ca511b2076edd7872865442ede343e3b26be2c46665a1c6beed5290584ccf0da6f93bc62ea1da1faf90abb3 SHA512 eb68b4b2b92a87c80f80b950bb5c2fc4f035f7650d786e4999d262bb21e2a5ee439e804aee4b3b0fb187b086ba4d899725a031f38d4138bec151969f9a874663
+DIST shorewall-lite-5.2.0.3.tar.bz2 36011 BLAKE2B 42e362eb8a17c8115ae3afd5985a367b51abda853466d204de033a064b7cdf9967596d10eb064fa61378c5292661bc884face83ab1f54cf30526e978c562346f SHA512 d76a63e8a1ab7701c91d5344f7dbe29f3cc3f10ca7b5f7886573e41f828f53e5a50af94004abbe01ab2a52551a86b25f4bce74f867cc8b5a0d9b28ec10ba7ae4
 DIST shorewall6-5.1.12.4.tar.bz2 197179 BLAKE2B 1c120388d0b8eafdbf6ec2fb64a8cc3e1e301dd109bb03f5dcfce60c534489210f669327eaa07bac5fbc7497e39c9167586f02017318ce9a2b054b4a39e4ae50 SHA512 9ff09b093f641452d3c5d615163336c903c74d4133cd620982760df6b8ee3acc704c460adb5db52b109f768d623152e47617c7d05742c2e6f19527c34eec9a61
 DIST shorewall6-5.2.0.2.tar.bz2 186161 BLAKE2B 97414d6c8d3c6cf9100330ff6d9be9808f9aa354ab4c535429b8593dba0d5f328469bd42e928f33f66ba40a0e91dfcc45d47d2b405a6ccdc814fb1e2c9a977dc SHA512 ec551998f04cd9b1ac0c791cbdc45068b402d5be89e2fd0e1a6eb95b288b339ed49c23bac73e81f324e8c277b66772d2ef5b11aed7a4b085a5ed0047fb96b1da
+DIST shorewall6-5.2.0.3.tar.bz2 185097 BLAKE2B dcbb3d42f257a2ed4c9f8e1f5185651700a7735d509c0f2a213608fb4c854c50c7330969f370449df62d5c95c9bbff609f955aafe472208940f83ddfe4da50db SHA512 ef14ac0759afe95a27c0a3a6217d884c0d95636cbee342c24c49ccc77f4538c2175a91866f96d7e79c992ab062d9a7a3e005a4580aaf4ccfe5ff524062bde8df
 DIST shorewall6-lite-5.1.12.4.tar.bz2 46902 BLAKE2B 6e9bad615833beacbb0d4b779dc8479cad73c1964bc2220541419b99a7fc8dd1b57ca42d61d6ef708460beffa65106166dbd5c60a90ce7f4cdf60ce3a879defb SHA512 95b5b96b3744bd1a499d00b4f98d71b264369752e6fd9ede21717657785833d1124b97434fe33457bc6f80026b204eb9306d73af9eb8abf23840291ecc1caf32
 DIST shorewall6-lite-5.2.0.2.tar.bz2 35311 BLAKE2B bb25abc719c776571273219df6a3ba89ffe2553efbb4e93755b3deabce9f34851024f72d5ab328ee9caa55ab3744e35f08013ae8fda19c480e6d907e7257f8fe SHA512 2c39805d17cd8d9710d175d583958cc25ac0f78351a36c36ff57e7a9c8db87bd64ddf5c27352c916d42db2a26864cb9e96f83e5b1677e24964e67315dc2fb086
+DIST shorewall6-lite-5.2.0.3.tar.bz2 35704 BLAKE2B bad1f19cb53258a33bb8bc15cc4bab24c00a2fe1d63b95859565466ef549726efa70ce8ba9e8aa6317eaae3106e32c0ad41bc92d34e111011b66382476a2dda6 SHA512 272f47172267d5b31a2fe46fdae20cf18215a2ec9833eb634eced80d3f0e40a99d7dff8ae856f536bce425392ab9b4aaa7f7e19eb55958224f9f1c0769c72069

diff --git a/net-firewall/shorewall/shorewall-5.2.0.3.ebuild b/net-firewall/shorewall/shorewall-5.2.0.3.ebuild
new file mode 100644
index 00000000000..a7f7766988a
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.0.3.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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
+
+	# 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
+	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
+	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
+	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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-05-21 19:02 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-05-21 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     8faca73a617dde0cd6d9d7eab35bd33e143bc433
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 18:45:09 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon May 21 18:45:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8faca73a

net-firewall/shorewall: Bump to v5.2.0.4

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.0.4.ebuild | 459 ++++++++++++++++++++++++
 2 files changed, 466 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 97255359cca..ad42f46bf1c 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.1.12.4.tar.bz2 555854 BLAKE2B 697fb7dbe4217b3a8d7230b3d79cec94f33ff69975b9f52477def8424e2ed9c79614e5aff4a40e31c2c0c69bc32f88c40810b7b1e5381037df1cf225b8bf97ec SHA512 25038865df0b3a4d1bcdb14b58108cd0f42e8738c3415ef2ce6fcbf3b15fc651fa90ce6adcfc3c67d6e0dd18709c4862a3ca18f1976e6c96567db6cdae86e000
 DIST shorewall-5.2.0.2.tar.bz2 537374 BLAKE2B 650b3f23307be51b3a4ce75dcdfb3024ab476b5b5a2119b92181a8fc304ea6c4d1bdad342163eff4ea797d6dd18de0c0f1cf26d4de1e48f5fb0b384c25c85edf SHA512 e80525599956316fbd1421fce95e2e6adc0a2992ef1791b3d4d5a339100859c34396e19ee4f00f430f5808fc160c09e6f7a7f4f619bbbe21422524f1daaa1849
 DIST shorewall-5.2.0.3.tar.bz2 538053 BLAKE2B 1488177b2151c90790cc3f1d9dd186e502189cc483a908e477adf878d52feb423e4a64c7a39470555ac06329124f01fd5918dd4d0b404f0435ab3ad34be0bd18 SHA512 37ae7d0ea9ebb86f75cf9a4572ee84118aba87b2690c76457f76313502a3abd96b5f5b700d7c650d98db7f0655d8f2ba0a0fece269613bb153fa3a2f6158b05b
+DIST shorewall-5.2.0.4.tar.bz2 538938 BLAKE2B 1df68e166f5f443f120b9f45010da005b3d86a51d09c059d0886a2735c6d27c1568ae0422998f001deb48c512cb9fed23cbad423754682b06e9a4b5176b45cef SHA512 b44622972d4b4ffcde9d7da57d3994279f3962bb2d2e13892d7d77453da502527ab89cb59fb6692341b5d166cb7a3e31909df31dc21c758707eff29f3ab2c9a0
 DIST shorewall-core-5.1.12.4.tar.bz2 86548 BLAKE2B 8384c2f8ec673db3f0fed04af702e1967d41133f3a066ba09cbd58199654878d4d6c73730a933525304d68f7834c80d5c2a2452a4dd6faa71e2580deadf3189e SHA512 f77ae4080fa81a3259ab620ba7615c4188e6bec0244e898702dc641aacd8ac54160331e270b3708d818bfa9452cf96014868199a48c28f15c50d128365cb62e6
 DIST shorewall-core-5.2.0.2.tar.bz2 75108 BLAKE2B 2523d3fbdb0755c9c14195dedd0a4db2329b96a1ac5bde1eed1f0bb5623f89e18fab641d84074999b3058f73da75c9d306d372e02fac0bd735b0247256dad123 SHA512 1a6b94d25a09eeb464e4e35dee6e10a505d9fe271f034bc92763bed5c7bae44f88de68321f4b21bef4ef6e199d746d24fb4be077c676f96d9c84d8dfd453f370
 DIST shorewall-core-5.2.0.3.tar.bz2 75625 BLAKE2B fd8ae63da974088958ffb4a0a9b3d740556f60e1f73b50614af1fd337cf0c715cbd79f003085df1d6a2e1ad1203b8f322aea56e4808dbc920c3c09ef7011a4d5 SHA512 c67f0c64272c03650d4c3a727bcc0f9fc5771eb10e8b914e0c4709b4fda5ee1bea98a6e2a84eb43ee44a41005d8b05bf869ec7c61be582d3b82936f33a6d3d0a
+DIST shorewall-core-5.2.0.4.tar.bz2 76022 BLAKE2B 58602e01f7a7b6e6853c847fa38bfff2fbeb57ea68ffd124f9e556b0137bef65bfe25c8b7c70f0d6fc7b21dab7e82401985a08f0a1a8c4ca6159cbfd1862712c SHA512 bfd21f249fa3b7a952bf9aeead91eac0f7db6c2f3c386e9d2aca9645916b8a799ce58ac7b6edb93d0b934d224824f9cd94b8db63a0b35a260051209613561bf4
 DIST shorewall-docs-html-5.1.12.4.tar.bz2 4281202 BLAKE2B 51624bf6a36766fa8f1aad9600885dc2b92f656ef3a7bc6cf3704a33d2e014af590bbe1621793bd77d291baa3441a0f493c27f838159ccbb15b0684ab26f4bef SHA512 e1592137013b463a7cbd28c7354f51b36460c054d55e1819198b72c600ccbdc8b3fee4bab33d7a71466397338bd38e0aa6312f1c182e79052f249c51d1017dc1
 DIST shorewall-docs-html-5.2.0.2.tar.bz2 4294083 BLAKE2B 3ce667e656359f7d2f27bd03a47f2eae9f407a04f7b2921ad7099729164c40b3a88b2651052c3b28a3ab404953bef811da499f6acd4eb432648bf6d727124a20 SHA512 751f2c426e8abe9a5af396df39d4b67ccf674113b4b595916c6d44c14ace67f82ae2ffc84500b25d2876f0356b02c96383068d54fa97804afe464d2d5eccba31
 DIST shorewall-docs-html-5.2.0.3.tar.bz2 4295064 BLAKE2B a4913ac5138a2ee1c0c8640a7e2ea4e40bd4324aee0ffd6d4b228b41065d4d4e9e55ef0d600fd93dca8cb3ee73aeb2df196496d68dd11b40b23ce7c96ec0f9d6 SHA512 1e887b7eb0c4d0a78be7857a537f7cfa1307b43feed6396c5db289de5a2ea13547e25311bdd1e1dd48cd460e12ff71ce1520f1ec0feab87753f10cfeb45873c1
+DIST shorewall-docs-html-5.2.0.4.tar.bz2 4294681 BLAKE2B b6e975ddefae5dc7fd0a9be58c6fd231e828ed8e18e2405202766068b37796c075785c2cc05f25bc9decc50fbdfc01bad8d8f929b90592aa2e8cc040719e3cf1 SHA512 2685161f9d25cf745831f603129c4e9a33a264118698392f589e481a76bcb082dad14c9be6dc57c29441eb9807d842e5f08b3483e1e03099f0059f10ea907d91
 DIST shorewall-init-5.1.12.4.tar.bz2 41541 BLAKE2B 149b31b2ffd37c64cfc69de7d2d3a39824ce427a98a84f4e96af02aad9e04f0973f862ea0b158245a1d806504dc0dac9a5a554776d9533a7c88dbf6c096d4d07 SHA512 971f0a7a25f49c289e9c9d6d564e05b7f2675d271ef95c15b06a4a4e878a74c5b13a1ea80411014a5130f53267df6691042b313c423db193b9cd6cde172ed359
 DIST shorewall-init-5.2.0.2.tar.bz2 29749 BLAKE2B c70067951d458bc54434214dc2b4764c0c52aca457a21c4c77d3ae6cc0586fc5ce325549f7a5df9c18c255113e7d71a4f687a6a72fc81528b7611a3edacab864 SHA512 1fef0feea7e36d2f12373e64d898129e2e49c66f3f182fad950f5aced6615ff2b59cea66c1d2c475e9a781c0faf50541642c71e69dda68fa41ab86509134b511
 DIST shorewall-init-5.2.0.3.tar.bz2 30209 BLAKE2B 93e80935fd659b073e85ea0281f749a8bfebcc752e8fb1134af21a0bf262c7a7ba0f96ed8ce2aba37b592cd4bfef0a8e714dce25c3e1af9529c4acafe52502cd SHA512 988342ba1755373ecc89bf139eb6ca7a3fb78081a84e510a2827d174129bb24e06cb36fb474f9cce1056879997bc641152da18d8feb57429686a88e8cc1c8b9d
+DIST shorewall-init-5.2.0.4.tar.bz2 30526 BLAKE2B a8ac5bf7e650a58d87b608321e0ed40d8b73ed675d5b5b64ff5859149f04aca507d7a83ff6ca9c7801c84fb416d22fdc930199731a9134ef529b29cf1ec01a67 SHA512 c4e2bcf5a2f7b8fae30773a930ac7433cc8678f7bb52958ecd92a4ce5f0a78041e45578bd47e01ad72fe9fc1a3cbcda2995bd9379cc90917a31b3f676c12beb6
 DIST shorewall-lite-5.1.12.4.tar.bz2 47209 BLAKE2B ca39daa7a864b86cd9075f8604d053984ef8c451285520c568b83171163513bdbe7f910b21638f4f69e716d4bdbb4f148856b02dbe83392789d8b962669374e1 SHA512 1bcdb90fccc634103ff190be9a058abf1b5158d562702c8c1ad51e8edebc2939271f3279bcb0fd8ff7389ea175387ce5a090a0d9e5655524a11203b5c0d55604
 DIST shorewall-lite-5.2.0.2.tar.bz2 35577 BLAKE2B 462480b73a4cb70e2c09f7b1c4607cc748d1ff5d6ca511b2076edd7872865442ede343e3b26be2c46665a1c6beed5290584ccf0da6f93bc62ea1da1faf90abb3 SHA512 eb68b4b2b92a87c80f80b950bb5c2fc4f035f7650d786e4999d262bb21e2a5ee439e804aee4b3b0fb187b086ba4d899725a031f38d4138bec151969f9a874663
 DIST shorewall-lite-5.2.0.3.tar.bz2 36011 BLAKE2B 42e362eb8a17c8115ae3afd5985a367b51abda853466d204de033a064b7cdf9967596d10eb064fa61378c5292661bc884face83ab1f54cf30526e978c562346f SHA512 d76a63e8a1ab7701c91d5344f7dbe29f3cc3f10ca7b5f7886573e41f828f53e5a50af94004abbe01ab2a52551a86b25f4bce74f867cc8b5a0d9b28ec10ba7ae4
+DIST shorewall-lite-5.2.0.4.tar.bz2 36307 BLAKE2B ad95e4f640ae1f05936dd5dbc87e4acaf6dd576bd6704f650c8bfdc437284f0c121563427f89dbe5de4e19f543f3e182ff0d5a333da8c8416aae24994ac52ed0 SHA512 55bb514d9446c953de0453b8016105ed2471420d2ca6346cbd986f03cec5e713a1d27d5e08ddc6cf54cd6e5f936cf9a826eac622596480374929f41c062e8803
 DIST shorewall6-5.1.12.4.tar.bz2 197179 BLAKE2B 1c120388d0b8eafdbf6ec2fb64a8cc3e1e301dd109bb03f5dcfce60c534489210f669327eaa07bac5fbc7497e39c9167586f02017318ce9a2b054b4a39e4ae50 SHA512 9ff09b093f641452d3c5d615163336c903c74d4133cd620982760df6b8ee3acc704c460adb5db52b109f768d623152e47617c7d05742c2e6f19527c34eec9a61
 DIST shorewall6-5.2.0.2.tar.bz2 186161 BLAKE2B 97414d6c8d3c6cf9100330ff6d9be9808f9aa354ab4c535429b8593dba0d5f328469bd42e928f33f66ba40a0e91dfcc45d47d2b405a6ccdc814fb1e2c9a977dc SHA512 ec551998f04cd9b1ac0c791cbdc45068b402d5be89e2fd0e1a6eb95b288b339ed49c23bac73e81f324e8c277b66772d2ef5b11aed7a4b085a5ed0047fb96b1da
 DIST shorewall6-5.2.0.3.tar.bz2 185097 BLAKE2B dcbb3d42f257a2ed4c9f8e1f5185651700a7735d509c0f2a213608fb4c854c50c7330969f370449df62d5c95c9bbff609f955aafe472208940f83ddfe4da50db SHA512 ef14ac0759afe95a27c0a3a6217d884c0d95636cbee342c24c49ccc77f4538c2175a91866f96d7e79c992ab062d9a7a3e005a4580aaf4ccfe5ff524062bde8df
+DIST shorewall6-5.2.0.4.tar.bz2 186267 BLAKE2B 4076c94596e462d4f150d734700d400db90ca1d0bd788152e5421d581890cf28d7e6546d2ac0c604625cdf25771415229b2a3324153ec5439cddfcab73464ae5 SHA512 e8989b5c6fcc1162f42e884cdb0fff47baed61b69c39b8bbdaf78b246f95ee0bf6690fce3a6ae14eff2bf48d64b762b170d67462dc685f594dfd70a2e3720a01
 DIST shorewall6-lite-5.1.12.4.tar.bz2 46902 BLAKE2B 6e9bad615833beacbb0d4b779dc8479cad73c1964bc2220541419b99a7fc8dd1b57ca42d61d6ef708460beffa65106166dbd5c60a90ce7f4cdf60ce3a879defb SHA512 95b5b96b3744bd1a499d00b4f98d71b264369752e6fd9ede21717657785833d1124b97434fe33457bc6f80026b204eb9306d73af9eb8abf23840291ecc1caf32
 DIST shorewall6-lite-5.2.0.2.tar.bz2 35311 BLAKE2B bb25abc719c776571273219df6a3ba89ffe2553efbb4e93755b3deabce9f34851024f72d5ab328ee9caa55ab3744e35f08013ae8fda19c480e6d907e7257f8fe SHA512 2c39805d17cd8d9710d175d583958cc25ac0f78351a36c36ff57e7a9c8db87bd64ddf5c27352c916d42db2a26864cb9e96f83e5b1677e24964e67315dc2fb086
 DIST shorewall6-lite-5.2.0.3.tar.bz2 35704 BLAKE2B bad1f19cb53258a33bb8bc15cc4bab24c00a2fe1d63b95859565466ef549726efa70ce8ba9e8aa6317eaae3106e32c0ad41bc92d34e111011b66382476a2dda6 SHA512 272f47172267d5b31a2fe46fdae20cf18215a2ec9833eb634eced80d3f0e40a99d7dff8ae856f536bce425392ab9b4aaa7f7e19eb55958224f9f1c0769c72069
+DIST shorewall6-lite-5.2.0.4.tar.bz2 36035 BLAKE2B edbdee2b979c0d2144e358b6e8b52808578923498c0da4f906ed6aa8460153879dd5f8b4cf98da4bcecc90a6a776d39ef17492881c093a018ccdc5b86e0c0bab SHA512 c212ba3f6bacab1b26bbc5c13a2bac2f1f796c7fa3d442f398c91ff367f242a9562ff2191b9b678e82d07a96c2dc39a0109d30417154e6cfd4f2c4c6e31b616f

diff --git a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild b/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
new file mode 100644
index 00000000000..a7f7766988a
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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
+
+	# 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
+	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
+	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
+	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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-06-07  0:02 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-06-07  0:02 UTC (permalink / raw
  To: gentoo-commits

commit:     823b7bed97fbb7fcd1d3f70797a457fb2a66f32e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  6 23:59:18 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 23:59:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823b7bed

net-firewall/shorewall: x86 stable, applying ALLARCHES policy

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-firewall/shorewall/shorewall-5.2.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild b/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
index a7f7766988a..041ddab407e 100644
--- a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.0.4.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-08-06 23:56 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-08-06 23:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3b384e7068e79024defc28e037961035217b40f6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  6 23:56:06 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 23:56:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b384e70

net-firewall/shorewall: bump to v5.2.0.5

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.0.5.ebuild | 459 ++++++++++++++++++++++++
 2 files changed, 466 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index df74226f872..b53573f8835 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.0.4.tar.bz2 538938 BLAKE2B 1df68e166f5f443f120b9f45010da005b3d86a51d09c059d0886a2735c6d27c1568ae0422998f001deb48c512cb9fed23cbad423754682b06e9a4b5176b45cef SHA512 b44622972d4b4ffcde9d7da57d3994279f3962bb2d2e13892d7d77453da502527ab89cb59fb6692341b5d166cb7a3e31909df31dc21c758707eff29f3ab2c9a0
+DIST shorewall-5.2.0.5.tar.bz2 539666 BLAKE2B df4f8680ee29a773f584a1210b40a7047be1a590490a01617b26b71840e488f569ebcf268ba2f6199fb10671925356c4e187a5219ed7784672f6d14b2e90f580 SHA512 8299e0f40ad96c09eceb9460c6088e694e50b7a1b81a16395426466c666eb21dc23236c1ee6cc6047c05ad4a4ba43aac33fc7cb05f5784bf27ac81e5fa4e9059
 DIST shorewall-core-5.2.0.4.tar.bz2 76022 BLAKE2B 58602e01f7a7b6e6853c847fa38bfff2fbeb57ea68ffd124f9e556b0137bef65bfe25c8b7c70f0d6fc7b21dab7e82401985a08f0a1a8c4ca6159cbfd1862712c SHA512 bfd21f249fa3b7a952bf9aeead91eac0f7db6c2f3c386e9d2aca9645916b8a799ce58ac7b6edb93d0b934d224824f9cd94b8db63a0b35a260051209613561bf4
+DIST shorewall-core-5.2.0.5.tar.bz2 76567 BLAKE2B 078520ef3166d689d559f1c08ae417a2bf5c7fdc3618a26f72b244fa14679634752dffaeebafbd84609e33ec7f1856b701abb297077797abcb14d3264a3bfd25 SHA512 640c854a7484e886cd603742d16682456e02c0054c3d6d5f2188bf30e235ac975fc1ce50af500cf4fb99253a1d13c2408cc72aff54f14aa738e1e80b8d07066a
 DIST shorewall-docs-html-5.2.0.4.tar.bz2 4294681 BLAKE2B b6e975ddefae5dc7fd0a9be58c6fd231e828ed8e18e2405202766068b37796c075785c2cc05f25bc9decc50fbdfc01bad8d8f929b90592aa2e8cc040719e3cf1 SHA512 2685161f9d25cf745831f603129c4e9a33a264118698392f589e481a76bcb082dad14c9be6dc57c29441eb9807d842e5f08b3483e1e03099f0059f10ea907d91
+DIST shorewall-docs-html-5.2.0.5.tar.bz2 4295236 BLAKE2B 8cef99b3535551e1d4ecdf0d3d1c2b3434c0b91c793f0857bc3f22f0020d80cd49b038c7c4f5d15fe23af14869f1736a69b01978403fe94bc5dac261bd2f5e4d SHA512 5fa3ab52580e8f090ab0be9b1796bef65a41d1a9dc5c9501e3daeba22bad7b28b5306aba5b383c654eed5f7d727a7744812034eeb1ad051633a80b2892096c24
 DIST shorewall-init-5.2.0.4.tar.bz2 30526 BLAKE2B a8ac5bf7e650a58d87b608321e0ed40d8b73ed675d5b5b64ff5859149f04aca507d7a83ff6ca9c7801c84fb416d22fdc930199731a9134ef529b29cf1ec01a67 SHA512 c4e2bcf5a2f7b8fae30773a930ac7433cc8678f7bb52958ecd92a4ce5f0a78041e45578bd47e01ad72fe9fc1a3cbcda2995bd9379cc90917a31b3f676c12beb6
+DIST shorewall-init-5.2.0.5.tar.bz2 30881 BLAKE2B 92617f17553b6df514cbfc72e86597e9859baa641782848763923ff4c650915cd7fb97f0c71b41d525d6a9d5ebbf10e9918d6a8d682c9c4654de3ba40b54c0ce SHA512 0367ad7468d5a9c0c70d31fdd66c05e54cf747dd45dc1bf2e128935c65af8c2508f033ed2945185059214dd81f5a8fb3f122323fd2bb79d2d642997741167371
 DIST shorewall-lite-5.2.0.4.tar.bz2 36307 BLAKE2B ad95e4f640ae1f05936dd5dbc87e4acaf6dd576bd6704f650c8bfdc437284f0c121563427f89dbe5de4e19f543f3e182ff0d5a333da8c8416aae24994ac52ed0 SHA512 55bb514d9446c953de0453b8016105ed2471420d2ca6346cbd986f03cec5e713a1d27d5e08ddc6cf54cd6e5f936cf9a826eac622596480374929f41c062e8803
+DIST shorewall-lite-5.2.0.5.tar.bz2 36651 BLAKE2B 192ecda8b04d0330f0a7bced6136f2723d201cd7c30af80b59bfa81f49614d10c900cf5856296ad854287f3c925e5f78f144698674ec7b8d91065072db4ca53e SHA512 b95154f7614eeedde1fc087750372cadd0c0a9618986741e035a9d83c06d2534feb78edaf6a97e2a45788015e6706f8dac3714ca3b22bd068e792458a3f5af40
 DIST shorewall6-5.2.0.4.tar.bz2 186267 BLAKE2B 4076c94596e462d4f150d734700d400db90ca1d0bd788152e5421d581890cf28d7e6546d2ac0c604625cdf25771415229b2a3324153ec5439cddfcab73464ae5 SHA512 e8989b5c6fcc1162f42e884cdb0fff47baed61b69c39b8bbdaf78b246f95ee0bf6690fce3a6ae14eff2bf48d64b762b170d67462dc685f594dfd70a2e3720a01
+DIST shorewall6-5.2.0.5.tar.bz2 185740 BLAKE2B 846a3fc44a9c0a838cf75671ca34e78dd9758eeee0690d994a34615467b241f0c854e3bb9b818bcfd5e96664ab03e14a7c69affc946dffd1357ad744da41f8d5 SHA512 6875074ed8ee5bce40253a6e2633c422d7c2c1bf860a072236d6197cfe949e455b511a1792d822a8f2351254e99880236267ce70fc1150ca68e87f962b6cc265
 DIST shorewall6-lite-5.2.0.4.tar.bz2 36035 BLAKE2B edbdee2b979c0d2144e358b6e8b52808578923498c0da4f906ed6aa8460153879dd5f8b4cf98da4bcecc90a6a776d39ef17492881c093a018ccdc5b86e0c0bab SHA512 c212ba3f6bacab1b26bbc5c13a2bac2f1f796c7fa3d442f398c91ff367f242a9562ff2191b9b678e82d07a96c2dc39a0109d30417154e6cfd4f2c4c6e31b616f
+DIST shorewall6-lite-5.2.0.5.tar.bz2 36370 BLAKE2B 212cee0313c3bbf08c8d22893c5b62125d0362eb66218dc954bc05d0e082fdb4dab209a05948300394943dcd97f698c1e02310ec54cc88fb72bd24d4383776f7 SHA512 18bcbaf3bd56aaadb8d42610d4868278f42299e5a022ac5732f730b34ed7d97f7cd013f1c9374f0a6afc809250288490d94d2b4e02e4bf5edf2542bff99150e4

diff --git a/net-firewall/shorewall/shorewall-5.2.0.5.ebuild b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
new file mode 100644
index 00000000000..a7f7766988a
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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
+
+	# 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
+	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
+	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
+	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
+	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
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-10-07 16:02 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-10-07 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     ed0c875a14ea0308fe822e13f0f80d801e968c31
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  7 13:59:32 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 16:02:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0c875a

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.2.0.4.ebuild | 459 ------------------------
 2 files changed, 466 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index b53573f8835..5dc17102042 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-DIST shorewall-5.2.0.4.tar.bz2 538938 BLAKE2B 1df68e166f5f443f120b9f45010da005b3d86a51d09c059d0886a2735c6d27c1568ae0422998f001deb48c512cb9fed23cbad423754682b06e9a4b5176b45cef SHA512 b44622972d4b4ffcde9d7da57d3994279f3962bb2d2e13892d7d77453da502527ab89cb59fb6692341b5d166cb7a3e31909df31dc21c758707eff29f3ab2c9a0
 DIST shorewall-5.2.0.5.tar.bz2 539666 BLAKE2B df4f8680ee29a773f584a1210b40a7047be1a590490a01617b26b71840e488f569ebcf268ba2f6199fb10671925356c4e187a5219ed7784672f6d14b2e90f580 SHA512 8299e0f40ad96c09eceb9460c6088e694e50b7a1b81a16395426466c666eb21dc23236c1ee6cc6047c05ad4a4ba43aac33fc7cb05f5784bf27ac81e5fa4e9059
-DIST shorewall-core-5.2.0.4.tar.bz2 76022 BLAKE2B 58602e01f7a7b6e6853c847fa38bfff2fbeb57ea68ffd124f9e556b0137bef65bfe25c8b7c70f0d6fc7b21dab7e82401985a08f0a1a8c4ca6159cbfd1862712c SHA512 bfd21f249fa3b7a952bf9aeead91eac0f7db6c2f3c386e9d2aca9645916b8a799ce58ac7b6edb93d0b934d224824f9cd94b8db63a0b35a260051209613561bf4
 DIST shorewall-core-5.2.0.5.tar.bz2 76567 BLAKE2B 078520ef3166d689d559f1c08ae417a2bf5c7fdc3618a26f72b244fa14679634752dffaeebafbd84609e33ec7f1856b701abb297077797abcb14d3264a3bfd25 SHA512 640c854a7484e886cd603742d16682456e02c0054c3d6d5f2188bf30e235ac975fc1ce50af500cf4fb99253a1d13c2408cc72aff54f14aa738e1e80b8d07066a
-DIST shorewall-docs-html-5.2.0.4.tar.bz2 4294681 BLAKE2B b6e975ddefae5dc7fd0a9be58c6fd231e828ed8e18e2405202766068b37796c075785c2cc05f25bc9decc50fbdfc01bad8d8f929b90592aa2e8cc040719e3cf1 SHA512 2685161f9d25cf745831f603129c4e9a33a264118698392f589e481a76bcb082dad14c9be6dc57c29441eb9807d842e5f08b3483e1e03099f0059f10ea907d91
 DIST shorewall-docs-html-5.2.0.5.tar.bz2 4295236 BLAKE2B 8cef99b3535551e1d4ecdf0d3d1c2b3434c0b91c793f0857bc3f22f0020d80cd49b038c7c4f5d15fe23af14869f1736a69b01978403fe94bc5dac261bd2f5e4d SHA512 5fa3ab52580e8f090ab0be9b1796bef65a41d1a9dc5c9501e3daeba22bad7b28b5306aba5b383c654eed5f7d727a7744812034eeb1ad051633a80b2892096c24
-DIST shorewall-init-5.2.0.4.tar.bz2 30526 BLAKE2B a8ac5bf7e650a58d87b608321e0ed40d8b73ed675d5b5b64ff5859149f04aca507d7a83ff6ca9c7801c84fb416d22fdc930199731a9134ef529b29cf1ec01a67 SHA512 c4e2bcf5a2f7b8fae30773a930ac7433cc8678f7bb52958ecd92a4ce5f0a78041e45578bd47e01ad72fe9fc1a3cbcda2995bd9379cc90917a31b3f676c12beb6
 DIST shorewall-init-5.2.0.5.tar.bz2 30881 BLAKE2B 92617f17553b6df514cbfc72e86597e9859baa641782848763923ff4c650915cd7fb97f0c71b41d525d6a9d5ebbf10e9918d6a8d682c9c4654de3ba40b54c0ce SHA512 0367ad7468d5a9c0c70d31fdd66c05e54cf747dd45dc1bf2e128935c65af8c2508f033ed2945185059214dd81f5a8fb3f122323fd2bb79d2d642997741167371
-DIST shorewall-lite-5.2.0.4.tar.bz2 36307 BLAKE2B ad95e4f640ae1f05936dd5dbc87e4acaf6dd576bd6704f650c8bfdc437284f0c121563427f89dbe5de4e19f543f3e182ff0d5a333da8c8416aae24994ac52ed0 SHA512 55bb514d9446c953de0453b8016105ed2471420d2ca6346cbd986f03cec5e713a1d27d5e08ddc6cf54cd6e5f936cf9a826eac622596480374929f41c062e8803
 DIST shorewall-lite-5.2.0.5.tar.bz2 36651 BLAKE2B 192ecda8b04d0330f0a7bced6136f2723d201cd7c30af80b59bfa81f49614d10c900cf5856296ad854287f3c925e5f78f144698674ec7b8d91065072db4ca53e SHA512 b95154f7614eeedde1fc087750372cadd0c0a9618986741e035a9d83c06d2534feb78edaf6a97e2a45788015e6706f8dac3714ca3b22bd068e792458a3f5af40
-DIST shorewall6-5.2.0.4.tar.bz2 186267 BLAKE2B 4076c94596e462d4f150d734700d400db90ca1d0bd788152e5421d581890cf28d7e6546d2ac0c604625cdf25771415229b2a3324153ec5439cddfcab73464ae5 SHA512 e8989b5c6fcc1162f42e884cdb0fff47baed61b69c39b8bbdaf78b246f95ee0bf6690fce3a6ae14eff2bf48d64b762b170d67462dc685f594dfd70a2e3720a01
 DIST shorewall6-5.2.0.5.tar.bz2 185740 BLAKE2B 846a3fc44a9c0a838cf75671ca34e78dd9758eeee0690d994a34615467b241f0c854e3bb9b818bcfd5e96664ab03e14a7c69affc946dffd1357ad744da41f8d5 SHA512 6875074ed8ee5bce40253a6e2633c422d7c2c1bf860a072236d6197cfe949e455b511a1792d822a8f2351254e99880236267ce70fc1150ca68e87f962b6cc265
-DIST shorewall6-lite-5.2.0.4.tar.bz2 36035 BLAKE2B edbdee2b979c0d2144e358b6e8b52808578923498c0da4f906ed6aa8460153879dd5f8b4cf98da4bcecc90a6a776d39ef17492881c093a018ccdc5b86e0c0bab SHA512 c212ba3f6bacab1b26bbc5c13a2bac2f1f796c7fa3d442f398c91ff367f242a9562ff2191b9b678e82d07a96c2dc39a0109d30417154e6cfd4f2c4c6e31b616f
 DIST shorewall6-lite-5.2.0.5.tar.bz2 36370 BLAKE2B 212cee0313c3bbf08c8d22893c5b62125d0362eb66218dc954bc05d0e082fdb4dab209a05948300394943dcd97f698c1e02310ec54cc88fb72bd24d4383776f7 SHA512 18bcbaf3bd56aaadb8d42610d4868278f42299e5a022ac5732f730b34ed7d97f7cd013f1c9374f0a6afc809250288490d94d2b4e02e4bf5edf2542bff99150e4

diff --git a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild b/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
deleted file mode 100644
index 041ddab407e..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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
-
-	# 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
-	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
-	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
-	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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-10-07 16:02 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-10-07 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     534206273c3f9ef07188d85f6c1829c686dd8e8e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  7 13:58:52 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 16:02:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53420627

net-firewall/shorewall: mark stable applying ALLARCHES policy

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.0.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.0.5.ebuild b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
index a7f7766988a..3794662afa6 100644
--- a/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-10-29 14:54 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-10-29 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     9684940802ac82dbbb0eff5ca1b9e1b83b815ff4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 29 13:30:48 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Oct 29 14:54:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96849408

net-firewall/shorewall: bump to v5.2.1.1

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.1.1.ebuild | 479 ++++++++++++++++++++++++
 2 files changed, 486 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 65b3e1bc59e..8a3f2870510 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.2.0.5.tar.bz2 539666 BLAKE2B df4f8680ee29a773f584a1210b40a7047be1a590490a01617b26b71840e488f569ebcf268ba2f6199fb10671925356c4e187a5219ed7784672f6d14b2e90f580 SHA512 8299e0f40ad96c09eceb9460c6088e694e50b7a1b81a16395426466c666eb21dc23236c1ee6cc6047c05ad4a4ba43aac33fc7cb05f5784bf27ac81e5fa4e9059
+DIST shorewall-5.2.1.1.tar.bz2 552739 BLAKE2B bfbfdb3320eb884b965f3c7b8d5af61a78bb625a10ad2bc493a5c8a191d676d933855335209a41f893ccb2edb644cf510930da936227fad9fb667793dce88e91 SHA512 59e1b4bb09114162911f0cb42d67df0d82c5a4410322ceb972506705c10cf903cb482123a00181399da99513c857d382771de36ec11433ff7bd9d57a343c48dc
 DIST shorewall-5.2.1.tar.bz2 550552 BLAKE2B c7b77912f644b3ae1a15a366018bc57da72d23342ec9db4ba282c8bc993f4964b3ce6d783448e2e36a6370fd223e1d14f1b27e9cadfa47024a1dda8109419c7f SHA512 2c408196a142a314f72ea4adb4193fa5cf30300529c41661e157e7b69f2d8448a0c25bcd177f25d6f993494b26068edf48cc0fc8e6a526380726baa33a8e11c8
 DIST shorewall-core-5.2.0.5.tar.bz2 76567 BLAKE2B 078520ef3166d689d559f1c08ae417a2bf5c7fdc3618a26f72b244fa14679634752dffaeebafbd84609e33ec7f1856b701abb297077797abcb14d3264a3bfd25 SHA512 640c854a7484e886cd603742d16682456e02c0054c3d6d5f2188bf30e235ac975fc1ce50af500cf4fb99253a1d13c2408cc72aff54f14aa738e1e80b8d07066a
+DIST shorewall-core-5.2.1.1.tar.bz2 78022 BLAKE2B dfa53a4558ec819feee25116021e410ac65dfad20d3d9384e3a233d47e7e443957149d025166d094397fb2c01b8be7694db8c06e927776250b5edafa97e5d287 SHA512 0c12d5deb4a93fb174a7c97459f2863149eec52ab778c30523c23cbdfbeb94d890442a0eb8ad9869158a967f2daac59a9d7194734e35e69982889d93d984b58b
 DIST shorewall-core-5.2.1.tar.bz2 76562 BLAKE2B 6129e90f9cfca9b36221320eb917f3299dd151d366e2b98d546519330cd5c95511d4a1e7b1a4ea2de046aed2d2a72367f8e3039ad288de89178e161cb16eb5a0 SHA512 4ea3fdec0c4ffb57a7e63334aed3479819079936575928b01399a3c2a8515a4ecf1eb19f1e193849480e6ac84f4c7de9e4c84699765684fb2299bf1b5276a3a8
 DIST shorewall-docs-html-5.2.0.5.tar.bz2 4295236 BLAKE2B 8cef99b3535551e1d4ecdf0d3d1c2b3434c0b91c793f0857bc3f22f0020d80cd49b038c7c4f5d15fe23af14869f1736a69b01978403fe94bc5dac261bd2f5e4d SHA512 5fa3ab52580e8f090ab0be9b1796bef65a41d1a9dc5c9501e3daeba22bad7b28b5306aba5b383c654eed5f7d727a7744812034eeb1ad051633a80b2892096c24
+DIST shorewall-docs-html-5.2.1.1.tar.bz2 4303275 BLAKE2B d2a9c980f0486671103653a6944e12f03e282bd859a9c06558d6dbfdf9fd6a7c72993355ab61138c94317d36228cbbb55903c9d17547ecdc18af57e989a5ef7b SHA512 c9eef71fdc53a97a523a580c5df0c7773f7dc6fc8abfbfe7a2fbc607be6d0e6377f47886001a87a37260118edb298880abda06e3ac4581d8551b3934791332fc
 DIST shorewall-docs-html-5.2.1.tar.bz2 4302517 BLAKE2B a38659f9740da36efe3a2bf844b9686a18bb47476388580d02462aec0715afb1d09d20ffb2ee708550f7288fb7bb36ae8e5f23d902bd126bb2a5c496866e49dd SHA512 c67c621c1fea599c5e1987a7847bed187d8d0571e1b6d42c9fc351022de04b47e4f57030f919b85e8c9fef51829e0b04cbbc14e29a0df6f084c765219d46591c
 DIST shorewall-init-5.2.0.5.tar.bz2 30881 BLAKE2B 92617f17553b6df514cbfc72e86597e9859baa641782848763923ff4c650915cd7fb97f0c71b41d525d6a9d5ebbf10e9918d6a8d682c9c4654de3ba40b54c0ce SHA512 0367ad7468d5a9c0c70d31fdd66c05e54cf747dd45dc1bf2e128935c65af8c2508f033ed2945185059214dd81f5a8fb3f122323fd2bb79d2d642997741167371
+DIST shorewall-init-5.2.1.1.tar.bz2 33215 BLAKE2B 3b151f60e368cd4237a8549d6de14ec4ed896c2c838f680a59aa12492c46bfb48accfa1a5bc98877663523861040af4995628e75f693c9fa5433483ef0fc6161 SHA512 21cdccc01b60df48e7e1204102c0b371d7e32fb1f897310e31a6cff128ebf5ed5efe3903bc487aa41ee093c23eb87e59764b78903ee5c6eba03552a1dcccc634
 DIST shorewall-init-5.2.1.tar.bz2 31705 BLAKE2B 7f6a6b5266d63e3b0fab99a49f342e8172a20f50471fdcebe07a6c62dc36fcf4d96a041870df815aa5ecf2c421b5d7cb1408c0f54f520295611d54a876150294 SHA512 caba4eebcc576bf261327cb7304aedcaaea7325a34e444b4dd9ce60cd545b479271ea9b7049743ac1499485695d7d0f2a37b127a895cb3d200e6dfb41a21fe17
 DIST shorewall-lite-5.2.0.5.tar.bz2 36651 BLAKE2B 192ecda8b04d0330f0a7bced6136f2723d201cd7c30af80b59bfa81f49614d10c900cf5856296ad854287f3c925e5f78f144698674ec7b8d91065072db4ca53e SHA512 b95154f7614eeedde1fc087750372cadd0c0a9618986741e035a9d83c06d2534feb78edaf6a97e2a45788015e6706f8dac3714ca3b22bd068e792458a3f5af40
+DIST shorewall-lite-5.2.1.1.tar.bz2 39020 BLAKE2B 40697930bb2251062a126a4bd86cd8379d32d9543f32d67208106205b35d3ae9cb9a67e48a48451053ae90138ffcda6cbe5dd5ce7c25bda6eab340dd4680bec8 SHA512 c10ee8ec81817fe8fc35caac253a89fb58be105fa1fb1c692d269f6916537007d555daeba4e5445568a6a6972dfc6db3e21f5637844c6a5e51e91b2a4795724d
 DIST shorewall-lite-5.2.1.tar.bz2 37527 BLAKE2B 5a50d66366b5c4c456fd4291d1413923162cfe24f989df00be5f613089d96402430ec6c6780c78ee5e398cd931c964e8d164efefb4d1531cb870ba65040809be SHA512 111f68c2d59b58e7d344e55b293d78fe2013771be9f8399bea88d9699905f3683931668fad23e7efea1fcae9d3c6381bd9f2073c3f208e81cec958ab19b2510e
 DIST shorewall6-5.2.0.5.tar.bz2 185740 BLAKE2B 846a3fc44a9c0a838cf75671ca34e78dd9758eeee0690d994a34615467b241f0c854e3bb9b818bcfd5e96664ab03e14a7c69affc946dffd1357ad744da41f8d5 SHA512 6875074ed8ee5bce40253a6e2633c422d7c2c1bf860a072236d6197cfe949e455b511a1792d822a8f2351254e99880236267ce70fc1150ca68e87f962b6cc265
+DIST shorewall6-5.2.1.1.tar.bz2 191039 BLAKE2B 4d40d30d4d6ad6a9aacf4acc4da6a4b31546a07969f12fde0d568f75e31ca587a31a830f386092ec0061df8cbff4032402c834e374076097fedb5de18127071b SHA512 0eb342a89f875527242be5e91c64a2debb7e2d159f5edc7f53a86c504e4e782f5635dd4e52b573526d1528d4aa4944384f52f68dc9a7c25513c3e5b2a7922b8c
 DIST shorewall6-5.2.1.tar.bz2 188322 BLAKE2B 5814433b11001f1e00ce3b124b5ec4ca6b1909ec00f966cb5fc93c34207325853249964492eb03f1f3c73cfc9c1b42def9578e507395395dd067f236475215b5 SHA512 b5dd5c4bf014c24a8a8bb4dc38b45dc92749182091b572340e1aef12d0aaeeb1dc436716b449cc1de34c74c6e4d590cc8cbe6b73aa3c614e8c9c37d7fa7a00a6
 DIST shorewall6-lite-5.2.0.5.tar.bz2 36370 BLAKE2B 212cee0313c3bbf08c8d22893c5b62125d0362eb66218dc954bc05d0e082fdb4dab209a05948300394943dcd97f698c1e02310ec54cc88fb72bd24d4383776f7 SHA512 18bcbaf3bd56aaadb8d42610d4868278f42299e5a022ac5732f730b34ed7d97f7cd013f1c9374f0a6afc809250288490d94d2b4e02e4bf5edf2542bff99150e4
+DIST shorewall6-lite-5.2.1.1.tar.bz2 38766 BLAKE2B 3a60a877516676a85f5d5d645ce3140c92438c7bb44abb5d8b8e188611bc14a0f3611e977a26526e6408439dd29eb00584217230e20e94ead9f5cbab73a980b3 SHA512 3df814352027ef9f16df030c7187eaa4d7b984cbb23e123eaa19a123a85e276a730b510ff7a76cafba80978474ed5bcb57a4b569332396780e14f7aa7d0d8669
 DIST shorewall6-lite-5.2.1.tar.bz2 37244 BLAKE2B 4fcd5a1b65b15a7c4214b079677f6ee3604d1a718fe6a4710d42085434af64bcef9db57135b0c6b0e6678dba6272a4341330e47b8a6917c759e450091c7d1b5a SHA512 ca807bf0d59db09439d80725e6eeafb7795346bd030fe8598dcccc4fc93a57819715c33c73035c1819a9eba93efe69e058be1377fcd9adf135a0a08f6ff3e481

diff --git a/net-firewall/shorewall/shorewall-5.2.1.1.ebuild b/net-firewall/shorewall/shorewall-5.2.1.1.ebuild
new file mode 100644
index 00000000000..1666426f5c3
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.1.1.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
+
+	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
+
+	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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-11-11 22:37 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-11-11 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     ff8834836609d9337775bed2b6d0aafe14f8ebef
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 22:36:29 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 22:36:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff883483

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |  14 -
 net-firewall/shorewall/shorewall-5.2.0.5.ebuild | 459 -----------------------
 net-firewall/shorewall/shorewall-5.2.1.ebuild   | 479 ------------------------
 3 files changed, 952 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 8a3f2870510..b94d26d4edb 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,7 @@
-DIST shorewall-5.2.0.5.tar.bz2 539666 BLAKE2B df4f8680ee29a773f584a1210b40a7047be1a590490a01617b26b71840e488f569ebcf268ba2f6199fb10671925356c4e187a5219ed7784672f6d14b2e90f580 SHA512 8299e0f40ad96c09eceb9460c6088e694e50b7a1b81a16395426466c666eb21dc23236c1ee6cc6047c05ad4a4ba43aac33fc7cb05f5784bf27ac81e5fa4e9059
 DIST shorewall-5.2.1.1.tar.bz2 552739 BLAKE2B bfbfdb3320eb884b965f3c7b8d5af61a78bb625a10ad2bc493a5c8a191d676d933855335209a41f893ccb2edb644cf510930da936227fad9fb667793dce88e91 SHA512 59e1b4bb09114162911f0cb42d67df0d82c5a4410322ceb972506705c10cf903cb482123a00181399da99513c857d382771de36ec11433ff7bd9d57a343c48dc
-DIST shorewall-5.2.1.tar.bz2 550552 BLAKE2B c7b77912f644b3ae1a15a366018bc57da72d23342ec9db4ba282c8bc993f4964b3ce6d783448e2e36a6370fd223e1d14f1b27e9cadfa47024a1dda8109419c7f SHA512 2c408196a142a314f72ea4adb4193fa5cf30300529c41661e157e7b69f2d8448a0c25bcd177f25d6f993494b26068edf48cc0fc8e6a526380726baa33a8e11c8
-DIST shorewall-core-5.2.0.5.tar.bz2 76567 BLAKE2B 078520ef3166d689d559f1c08ae417a2bf5c7fdc3618a26f72b244fa14679634752dffaeebafbd84609e33ec7f1856b701abb297077797abcb14d3264a3bfd25 SHA512 640c854a7484e886cd603742d16682456e02c0054c3d6d5f2188bf30e235ac975fc1ce50af500cf4fb99253a1d13c2408cc72aff54f14aa738e1e80b8d07066a
 DIST shorewall-core-5.2.1.1.tar.bz2 78022 BLAKE2B dfa53a4558ec819feee25116021e410ac65dfad20d3d9384e3a233d47e7e443957149d025166d094397fb2c01b8be7694db8c06e927776250b5edafa97e5d287 SHA512 0c12d5deb4a93fb174a7c97459f2863149eec52ab778c30523c23cbdfbeb94d890442a0eb8ad9869158a967f2daac59a9d7194734e35e69982889d93d984b58b
-DIST shorewall-core-5.2.1.tar.bz2 76562 BLAKE2B 6129e90f9cfca9b36221320eb917f3299dd151d366e2b98d546519330cd5c95511d4a1e7b1a4ea2de046aed2d2a72367f8e3039ad288de89178e161cb16eb5a0 SHA512 4ea3fdec0c4ffb57a7e63334aed3479819079936575928b01399a3c2a8515a4ecf1eb19f1e193849480e6ac84f4c7de9e4c84699765684fb2299bf1b5276a3a8
-DIST shorewall-docs-html-5.2.0.5.tar.bz2 4295236 BLAKE2B 8cef99b3535551e1d4ecdf0d3d1c2b3434c0b91c793f0857bc3f22f0020d80cd49b038c7c4f5d15fe23af14869f1736a69b01978403fe94bc5dac261bd2f5e4d SHA512 5fa3ab52580e8f090ab0be9b1796bef65a41d1a9dc5c9501e3daeba22bad7b28b5306aba5b383c654eed5f7d727a7744812034eeb1ad051633a80b2892096c24
 DIST shorewall-docs-html-5.2.1.1.tar.bz2 4303275 BLAKE2B d2a9c980f0486671103653a6944e12f03e282bd859a9c06558d6dbfdf9fd6a7c72993355ab61138c94317d36228cbbb55903c9d17547ecdc18af57e989a5ef7b SHA512 c9eef71fdc53a97a523a580c5df0c7773f7dc6fc8abfbfe7a2fbc607be6d0e6377f47886001a87a37260118edb298880abda06e3ac4581d8551b3934791332fc
-DIST shorewall-docs-html-5.2.1.tar.bz2 4302517 BLAKE2B a38659f9740da36efe3a2bf844b9686a18bb47476388580d02462aec0715afb1d09d20ffb2ee708550f7288fb7bb36ae8e5f23d902bd126bb2a5c496866e49dd SHA512 c67c621c1fea599c5e1987a7847bed187d8d0571e1b6d42c9fc351022de04b47e4f57030f919b85e8c9fef51829e0b04cbbc14e29a0df6f084c765219d46591c
-DIST shorewall-init-5.2.0.5.tar.bz2 30881 BLAKE2B 92617f17553b6df514cbfc72e86597e9859baa641782848763923ff4c650915cd7fb97f0c71b41d525d6a9d5ebbf10e9918d6a8d682c9c4654de3ba40b54c0ce SHA512 0367ad7468d5a9c0c70d31fdd66c05e54cf747dd45dc1bf2e128935c65af8c2508f033ed2945185059214dd81f5a8fb3f122323fd2bb79d2d642997741167371
 DIST shorewall-init-5.2.1.1.tar.bz2 33215 BLAKE2B 3b151f60e368cd4237a8549d6de14ec4ed896c2c838f680a59aa12492c46bfb48accfa1a5bc98877663523861040af4995628e75f693c9fa5433483ef0fc6161 SHA512 21cdccc01b60df48e7e1204102c0b371d7e32fb1f897310e31a6cff128ebf5ed5efe3903bc487aa41ee093c23eb87e59764b78903ee5c6eba03552a1dcccc634
-DIST shorewall-init-5.2.1.tar.bz2 31705 BLAKE2B 7f6a6b5266d63e3b0fab99a49f342e8172a20f50471fdcebe07a6c62dc36fcf4d96a041870df815aa5ecf2c421b5d7cb1408c0f54f520295611d54a876150294 SHA512 caba4eebcc576bf261327cb7304aedcaaea7325a34e444b4dd9ce60cd545b479271ea9b7049743ac1499485695d7d0f2a37b127a895cb3d200e6dfb41a21fe17
-DIST shorewall-lite-5.2.0.5.tar.bz2 36651 BLAKE2B 192ecda8b04d0330f0a7bced6136f2723d201cd7c30af80b59bfa81f49614d10c900cf5856296ad854287f3c925e5f78f144698674ec7b8d91065072db4ca53e SHA512 b95154f7614eeedde1fc087750372cadd0c0a9618986741e035a9d83c06d2534feb78edaf6a97e2a45788015e6706f8dac3714ca3b22bd068e792458a3f5af40
 DIST shorewall-lite-5.2.1.1.tar.bz2 39020 BLAKE2B 40697930bb2251062a126a4bd86cd8379d32d9543f32d67208106205b35d3ae9cb9a67e48a48451053ae90138ffcda6cbe5dd5ce7c25bda6eab340dd4680bec8 SHA512 c10ee8ec81817fe8fc35caac253a89fb58be105fa1fb1c692d269f6916537007d555daeba4e5445568a6a6972dfc6db3e21f5637844c6a5e51e91b2a4795724d
-DIST shorewall-lite-5.2.1.tar.bz2 37527 BLAKE2B 5a50d66366b5c4c456fd4291d1413923162cfe24f989df00be5f613089d96402430ec6c6780c78ee5e398cd931c964e8d164efefb4d1531cb870ba65040809be SHA512 111f68c2d59b58e7d344e55b293d78fe2013771be9f8399bea88d9699905f3683931668fad23e7efea1fcae9d3c6381bd9f2073c3f208e81cec958ab19b2510e
-DIST shorewall6-5.2.0.5.tar.bz2 185740 BLAKE2B 846a3fc44a9c0a838cf75671ca34e78dd9758eeee0690d994a34615467b241f0c854e3bb9b818bcfd5e96664ab03e14a7c69affc946dffd1357ad744da41f8d5 SHA512 6875074ed8ee5bce40253a6e2633c422d7c2c1bf860a072236d6197cfe949e455b511a1792d822a8f2351254e99880236267ce70fc1150ca68e87f962b6cc265
 DIST shorewall6-5.2.1.1.tar.bz2 191039 BLAKE2B 4d40d30d4d6ad6a9aacf4acc4da6a4b31546a07969f12fde0d568f75e31ca587a31a830f386092ec0061df8cbff4032402c834e374076097fedb5de18127071b SHA512 0eb342a89f875527242be5e91c64a2debb7e2d159f5edc7f53a86c504e4e782f5635dd4e52b573526d1528d4aa4944384f52f68dc9a7c25513c3e5b2a7922b8c
-DIST shorewall6-5.2.1.tar.bz2 188322 BLAKE2B 5814433b11001f1e00ce3b124b5ec4ca6b1909ec00f966cb5fc93c34207325853249964492eb03f1f3c73cfc9c1b42def9578e507395395dd067f236475215b5 SHA512 b5dd5c4bf014c24a8a8bb4dc38b45dc92749182091b572340e1aef12d0aaeeb1dc436716b449cc1de34c74c6e4d590cc8cbe6b73aa3c614e8c9c37d7fa7a00a6
-DIST shorewall6-lite-5.2.0.5.tar.bz2 36370 BLAKE2B 212cee0313c3bbf08c8d22893c5b62125d0362eb66218dc954bc05d0e082fdb4dab209a05948300394943dcd97f698c1e02310ec54cc88fb72bd24d4383776f7 SHA512 18bcbaf3bd56aaadb8d42610d4868278f42299e5a022ac5732f730b34ed7d97f7cd013f1c9374f0a6afc809250288490d94d2b4e02e4bf5edf2542bff99150e4
 DIST shorewall6-lite-5.2.1.1.tar.bz2 38766 BLAKE2B 3a60a877516676a85f5d5d645ce3140c92438c7bb44abb5d8b8e188611bc14a0f3611e977a26526e6408439dd29eb00584217230e20e94ead9f5cbab73a980b3 SHA512 3df814352027ef9f16df030c7187eaa4d7b984cbb23e123eaa19a123a85e276a730b510ff7a76cafba80978474ed5bcb57a4b569332396780e14f7aa7d0d8669
-DIST shorewall6-lite-5.2.1.tar.bz2 37244 BLAKE2B 4fcd5a1b65b15a7c4214b079677f6ee3604d1a718fe6a4710d42085434af64bcef9db57135b0c6b0e6678dba6272a4341330e47b8a6917c759e450091c7d1b5a SHA512 ca807bf0d59db09439d80725e6eeafb7795346bd030fe8598dcccc4fc93a57819715c33c73035c1819a9eba93efe69e058be1377fcd9adf135a0a08f6ff3e481

diff --git a/net-firewall/shorewall/shorewall-5.2.0.5.ebuild b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
deleted file mode 100644
index 3794662afa6..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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
-
-	# 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
-	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
-	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
-	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
-	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
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || 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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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.1.ebuild b/net-firewall/shorewall/shorewall-5.2.1.ebuild
deleted file mode 100644
index 1666426f5c3..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.1.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-11-11 22:37 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-11-11 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b4c0b2be426285534203a3b275d7c5243e86f34f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 22:35:19 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 22:35:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c0b2be

net-firewall/shorewall: x86 stable, applying ALLARCHES policy

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.1.1.ebuild b/net-firewall/shorewall/shorewall-5.2.1.1.ebuild
index 1666426f5c3..9bbd0762512 100644
--- a/net-firewall/shorewall/shorewall-5.2.1.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.1.1.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-12-03  0:55 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-12-03  0:55 UTC (permalink / raw
  To: gentoo-commits

commit:     1ed1c42578b416170755991a6a005e4d8f958c6b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 00:54:58 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec  3 00:55:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed1c425

net-firewall/shorewall: bump to v5.2.1.2

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.2.1.1.ebuild => shorewall-5.2.1.2.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index b94d26d4edb..52ac67ebbe5 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,7 @@
-DIST shorewall-5.2.1.1.tar.bz2 552739 BLAKE2B bfbfdb3320eb884b965f3c7b8d5af61a78bb625a10ad2bc493a5c8a191d676d933855335209a41f893ccb2edb644cf510930da936227fad9fb667793dce88e91 SHA512 59e1b4bb09114162911f0cb42d67df0d82c5a4410322ceb972506705c10cf903cb482123a00181399da99513c857d382771de36ec11433ff7bd9d57a343c48dc
-DIST shorewall-core-5.2.1.1.tar.bz2 78022 BLAKE2B dfa53a4558ec819feee25116021e410ac65dfad20d3d9384e3a233d47e7e443957149d025166d094397fb2c01b8be7694db8c06e927776250b5edafa97e5d287 SHA512 0c12d5deb4a93fb174a7c97459f2863149eec52ab778c30523c23cbdfbeb94d890442a0eb8ad9869158a967f2daac59a9d7194734e35e69982889d93d984b58b
-DIST shorewall-docs-html-5.2.1.1.tar.bz2 4303275 BLAKE2B d2a9c980f0486671103653a6944e12f03e282bd859a9c06558d6dbfdf9fd6a7c72993355ab61138c94317d36228cbbb55903c9d17547ecdc18af57e989a5ef7b SHA512 c9eef71fdc53a97a523a580c5df0c7773f7dc6fc8abfbfe7a2fbc607be6d0e6377f47886001a87a37260118edb298880abda06e3ac4581d8551b3934791332fc
-DIST shorewall-init-5.2.1.1.tar.bz2 33215 BLAKE2B 3b151f60e368cd4237a8549d6de14ec4ed896c2c838f680a59aa12492c46bfb48accfa1a5bc98877663523861040af4995628e75f693c9fa5433483ef0fc6161 SHA512 21cdccc01b60df48e7e1204102c0b371d7e32fb1f897310e31a6cff128ebf5ed5efe3903bc487aa41ee093c23eb87e59764b78903ee5c6eba03552a1dcccc634
-DIST shorewall-lite-5.2.1.1.tar.bz2 39020 BLAKE2B 40697930bb2251062a126a4bd86cd8379d32d9543f32d67208106205b35d3ae9cb9a67e48a48451053ae90138ffcda6cbe5dd5ce7c25bda6eab340dd4680bec8 SHA512 c10ee8ec81817fe8fc35caac253a89fb58be105fa1fb1c692d269f6916537007d555daeba4e5445568a6a6972dfc6db3e21f5637844c6a5e51e91b2a4795724d
-DIST shorewall6-5.2.1.1.tar.bz2 191039 BLAKE2B 4d40d30d4d6ad6a9aacf4acc4da6a4b31546a07969f12fde0d568f75e31ca587a31a830f386092ec0061df8cbff4032402c834e374076097fedb5de18127071b SHA512 0eb342a89f875527242be5e91c64a2debb7e2d159f5edc7f53a86c504e4e782f5635dd4e52b573526d1528d4aa4944384f52f68dc9a7c25513c3e5b2a7922b8c
-DIST shorewall6-lite-5.2.1.1.tar.bz2 38766 BLAKE2B 3a60a877516676a85f5d5d645ce3140c92438c7bb44abb5d8b8e188611bc14a0f3611e977a26526e6408439dd29eb00584217230e20e94ead9f5cbab73a980b3 SHA512 3df814352027ef9f16df030c7187eaa4d7b984cbb23e123eaa19a123a85e276a730b510ff7a76cafba80978474ed5bcb57a4b569332396780e14f7aa7d0d8669
+DIST shorewall-5.2.1.2.tar.bz2 553498 BLAKE2B e025c35f8c3a50b0dd3c70729882b9c89444dc51950ac03a2dae3481cd86fec2b78240222c3bbbe115c35a9495a7640fc482bcc8b66c6e471e5d80eb5d59dcbf SHA512 75e517be16551db9f0502e4ee24551c4ad6bfcdafa7c43959b64b55021536f67b8831169692285ca17a47ce1c7e484c52cd8f54dcac51bea6b0dfd7a3fbb7e06
+DIST shorewall-core-5.2.1.2.tar.bz2 78347 BLAKE2B 221e027a8e01530d25d23b6997a6ecf6e5108ba23e3ccd91a461920e335e515fb77d72d8329d27bd22a7175b8ef1396792c36117d907cd937b0b2270872de33a SHA512 58cf20703522066f80b0dfac8614d007398c92a664b72e08eb4046321e5361bb16bdd99e91bf4ef31abd1febc319fbdf26c5a1520db020b03340ad171278c29a
+DIST shorewall-docs-html-5.2.1.2.tar.bz2 4302786 BLAKE2B 32eb3dfe27de9a25110182fe33ae27154deeacccd7c275ad8442d2f606731afb15cf76ed569a7728dc76c71bb2ebc5a98effa5601dc172b8d29743f91dc0c130 SHA512 e5c6fd884908772187a273b695e707f656cd7b48c1e271dc659754a9ef857ba1a5118b279437cce5898c26d28c431eb73a6c593192b616f554a9cf18968fb07a
+DIST shorewall-init-5.2.1.2.tar.bz2 33604 BLAKE2B a80fa646fede3cde2ed0e1c036acfbf315c002648319cc705ba54042277b06b44d1e97cd529544ca321cd2fd00c9d4adf7734665e633c81516501f9f551908f9 SHA512 b392b034a8fb9ab25ba06ba35fee2bfdcd6e2c197fea8f5581898cce0b2f14ea2d6c2e9c08a6329194d075bf273600b4dae0e7079134f39554cb1c0dc1d2be82
+DIST shorewall-lite-5.2.1.2.tar.bz2 39425 BLAKE2B 90fe96dbb4e0662d5380eda90557fe641589aedaf46b292ff1808cabba9a2754c574eaf269352fee9955f7738de88325628a0ca0e9c1fa78ffca62f476673f39 SHA512 90da64e8f69ef9045576ead94d778bf4da957480a8e5f89e0d21b96c74cf670254544109ee69c0bcf6afc5e655a523fdba08f0725ec565a46911ebb36e0cc87d
+DIST shorewall6-5.2.1.2.tar.bz2 190165 BLAKE2B b62551bc2aae8033e100b75247dde1776a13bb957c2a77cedf2768b55ef0e216d6f37b62c6478a9bd18413321abfbadbc32cac9ac7c424c9bbb31b0a5783bbf3 SHA512 ba5c5987e87c1d1166c9d3b8b4745e8173eb4cf136916d0f067cf51d20ae047c00a62c1878c7223b2b05d990bf8e011a4e863a93394f5d037918c3abe0838ee2
+DIST shorewall6-lite-5.2.1.2.tar.bz2 39166 BLAKE2B 88281f6198b4f27830afc5a968d83bf2cff7812a7776a1d5010910450f3ba47fcc3ccad085c84c9a557e45dc23b7dd32ae6b7e0aebd2e399cddc25fbbe6dc774 SHA512 bb9b8aa721c337b915082662d581688e557908e579d392b61a6e3f5f5fe922b76f1433b90f746f4625860dabee68c9533c379c1428d4f8fca208723174d72645

diff --git a/net-firewall/shorewall/shorewall-5.2.1.1.ebuild b/net-firewall/shorewall/shorewall-5.2.1.2.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.2.1.1.ebuild
rename to net-firewall/shorewall/shorewall-5.2.1.2.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-12-17 23:20 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-12-17 23:20 UTC (permalink / raw
  To: gentoo-commits

commit:     8e9048f4db361272d6dee5f993220a84bca3541c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 17 23:20:13 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 17 23:20:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9048f4

net-firewall/shorewall: bump to v5.2.1.4

Kernel config check adjusted because in >=linux-4.19, ipv4 and ipv6 protocol
trackers were unified in NF_CONNTRACK and the l3proto abstraction was removed
(kernel commit a0ae2562c6c4b2721d9fddba63b7286c13517d9f).

Closes: https://bugs.gentoo.org/671176
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.1.4.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 52ac67ebbe5..f1e6c9466ab 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.1.2.tar.bz2 553498 BLAKE2B e025c35f8c3a50b0dd3c70729882b9c89444dc51950ac03a2dae3481cd86fec2b78240222c3bbbe115c35a9495a7640fc482bcc8b66c6e471e5d80eb5d59dcbf SHA512 75e517be16551db9f0502e4ee24551c4ad6bfcdafa7c43959b64b55021536f67b8831169692285ca17a47ce1c7e484c52cd8f54dcac51bea6b0dfd7a3fbb7e06
+DIST shorewall-5.2.1.4.tar.bz2 554756 BLAKE2B cfbc917fb12049a0e8817c478fcccb93b02634ad9aebcd31a839f934e52890f6c20dc2a7d10742d4e10ac0adb1500d9e6445b43390db5bc28874e610b9c07939 SHA512 3682399ddc743c03965e0c0c26b5714e611d186bddf9169524268488cc4f2d6e9e9fb3b2a4c24408cc247ce7d32f793fb35090f85b73a645bb0dd0e99c671564
 DIST shorewall-core-5.2.1.2.tar.bz2 78347 BLAKE2B 221e027a8e01530d25d23b6997a6ecf6e5108ba23e3ccd91a461920e335e515fb77d72d8329d27bd22a7175b8ef1396792c36117d907cd937b0b2270872de33a SHA512 58cf20703522066f80b0dfac8614d007398c92a664b72e08eb4046321e5361bb16bdd99e91bf4ef31abd1febc319fbdf26c5a1520db020b03340ad171278c29a
+DIST shorewall-core-5.2.1.4.tar.bz2 78957 BLAKE2B 7310813f4c4ac57378ed9565b1aa32fc3db3bcf9e1dc6e6307a7c399465a051110262dcb78c6d465a6227beeadc1f5c4a82d204c1926f66bcecf5469dc44b5e3 SHA512 9418cb6ef14def2a1a2c7879c6364881d80245ff5a59996bb71d093c14e67c6ce1d462d0217f0ae8574e9a916d3796f945dbececbe6b9851f892022f29a389c9
 DIST shorewall-docs-html-5.2.1.2.tar.bz2 4302786 BLAKE2B 32eb3dfe27de9a25110182fe33ae27154deeacccd7c275ad8442d2f606731afb15cf76ed569a7728dc76c71bb2ebc5a98effa5601dc172b8d29743f91dc0c130 SHA512 e5c6fd884908772187a273b695e707f656cd7b48c1e271dc659754a9ef857ba1a5118b279437cce5898c26d28c431eb73a6c593192b616f554a9cf18968fb07a
+DIST shorewall-docs-html-5.2.1.4.tar.bz2 4303361 BLAKE2B 22f7a94d9cb0de5ee9903e8d05498a6a6de6ea643f2d08b709bf9f8dd516ba507f80ed11207973884905421443eedf56e3693b9e42f5f372515b957e2be8132c SHA512 44bb66feecac927de6fe1cdfba9247e9f01c982c3b105f7cd68348fee0803b9b7bd76e7551528e0b2d6ff8e65e6ebf8a05c26831871a98565374692d6405f34a
 DIST shorewall-init-5.2.1.2.tar.bz2 33604 BLAKE2B a80fa646fede3cde2ed0e1c036acfbf315c002648319cc705ba54042277b06b44d1e97cd529544ca321cd2fd00c9d4adf7734665e633c81516501f9f551908f9 SHA512 b392b034a8fb9ab25ba06ba35fee2bfdcd6e2c197fea8f5581898cce0b2f14ea2d6c2e9c08a6329194d075bf273600b4dae0e7079134f39554cb1c0dc1d2be82
+DIST shorewall-init-5.2.1.4.tar.bz2 34088 BLAKE2B f285b04e448584fe1f9a5528b6ddb6e16cbedcfda51f9c9925228835b2b065c658e9314ecad23364dc4ee21579fa113fe5a1c5581ea3e7c310d12744de64798d SHA512 58044bbcd2f30aaecb3c02374ca21a51b6f5fee49e9cf9565444649d64e3babd3070a72eddaccb52224201064e8642f9bcd9979bde41c13bfe10438720911d24
 DIST shorewall-lite-5.2.1.2.tar.bz2 39425 BLAKE2B 90fe96dbb4e0662d5380eda90557fe641589aedaf46b292ff1808cabba9a2754c574eaf269352fee9955f7738de88325628a0ca0e9c1fa78ffca62f476673f39 SHA512 90da64e8f69ef9045576ead94d778bf4da957480a8e5f89e0d21b96c74cf670254544109ee69c0bcf6afc5e655a523fdba08f0725ec565a46911ebb36e0cc87d
+DIST shorewall-lite-5.2.1.4.tar.bz2 39858 BLAKE2B dcaf1adfc20640c22cdca20e2b786ec4ad2736567c0c5eec6cd22a95f0b0c461b24826afa933eac7a1ecffd836da55b8053a1370623d73dd6434b91d59d63e36 SHA512 25712a264ee615b4b0ae038836636ea07f4fedca721759b3860912838ef1aee4535831ed4dd8abd670e082e9f59bd52ac00fb0fd1c5907786bb239e270d5fdf1
 DIST shorewall6-5.2.1.2.tar.bz2 190165 BLAKE2B b62551bc2aae8033e100b75247dde1776a13bb957c2a77cedf2768b55ef0e216d6f37b62c6478a9bd18413321abfbadbc32cac9ac7c424c9bbb31b0a5783bbf3 SHA512 ba5c5987e87c1d1166c9d3b8b4745e8173eb4cf136916d0f067cf51d20ae047c00a62c1878c7223b2b05d990bf8e011a4e863a93394f5d037918c3abe0838ee2
+DIST shorewall6-5.2.1.4.tar.bz2 191855 BLAKE2B 3967e715ca88c85fd05f0cce1d4836c2b7f17b7a7360698c269b109f54dfbac2c4d67958c3c8c2d8cb74b5117d7f8ac30dc9ab3c09d97243cffe21ef3005c7b7 SHA512 8b49f187b7141c3eedb02c64a17fe8fa3f01e4b40b33184c4b4c5914e65557595828f87f3e1534abb973320b7a1103b10296b6dfc316ea78f698aeb61a0d63a1
 DIST shorewall6-lite-5.2.1.2.tar.bz2 39166 BLAKE2B 88281f6198b4f27830afc5a968d83bf2cff7812a7776a1d5010910450f3ba47fcc3ccad085c84c9a557e45dc23b7dd32ae6b7e0aebd2e399cddc25fbbe6dc774 SHA512 bb9b8aa721c337b915082662d581688e557908e579d392b61a6e3f5f5fe922b76f1433b90f746f4625860dabee68c9533c379c1428d4f8fca208723174d72645
+DIST shorewall6-lite-5.2.1.4.tar.bz2 39599 BLAKE2B cb0e2b45fecc4c126504f5caafcd291e919542cd08fb53d69f89c11d4bca784744e2c6eedc0e86a234bcfe7dd9baee46498de1600bdba4475be6a705c92faa54 SHA512 a994cc1a37174ac085d784c5638eb9c5713e6f191260857c7b288a5ba5c54e3d99e88fb31a5b887d3d637edbd2ba8c7711575ca323d616f49b7a0595431b6e13

diff --git a/net-firewall/shorewall/shorewall-5.2.1.4.ebuild b/net-firewall/shorewall/shorewall-5.2.1.4.ebuild
new file mode 100644
index 00000000000..ef3c122caf7
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.1.4.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-12-22 19:22 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-12-22 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     bcbffaa7b8b0db7332bcba8596640ad033a60841
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 19:13:13 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 19:22:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbffaa7

net-firewall/shorewall: move stable keywords

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.1.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.1.4.ebuild b/net-firewall/shorewall/shorewall-5.2.1.4.ebuild
index ef3c122caf7..206f56bc745 100644
--- a/net-firewall/shorewall/shorewall-5.2.1.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.1.4.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2018-12-22 19:22 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2018-12-22 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     05d9b6b6b808df401bfed118618bb33ff51bf260
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 19:13:41 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 19:22:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d9b6b6

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.2.1.2.ebuild | 479 ------------------------
 2 files changed, 486 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index f1e6c9466ab..9e6b945df9c 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-DIST shorewall-5.2.1.2.tar.bz2 553498 BLAKE2B e025c35f8c3a50b0dd3c70729882b9c89444dc51950ac03a2dae3481cd86fec2b78240222c3bbbe115c35a9495a7640fc482bcc8b66c6e471e5d80eb5d59dcbf SHA512 75e517be16551db9f0502e4ee24551c4ad6bfcdafa7c43959b64b55021536f67b8831169692285ca17a47ce1c7e484c52cd8f54dcac51bea6b0dfd7a3fbb7e06
 DIST shorewall-5.2.1.4.tar.bz2 554756 BLAKE2B cfbc917fb12049a0e8817c478fcccb93b02634ad9aebcd31a839f934e52890f6c20dc2a7d10742d4e10ac0adb1500d9e6445b43390db5bc28874e610b9c07939 SHA512 3682399ddc743c03965e0c0c26b5714e611d186bddf9169524268488cc4f2d6e9e9fb3b2a4c24408cc247ce7d32f793fb35090f85b73a645bb0dd0e99c671564
-DIST shorewall-core-5.2.1.2.tar.bz2 78347 BLAKE2B 221e027a8e01530d25d23b6997a6ecf6e5108ba23e3ccd91a461920e335e515fb77d72d8329d27bd22a7175b8ef1396792c36117d907cd937b0b2270872de33a SHA512 58cf20703522066f80b0dfac8614d007398c92a664b72e08eb4046321e5361bb16bdd99e91bf4ef31abd1febc319fbdf26c5a1520db020b03340ad171278c29a
 DIST shorewall-core-5.2.1.4.tar.bz2 78957 BLAKE2B 7310813f4c4ac57378ed9565b1aa32fc3db3bcf9e1dc6e6307a7c399465a051110262dcb78c6d465a6227beeadc1f5c4a82d204c1926f66bcecf5469dc44b5e3 SHA512 9418cb6ef14def2a1a2c7879c6364881d80245ff5a59996bb71d093c14e67c6ce1d462d0217f0ae8574e9a916d3796f945dbececbe6b9851f892022f29a389c9
-DIST shorewall-docs-html-5.2.1.2.tar.bz2 4302786 BLAKE2B 32eb3dfe27de9a25110182fe33ae27154deeacccd7c275ad8442d2f606731afb15cf76ed569a7728dc76c71bb2ebc5a98effa5601dc172b8d29743f91dc0c130 SHA512 e5c6fd884908772187a273b695e707f656cd7b48c1e271dc659754a9ef857ba1a5118b279437cce5898c26d28c431eb73a6c593192b616f554a9cf18968fb07a
 DIST shorewall-docs-html-5.2.1.4.tar.bz2 4303361 BLAKE2B 22f7a94d9cb0de5ee9903e8d05498a6a6de6ea643f2d08b709bf9f8dd516ba507f80ed11207973884905421443eedf56e3693b9e42f5f372515b957e2be8132c SHA512 44bb66feecac927de6fe1cdfba9247e9f01c982c3b105f7cd68348fee0803b9b7bd76e7551528e0b2d6ff8e65e6ebf8a05c26831871a98565374692d6405f34a
-DIST shorewall-init-5.2.1.2.tar.bz2 33604 BLAKE2B a80fa646fede3cde2ed0e1c036acfbf315c002648319cc705ba54042277b06b44d1e97cd529544ca321cd2fd00c9d4adf7734665e633c81516501f9f551908f9 SHA512 b392b034a8fb9ab25ba06ba35fee2bfdcd6e2c197fea8f5581898cce0b2f14ea2d6c2e9c08a6329194d075bf273600b4dae0e7079134f39554cb1c0dc1d2be82
 DIST shorewall-init-5.2.1.4.tar.bz2 34088 BLAKE2B f285b04e448584fe1f9a5528b6ddb6e16cbedcfda51f9c9925228835b2b065c658e9314ecad23364dc4ee21579fa113fe5a1c5581ea3e7c310d12744de64798d SHA512 58044bbcd2f30aaecb3c02374ca21a51b6f5fee49e9cf9565444649d64e3babd3070a72eddaccb52224201064e8642f9bcd9979bde41c13bfe10438720911d24
-DIST shorewall-lite-5.2.1.2.tar.bz2 39425 BLAKE2B 90fe96dbb4e0662d5380eda90557fe641589aedaf46b292ff1808cabba9a2754c574eaf269352fee9955f7738de88325628a0ca0e9c1fa78ffca62f476673f39 SHA512 90da64e8f69ef9045576ead94d778bf4da957480a8e5f89e0d21b96c74cf670254544109ee69c0bcf6afc5e655a523fdba08f0725ec565a46911ebb36e0cc87d
 DIST shorewall-lite-5.2.1.4.tar.bz2 39858 BLAKE2B dcaf1adfc20640c22cdca20e2b786ec4ad2736567c0c5eec6cd22a95f0b0c461b24826afa933eac7a1ecffd836da55b8053a1370623d73dd6434b91d59d63e36 SHA512 25712a264ee615b4b0ae038836636ea07f4fedca721759b3860912838ef1aee4535831ed4dd8abd670e082e9f59bd52ac00fb0fd1c5907786bb239e270d5fdf1
-DIST shorewall6-5.2.1.2.tar.bz2 190165 BLAKE2B b62551bc2aae8033e100b75247dde1776a13bb957c2a77cedf2768b55ef0e216d6f37b62c6478a9bd18413321abfbadbc32cac9ac7c424c9bbb31b0a5783bbf3 SHA512 ba5c5987e87c1d1166c9d3b8b4745e8173eb4cf136916d0f067cf51d20ae047c00a62c1878c7223b2b05d990bf8e011a4e863a93394f5d037918c3abe0838ee2
 DIST shorewall6-5.2.1.4.tar.bz2 191855 BLAKE2B 3967e715ca88c85fd05f0cce1d4836c2b7f17b7a7360698c269b109f54dfbac2c4d67958c3c8c2d8cb74b5117d7f8ac30dc9ab3c09d97243cffe21ef3005c7b7 SHA512 8b49f187b7141c3eedb02c64a17fe8fa3f01e4b40b33184c4b4c5914e65557595828f87f3e1534abb973320b7a1103b10296b6dfc316ea78f698aeb61a0d63a1
-DIST shorewall6-lite-5.2.1.2.tar.bz2 39166 BLAKE2B 88281f6198b4f27830afc5a968d83bf2cff7812a7776a1d5010910450f3ba47fcc3ccad085c84c9a557e45dc23b7dd32ae6b7e0aebd2e399cddc25fbbe6dc774 SHA512 bb9b8aa721c337b915082662d581688e557908e579d392b61a6e3f5f5fe922b76f1433b90f746f4625860dabee68c9533c379c1428d4f8fca208723174d72645
 DIST shorewall6-lite-5.2.1.4.tar.bz2 39599 BLAKE2B cb0e2b45fecc4c126504f5caafcd291e919542cd08fb53d69f89c11d4bca784744e2c6eedc0e86a234bcfe7dd9baee46498de1600bdba4475be6a705c92faa54 SHA512 a994cc1a37174ac085d784c5638eb9c5713e6f191260857c7b288a5ba5c54e3d99e88fb31a5b887d3d637edbd2ba8c7711575ca323d616f49b7a0595431b6e13

diff --git a/net-firewall/shorewall/shorewall-5.2.1.2.ebuild b/net-firewall/shorewall/shorewall-5.2.1.2.ebuild
deleted file mode 100644
index 9bbd0762512..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.1.2.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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."
-
-	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
-
-	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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-01-26 19:35 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-01-26 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     8af1323d3ac7bcb3043fe39a869c6e4bebd87a17
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 26 19:34:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 19:34:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af1323d

net-firewall/shorewall: bump to v5.2.2

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.2.2.ebuild | 482 ++++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 9e6b945df9c..a4334183cee 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.1.4.tar.bz2 554756 BLAKE2B cfbc917fb12049a0e8817c478fcccb93b02634ad9aebcd31a839f934e52890f6c20dc2a7d10742d4e10ac0adb1500d9e6445b43390db5bc28874e610b9c07939 SHA512 3682399ddc743c03965e0c0c26b5714e611d186bddf9169524268488cc4f2d6e9e9fb3b2a4c24408cc247ce7d32f793fb35090f85b73a645bb0dd0e99c671564
+DIST shorewall-5.2.2.tar.bz2 557248 BLAKE2B d4fface30ef1bbeefda716b00373e686db73bd29bd2597d3f9950c5f4b3208205be8f321e84749fb92313633f7a6a2a37a493e4a826790d82e6bc6a8dd18bbd3 SHA512 0c4c3e51c2517a56fda2335f433033c8db66fcb843484b928979627b213be4e24408deb1e49df56f9a96e6b9c2a95d74789f07a365d4c4e6f17db96915520598
 DIST shorewall-core-5.2.1.4.tar.bz2 78957 BLAKE2B 7310813f4c4ac57378ed9565b1aa32fc3db3bcf9e1dc6e6307a7c399465a051110262dcb78c6d465a6227beeadc1f5c4a82d204c1926f66bcecf5469dc44b5e3 SHA512 9418cb6ef14def2a1a2c7879c6364881d80245ff5a59996bb71d093c14e67c6ce1d462d0217f0ae8574e9a916d3796f945dbececbe6b9851f892022f29a389c9
+DIST shorewall-core-5.2.2.tar.bz2 68223 BLAKE2B 33bc2b8a2ec2f76a909ddd73199462a470ed631029cebae37ca4a43d64a217e6e20fe0aa4c3002a2a5d0d3894a23634f45b4d5ecd916b96db44d3abcbd2fee58 SHA512 607fee1d17bb777e95346867d4dfeac5063f353d6bac6bc6ea625841746bb66a9959cd436a7340c18258188771bddf916e004ba81f256f01699cfda9c909cf7d
 DIST shorewall-docs-html-5.2.1.4.tar.bz2 4303361 BLAKE2B 22f7a94d9cb0de5ee9903e8d05498a6a6de6ea643f2d08b709bf9f8dd516ba507f80ed11207973884905421443eedf56e3693b9e42f5f372515b957e2be8132c SHA512 44bb66feecac927de6fe1cdfba9247e9f01c982c3b105f7cd68348fee0803b9b7bd76e7551528e0b2d6ff8e65e6ebf8a05c26831871a98565374692d6405f34a
+DIST shorewall-docs-html-5.2.2.tar.bz2 4302493 BLAKE2B 49c8f44aaeb3d06330ea293fafb7535096355bd4a151d8b4dfbc476d1e92c785360474d1b86754247ccff1f7198fd7f6f8e17da608f41a76642e73cafbdea65b SHA512 ea7fa5f6df6413e33c5fa9f043973c70351c9c99fe8e6095ccbe3e5b6e4667c4f89907fc995ab252c6a1aee5652b496e96d4e38b898ddd41b9e220f4edefa93e
 DIST shorewall-init-5.2.1.4.tar.bz2 34088 BLAKE2B f285b04e448584fe1f9a5528b6ddb6e16cbedcfda51f9c9925228835b2b065c658e9314ecad23364dc4ee21579fa113fe5a1c5581ea3e7c310d12744de64798d SHA512 58044bbcd2f30aaecb3c02374ca21a51b6f5fee49e9cf9565444649d64e3babd3070a72eddaccb52224201064e8642f9bcd9979bde41c13bfe10438720911d24
+DIST shorewall-init-5.2.2.tar.bz2 33578 BLAKE2B d8eb427e482f01fc59412b08cd58dc2317157570b266e5950ee34d17d504d9dfd886ecbfc861bc83b445b44b2cf85831ec2462acd54c9be519263e340af0d827 SHA512 4aaee33f2f6944498c88938796e987f05e16f2a4a761b1ec14a293ffd293d688bf39f913c426168a7162f3b0dba6679dc0392d9248bd43f678dd42e9532afbbe
 DIST shorewall-lite-5.2.1.4.tar.bz2 39858 BLAKE2B dcaf1adfc20640c22cdca20e2b786ec4ad2736567c0c5eec6cd22a95f0b0c461b24826afa933eac7a1ecffd836da55b8053a1370623d73dd6434b91d59d63e36 SHA512 25712a264ee615b4b0ae038836636ea07f4fedca721759b3860912838ef1aee4535831ed4dd8abd670e082e9f59bd52ac00fb0fd1c5907786bb239e270d5fdf1
+DIST shorewall-lite-5.2.2.tar.bz2 39421 BLAKE2B 6d24b62c54eed028785b6eb581be4659c1110c5e7d85caf3382b814edce0046064798a1ffb5100f04bc48bbac877969913f03e19883c33563bc7dfdb0bc48a3d SHA512 e49ee3eee13a4fe801c5d86aa85747a9543882a49b40454dad62154f772dc47adea84e967a4ef30b8c4c3e9964a04c76a794a318affe8eaac6cc107b255cca4a
 DIST shorewall6-5.2.1.4.tar.bz2 191855 BLAKE2B 3967e715ca88c85fd05f0cce1d4836c2b7f17b7a7360698c269b109f54dfbac2c4d67958c3c8c2d8cb74b5117d7f8ac30dc9ab3c09d97243cffe21ef3005c7b7 SHA512 8b49f187b7141c3eedb02c64a17fe8fa3f01e4b40b33184c4b4c5914e65557595828f87f3e1534abb973320b7a1103b10296b6dfc316ea78f698aeb61a0d63a1
+DIST shorewall6-5.2.2.tar.bz2 191037 BLAKE2B d774ab42658e2636fc15bc9dc04510c3a3745c9ebe204a27707237c168b476ee4fc247fb55c17b99069348947db1760d23c9f61d70a78231d8928e86eb312560 SHA512 5cf83e8c3fd940a6573de04afd29e37e3aa5d6908fffa276ff338b6818d0200b3d1e556420fcdf6989fe27dbef6e26f5a513ea566d70acb9a7db4bf1c3e6faf4
 DIST shorewall6-lite-5.2.1.4.tar.bz2 39599 BLAKE2B cb0e2b45fecc4c126504f5caafcd291e919542cd08fb53d69f89c11d4bca784744e2c6eedc0e86a234bcfe7dd9baee46498de1600bdba4475be6a705c92faa54 SHA512 a994cc1a37174ac085d784c5638eb9c5713e6f191260857c7b288a5ba5c54e3d99e88fb31a5b887d3d637edbd2ba8c7711575ca323d616f49b7a0595431b6e13
+DIST shorewall6-lite-5.2.2.tar.bz2 39148 BLAKE2B bcb0cb1b23cb4a486faafcfee588e11a6a50f6d151039ef15f396838b828ed803589d205717ad868140cc7d468f9309ac23dd34d307bbd8640a7791728102c55 SHA512 10f96bc42f47adebc581579b28ab2edb79876dccbf0a8c27d46234ac8fb9af8cb03730851188576bdb24278e9b19cb3cdef91bb4873cab0ef82064d54eeb176f

diff --git a/net-firewall/shorewall/shorewall-5.2.2.ebuild b/net-firewall/shorewall/shorewall-5.2.2.ebuild
new file mode 100644
index 00000000000..b12b3712acb
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.2.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-02-16 18:17 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-02-16 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     78236318cf348ead5555014d58f5d8583a3c1b55
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 18:17:10 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 18:17:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78236318

net-firewall/shorewall: bump to v5.2.3

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.2.3.ebuild | 482 ++++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a4334183cee..c0e8ac708d3 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.2.1.4.tar.bz2 554756 BLAKE2B cfbc917fb12049a0e8817c478fcccb93b02634ad9aebcd31a839f934e52890f6c20dc2a7d10742d4e10ac0adb1500d9e6445b43390db5bc28874e610b9c07939 SHA512 3682399ddc743c03965e0c0c26b5714e611d186bddf9169524268488cc4f2d6e9e9fb3b2a4c24408cc247ce7d32f793fb35090f85b73a645bb0dd0e99c671564
 DIST shorewall-5.2.2.tar.bz2 557248 BLAKE2B d4fface30ef1bbeefda716b00373e686db73bd29bd2597d3f9950c5f4b3208205be8f321e84749fb92313633f7a6a2a37a493e4a826790d82e6bc6a8dd18bbd3 SHA512 0c4c3e51c2517a56fda2335f433033c8db66fcb843484b928979627b213be4e24408deb1e49df56f9a96e6b9c2a95d74789f07a365d4c4e6f17db96915520598
+DIST shorewall-5.2.3.tar.bz2 555553 BLAKE2B 8d59d128f4fd5a109fba2280cc0f6a9c74e756feb2e9b8fffa481ee0e1dddef84da44e0c3e578b1513b34b200226ef17c8f73e1a5d917e71d2c83990bf499275 SHA512 51e945ef8207734729e5e81a6d14a4c109042cfe91ef4a893d1e2efca5fa1cca38b22524eaa0c84d95f59ae6f85a6f5e2942443827e74afb8bac62a3bd785ee1
 DIST shorewall-core-5.2.1.4.tar.bz2 78957 BLAKE2B 7310813f4c4ac57378ed9565b1aa32fc3db3bcf9e1dc6e6307a7c399465a051110262dcb78c6d465a6227beeadc1f5c4a82d204c1926f66bcecf5469dc44b5e3 SHA512 9418cb6ef14def2a1a2c7879c6364881d80245ff5a59996bb71d093c14e67c6ce1d462d0217f0ae8574e9a916d3796f945dbececbe6b9851f892022f29a389c9
 DIST shorewall-core-5.2.2.tar.bz2 68223 BLAKE2B 33bc2b8a2ec2f76a909ddd73199462a470ed631029cebae37ca4a43d64a217e6e20fe0aa4c3002a2a5d0d3894a23634f45b4d5ecd916b96db44d3abcbd2fee58 SHA512 607fee1d17bb777e95346867d4dfeac5063f353d6bac6bc6ea625841746bb66a9959cd436a7340c18258188771bddf916e004ba81f256f01699cfda9c909cf7d
+DIST shorewall-core-5.2.3.tar.bz2 68720 BLAKE2B 20ee90025c53befd9328a8f6280bcad59f14b9064973634fe0167c2228444d277ccb4c7bb73979856f7ec3b1dec145753b7bdcc01de6f77742f88d410a6ef946 SHA512 52cf9c7ac55fc9fa152f8fe236ff60c3e802e72661d0429f4c1e39eb685dc81878c4d08adf9d2eca022abc952d745f247240bcc182039a05411db180c21404ae
 DIST shorewall-docs-html-5.2.1.4.tar.bz2 4303361 BLAKE2B 22f7a94d9cb0de5ee9903e8d05498a6a6de6ea643f2d08b709bf9f8dd516ba507f80ed11207973884905421443eedf56e3693b9e42f5f372515b957e2be8132c SHA512 44bb66feecac927de6fe1cdfba9247e9f01c982c3b105f7cd68348fee0803b9b7bd76e7551528e0b2d6ff8e65e6ebf8a05c26831871a98565374692d6405f34a
 DIST shorewall-docs-html-5.2.2.tar.bz2 4302493 BLAKE2B 49c8f44aaeb3d06330ea293fafb7535096355bd4a151d8b4dfbc476d1e92c785360474d1b86754247ccff1f7198fd7f6f8e17da608f41a76642e73cafbdea65b SHA512 ea7fa5f6df6413e33c5fa9f043973c70351c9c99fe8e6095ccbe3e5b6e4667c4f89907fc995ab252c6a1aee5652b496e96d4e38b898ddd41b9e220f4edefa93e
+DIST shorewall-docs-html-5.2.3.tar.bz2 4302850 BLAKE2B 4ba7d4a181bb62737e31750e2e1e790ca4176e7c987d699c3447d19d238d9b79f61cb8b135b94214ce69e7e5e71d324df99a393009abe2555eb909e82eb0755d SHA512 177b88d735c23796bae805f261c9e7843ecaad4539123d4f16b1e00723ab5c476b2d143f80bcf4c773f3ee33f0a5b2db4131857e65855b5e4f2dd5ed579bbe72
 DIST shorewall-init-5.2.1.4.tar.bz2 34088 BLAKE2B f285b04e448584fe1f9a5528b6ddb6e16cbedcfda51f9c9925228835b2b065c658e9314ecad23364dc4ee21579fa113fe5a1c5581ea3e7c310d12744de64798d SHA512 58044bbcd2f30aaecb3c02374ca21a51b6f5fee49e9cf9565444649d64e3babd3070a72eddaccb52224201064e8642f9bcd9979bde41c13bfe10438720911d24
 DIST shorewall-init-5.2.2.tar.bz2 33578 BLAKE2B d8eb427e482f01fc59412b08cd58dc2317157570b266e5950ee34d17d504d9dfd886ecbfc861bc83b445b44b2cf85831ec2462acd54c9be519263e340af0d827 SHA512 4aaee33f2f6944498c88938796e987f05e16f2a4a761b1ec14a293ffd293d688bf39f913c426168a7162f3b0dba6679dc0392d9248bd43f678dd42e9532afbbe
+DIST shorewall-init-5.2.3.tar.bz2 34153 BLAKE2B 1a4eddf778f372ce152c542b40da31f867ae43d94dfb664a750ef2a68a8842be353d2b105ca2ba8959864ac5669afc3624de3b44fbe1f145be48ac2a9e1d4685 SHA512 bacd1a24e6ab23d4ee84fcf6ad8edd30716b20e0115540536c70061d7749e9e302749e7fe9f50e07bc100be8122ada3d0f047301e88f58bd5b2573d73917f0b4
 DIST shorewall-lite-5.2.1.4.tar.bz2 39858 BLAKE2B dcaf1adfc20640c22cdca20e2b786ec4ad2736567c0c5eec6cd22a95f0b0c461b24826afa933eac7a1ecffd836da55b8053a1370623d73dd6434b91d59d63e36 SHA512 25712a264ee615b4b0ae038836636ea07f4fedca721759b3860912838ef1aee4535831ed4dd8abd670e082e9f59bd52ac00fb0fd1c5907786bb239e270d5fdf1
 DIST shorewall-lite-5.2.2.tar.bz2 39421 BLAKE2B 6d24b62c54eed028785b6eb581be4659c1110c5e7d85caf3382b814edce0046064798a1ffb5100f04bc48bbac877969913f03e19883c33563bc7dfdb0bc48a3d SHA512 e49ee3eee13a4fe801c5d86aa85747a9543882a49b40454dad62154f772dc47adea84e967a4ef30b8c4c3e9964a04c76a794a318affe8eaac6cc107b255cca4a
+DIST shorewall-lite-5.2.3.tar.bz2 38963 BLAKE2B a13153f85a41c45b37e31bde851e3b587ecb31c752f8c8ca4b2956341ecff8cd534326ed0f0fc069f67f84b74e5e933493c0901695bc24872509ebb24bf89149 SHA512 8b49668fd983baae91e18a712fe79cc8c90f949969bf49e00506b8e822ae8e5495914bba6df795a71ebc47958649fbc521401dde66af79790e7f59352a27e627
 DIST shorewall6-5.2.1.4.tar.bz2 191855 BLAKE2B 3967e715ca88c85fd05f0cce1d4836c2b7f17b7a7360698c269b109f54dfbac2c4d67958c3c8c2d8cb74b5117d7f8ac30dc9ab3c09d97243cffe21ef3005c7b7 SHA512 8b49f187b7141c3eedb02c64a17fe8fa3f01e4b40b33184c4b4c5914e65557595828f87f3e1534abb973320b7a1103b10296b6dfc316ea78f698aeb61a0d63a1
 DIST shorewall6-5.2.2.tar.bz2 191037 BLAKE2B d774ab42658e2636fc15bc9dc04510c3a3745c9ebe204a27707237c168b476ee4fc247fb55c17b99069348947db1760d23c9f61d70a78231d8928e86eb312560 SHA512 5cf83e8c3fd940a6573de04afd29e37e3aa5d6908fffa276ff338b6818d0200b3d1e556420fcdf6989fe27dbef6e26f5a513ea566d70acb9a7db4bf1c3e6faf4
+DIST shorewall6-5.2.3.tar.bz2 190796 BLAKE2B 134dc046cd6b5a88df598f37c503835382f85082783af844e3f70174641d7ddfb94b9be5f5e9c76add6bafdfb1472b6958e880d9b3da67d662a78421363eb8c6 SHA512 52613602800d3118ba9d1bb46088f932772fe0a002e640e406fa4f22079ac5700bc2f39ae59dd771cfd3557a9c8a68822ba684c07d8b9bfe01c0a8ab83ad1b38
 DIST shorewall6-lite-5.2.1.4.tar.bz2 39599 BLAKE2B cb0e2b45fecc4c126504f5caafcd291e919542cd08fb53d69f89c11d4bca784744e2c6eedc0e86a234bcfe7dd9baee46498de1600bdba4475be6a705c92faa54 SHA512 a994cc1a37174ac085d784c5638eb9c5713e6f191260857c7b288a5ba5c54e3d99e88fb31a5b887d3d637edbd2ba8c7711575ca323d616f49b7a0595431b6e13
 DIST shorewall6-lite-5.2.2.tar.bz2 39148 BLAKE2B bcb0cb1b23cb4a486faafcfee588e11a6a50f6d151039ef15f396838b828ed803589d205717ad868140cc7d468f9309ac23dd34d307bbd8640a7791728102c55 SHA512 10f96bc42f47adebc581579b28ab2edb79876dccbf0a8c27d46234ac8fb9af8cb03730851188576bdb24278e9b19cb3cdef91bb4873cab0ef82064d54eeb176f
+DIST shorewall6-lite-5.2.3.tar.bz2 38897 BLAKE2B 93003ad535d87dd0c69fc8dde49c63c63445974aec2949739fedf5a0df9b77a4ee43b4a41e0ff33e1e83a1917aeb978366d95f62ed1ec80d5168627317a26b03 SHA512 1cc21eb1c822e00dbf304d323a9c1cea42e7974e15f24596eb03327bb2499147f6ee9b2e5f5446847943c7e0e925af9a7155e75f0777f5c022e65b54b7cb2cf4

diff --git a/net-firewall/shorewall/shorewall-5.2.3.ebuild b/net-firewall/shorewall/shorewall-5.2.3.ebuild
new file mode 100644
index 00000000000..b12b3712acb
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.3.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-02-28  3:06 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-02-28  3:06 UTC (permalink / raw
  To: gentoo-commits

commit:     96e562a5f55911b393e923fc42efb8dd78248cd0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 28 03:06:05 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 03:06:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96e562a5

net-firewall/shorewall: bump to v5.2.3.1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.3.1.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index c0e8ac708d3..c24b91842df 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.2.1.4.tar.bz2 554756 BLAKE2B cfbc917fb12049a0e8817c478fcccb93b02634ad9aebcd31a839f934e52890f6c20dc2a7d10742d4e10ac0adb1500d9e6445b43390db5bc28874e610b9c07939 SHA512 3682399ddc743c03965e0c0c26b5714e611d186bddf9169524268488cc4f2d6e9e9fb3b2a4c24408cc247ce7d32f793fb35090f85b73a645bb0dd0e99c671564
 DIST shorewall-5.2.2.tar.bz2 557248 BLAKE2B d4fface30ef1bbeefda716b00373e686db73bd29bd2597d3f9950c5f4b3208205be8f321e84749fb92313633f7a6a2a37a493e4a826790d82e6bc6a8dd18bbd3 SHA512 0c4c3e51c2517a56fda2335f433033c8db66fcb843484b928979627b213be4e24408deb1e49df56f9a96e6b9c2a95d74789f07a365d4c4e6f17db96915520598
+DIST shorewall-5.2.3.1.tar.bz2 555568 BLAKE2B a6d1a32d0b3a8858fed6c920b5988ddb27b090ce3a455298ed0f75eb29eb274befebc9509245878a5b9d32574dc8d64d01420eba0e091d9bffde0138296eb7f8 SHA512 bc8bc7f35c9e259ca7a38f6cf38bac60dd04d4c73f7366d33213a9279809f58ef816f8767c81105b8b391b753f9acae7e6313172dacae38f9ad7a5dc02bb890c
 DIST shorewall-5.2.3.tar.bz2 555553 BLAKE2B 8d59d128f4fd5a109fba2280cc0f6a9c74e756feb2e9b8fffa481ee0e1dddef84da44e0c3e578b1513b34b200226ef17c8f73e1a5d917e71d2c83990bf499275 SHA512 51e945ef8207734729e5e81a6d14a4c109042cfe91ef4a893d1e2efca5fa1cca38b22524eaa0c84d95f59ae6f85a6f5e2942443827e74afb8bac62a3bd785ee1
 DIST shorewall-core-5.2.1.4.tar.bz2 78957 BLAKE2B 7310813f4c4ac57378ed9565b1aa32fc3db3bcf9e1dc6e6307a7c399465a051110262dcb78c6d465a6227beeadc1f5c4a82d204c1926f66bcecf5469dc44b5e3 SHA512 9418cb6ef14def2a1a2c7879c6364881d80245ff5a59996bb71d093c14e67c6ce1d462d0217f0ae8574e9a916d3796f945dbececbe6b9851f892022f29a389c9
 DIST shorewall-core-5.2.2.tar.bz2 68223 BLAKE2B 33bc2b8a2ec2f76a909ddd73199462a470ed631029cebae37ca4a43d64a217e6e20fe0aa4c3002a2a5d0d3894a23634f45b4d5ecd916b96db44d3abcbd2fee58 SHA512 607fee1d17bb777e95346867d4dfeac5063f353d6bac6bc6ea625841746bb66a9959cd436a7340c18258188771bddf916e004ba81f256f01699cfda9c909cf7d
+DIST shorewall-core-5.2.3.1.tar.bz2 68870 BLAKE2B 50fe40b119c7778687cef5ac2728c55dff2c70f16174f03d229507ae9db1e505976dbf85df002a234f01a8c07843e889e963c3776dd647c32d202f161cb0f0d2 SHA512 3b44c5cc4dd6e0ffa2f2ed6ce4783fc2f934966eff405671931c2c150794de0e6645f7e4fdb35e93bcaee74e2df53ce41641ea7d9093f20399761ceb90191faf
 DIST shorewall-core-5.2.3.tar.bz2 68720 BLAKE2B 20ee90025c53befd9328a8f6280bcad59f14b9064973634fe0167c2228444d277ccb4c7bb73979856f7ec3b1dec145753b7bdcc01de6f77742f88d410a6ef946 SHA512 52cf9c7ac55fc9fa152f8fe236ff60c3e802e72661d0429f4c1e39eb685dc81878c4d08adf9d2eca022abc952d745f247240bcc182039a05411db180c21404ae
 DIST shorewall-docs-html-5.2.1.4.tar.bz2 4303361 BLAKE2B 22f7a94d9cb0de5ee9903e8d05498a6a6de6ea643f2d08b709bf9f8dd516ba507f80ed11207973884905421443eedf56e3693b9e42f5f372515b957e2be8132c SHA512 44bb66feecac927de6fe1cdfba9247e9f01c982c3b105f7cd68348fee0803b9b7bd76e7551528e0b2d6ff8e65e6ebf8a05c26831871a98565374692d6405f34a
 DIST shorewall-docs-html-5.2.2.tar.bz2 4302493 BLAKE2B 49c8f44aaeb3d06330ea293fafb7535096355bd4a151d8b4dfbc476d1e92c785360474d1b86754247ccff1f7198fd7f6f8e17da608f41a76642e73cafbdea65b SHA512 ea7fa5f6df6413e33c5fa9f043973c70351c9c99fe8e6095ccbe3e5b6e4667c4f89907fc995ab252c6a1aee5652b496e96d4e38b898ddd41b9e220f4edefa93e
+DIST shorewall-docs-html-5.2.3.1.tar.bz2 4302429 BLAKE2B dbd36a313ae3a637450ebcb1b5147c2a43f688e21d312ad7ccd79101ad1b046975fb6cf20ea46afb3f1383f427ac1bbcb1ce3fa4715338ed46827da17429e6be SHA512 31f840d9522331266149ac24898618ea172ae89c1b35b5abf4db6d5a15dc9199b6385999a7dff9445c0a319d18e2d47c1b718b6daa07155f28c0f0aa18dba767
 DIST shorewall-docs-html-5.2.3.tar.bz2 4302850 BLAKE2B 4ba7d4a181bb62737e31750e2e1e790ca4176e7c987d699c3447d19d238d9b79f61cb8b135b94214ce69e7e5e71d324df99a393009abe2555eb909e82eb0755d SHA512 177b88d735c23796bae805f261c9e7843ecaad4539123d4f16b1e00723ab5c476b2d143f80bcf4c773f3ee33f0a5b2db4131857e65855b5e4f2dd5ed579bbe72
 DIST shorewall-init-5.2.1.4.tar.bz2 34088 BLAKE2B f285b04e448584fe1f9a5528b6ddb6e16cbedcfda51f9c9925228835b2b065c658e9314ecad23364dc4ee21579fa113fe5a1c5581ea3e7c310d12744de64798d SHA512 58044bbcd2f30aaecb3c02374ca21a51b6f5fee49e9cf9565444649d64e3babd3070a72eddaccb52224201064e8642f9bcd9979bde41c13bfe10438720911d24
 DIST shorewall-init-5.2.2.tar.bz2 33578 BLAKE2B d8eb427e482f01fc59412b08cd58dc2317157570b266e5950ee34d17d504d9dfd886ecbfc861bc83b445b44b2cf85831ec2462acd54c9be519263e340af0d827 SHA512 4aaee33f2f6944498c88938796e987f05e16f2a4a761b1ec14a293ffd293d688bf39f913c426168a7162f3b0dba6679dc0392d9248bd43f678dd42e9532afbbe
+DIST shorewall-init-5.2.3.1.tar.bz2 34221 BLAKE2B 79607fa498eef4adb657009031dd2fc81c53f891d170fc9cb1f6d8432772319194770894d7cb5b95bcd3e41eabd3d6885edde13317b04c92c05c9106a925747a SHA512 fdbe504659c4c0436e3992288aa8868df60bcbccf2ba89e014d4927b82046354f47a54794020199b741de15f38fa4c04a012e595288828715e87fb2ce2bd4d60
 DIST shorewall-init-5.2.3.tar.bz2 34153 BLAKE2B 1a4eddf778f372ce152c542b40da31f867ae43d94dfb664a750ef2a68a8842be353d2b105ca2ba8959864ac5669afc3624de3b44fbe1f145be48ac2a9e1d4685 SHA512 bacd1a24e6ab23d4ee84fcf6ad8edd30716b20e0115540536c70061d7749e9e302749e7fe9f50e07bc100be8122ada3d0f047301e88f58bd5b2573d73917f0b4
 DIST shorewall-lite-5.2.1.4.tar.bz2 39858 BLAKE2B dcaf1adfc20640c22cdca20e2b786ec4ad2736567c0c5eec6cd22a95f0b0c461b24826afa933eac7a1ecffd836da55b8053a1370623d73dd6434b91d59d63e36 SHA512 25712a264ee615b4b0ae038836636ea07f4fedca721759b3860912838ef1aee4535831ed4dd8abd670e082e9f59bd52ac00fb0fd1c5907786bb239e270d5fdf1
 DIST shorewall-lite-5.2.2.tar.bz2 39421 BLAKE2B 6d24b62c54eed028785b6eb581be4659c1110c5e7d85caf3382b814edce0046064798a1ffb5100f04bc48bbac877969913f03e19883c33563bc7dfdb0bc48a3d SHA512 e49ee3eee13a4fe801c5d86aa85747a9543882a49b40454dad62154f772dc47adea84e967a4ef30b8c4c3e9964a04c76a794a318affe8eaac6cc107b255cca4a
+DIST shorewall-lite-5.2.3.1.tar.bz2 38993 BLAKE2B d8c230c9abef51ce4b1a02584c903b5c39080aa9d0398f104c36481eb28d29079fa0b6cb9c20f2d78e2bf8dc09535a643ee318c734ff1358f574f6b12ffc8bf2 SHA512 7ba0cb4ddc863448237c60dec3300dc04b8e509b7df5f650cbc5517badf59af35a5bc651a58bb5e2fed47fb16d633772a385c54bb929c7ac12222191deaab7ba
 DIST shorewall-lite-5.2.3.tar.bz2 38963 BLAKE2B a13153f85a41c45b37e31bde851e3b587ecb31c752f8c8ca4b2956341ecff8cd534326ed0f0fc069f67f84b74e5e933493c0901695bc24872509ebb24bf89149 SHA512 8b49668fd983baae91e18a712fe79cc8c90f949969bf49e00506b8e822ae8e5495914bba6df795a71ebc47958649fbc521401dde66af79790e7f59352a27e627
 DIST shorewall6-5.2.1.4.tar.bz2 191855 BLAKE2B 3967e715ca88c85fd05f0cce1d4836c2b7f17b7a7360698c269b109f54dfbac2c4d67958c3c8c2d8cb74b5117d7f8ac30dc9ab3c09d97243cffe21ef3005c7b7 SHA512 8b49f187b7141c3eedb02c64a17fe8fa3f01e4b40b33184c4b4c5914e65557595828f87f3e1534abb973320b7a1103b10296b6dfc316ea78f698aeb61a0d63a1
 DIST shorewall6-5.2.2.tar.bz2 191037 BLAKE2B d774ab42658e2636fc15bc9dc04510c3a3745c9ebe204a27707237c168b476ee4fc247fb55c17b99069348947db1760d23c9f61d70a78231d8928e86eb312560 SHA512 5cf83e8c3fd940a6573de04afd29e37e3aa5d6908fffa276ff338b6818d0200b3d1e556420fcdf6989fe27dbef6e26f5a513ea566d70acb9a7db4bf1c3e6faf4
+DIST shorewall6-5.2.3.1.tar.bz2 190299 BLAKE2B 71745734cda4359da9213478bed680dca595775dca82e937f3a57cce9af0a3f0910989570461d5507bb88e5ebbad5176ed515ab1f8dcef072c78c42a96ff0d11 SHA512 4d2f688e1ecdde239f271c660820faec4db1d7c936c4579e9c5b087125fdfd14e14b72dc590ca59de050155ce91815a49b7b30125ebe97e7be8323aa0f662136
 DIST shorewall6-5.2.3.tar.bz2 190796 BLAKE2B 134dc046cd6b5a88df598f37c503835382f85082783af844e3f70174641d7ddfb94b9be5f5e9c76add6bafdfb1472b6958e880d9b3da67d662a78421363eb8c6 SHA512 52613602800d3118ba9d1bb46088f932772fe0a002e640e406fa4f22079ac5700bc2f39ae59dd771cfd3557a9c8a68822ba684c07d8b9bfe01c0a8ab83ad1b38
 DIST shorewall6-lite-5.2.1.4.tar.bz2 39599 BLAKE2B cb0e2b45fecc4c126504f5caafcd291e919542cd08fb53d69f89c11d4bca784744e2c6eedc0e86a234bcfe7dd9baee46498de1600bdba4475be6a705c92faa54 SHA512 a994cc1a37174ac085d784c5638eb9c5713e6f191260857c7b288a5ba5c54e3d99e88fb31a5b887d3d637edbd2ba8c7711575ca323d616f49b7a0595431b6e13
 DIST shorewall6-lite-5.2.2.tar.bz2 39148 BLAKE2B bcb0cb1b23cb4a486faafcfee588e11a6a50f6d151039ef15f396838b828ed803589d205717ad868140cc7d468f9309ac23dd34d307bbd8640a7791728102c55 SHA512 10f96bc42f47adebc581579b28ab2edb79876dccbf0a8c27d46234ac8fb9af8cb03730851188576bdb24278e9b19cb3cdef91bb4873cab0ef82064d54eeb176f
+DIST shorewall6-lite-5.2.3.1.tar.bz2 38966 BLAKE2B c7c6158b1d1dd1aa58bdba35b2606286d01de885e7e35c825d41bcadb651357c62188dd4d7af81979ac8dc18b2f24a6d37c6d2486159796fcccdb9b656178f60 SHA512 cbe82e7a25ea0e0d7cd6a0ceaefe80413a2d07be92433c9932a4b0e1aaa6ff93e6150fd221b43fd056c088390d42b9bb9d8540e8d70dde315f7a53057e6f2f1c
 DIST shorewall6-lite-5.2.3.tar.bz2 38897 BLAKE2B 93003ad535d87dd0c69fc8dde49c63c63445974aec2949739fedf5a0df9b77a4ee43b4a41e0ff33e1e83a1917aeb978366d95f62ed1ec80d5168627317a26b03 SHA512 1cc21eb1c822e00dbf304d323a9c1cea42e7974e15f24596eb03327bb2499147f6ee9b2e5f5446847943c7e0e925af9a7155e75f0777f5c022e65b54b7cb2cf4

diff --git a/net-firewall/shorewall/shorewall-5.2.3.1.ebuild b/net-firewall/shorewall/shorewall-5.2.3.1.ebuild
new file mode 100644
index 00000000000..b12b3712acb
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.3.1.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+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=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-03-06 22:52 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-03-06 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     fbf330fd53fe25347a27ede001e23efe7af85329
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 22:49:16 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 22:52:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf330fd

net-firewall/shorewall: x86 stable, applying ALLARCHES policy

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.3.1.ebuild b/net-firewall/shorewall/shorewall-5.2.3.1.ebuild
index b12b3712acb..14bfe9b234c 100644
--- a/net-firewall/shorewall/shorewall-5.2.3.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.1.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-03-06 22:52 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-03-06 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     16e23d9f6ae962c11295c18cf76403b9579965c1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 22:50:02 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 22:52:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e23d9f

net-firewall/shorewall: cleanup old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |  21 --
 net-firewall/shorewall/shorewall-5.2.1.4.ebuild | 482 ------------------------
 net-firewall/shorewall/shorewall-5.2.2.ebuild   | 482 ------------------------
 net-firewall/shorewall/shorewall-5.2.3.ebuild   | 482 ------------------------
 4 files changed, 1467 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index c24b91842df..674bc93b61d 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,28 +1,7 @@
-DIST shorewall-5.2.1.4.tar.bz2 554756 BLAKE2B cfbc917fb12049a0e8817c478fcccb93b02634ad9aebcd31a839f934e52890f6c20dc2a7d10742d4e10ac0adb1500d9e6445b43390db5bc28874e610b9c07939 SHA512 3682399ddc743c03965e0c0c26b5714e611d186bddf9169524268488cc4f2d6e9e9fb3b2a4c24408cc247ce7d32f793fb35090f85b73a645bb0dd0e99c671564
-DIST shorewall-5.2.2.tar.bz2 557248 BLAKE2B d4fface30ef1bbeefda716b00373e686db73bd29bd2597d3f9950c5f4b3208205be8f321e84749fb92313633f7a6a2a37a493e4a826790d82e6bc6a8dd18bbd3 SHA512 0c4c3e51c2517a56fda2335f433033c8db66fcb843484b928979627b213be4e24408deb1e49df56f9a96e6b9c2a95d74789f07a365d4c4e6f17db96915520598
 DIST shorewall-5.2.3.1.tar.bz2 555568 BLAKE2B a6d1a32d0b3a8858fed6c920b5988ddb27b090ce3a455298ed0f75eb29eb274befebc9509245878a5b9d32574dc8d64d01420eba0e091d9bffde0138296eb7f8 SHA512 bc8bc7f35c9e259ca7a38f6cf38bac60dd04d4c73f7366d33213a9279809f58ef816f8767c81105b8b391b753f9acae7e6313172dacae38f9ad7a5dc02bb890c
-DIST shorewall-5.2.3.tar.bz2 555553 BLAKE2B 8d59d128f4fd5a109fba2280cc0f6a9c74e756feb2e9b8fffa481ee0e1dddef84da44e0c3e578b1513b34b200226ef17c8f73e1a5d917e71d2c83990bf499275 SHA512 51e945ef8207734729e5e81a6d14a4c109042cfe91ef4a893d1e2efca5fa1cca38b22524eaa0c84d95f59ae6f85a6f5e2942443827e74afb8bac62a3bd785ee1
-DIST shorewall-core-5.2.1.4.tar.bz2 78957 BLAKE2B 7310813f4c4ac57378ed9565b1aa32fc3db3bcf9e1dc6e6307a7c399465a051110262dcb78c6d465a6227beeadc1f5c4a82d204c1926f66bcecf5469dc44b5e3 SHA512 9418cb6ef14def2a1a2c7879c6364881d80245ff5a59996bb71d093c14e67c6ce1d462d0217f0ae8574e9a916d3796f945dbececbe6b9851f892022f29a389c9
-DIST shorewall-core-5.2.2.tar.bz2 68223 BLAKE2B 33bc2b8a2ec2f76a909ddd73199462a470ed631029cebae37ca4a43d64a217e6e20fe0aa4c3002a2a5d0d3894a23634f45b4d5ecd916b96db44d3abcbd2fee58 SHA512 607fee1d17bb777e95346867d4dfeac5063f353d6bac6bc6ea625841746bb66a9959cd436a7340c18258188771bddf916e004ba81f256f01699cfda9c909cf7d
 DIST shorewall-core-5.2.3.1.tar.bz2 68870 BLAKE2B 50fe40b119c7778687cef5ac2728c55dff2c70f16174f03d229507ae9db1e505976dbf85df002a234f01a8c07843e889e963c3776dd647c32d202f161cb0f0d2 SHA512 3b44c5cc4dd6e0ffa2f2ed6ce4783fc2f934966eff405671931c2c150794de0e6645f7e4fdb35e93bcaee74e2df53ce41641ea7d9093f20399761ceb90191faf
-DIST shorewall-core-5.2.3.tar.bz2 68720 BLAKE2B 20ee90025c53befd9328a8f6280bcad59f14b9064973634fe0167c2228444d277ccb4c7bb73979856f7ec3b1dec145753b7bdcc01de6f77742f88d410a6ef946 SHA512 52cf9c7ac55fc9fa152f8fe236ff60c3e802e72661d0429f4c1e39eb685dc81878c4d08adf9d2eca022abc952d745f247240bcc182039a05411db180c21404ae
-DIST shorewall-docs-html-5.2.1.4.tar.bz2 4303361 BLAKE2B 22f7a94d9cb0de5ee9903e8d05498a6a6de6ea643f2d08b709bf9f8dd516ba507f80ed11207973884905421443eedf56e3693b9e42f5f372515b957e2be8132c SHA512 44bb66feecac927de6fe1cdfba9247e9f01c982c3b105f7cd68348fee0803b9b7bd76e7551528e0b2d6ff8e65e6ebf8a05c26831871a98565374692d6405f34a
-DIST shorewall-docs-html-5.2.2.tar.bz2 4302493 BLAKE2B 49c8f44aaeb3d06330ea293fafb7535096355bd4a151d8b4dfbc476d1e92c785360474d1b86754247ccff1f7198fd7f6f8e17da608f41a76642e73cafbdea65b SHA512 ea7fa5f6df6413e33c5fa9f043973c70351c9c99fe8e6095ccbe3e5b6e4667c4f89907fc995ab252c6a1aee5652b496e96d4e38b898ddd41b9e220f4edefa93e
 DIST shorewall-docs-html-5.2.3.1.tar.bz2 4302429 BLAKE2B dbd36a313ae3a637450ebcb1b5147c2a43f688e21d312ad7ccd79101ad1b046975fb6cf20ea46afb3f1383f427ac1bbcb1ce3fa4715338ed46827da17429e6be SHA512 31f840d9522331266149ac24898618ea172ae89c1b35b5abf4db6d5a15dc9199b6385999a7dff9445c0a319d18e2d47c1b718b6daa07155f28c0f0aa18dba767
-DIST shorewall-docs-html-5.2.3.tar.bz2 4302850 BLAKE2B 4ba7d4a181bb62737e31750e2e1e790ca4176e7c987d699c3447d19d238d9b79f61cb8b135b94214ce69e7e5e71d324df99a393009abe2555eb909e82eb0755d SHA512 177b88d735c23796bae805f261c9e7843ecaad4539123d4f16b1e00723ab5c476b2d143f80bcf4c773f3ee33f0a5b2db4131857e65855b5e4f2dd5ed579bbe72
-DIST shorewall-init-5.2.1.4.tar.bz2 34088 BLAKE2B f285b04e448584fe1f9a5528b6ddb6e16cbedcfda51f9c9925228835b2b065c658e9314ecad23364dc4ee21579fa113fe5a1c5581ea3e7c310d12744de64798d SHA512 58044bbcd2f30aaecb3c02374ca21a51b6f5fee49e9cf9565444649d64e3babd3070a72eddaccb52224201064e8642f9bcd9979bde41c13bfe10438720911d24
-DIST shorewall-init-5.2.2.tar.bz2 33578 BLAKE2B d8eb427e482f01fc59412b08cd58dc2317157570b266e5950ee34d17d504d9dfd886ecbfc861bc83b445b44b2cf85831ec2462acd54c9be519263e340af0d827 SHA512 4aaee33f2f6944498c88938796e987f05e16f2a4a761b1ec14a293ffd293d688bf39f913c426168a7162f3b0dba6679dc0392d9248bd43f678dd42e9532afbbe
 DIST shorewall-init-5.2.3.1.tar.bz2 34221 BLAKE2B 79607fa498eef4adb657009031dd2fc81c53f891d170fc9cb1f6d8432772319194770894d7cb5b95bcd3e41eabd3d6885edde13317b04c92c05c9106a925747a SHA512 fdbe504659c4c0436e3992288aa8868df60bcbccf2ba89e014d4927b82046354f47a54794020199b741de15f38fa4c04a012e595288828715e87fb2ce2bd4d60
-DIST shorewall-init-5.2.3.tar.bz2 34153 BLAKE2B 1a4eddf778f372ce152c542b40da31f867ae43d94dfb664a750ef2a68a8842be353d2b105ca2ba8959864ac5669afc3624de3b44fbe1f145be48ac2a9e1d4685 SHA512 bacd1a24e6ab23d4ee84fcf6ad8edd30716b20e0115540536c70061d7749e9e302749e7fe9f50e07bc100be8122ada3d0f047301e88f58bd5b2573d73917f0b4
-DIST shorewall-lite-5.2.1.4.tar.bz2 39858 BLAKE2B dcaf1adfc20640c22cdca20e2b786ec4ad2736567c0c5eec6cd22a95f0b0c461b24826afa933eac7a1ecffd836da55b8053a1370623d73dd6434b91d59d63e36 SHA512 25712a264ee615b4b0ae038836636ea07f4fedca721759b3860912838ef1aee4535831ed4dd8abd670e082e9f59bd52ac00fb0fd1c5907786bb239e270d5fdf1
-DIST shorewall-lite-5.2.2.tar.bz2 39421 BLAKE2B 6d24b62c54eed028785b6eb581be4659c1110c5e7d85caf3382b814edce0046064798a1ffb5100f04bc48bbac877969913f03e19883c33563bc7dfdb0bc48a3d SHA512 e49ee3eee13a4fe801c5d86aa85747a9543882a49b40454dad62154f772dc47adea84e967a4ef30b8c4c3e9964a04c76a794a318affe8eaac6cc107b255cca4a
 DIST shorewall-lite-5.2.3.1.tar.bz2 38993 BLAKE2B d8c230c9abef51ce4b1a02584c903b5c39080aa9d0398f104c36481eb28d29079fa0b6cb9c20f2d78e2bf8dc09535a643ee318c734ff1358f574f6b12ffc8bf2 SHA512 7ba0cb4ddc863448237c60dec3300dc04b8e509b7df5f650cbc5517badf59af35a5bc651a58bb5e2fed47fb16d633772a385c54bb929c7ac12222191deaab7ba
-DIST shorewall-lite-5.2.3.tar.bz2 38963 BLAKE2B a13153f85a41c45b37e31bde851e3b587ecb31c752f8c8ca4b2956341ecff8cd534326ed0f0fc069f67f84b74e5e933493c0901695bc24872509ebb24bf89149 SHA512 8b49668fd983baae91e18a712fe79cc8c90f949969bf49e00506b8e822ae8e5495914bba6df795a71ebc47958649fbc521401dde66af79790e7f59352a27e627
-DIST shorewall6-5.2.1.4.tar.bz2 191855 BLAKE2B 3967e715ca88c85fd05f0cce1d4836c2b7f17b7a7360698c269b109f54dfbac2c4d67958c3c8c2d8cb74b5117d7f8ac30dc9ab3c09d97243cffe21ef3005c7b7 SHA512 8b49f187b7141c3eedb02c64a17fe8fa3f01e4b40b33184c4b4c5914e65557595828f87f3e1534abb973320b7a1103b10296b6dfc316ea78f698aeb61a0d63a1
-DIST shorewall6-5.2.2.tar.bz2 191037 BLAKE2B d774ab42658e2636fc15bc9dc04510c3a3745c9ebe204a27707237c168b476ee4fc247fb55c17b99069348947db1760d23c9f61d70a78231d8928e86eb312560 SHA512 5cf83e8c3fd940a6573de04afd29e37e3aa5d6908fffa276ff338b6818d0200b3d1e556420fcdf6989fe27dbef6e26f5a513ea566d70acb9a7db4bf1c3e6faf4
 DIST shorewall6-5.2.3.1.tar.bz2 190299 BLAKE2B 71745734cda4359da9213478bed680dca595775dca82e937f3a57cce9af0a3f0910989570461d5507bb88e5ebbad5176ed515ab1f8dcef072c78c42a96ff0d11 SHA512 4d2f688e1ecdde239f271c660820faec4db1d7c936c4579e9c5b087125fdfd14e14b72dc590ca59de050155ce91815a49b7b30125ebe97e7be8323aa0f662136
-DIST shorewall6-5.2.3.tar.bz2 190796 BLAKE2B 134dc046cd6b5a88df598f37c503835382f85082783af844e3f70174641d7ddfb94b9be5f5e9c76add6bafdfb1472b6958e880d9b3da67d662a78421363eb8c6 SHA512 52613602800d3118ba9d1bb46088f932772fe0a002e640e406fa4f22079ac5700bc2f39ae59dd771cfd3557a9c8a68822ba684c07d8b9bfe01c0a8ab83ad1b38
-DIST shorewall6-lite-5.2.1.4.tar.bz2 39599 BLAKE2B cb0e2b45fecc4c126504f5caafcd291e919542cd08fb53d69f89c11d4bca784744e2c6eedc0e86a234bcfe7dd9baee46498de1600bdba4475be6a705c92faa54 SHA512 a994cc1a37174ac085d784c5638eb9c5713e6f191260857c7b288a5ba5c54e3d99e88fb31a5b887d3d637edbd2ba8c7711575ca323d616f49b7a0595431b6e13
-DIST shorewall6-lite-5.2.2.tar.bz2 39148 BLAKE2B bcb0cb1b23cb4a486faafcfee588e11a6a50f6d151039ef15f396838b828ed803589d205717ad868140cc7d468f9309ac23dd34d307bbd8640a7791728102c55 SHA512 10f96bc42f47adebc581579b28ab2edb79876dccbf0a8c27d46234ac8fb9af8cb03730851188576bdb24278e9b19cb3cdef91bb4873cab0ef82064d54eeb176f
 DIST shorewall6-lite-5.2.3.1.tar.bz2 38966 BLAKE2B c7c6158b1d1dd1aa58bdba35b2606286d01de885e7e35c825d41bcadb651357c62188dd4d7af81979ac8dc18b2f24a6d37c6d2486159796fcccdb9b656178f60 SHA512 cbe82e7a25ea0e0d7cd6a0ceaefe80413a2d07be92433c9932a4b0e1aaa6ff93e6150fd221b43fd056c088390d42b9bb9d8540e8d70dde315f7a53057e6f2f1c
-DIST shorewall6-lite-5.2.3.tar.bz2 38897 BLAKE2B 93003ad535d87dd0c69fc8dde49c63c63445974aec2949739fedf5a0df9b77a4ee43b4a41e0ff33e1e83a1917aeb978366d95f62ed1ec80d5168627317a26b03 SHA512 1cc21eb1c822e00dbf304d323a9c1cea42e7974e15f24596eb03327bb2499147f6ee9b2e5f5446847943c7e0e925af9a7155e75f0777f5c022e65b54b7cb2cf4

diff --git a/net-firewall/shorewall/shorewall-5.2.1.4.ebuild b/net-firewall/shorewall/shorewall-5.2.1.4.ebuild
deleted file mode 100644
index 206f56bc745..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.1.4.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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.2.ebuild b/net-firewall/shorewall/shorewall-5.2.2.ebuild
deleted file mode 100644
index b12b3712acb..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.2.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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.3.ebuild b/net-firewall/shorewall/shorewall-5.2.3.ebuild
deleted file mode 100644
index b12b3712acb..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.3.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-03-20 19:29 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-03-20 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     d1c56c8e95c880b389384d5ba424078ec8f76fac
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 19:29:10 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 19:29:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c56c8e

net-firewall/shorewall: bump to v5.2.3.2

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.2.3.1.ebuild => shorewall-5.2.3.2.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 674bc93b61d..e952d94c75b 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,7 @@
-DIST shorewall-5.2.3.1.tar.bz2 555568 BLAKE2B a6d1a32d0b3a8858fed6c920b5988ddb27b090ce3a455298ed0f75eb29eb274befebc9509245878a5b9d32574dc8d64d01420eba0e091d9bffde0138296eb7f8 SHA512 bc8bc7f35c9e259ca7a38f6cf38bac60dd04d4c73f7366d33213a9279809f58ef816f8767c81105b8b391b753f9acae7e6313172dacae38f9ad7a5dc02bb890c
-DIST shorewall-core-5.2.3.1.tar.bz2 68870 BLAKE2B 50fe40b119c7778687cef5ac2728c55dff2c70f16174f03d229507ae9db1e505976dbf85df002a234f01a8c07843e889e963c3776dd647c32d202f161cb0f0d2 SHA512 3b44c5cc4dd6e0ffa2f2ed6ce4783fc2f934966eff405671931c2c150794de0e6645f7e4fdb35e93bcaee74e2df53ce41641ea7d9093f20399761ceb90191faf
-DIST shorewall-docs-html-5.2.3.1.tar.bz2 4302429 BLAKE2B dbd36a313ae3a637450ebcb1b5147c2a43f688e21d312ad7ccd79101ad1b046975fb6cf20ea46afb3f1383f427ac1bbcb1ce3fa4715338ed46827da17429e6be SHA512 31f840d9522331266149ac24898618ea172ae89c1b35b5abf4db6d5a15dc9199b6385999a7dff9445c0a319d18e2d47c1b718b6daa07155f28c0f0aa18dba767
-DIST shorewall-init-5.2.3.1.tar.bz2 34221 BLAKE2B 79607fa498eef4adb657009031dd2fc81c53f891d170fc9cb1f6d8432772319194770894d7cb5b95bcd3e41eabd3d6885edde13317b04c92c05c9106a925747a SHA512 fdbe504659c4c0436e3992288aa8868df60bcbccf2ba89e014d4927b82046354f47a54794020199b741de15f38fa4c04a012e595288828715e87fb2ce2bd4d60
-DIST shorewall-lite-5.2.3.1.tar.bz2 38993 BLAKE2B d8c230c9abef51ce4b1a02584c903b5c39080aa9d0398f104c36481eb28d29079fa0b6cb9c20f2d78e2bf8dc09535a643ee318c734ff1358f574f6b12ffc8bf2 SHA512 7ba0cb4ddc863448237c60dec3300dc04b8e509b7df5f650cbc5517badf59af35a5bc651a58bb5e2fed47fb16d633772a385c54bb929c7ac12222191deaab7ba
-DIST shorewall6-5.2.3.1.tar.bz2 190299 BLAKE2B 71745734cda4359da9213478bed680dca595775dca82e937f3a57cce9af0a3f0910989570461d5507bb88e5ebbad5176ed515ab1f8dcef072c78c42a96ff0d11 SHA512 4d2f688e1ecdde239f271c660820faec4db1d7c936c4579e9c5b087125fdfd14e14b72dc590ca59de050155ce91815a49b7b30125ebe97e7be8323aa0f662136
-DIST shorewall6-lite-5.2.3.1.tar.bz2 38966 BLAKE2B c7c6158b1d1dd1aa58bdba35b2606286d01de885e7e35c825d41bcadb651357c62188dd4d7af81979ac8dc18b2f24a6d37c6d2486159796fcccdb9b656178f60 SHA512 cbe82e7a25ea0e0d7cd6a0ceaefe80413a2d07be92433c9932a4b0e1aaa6ff93e6150fd221b43fd056c088390d42b9bb9d8540e8d70dde315f7a53057e6f2f1c
+DIST shorewall-5.2.3.2.tar.bz2 556260 BLAKE2B 4a210acea452c93bc3161ae4386e3f9337ba759bbddde6fc4dfca712d26bf8b99d48b4395b08f351e095155d71a9c0fb014ee16880224ec9d52e88743ca789ef SHA512 187af5eadf1b7717ec02c2532aa65f89a93a4ec6a7dbff11eceabc92309179297f748accf9bd0e35a6c6b8f5f99fa045550c9eb19b08885dd1ecb8206b97de89
+DIST shorewall-core-5.2.3.2.tar.bz2 69128 BLAKE2B 6a5caf31f415094071584d740c56551214326c8b6376cbd770fb4a7b72607bbdb1e53dfe863e40c1b65e874915fdcb0364779efe22c807fa5c8ed810c6cc4d2d SHA512 1de38fb74282a67d4596bc6ddb3b73b88d9d9d31ef4d40555199cba923a600fdfcf19b922d29fa47e9e3f25048404299dadced27ffa0c0ca93368bb80694c17b
+DIST shorewall-docs-html-5.2.3.2.tar.bz2 4302686 BLAKE2B 73d20e4a6a28771963e2fb79b251d42b7c7c7e47df446e5f400f299cbc334567505bb50d2bc5c9c834baf6d8d6208283b86ea0e873c194e9dfbd3d1da2720c2f SHA512 ede1eeb8444832839bdd0642809fbb960300f289c0a9e8c979d92fa376a3ba28648b7c89d4ff8caca4bc4d6ce15d4205e4d4679628b9080e3f41919105850aaa
+DIST shorewall-init-5.2.3.2.tar.bz2 34418 BLAKE2B 1657bf055f2f5aa9206392a4cdf4a2a03185d964e01edc93455b587e5004aab146f6da65d8b70c72414a74887696ad9dbaca729ab063fe4016f3e45a8bb732d9 SHA512 ed46184535a0cc7197f4c7513604574b0ba862a99ac3cd1d0437f12dca17e9b1d249df77ac0152d4cfd257a1de1310af07c1bd70e763e4d663e7114dd26c617c
+DIST shorewall-lite-5.2.3.2.tar.bz2 39201 BLAKE2B a50fdfe8498e745daed93166c5bd3d4cabebcc13f54bf3c00360f6e2fbaaa4327f0b40496308ca00915d35abdff2e37b3e85b29a77828d1bdacd0b36cdcac2f5 SHA512 2ce235153546c35a4fe440ec4b0dc66f6d0807b50dc3a7f148296e341f6a264bf63da36cac1ed9cbb4b857df7843209f818101ff6d342c5673d8b1134de67073
+DIST shorewall6-5.2.3.2.tar.bz2 190178 BLAKE2B 587902f4d0ac799f499520964e33db5251d1e5e3022a2cb2413a1349893bea13a7f1995fe3a70ae0b23d4ab3936e55233f208e9162bd51877d01b3eec4f7137e SHA512 3dc5bb4996ea251aef323241a855a2efaf4db3772e94050403faf040cf8f18fa4e38d7b2cae8733f0557b79c6330b10cf545d51338d4df1ebea19ba20bd66b05
+DIST shorewall6-lite-5.2.3.2.tar.bz2 39069 BLAKE2B 3647156f673cfce29a1bebddeef81de911146d707e5c917ce01a93ed807bc67ee7f9107c9010a396f000fd76286ef167f43b2432954c17bc2a3a5cf085acc073 SHA512 1d47bb005655bf863ec41601b7e49c91508d330f80f0b9b5a546ed366d06fe04a4005598fc5b34b271ccf7f5f4798ccee83917b0988b03fd36cb53e12c44334d

diff --git a/net-firewall/shorewall/shorewall-5.2.3.1.ebuild b/net-firewall/shorewall/shorewall-5.2.3.2.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.2.3.1.ebuild
rename to net-firewall/shorewall/shorewall-5.2.3.2.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-04-18  1:40 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-04-18  1:40 UTC (permalink / raw
  To: gentoo-commits

commit:     cb128067b12dd9890d2986f7d9b2639003635ddb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 01:39:59 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 01:39:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb128067

net-firewall/shorewall: bump to v5.2.3.3

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.2.3.2.ebuild => shorewall-5.2.3.3.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e952d94c75b..7613520c300 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,7 @@
-DIST shorewall-5.2.3.2.tar.bz2 556260 BLAKE2B 4a210acea452c93bc3161ae4386e3f9337ba759bbddde6fc4dfca712d26bf8b99d48b4395b08f351e095155d71a9c0fb014ee16880224ec9d52e88743ca789ef SHA512 187af5eadf1b7717ec02c2532aa65f89a93a4ec6a7dbff11eceabc92309179297f748accf9bd0e35a6c6b8f5f99fa045550c9eb19b08885dd1ecb8206b97de89
-DIST shorewall-core-5.2.3.2.tar.bz2 69128 BLAKE2B 6a5caf31f415094071584d740c56551214326c8b6376cbd770fb4a7b72607bbdb1e53dfe863e40c1b65e874915fdcb0364779efe22c807fa5c8ed810c6cc4d2d SHA512 1de38fb74282a67d4596bc6ddb3b73b88d9d9d31ef4d40555199cba923a600fdfcf19b922d29fa47e9e3f25048404299dadced27ffa0c0ca93368bb80694c17b
-DIST shorewall-docs-html-5.2.3.2.tar.bz2 4302686 BLAKE2B 73d20e4a6a28771963e2fb79b251d42b7c7c7e47df446e5f400f299cbc334567505bb50d2bc5c9c834baf6d8d6208283b86ea0e873c194e9dfbd3d1da2720c2f SHA512 ede1eeb8444832839bdd0642809fbb960300f289c0a9e8c979d92fa376a3ba28648b7c89d4ff8caca4bc4d6ce15d4205e4d4679628b9080e3f41919105850aaa
-DIST shorewall-init-5.2.3.2.tar.bz2 34418 BLAKE2B 1657bf055f2f5aa9206392a4cdf4a2a03185d964e01edc93455b587e5004aab146f6da65d8b70c72414a74887696ad9dbaca729ab063fe4016f3e45a8bb732d9 SHA512 ed46184535a0cc7197f4c7513604574b0ba862a99ac3cd1d0437f12dca17e9b1d249df77ac0152d4cfd257a1de1310af07c1bd70e763e4d663e7114dd26c617c
-DIST shorewall-lite-5.2.3.2.tar.bz2 39201 BLAKE2B a50fdfe8498e745daed93166c5bd3d4cabebcc13f54bf3c00360f6e2fbaaa4327f0b40496308ca00915d35abdff2e37b3e85b29a77828d1bdacd0b36cdcac2f5 SHA512 2ce235153546c35a4fe440ec4b0dc66f6d0807b50dc3a7f148296e341f6a264bf63da36cac1ed9cbb4b857df7843209f818101ff6d342c5673d8b1134de67073
-DIST shorewall6-5.2.3.2.tar.bz2 190178 BLAKE2B 587902f4d0ac799f499520964e33db5251d1e5e3022a2cb2413a1349893bea13a7f1995fe3a70ae0b23d4ab3936e55233f208e9162bd51877d01b3eec4f7137e SHA512 3dc5bb4996ea251aef323241a855a2efaf4db3772e94050403faf040cf8f18fa4e38d7b2cae8733f0557b79c6330b10cf545d51338d4df1ebea19ba20bd66b05
-DIST shorewall6-lite-5.2.3.2.tar.bz2 39069 BLAKE2B 3647156f673cfce29a1bebddeef81de911146d707e5c917ce01a93ed807bc67ee7f9107c9010a396f000fd76286ef167f43b2432954c17bc2a3a5cf085acc073 SHA512 1d47bb005655bf863ec41601b7e49c91508d330f80f0b9b5a546ed366d06fe04a4005598fc5b34b271ccf7f5f4798ccee83917b0988b03fd36cb53e12c44334d
+DIST shorewall-5.2.3.3.tar.bz2 556424 BLAKE2B 0a172f0e70449af91421308c5308420a8de7af405eb74107201966b10df2fa7a0fd6042337c182bfa30a92cce3e611e46f8f5b910fb1bbc282513e3fc2d77d0c SHA512 d4166332160cbbc9e36f0c7f8fb6db8573dda17f80bbfb062465bba42f748c4f6815c9467da8a072b9eb01f3745fad67e00eea657ef61d9f90b49ad3a4668300
+DIST shorewall-core-5.2.3.3.tar.bz2 69043 BLAKE2B 6e84490258bc5cff88ef081bae11520463ff63a079fa8884d5976fa8c812d85e029636abe1092f2fd97a8529e935dc16f877cb75d7f9a3c0aa2236b2a9636d22 SHA512 c8c03273f686a8fa4151686b2426e437b3169ec78831e2d2f4a5bb20bb5265f4ede4a701bca5d21d0d8cafb4bb1e2c460c1b7ebb72ff042ec47221304dfbddd5
+DIST shorewall-docs-html-5.2.3.3.tar.bz2 4303296 BLAKE2B 26fa00d1226fee0a60c5c352bb6d625a365641837a3e7cc9b0a9ec249f45926bb5230e53052597cda098e8bcbc171c9909b98436af75a3ceff6407bab3cbc8ad SHA512 e43c48cad4abb4e8455ff5f012af8cc466737b0c0ff130cadeb5860cee7f3fc38a7d6eacde5fa49c8afbbb6c49cc9df310eb9bcf992bb12422ade26ae003740e
+DIST shorewall-init-5.2.3.3.tar.bz2 34456 BLAKE2B 5e7bf650de96973cfe211e4cbb9927c78a9cbae4a4436b8d556ac3df679a999294205f61532906dcbd0fa1027608dfa087b35c31bf64065cb0ccd6d5689905d0 SHA512 6c7017a6ac2df5611910132d9e5d2281b3210dda5e31ce26b15eed9ccd302ca9e1ddfbf92c093e6a751080e6f5a745516db2110bf30154f077d078b607087485
+DIST shorewall-lite-5.2.3.3.tar.bz2 39290 BLAKE2B f499ead6ee21323847b314793cd3250c08eda5e66c335effd72d9df92629e041377cbace0a6a647f5f791489a50663570d79eca7b4c59e1b75d017e47af82706 SHA512 12e87dc80fc347dd8077c9de9d87435bfe689c9115a5e88460f46f58a406ed66ce67f9b9847960bc50bee09eba7f1fe526a871f4852c2978392e7c10929f6617
+DIST shorewall6-5.2.3.3.tar.bz2 190274 BLAKE2B be44782454dff686a769e0f84298d5bb6217a85953e67acc7d2df16bcb4ebafc0867c62fc308f24690ba1d3b71444779fd5df1c6bce6545e3f269b0efbe49bd3 SHA512 ceb887f479841ed4998e488019bf3ec6874585c552f67be60af39f6414b40d24e2f6595812241d2f5fdf021beed2e0e2af8d98b03cdc66e72c7aedecbad8d3b1
+DIST shorewall6-lite-5.2.3.3.tar.bz2 39210 BLAKE2B de02932cfc5315f1db0a21b6ec2f20e393ab041c3634a2bfee3bb309de73614f5da0e8e60ced697d16f82ff19f8257e7fff943fdae983bf64e8b7a18d43811be SHA512 044d793bfd98c0698713adf2aea8837fac970f39956db6f44c9e5b68c4435c65ebf594f5c3091f58dbd3e4d34c2d178052c5af28b568f591c290359cc1418e61

diff --git a/net-firewall/shorewall/shorewall-5.2.3.2.ebuild b/net-firewall/shorewall/shorewall-5.2.3.3.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.2.3.2.ebuild
rename to net-firewall/shorewall/shorewall-5.2.3.3.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-09-03 22:23 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-09-03 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e61b2a14cea1919daf505bbde68f77b16ee73482
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 22:06:27 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 22:23:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61b2a14

net-firewall/shorewall: bump to v5.2.3.4

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.3.4.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 7613520c300..d16e0cae281 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.3.3.tar.bz2 556424 BLAKE2B 0a172f0e70449af91421308c5308420a8de7af405eb74107201966b10df2fa7a0fd6042337c182bfa30a92cce3e611e46f8f5b910fb1bbc282513e3fc2d77d0c SHA512 d4166332160cbbc9e36f0c7f8fb6db8573dda17f80bbfb062465bba42f748c4f6815c9467da8a072b9eb01f3745fad67e00eea657ef61d9f90b49ad3a4668300
+DIST shorewall-5.2.3.4.tar.bz2 554090 BLAKE2B b7c5305a23c661d73dcce0d0b2edacbf7dcad911fe8cd7bb11dc34f860505aab5290f0ac9c3902ee5bba826335ec0b656a44b3580250dc6b546436addaad18c1 SHA512 e73fd31d4242823ad592b453af2ad47c28f0b2bfa6fe357f7b0f40f6facd20a293800ae48a8f9db4be68937eb957f24902966710ae1ca649204489f6269cc780
 DIST shorewall-core-5.2.3.3.tar.bz2 69043 BLAKE2B 6e84490258bc5cff88ef081bae11520463ff63a079fa8884d5976fa8c812d85e029636abe1092f2fd97a8529e935dc16f877cb75d7f9a3c0aa2236b2a9636d22 SHA512 c8c03273f686a8fa4151686b2426e437b3169ec78831e2d2f4a5bb20bb5265f4ede4a701bca5d21d0d8cafb4bb1e2c460c1b7ebb72ff042ec47221304dfbddd5
+DIST shorewall-core-5.2.3.4.tar.bz2 69744 BLAKE2B 14305bbd73f7f8fd5156a89bf986cbd5a1f4a3f511e8246659a132bc04d3f9ec3b3c6df4f4ced8e29b6034e690751c0dcd1ff8d28d6694528d704ed8ceedd33f SHA512 9fcc55d6eef1456cf3d45b87c29bdfc311e366837a91776519a158605ca2c012779851e94462acbe56868b8549d906f68d36b517b18e99a344cbb39f7127c649
 DIST shorewall-docs-html-5.2.3.3.tar.bz2 4303296 BLAKE2B 26fa00d1226fee0a60c5c352bb6d625a365641837a3e7cc9b0a9ec249f45926bb5230e53052597cda098e8bcbc171c9909b98436af75a3ceff6407bab3cbc8ad SHA512 e43c48cad4abb4e8455ff5f012af8cc466737b0c0ff130cadeb5860cee7f3fc38a7d6eacde5fa49c8afbbb6c49cc9df310eb9bcf992bb12422ade26ae003740e
+DIST shorewall-docs-html-5.2.3.4.tar.bz2 4292826 BLAKE2B ad5430fac374caeb00cab6edf0f5e9c7d72a5f60c39d43efb57013987eecc029283f698c51b82b577f708f64c39257f679c0c63c4d1879b95aa06e081c4275b0 SHA512 7c3fdc0603c4a8395a86234b982f984c01e131d6ab32a290477fc2ca081f5417dc943dd749da8f1ab76e0f5c0745ca99a6e5d3c3f03f4aa56720e7bf12f430c6
 DIST shorewall-init-5.2.3.3.tar.bz2 34456 BLAKE2B 5e7bf650de96973cfe211e4cbb9927c78a9cbae4a4436b8d556ac3df679a999294205f61532906dcbd0fa1027608dfa087b35c31bf64065cb0ccd6d5689905d0 SHA512 6c7017a6ac2df5611910132d9e5d2281b3210dda5e31ce26b15eed9ccd302ca9e1ddfbf92c093e6a751080e6f5a745516db2110bf30154f077d078b607087485
+DIST shorewall-init-5.2.3.4.tar.bz2 34827 BLAKE2B c57fed92734aa9f2e82b9f232568c7181c7ed2dd85257efd1a903747bc6c15951f1ca5521019bc7afa8b1e3e135359e6fa8162ae2ca732a45f03e035a3d0251b SHA512 f22e1a06ee47feacd49add0f0d9cfd7746ed4db626e863c1d8bf0287a33e4a39f6579deb3af29d38c299e8adc35fa5c4b930ba07cad449b1dab87054780109db
 DIST shorewall-lite-5.2.3.3.tar.bz2 39290 BLAKE2B f499ead6ee21323847b314793cd3250c08eda5e66c335effd72d9df92629e041377cbace0a6a647f5f791489a50663570d79eca7b4c59e1b75d017e47af82706 SHA512 12e87dc80fc347dd8077c9de9d87435bfe689c9115a5e88460f46f58a406ed66ce67f9b9847960bc50bee09eba7f1fe526a871f4852c2978392e7c10929f6617
+DIST shorewall-lite-5.2.3.4.tar.bz2 39642 BLAKE2B 83181e5bedc92d0f7bc6854aa7efe49c05caf3de310a3d3fb5d24eac312f957e3ebaf092a9cf4fa4eb19b9e1b853ececd8b1f3ce64ce47e5b475669920f5464e SHA512 4f73c05f1163051a30c46e4c898622a41c623b8d895c5c819f06ab7d81612cb1d396cdc2dceb816c65a67a1a11642f2bc20f6a510c71f11fc11b4057af837d62
 DIST shorewall6-5.2.3.3.tar.bz2 190274 BLAKE2B be44782454dff686a769e0f84298d5bb6217a85953e67acc7d2df16bcb4ebafc0867c62fc308f24690ba1d3b71444779fd5df1c6bce6545e3f269b0efbe49bd3 SHA512 ceb887f479841ed4998e488019bf3ec6874585c552f67be60af39f6414b40d24e2f6595812241d2f5fdf021beed2e0e2af8d98b03cdc66e72c7aedecbad8d3b1
+DIST shorewall6-5.2.3.4.tar.bz2 190759 BLAKE2B ad4a8530341700c475f6fadc840968c7c11fe1841a3c68a1145de457092dadce9a6c6b8df7ca6cb39343d248b1b9c5f267641a62193a76dc41b2bf93d0fe6b01 SHA512 d9c73ac388b794a1714e4487ef805121cef5743c04f48980bad74fd805bd923aae35c678e47a605532634ef156c4ba983f0f63672ee704634bef636505bb7c55
 DIST shorewall6-lite-5.2.3.3.tar.bz2 39210 BLAKE2B de02932cfc5315f1db0a21b6ec2f20e393ab041c3634a2bfee3bb309de73614f5da0e8e60ced697d16f82ff19f8257e7fff943fdae983bf64e8b7a18d43811be SHA512 044d793bfd98c0698713adf2aea8837fac970f39956db6f44c9e5b68c4435c65ebf594f5c3091f58dbd3e4d34c2d178052c5af28b568f591c290359cc1418e61
+DIST shorewall6-lite-5.2.3.4.tar.bz2 39623 BLAKE2B fc7ee2d7eee5a4f50b53882ad0ced13893b5f3c4348214529791e7aeffc6662ec5a6e9cead676287be028a8575ccb083570606f12b5e6880848c7476ca90a382 SHA512 3acb0a11c175ec8fd18b48a164c53aedb9e65347e0ca985307624ea892e3609ef645e8b2659319e00757a42efc161a219691027163387da70c6db624d0d6739d

diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
new file mode 100644
index 00000000000..e377930a382
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2019 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="http://www.shorewall.net/"
+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="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-09-04  9:06 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-09-04  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     7a72f005ce01318e2ed7a51936782ddcbf71f8f6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  4 09:05:40 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 09:05:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a72f005

net-firewall/shorewall: fix missing slashes

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.3.4.ebuild | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
index e377930a382..6effdd7a417 100644
--- a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
@@ -272,13 +272,13 @@ src_compile() {
 src_install() {
 	# shorewall-core
 	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	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="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+		DESTDIR="${ED}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
 		keepdir /var/lib/shorewall
 
 		if use doc; then
@@ -289,7 +289,7 @@ src_install() {
 	# shorewall6
 	if use ipv6; then
 		einfo "Installing ${MY_P_IPV6} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+		DESTDIR="${ED}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
 		keepdir /var/lib/shorewall6
 
 		if use doc; then
@@ -300,40 +300,40 @@ src_install() {
 	# shorewall-lite
 	if use lite4; then
 		einfo "Installing ${MY_P_LITE4} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+		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="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+		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="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		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 "${D}etc/logrotate.d/shorewall-init" ]]; then
+		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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+			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 "${D}etc/NetworkManager" ]]; then
+		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 \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+			einfo "Removing unused \"${ED}/etc/NetworkManager\" ..."
+			rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed"
 		fi
 
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+		if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then
 			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+			rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/usr/share/shorewall-init/ifupdown\" failed"
 		fi
 	fi
 


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-09-12 21:35 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-09-12 21:35 UTC (permalink / raw
  To: gentoo-commits

commit:     3d615a40ab516f45d6cc811bfe253fe799c862b5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 21:33:13 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 21:33:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d615a40

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.2.3.3.ebuild | 482 ------------------------
 2 files changed, 489 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index d16e0cae281..f112ca20b5a 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-DIST shorewall-5.2.3.3.tar.bz2 556424 BLAKE2B 0a172f0e70449af91421308c5308420a8de7af405eb74107201966b10df2fa7a0fd6042337c182bfa30a92cce3e611e46f8f5b910fb1bbc282513e3fc2d77d0c SHA512 d4166332160cbbc9e36f0c7f8fb6db8573dda17f80bbfb062465bba42f748c4f6815c9467da8a072b9eb01f3745fad67e00eea657ef61d9f90b49ad3a4668300
 DIST shorewall-5.2.3.4.tar.bz2 554090 BLAKE2B b7c5305a23c661d73dcce0d0b2edacbf7dcad911fe8cd7bb11dc34f860505aab5290f0ac9c3902ee5bba826335ec0b656a44b3580250dc6b546436addaad18c1 SHA512 e73fd31d4242823ad592b453af2ad47c28f0b2bfa6fe357f7b0f40f6facd20a293800ae48a8f9db4be68937eb957f24902966710ae1ca649204489f6269cc780
-DIST shorewall-core-5.2.3.3.tar.bz2 69043 BLAKE2B 6e84490258bc5cff88ef081bae11520463ff63a079fa8884d5976fa8c812d85e029636abe1092f2fd97a8529e935dc16f877cb75d7f9a3c0aa2236b2a9636d22 SHA512 c8c03273f686a8fa4151686b2426e437b3169ec78831e2d2f4a5bb20bb5265f4ede4a701bca5d21d0d8cafb4bb1e2c460c1b7ebb72ff042ec47221304dfbddd5
 DIST shorewall-core-5.2.3.4.tar.bz2 69744 BLAKE2B 14305bbd73f7f8fd5156a89bf986cbd5a1f4a3f511e8246659a132bc04d3f9ec3b3c6df4f4ced8e29b6034e690751c0dcd1ff8d28d6694528d704ed8ceedd33f SHA512 9fcc55d6eef1456cf3d45b87c29bdfc311e366837a91776519a158605ca2c012779851e94462acbe56868b8549d906f68d36b517b18e99a344cbb39f7127c649
-DIST shorewall-docs-html-5.2.3.3.tar.bz2 4303296 BLAKE2B 26fa00d1226fee0a60c5c352bb6d625a365641837a3e7cc9b0a9ec249f45926bb5230e53052597cda098e8bcbc171c9909b98436af75a3ceff6407bab3cbc8ad SHA512 e43c48cad4abb4e8455ff5f012af8cc466737b0c0ff130cadeb5860cee7f3fc38a7d6eacde5fa49c8afbbb6c49cc9df310eb9bcf992bb12422ade26ae003740e
 DIST shorewall-docs-html-5.2.3.4.tar.bz2 4292826 BLAKE2B ad5430fac374caeb00cab6edf0f5e9c7d72a5f60c39d43efb57013987eecc029283f698c51b82b577f708f64c39257f679c0c63c4d1879b95aa06e081c4275b0 SHA512 7c3fdc0603c4a8395a86234b982f984c01e131d6ab32a290477fc2ca081f5417dc943dd749da8f1ab76e0f5c0745ca99a6e5d3c3f03f4aa56720e7bf12f430c6
-DIST shorewall-init-5.2.3.3.tar.bz2 34456 BLAKE2B 5e7bf650de96973cfe211e4cbb9927c78a9cbae4a4436b8d556ac3df679a999294205f61532906dcbd0fa1027608dfa087b35c31bf64065cb0ccd6d5689905d0 SHA512 6c7017a6ac2df5611910132d9e5d2281b3210dda5e31ce26b15eed9ccd302ca9e1ddfbf92c093e6a751080e6f5a745516db2110bf30154f077d078b607087485
 DIST shorewall-init-5.2.3.4.tar.bz2 34827 BLAKE2B c57fed92734aa9f2e82b9f232568c7181c7ed2dd85257efd1a903747bc6c15951f1ca5521019bc7afa8b1e3e135359e6fa8162ae2ca732a45f03e035a3d0251b SHA512 f22e1a06ee47feacd49add0f0d9cfd7746ed4db626e863c1d8bf0287a33e4a39f6579deb3af29d38c299e8adc35fa5c4b930ba07cad449b1dab87054780109db
-DIST shorewall-lite-5.2.3.3.tar.bz2 39290 BLAKE2B f499ead6ee21323847b314793cd3250c08eda5e66c335effd72d9df92629e041377cbace0a6a647f5f791489a50663570d79eca7b4c59e1b75d017e47af82706 SHA512 12e87dc80fc347dd8077c9de9d87435bfe689c9115a5e88460f46f58a406ed66ce67f9b9847960bc50bee09eba7f1fe526a871f4852c2978392e7c10929f6617
 DIST shorewall-lite-5.2.3.4.tar.bz2 39642 BLAKE2B 83181e5bedc92d0f7bc6854aa7efe49c05caf3de310a3d3fb5d24eac312f957e3ebaf092a9cf4fa4eb19b9e1b853ececd8b1f3ce64ce47e5b475669920f5464e SHA512 4f73c05f1163051a30c46e4c898622a41c623b8d895c5c819f06ab7d81612cb1d396cdc2dceb816c65a67a1a11642f2bc20f6a510c71f11fc11b4057af837d62
-DIST shorewall6-5.2.3.3.tar.bz2 190274 BLAKE2B be44782454dff686a769e0f84298d5bb6217a85953e67acc7d2df16bcb4ebafc0867c62fc308f24690ba1d3b71444779fd5df1c6bce6545e3f269b0efbe49bd3 SHA512 ceb887f479841ed4998e488019bf3ec6874585c552f67be60af39f6414b40d24e2f6595812241d2f5fdf021beed2e0e2af8d98b03cdc66e72c7aedecbad8d3b1
 DIST shorewall6-5.2.3.4.tar.bz2 190759 BLAKE2B ad4a8530341700c475f6fadc840968c7c11fe1841a3c68a1145de457092dadce9a6c6b8df7ca6cb39343d248b1b9c5f267641a62193a76dc41b2bf93d0fe6b01 SHA512 d9c73ac388b794a1714e4487ef805121cef5743c04f48980bad74fd805bd923aae35c678e47a605532634ef156c4ba983f0f63672ee704634bef636505bb7c55
-DIST shorewall6-lite-5.2.3.3.tar.bz2 39210 BLAKE2B de02932cfc5315f1db0a21b6ec2f20e393ab041c3634a2bfee3bb309de73614f5da0e8e60ced697d16f82ff19f8257e7fff943fdae983bf64e8b7a18d43811be SHA512 044d793bfd98c0698713adf2aea8837fac970f39956db6f44c9e5b68c4435c65ebf594f5c3091f58dbd3e4d34c2d178052c5af28b568f591c290359cc1418e61
 DIST shorewall6-lite-5.2.3.4.tar.bz2 39623 BLAKE2B fc7ee2d7eee5a4f50b53882ad0ced13893b5f3c4348214529791e7aeffc6662ec5a6e9cead676287be028a8575ccb083570606f12b5e6880848c7476ca90a382 SHA512 3acb0a11c175ec8fd18b48a164c53aedb9e65347e0ca985307624ea892e3609ef645e8b2659319e00757a42efc161a219691027163387da70c6db624d0d6739d

diff --git a/net-firewall/shorewall/shorewall-5.2.3.3.ebuild b/net-firewall/shorewall/shorewall-5.2.3.3.ebuild
deleted file mode 100644
index 14bfe9b234c..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.3.3.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-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=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 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/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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="${D%/}" ${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 "${D}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 \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2019-09-12 21:35 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2019-09-12 21:35 UTC (permalink / raw
  To: gentoo-commits

commit:     b60d565b4d13cce674a38b1f36ab29d5147702f6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 21:32:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 21:32:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60d565b

net-firewall/shorewall: x86 stable, applying ALLARCHES policy

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
index 6effdd7a417..a36cb7a7d14 100644
--- a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.4.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-01-18  9:51 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-01-18  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     8bc26ae60773e886f31d50964181cfcd4affa02e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 08:59:06 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 09:51:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc26ae6

net-firewall/shorewall: bump to v5.2.3.5

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.3.5.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index f112ca20b5a..3c4873dead4 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.3.4.tar.bz2 554090 BLAKE2B b7c5305a23c661d73dcce0d0b2edacbf7dcad911fe8cd7bb11dc34f860505aab5290f0ac9c3902ee5bba826335ec0b656a44b3580250dc6b546436addaad18c1 SHA512 e73fd31d4242823ad592b453af2ad47c28f0b2bfa6fe357f7b0f40f6facd20a293800ae48a8f9db4be68937eb957f24902966710ae1ca649204489f6269cc780
+DIST shorewall-5.2.3.5.tar.bz2 554891 BLAKE2B 470b2a6d67e18f05262197877dc2bd853a756fcf3ac4e547c4e53a398fc1ddcb7bc2beccecc3146baafce72cae49cb20b41f482ceb036ccbe1c4b21bc2a3c2af SHA512 a93166d77ae29d32719a47912d64c9f0a7fdace61473a2d95c60cd611bab3a9b5faf0cebe6d80c47a34a5164538d61695e951e5d458a6f7ae172ff62dd9b81ea
 DIST shorewall-core-5.2.3.4.tar.bz2 69744 BLAKE2B 14305bbd73f7f8fd5156a89bf986cbd5a1f4a3f511e8246659a132bc04d3f9ec3b3c6df4f4ced8e29b6034e690751c0dcd1ff8d28d6694528d704ed8ceedd33f SHA512 9fcc55d6eef1456cf3d45b87c29bdfc311e366837a91776519a158605ca2c012779851e94462acbe56868b8549d906f68d36b517b18e99a344cbb39f7127c649
+DIST shorewall-core-5.2.3.5.tar.bz2 70007 BLAKE2B 0f7485775fe566e5bc9d67da314f27f1aba3b9faef82a8d51dc5bc00413dba32a24c53cae07531c59c528b0c2b7c87fda81252669c771c749abf5d83f9c02696 SHA512 f8346767d42ae6624b1831b637be3b4f625c4213a75759fc9330ffac7fc31aef0926e89af952f6353faf2a56334fe49fc65635c33a9c77c21b4ae79d93a0e9a6
 DIST shorewall-docs-html-5.2.3.4.tar.bz2 4292826 BLAKE2B ad5430fac374caeb00cab6edf0f5e9c7d72a5f60c39d43efb57013987eecc029283f698c51b82b577f708f64c39257f679c0c63c4d1879b95aa06e081c4275b0 SHA512 7c3fdc0603c4a8395a86234b982f984c01e131d6ab32a290477fc2ca081f5417dc943dd749da8f1ab76e0f5c0745ca99a6e5d3c3f03f4aa56720e7bf12f430c6
+DIST shorewall-docs-html-5.2.3.5.tar.bz2 4291459 BLAKE2B 150345621b93a100ff08b3e38df789a706ef73543022ab963b951d1c19088407c7b4698729935c2717d65199cffceb2652b222247f4610554d21c7d74ef14c07 SHA512 5b638a4eb15a8ab28787cf684003ba02c43f04b691b90f70637a3c981d774ccc52150fa1419e54b5294f59f92118a74b56cb6ca9b5598e7176f92f0cab76c3b8
 DIST shorewall-init-5.2.3.4.tar.bz2 34827 BLAKE2B c57fed92734aa9f2e82b9f232568c7181c7ed2dd85257efd1a903747bc6c15951f1ca5521019bc7afa8b1e3e135359e6fa8162ae2ca732a45f03e035a3d0251b SHA512 f22e1a06ee47feacd49add0f0d9cfd7746ed4db626e863c1d8bf0287a33e4a39f6579deb3af29d38c299e8adc35fa5c4b930ba07cad449b1dab87054780109db
+DIST shorewall-init-5.2.3.5.tar.bz2 35147 BLAKE2B 34fff5474fc60a7526991e5718f2f561ee7e67f339f5d95bef204bbbd4efafef5c1298d9533eae481a6adeb4fe516f45cd1060af33b66c900c054f7b7f9e519e SHA512 ad06ad0c0ddeef278e18babe7aa42935aa3af79052d10b54cd6729fe7b67ed9f210ea3f511b0da23cb2b1f67b82bdcba339f919f1ccbafbde51f77b9f0004606
 DIST shorewall-lite-5.2.3.4.tar.bz2 39642 BLAKE2B 83181e5bedc92d0f7bc6854aa7efe49c05caf3de310a3d3fb5d24eac312f957e3ebaf092a9cf4fa4eb19b9e1b853ececd8b1f3ce64ce47e5b475669920f5464e SHA512 4f73c05f1163051a30c46e4c898622a41c623b8d895c5c819f06ab7d81612cb1d396cdc2dceb816c65a67a1a11642f2bc20f6a510c71f11fc11b4057af837d62
+DIST shorewall-lite-5.2.3.5.tar.bz2 39954 BLAKE2B 601e793adaa9d4ac77a1a4c17b7d1726af6a0b19c8dda2621ebbd36be63e3a33deb9ff36cb25d195d0875c5f159fa758a16cd7af2200e748d542f862bc474425 SHA512 3472bc4e96cd1624b5a6dde0bac893d87f57baa0381a230682889c15f841324e67034411e3ceb5229d48256a84e7f63ba04c478a86df9dd0e76ce820bb7c27dc
 DIST shorewall6-5.2.3.4.tar.bz2 190759 BLAKE2B ad4a8530341700c475f6fadc840968c7c11fe1841a3c68a1145de457092dadce9a6c6b8df7ca6cb39343d248b1b9c5f267641a62193a76dc41b2bf93d0fe6b01 SHA512 d9c73ac388b794a1714e4487ef805121cef5743c04f48980bad74fd805bd923aae35c678e47a605532634ef156c4ba983f0f63672ee704634bef636505bb7c55
+DIST shorewall6-5.2.3.5.tar.bz2 191963 BLAKE2B b1aa5e5576749313a351eac29b2c247d58c4e38b9d948374f2c64a97a51bd6f7407afd52601ad0856c2899765ff4fe3ac0c96b4507e777a3112ec962a7dc71c9 SHA512 10081615887a5507b885ba6177016575829ca9cec81fe0fb8d5a6c12871d87ae1c63bb7319ea1e831d0c259084e243294125cad3650a0ffc66d0c09e457283d1
 DIST shorewall6-lite-5.2.3.4.tar.bz2 39623 BLAKE2B fc7ee2d7eee5a4f50b53882ad0ced13893b5f3c4348214529791e7aeffc6662ec5a6e9cead676287be028a8575ccb083570606f12b5e6880848c7476ca90a382 SHA512 3acb0a11c175ec8fd18b48a164c53aedb9e65347e0ca985307624ea892e3609ef645e8b2659319e00757a42efc161a219691027163387da70c6db624d0d6739d
+DIST shorewall6-lite-5.2.3.5.tar.bz2 39907 BLAKE2B d396c4365d0fedac5afd997c2283c9cfaa05077d786dc95f40f3bcebf778f2cf8a95b386aeed8e8c80f556b000399da8c7c2e3fae9f1cbf2e9ebe4935acd27f4 SHA512 533be2c2bcc6b406eda45916d49bf38d776445fa6a7b43946ab5f11623f45f922d9a49ed47abc141a843c0afbec5ed08f6050d431ff73aba922fd8b5197f6bf0

diff --git a/net-firewall/shorewall/shorewall-5.2.3.5.ebuild b/net-firewall/shorewall/shorewall-5.2.3.5.ebuild
new file mode 100644
index 00000000000..9f77b3406b1
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.3.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
+	!<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-r1.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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-02-24 17:28 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-02-24 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1a13688eb7a301e8f2d7c60526eea2beca9f6b33
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 17:18:25 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 17:28:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a13688e

net-firewall/shorewall: move stable keywords

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.3.5.ebuild b/net-firewall/shorewall/shorewall-5.2.3.5.ebuild
index 9f77b3406b1..ab98fa11307 100644
--- a/net-firewall/shorewall/shorewall-5.2.3.5.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.5.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-02-24 17:28 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-02-24 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     725cf9ccdd9248b07211104a714b354d81cee761
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 17:18:59 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 17:28:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=725cf9cc

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.2.3.4.ebuild | 482 ------------------------
 2 files changed, 489 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 3c4873dead4..f8a138467cb 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-DIST shorewall-5.2.3.4.tar.bz2 554090 BLAKE2B b7c5305a23c661d73dcce0d0b2edacbf7dcad911fe8cd7bb11dc34f860505aab5290f0ac9c3902ee5bba826335ec0b656a44b3580250dc6b546436addaad18c1 SHA512 e73fd31d4242823ad592b453af2ad47c28f0b2bfa6fe357f7b0f40f6facd20a293800ae48a8f9db4be68937eb957f24902966710ae1ca649204489f6269cc780
 DIST shorewall-5.2.3.5.tar.bz2 554891 BLAKE2B 470b2a6d67e18f05262197877dc2bd853a756fcf3ac4e547c4e53a398fc1ddcb7bc2beccecc3146baafce72cae49cb20b41f482ceb036ccbe1c4b21bc2a3c2af SHA512 a93166d77ae29d32719a47912d64c9f0a7fdace61473a2d95c60cd611bab3a9b5faf0cebe6d80c47a34a5164538d61695e951e5d458a6f7ae172ff62dd9b81ea
-DIST shorewall-core-5.2.3.4.tar.bz2 69744 BLAKE2B 14305bbd73f7f8fd5156a89bf986cbd5a1f4a3f511e8246659a132bc04d3f9ec3b3c6df4f4ced8e29b6034e690751c0dcd1ff8d28d6694528d704ed8ceedd33f SHA512 9fcc55d6eef1456cf3d45b87c29bdfc311e366837a91776519a158605ca2c012779851e94462acbe56868b8549d906f68d36b517b18e99a344cbb39f7127c649
 DIST shorewall-core-5.2.3.5.tar.bz2 70007 BLAKE2B 0f7485775fe566e5bc9d67da314f27f1aba3b9faef82a8d51dc5bc00413dba32a24c53cae07531c59c528b0c2b7c87fda81252669c771c749abf5d83f9c02696 SHA512 f8346767d42ae6624b1831b637be3b4f625c4213a75759fc9330ffac7fc31aef0926e89af952f6353faf2a56334fe49fc65635c33a9c77c21b4ae79d93a0e9a6
-DIST shorewall-docs-html-5.2.3.4.tar.bz2 4292826 BLAKE2B ad5430fac374caeb00cab6edf0f5e9c7d72a5f60c39d43efb57013987eecc029283f698c51b82b577f708f64c39257f679c0c63c4d1879b95aa06e081c4275b0 SHA512 7c3fdc0603c4a8395a86234b982f984c01e131d6ab32a290477fc2ca081f5417dc943dd749da8f1ab76e0f5c0745ca99a6e5d3c3f03f4aa56720e7bf12f430c6
 DIST shorewall-docs-html-5.2.3.5.tar.bz2 4291459 BLAKE2B 150345621b93a100ff08b3e38df789a706ef73543022ab963b951d1c19088407c7b4698729935c2717d65199cffceb2652b222247f4610554d21c7d74ef14c07 SHA512 5b638a4eb15a8ab28787cf684003ba02c43f04b691b90f70637a3c981d774ccc52150fa1419e54b5294f59f92118a74b56cb6ca9b5598e7176f92f0cab76c3b8
-DIST shorewall-init-5.2.3.4.tar.bz2 34827 BLAKE2B c57fed92734aa9f2e82b9f232568c7181c7ed2dd85257efd1a903747bc6c15951f1ca5521019bc7afa8b1e3e135359e6fa8162ae2ca732a45f03e035a3d0251b SHA512 f22e1a06ee47feacd49add0f0d9cfd7746ed4db626e863c1d8bf0287a33e4a39f6579deb3af29d38c299e8adc35fa5c4b930ba07cad449b1dab87054780109db
 DIST shorewall-init-5.2.3.5.tar.bz2 35147 BLAKE2B 34fff5474fc60a7526991e5718f2f561ee7e67f339f5d95bef204bbbd4efafef5c1298d9533eae481a6adeb4fe516f45cd1060af33b66c900c054f7b7f9e519e SHA512 ad06ad0c0ddeef278e18babe7aa42935aa3af79052d10b54cd6729fe7b67ed9f210ea3f511b0da23cb2b1f67b82bdcba339f919f1ccbafbde51f77b9f0004606
-DIST shorewall-lite-5.2.3.4.tar.bz2 39642 BLAKE2B 83181e5bedc92d0f7bc6854aa7efe49c05caf3de310a3d3fb5d24eac312f957e3ebaf092a9cf4fa4eb19b9e1b853ececd8b1f3ce64ce47e5b475669920f5464e SHA512 4f73c05f1163051a30c46e4c898622a41c623b8d895c5c819f06ab7d81612cb1d396cdc2dceb816c65a67a1a11642f2bc20f6a510c71f11fc11b4057af837d62
 DIST shorewall-lite-5.2.3.5.tar.bz2 39954 BLAKE2B 601e793adaa9d4ac77a1a4c17b7d1726af6a0b19c8dda2621ebbd36be63e3a33deb9ff36cb25d195d0875c5f159fa758a16cd7af2200e748d542f862bc474425 SHA512 3472bc4e96cd1624b5a6dde0bac893d87f57baa0381a230682889c15f841324e67034411e3ceb5229d48256a84e7f63ba04c478a86df9dd0e76ce820bb7c27dc
-DIST shorewall6-5.2.3.4.tar.bz2 190759 BLAKE2B ad4a8530341700c475f6fadc840968c7c11fe1841a3c68a1145de457092dadce9a6c6b8df7ca6cb39343d248b1b9c5f267641a62193a76dc41b2bf93d0fe6b01 SHA512 d9c73ac388b794a1714e4487ef805121cef5743c04f48980bad74fd805bd923aae35c678e47a605532634ef156c4ba983f0f63672ee704634bef636505bb7c55
 DIST shorewall6-5.2.3.5.tar.bz2 191963 BLAKE2B b1aa5e5576749313a351eac29b2c247d58c4e38b9d948374f2c64a97a51bd6f7407afd52601ad0856c2899765ff4fe3ac0c96b4507e777a3112ec962a7dc71c9 SHA512 10081615887a5507b885ba6177016575829ca9cec81fe0fb8d5a6c12871d87ae1c63bb7319ea1e831d0c259084e243294125cad3650a0ffc66d0c09e457283d1
-DIST shorewall6-lite-5.2.3.4.tar.bz2 39623 BLAKE2B fc7ee2d7eee5a4f50b53882ad0ced13893b5f3c4348214529791e7aeffc6662ec5a6e9cead676287be028a8575ccb083570606f12b5e6880848c7476ca90a382 SHA512 3acb0a11c175ec8fd18b48a164c53aedb9e65347e0ca985307624ea892e3609ef645e8b2659319e00757a42efc161a219691027163387da70c6db624d0d6739d
 DIST shorewall6-lite-5.2.3.5.tar.bz2 39907 BLAKE2B d396c4365d0fedac5afd997c2283c9cfaa05077d786dc95f40f3bcebf778f2cf8a95b386aeed8e8c80f556b000399da8c7c2e3fae9f1cbf2e9ebe4935acd27f4 SHA512 533be2c2bcc6b406eda45916d49bf38d776445fa6a7b43946ab5f11623f45f922d9a49ed47abc141a843c0afbec5ed08f6050d431ff73aba922fd8b5197f6bf0

diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
deleted file mode 100644
index 21da10cc4cd..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.3.4.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="http://www.shorewall.net/"
-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="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/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 http://shorewall.net/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-r1.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 "  http://shorewall.net/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 "  - http://shorewall.net/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 "  http://www.shorewall.net/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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-02-24 17:28 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-02-24 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     688ea394e34f807f094ce2b16fdb8c800b8b384b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 17:19:44 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 17:28:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688ea394

net-firewall/shorewall: bump to v5.2.3.6

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.3.6.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index f8a138467cb..352a0c600bc 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.3.5.tar.bz2 554891 BLAKE2B 470b2a6d67e18f05262197877dc2bd853a756fcf3ac4e547c4e53a398fc1ddcb7bc2beccecc3146baafce72cae49cb20b41f482ceb036ccbe1c4b21bc2a3c2af SHA512 a93166d77ae29d32719a47912d64c9f0a7fdace61473a2d95c60cd611bab3a9b5faf0cebe6d80c47a34a5164538d61695e951e5d458a6f7ae172ff62dd9b81ea
+DIST shorewall-5.2.3.6.tar.bz2 543859 BLAKE2B 29a7e8068a5920e73bcb832241c2366a31fc54e6671d401ad35dd01a38f719622a5e3d09cb50084887ac52b96ff5f827e433ef06223eaf2d7f279b1299d726c4 SHA512 e6cd5bcf9f3fe57a5220e717985525ef4dac37b36e7e81b583948fc47c73d443e9649395db365829e0b29d213e5ca8e706578ad323983c6851c3cc5f3dccb03f
 DIST shorewall-core-5.2.3.5.tar.bz2 70007 BLAKE2B 0f7485775fe566e5bc9d67da314f27f1aba3b9faef82a8d51dc5bc00413dba32a24c53cae07531c59c528b0c2b7c87fda81252669c771c749abf5d83f9c02696 SHA512 f8346767d42ae6624b1831b637be3b4f625c4213a75759fc9330ffac7fc31aef0926e89af952f6353faf2a56334fe49fc65635c33a9c77c21b4ae79d93a0e9a6
+DIST shorewall-core-5.2.3.6.tar.bz2 70407 BLAKE2B 084e79d02702dfa3738f593ba029d97b230ccff5fd1741ca2566db7bfabb5ffe7afba5104ec7cca7d54da6e261c85090ecdbc2a0ab3c85b4fc9eb5a22add8ee8 SHA512 8bbd571e4279ea097634632903e3297bad6579152fe0d590db1f04cc1852cef86abdf5720b704bc166185118fa2d90c0463745a930ffe379f87a5d77c8a69141
 DIST shorewall-docs-html-5.2.3.5.tar.bz2 4291459 BLAKE2B 150345621b93a100ff08b3e38df789a706ef73543022ab963b951d1c19088407c7b4698729935c2717d65199cffceb2652b222247f4610554d21c7d74ef14c07 SHA512 5b638a4eb15a8ab28787cf684003ba02c43f04b691b90f70637a3c981d774ccc52150fa1419e54b5294f59f92118a74b56cb6ca9b5598e7176f92f0cab76c3b8
+DIST shorewall-docs-html-5.2.3.6.tar.bz2 4306757 BLAKE2B b2ef0ec2956b6dccfa0e2c597d3a924ad068f7e627bf86cf508d7db5547def979910a9bfdbf49650b1907716ca45973be23d0470eb1e90825c3cef9ea8c63268 SHA512 fb89f54e6da64fcb59ac76441588d0473e229279aad8cbc394cacf9bdb93d74723c6c7334934dee373527adcfc582d9843ce12aa454ea3a4d3f42597c93a3661
 DIST shorewall-init-5.2.3.5.tar.bz2 35147 BLAKE2B 34fff5474fc60a7526991e5718f2f561ee7e67f339f5d95bef204bbbd4efafef5c1298d9533eae481a6adeb4fe516f45cd1060af33b66c900c054f7b7f9e519e SHA512 ad06ad0c0ddeef278e18babe7aa42935aa3af79052d10b54cd6729fe7b67ed9f210ea3f511b0da23cb2b1f67b82bdcba339f919f1ccbafbde51f77b9f0004606
+DIST shorewall-init-5.2.3.6.tar.bz2 35309 BLAKE2B 963b73e86592fcefa5881273149d8c0c2fcf423d6268ba4ccc60941f2eccebc9d8e5ee2d2e80209fe3109ae43ce43521117f50824c2796b51ea945c9a7d06e01 SHA512 4e3ef2d4a47f8e0b7751dbeab26cbf749a0304c5e64f42642b3e6cdf8df1bfa057666260dc76c628ec193cac880d8574f2aaf91b4a54f2fd4f4ac76ee102093b
 DIST shorewall-lite-5.2.3.5.tar.bz2 39954 BLAKE2B 601e793adaa9d4ac77a1a4c17b7d1726af6a0b19c8dda2621ebbd36be63e3a33deb9ff36cb25d195d0875c5f159fa758a16cd7af2200e748d542f862bc474425 SHA512 3472bc4e96cd1624b5a6dde0bac893d87f57baa0381a230682889c15f841324e67034411e3ceb5229d48256a84e7f63ba04c478a86df9dd0e76ce820bb7c27dc
+DIST shorewall-lite-5.2.3.6.tar.bz2 40125 BLAKE2B 432fe34770b0da68c3fa9955ddebab6ce3fd75fec83d81d2e71ff4c7b74e8923886396acf8d5641cd5f1bd4bbf7a298283dad5db52ff1df04c6df452a947f791 SHA512 5d2802057cd5b3b8cbd15aadd8a4bdad13b2ae88d9839982ff95a98552bf672a2602bb3afa548068fc58f095f31267e07037f6ffc58a8213367a3edc904e5966
 DIST shorewall6-5.2.3.5.tar.bz2 191963 BLAKE2B b1aa5e5576749313a351eac29b2c247d58c4e38b9d948374f2c64a97a51bd6f7407afd52601ad0856c2899765ff4fe3ac0c96b4507e777a3112ec962a7dc71c9 SHA512 10081615887a5507b885ba6177016575829ca9cec81fe0fb8d5a6c12871d87ae1c63bb7319ea1e831d0c259084e243294125cad3650a0ffc66d0c09e457283d1
+DIST shorewall6-5.2.3.6.tar.bz2 191857 BLAKE2B 53784b26b8a8a94c525ec50e94d370ac022f4ab214d20580450bd2f083dcd05192442750aeeca17dba7b9e910c148feaa988bf3affcc07010bc0b87751fef47a SHA512 56b72e4821217a57b64a5295cd7fd9556899b946a8ad6d04e343e35109c67401ed5dc7bb3cf96f3b969f90d5d45cf0c0bbab1a3114658d0f6e21d69d4c0e0bb4
 DIST shorewall6-lite-5.2.3.5.tar.bz2 39907 BLAKE2B d396c4365d0fedac5afd997c2283c9cfaa05077d786dc95f40f3bcebf778f2cf8a95b386aeed8e8c80f556b000399da8c7c2e3fae9f1cbf2e9ebe4935acd27f4 SHA512 533be2c2bcc6b406eda45916d49bf38d776445fa6a7b43946ab5f11623f45f922d9a49ed47abc141a843c0afbec5ed08f6050d431ff73aba922fd8b5197f6bf0
+DIST shorewall6-lite-5.2.3.6.tar.bz2 40089 BLAKE2B 03552fc8cbcfeeedd5099781a38050896ca36d178faf396a11766c055959d2241e9c9f30e5030001a059b45090914c2c6ee24700b9ee7c1cf96de66665c83e4a SHA512 3bab2d04111ed68e228b5a22db6bc2471eeb4b9fe80da1c826af179a5bb9f8a7377e95850d8e97bf167c6254553304509eee01828da13957f6472c4eb507c1ec

diff --git a/net-firewall/shorewall/shorewall-5.2.3.6.ebuild b/net-firewall/shorewall/shorewall-5.2.3.6.ebuild
new file mode 100644
index 00000000000..9f77b3406b1
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.3.6.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
+	!<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-r1.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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-03-09 15:01 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-03-09 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     9d0095e451e4c6ed300ea19a636378935afb2ceb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 14:31:11 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 15:01:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0095e4

net-firewall/shorewall: bump to v5.2.3.7

Package-Manager: Portage-2.3.91, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.3.7.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 352a0c600bc..988a7f65c92 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.2.3.5.tar.bz2 554891 BLAKE2B 470b2a6d67e18f05262197877dc2bd853a756fcf3ac4e547c4e53a398fc1ddcb7bc2beccecc3146baafce72cae49cb20b41f482ceb036ccbe1c4b21bc2a3c2af SHA512 a93166d77ae29d32719a47912d64c9f0a7fdace61473a2d95c60cd611bab3a9b5faf0cebe6d80c47a34a5164538d61695e951e5d458a6f7ae172ff62dd9b81ea
 DIST shorewall-5.2.3.6.tar.bz2 543859 BLAKE2B 29a7e8068a5920e73bcb832241c2366a31fc54e6671d401ad35dd01a38f719622a5e3d09cb50084887ac52b96ff5f827e433ef06223eaf2d7f279b1299d726c4 SHA512 e6cd5bcf9f3fe57a5220e717985525ef4dac37b36e7e81b583948fc47c73d443e9649395db365829e0b29d213e5ca8e706578ad323983c6851c3cc5f3dccb03f
+DIST shorewall-5.2.3.7.tar.bz2 579234 BLAKE2B 968d9f23f9d66d1326dfd9c0b989959a1a8449f6dd3230d9191cb3f3be805065fe4d1ab5e7bd679b5da7ebbf625654dc0a878a4ebc6346e51a9d2588102e52b5 SHA512 c0f90d5cbbc6a9cad443b3ecfedda79bee71f79685049c421d8bba3826e5c874c7c31f09f243d3728514684983a27c8d4ac6854b55766fbcf34f6937f8ab28bd
 DIST shorewall-core-5.2.3.5.tar.bz2 70007 BLAKE2B 0f7485775fe566e5bc9d67da314f27f1aba3b9faef82a8d51dc5bc00413dba32a24c53cae07531c59c528b0c2b7c87fda81252669c771c749abf5d83f9c02696 SHA512 f8346767d42ae6624b1831b637be3b4f625c4213a75759fc9330ffac7fc31aef0926e89af952f6353faf2a56334fe49fc65635c33a9c77c21b4ae79d93a0e9a6
 DIST shorewall-core-5.2.3.6.tar.bz2 70407 BLAKE2B 084e79d02702dfa3738f593ba029d97b230ccff5fd1741ca2566db7bfabb5ffe7afba5104ec7cca7d54da6e261c85090ecdbc2a0ab3c85b4fc9eb5a22add8ee8 SHA512 8bbd571e4279ea097634632903e3297bad6579152fe0d590db1f04cc1852cef86abdf5720b704bc166185118fa2d90c0463745a930ffe379f87a5d77c8a69141
+DIST shorewall-core-5.2.3.7.tar.bz2 71454 BLAKE2B 3df2b99dfbde169a817f4a5f45876c07dbdcda432763c1227fd86d9f2e2556c639595db9c57f195a404535c72f33ae1211aee080e5df37c342f6ebd4be2a5994 SHA512 e708ee48bc087cef24959b22430c8d8814d5c2f9315988c410e6fa59b4dca9c8b48501fea9515115e760d902d9e9719f33c1310d91a83550030a8768efd18751
 DIST shorewall-docs-html-5.2.3.5.tar.bz2 4291459 BLAKE2B 150345621b93a100ff08b3e38df789a706ef73543022ab963b951d1c19088407c7b4698729935c2717d65199cffceb2652b222247f4610554d21c7d74ef14c07 SHA512 5b638a4eb15a8ab28787cf684003ba02c43f04b691b90f70637a3c981d774ccc52150fa1419e54b5294f59f92118a74b56cb6ca9b5598e7176f92f0cab76c3b8
 DIST shorewall-docs-html-5.2.3.6.tar.bz2 4306757 BLAKE2B b2ef0ec2956b6dccfa0e2c597d3a924ad068f7e627bf86cf508d7db5547def979910a9bfdbf49650b1907716ca45973be23d0470eb1e90825c3cef9ea8c63268 SHA512 fb89f54e6da64fcb59ac76441588d0473e229279aad8cbc394cacf9bdb93d74723c6c7334934dee373527adcfc582d9843ce12aa454ea3a4d3f42597c93a3661
+DIST shorewall-docs-html-5.2.3.7.tar.bz2 4293387 BLAKE2B 6a0ffe8eac171c13961fcf448932b7287cdca3e1da895020d5551d135fe542ca8dba3e0cba7f505ec9a204649dd5fd9849613bbb30d2970a45f321b46aa74ba5 SHA512 19c5bb80f40c9df8262e6ee00908f64d3e2d489c734bdecf6faec5f8d23bf3b6201ed21673900a2906053bc7d59872b7974262caf9883207126a082bbb2cb281
 DIST shorewall-init-5.2.3.5.tar.bz2 35147 BLAKE2B 34fff5474fc60a7526991e5718f2f561ee7e67f339f5d95bef204bbbd4efafef5c1298d9533eae481a6adeb4fe516f45cd1060af33b66c900c054f7b7f9e519e SHA512 ad06ad0c0ddeef278e18babe7aa42935aa3af79052d10b54cd6729fe7b67ed9f210ea3f511b0da23cb2b1f67b82bdcba339f919f1ccbafbde51f77b9f0004606
 DIST shorewall-init-5.2.3.6.tar.bz2 35309 BLAKE2B 963b73e86592fcefa5881273149d8c0c2fcf423d6268ba4ccc60941f2eccebc9d8e5ee2d2e80209fe3109ae43ce43521117f50824c2796b51ea945c9a7d06e01 SHA512 4e3ef2d4a47f8e0b7751dbeab26cbf749a0304c5e64f42642b3e6cdf8df1bfa057666260dc76c628ec193cac880d8574f2aaf91b4a54f2fd4f4ac76ee102093b
+DIST shorewall-init-5.2.3.7.tar.bz2 35860 BLAKE2B b6046004c246113105206f2a034e0d8930a8283c3431675a2cb5c29b1509619b5d79a03bdf8c1daea085a330344ffe519a0b9d7ec860fdcd3603efd739613d2e SHA512 f3f231923a5d352cb8288d051568d4dbf24ef38122a1d8ae0c158b317c09146d938389597a5f57e9099c7c1b283780357b74f8605ea1e14393a0e3b1fa6b1118
 DIST shorewall-lite-5.2.3.5.tar.bz2 39954 BLAKE2B 601e793adaa9d4ac77a1a4c17b7d1726af6a0b19c8dda2621ebbd36be63e3a33deb9ff36cb25d195d0875c5f159fa758a16cd7af2200e748d542f862bc474425 SHA512 3472bc4e96cd1624b5a6dde0bac893d87f57baa0381a230682889c15f841324e67034411e3ceb5229d48256a84e7f63ba04c478a86df9dd0e76ce820bb7c27dc
 DIST shorewall-lite-5.2.3.6.tar.bz2 40125 BLAKE2B 432fe34770b0da68c3fa9955ddebab6ce3fd75fec83d81d2e71ff4c7b74e8923886396acf8d5641cd5f1bd4bbf7a298283dad5db52ff1df04c6df452a947f791 SHA512 5d2802057cd5b3b8cbd15aadd8a4bdad13b2ae88d9839982ff95a98552bf672a2602bb3afa548068fc58f095f31267e07037f6ffc58a8213367a3edc904e5966
+DIST shorewall-lite-5.2.3.7.tar.bz2 40674 BLAKE2B cf7ed3c81ab3a49556e61f48bdabf828dbb79a4c0a6c431f9ce77a4f15ec33ccbfc6bc5b1e6a942d695795679670bdb3ff22c37c54bcc4cd3552f6117bb4834b SHA512 c83f349f2626fe98a2f968a76fb48de2e7412f95ed0e72c48724cd93fe6e3b480d6cc185b5445434432bbf40ffaef7dbb875c4b5494f7875ce1f96f345314ea6
 DIST shorewall6-5.2.3.5.tar.bz2 191963 BLAKE2B b1aa5e5576749313a351eac29b2c247d58c4e38b9d948374f2c64a97a51bd6f7407afd52601ad0856c2899765ff4fe3ac0c96b4507e777a3112ec962a7dc71c9 SHA512 10081615887a5507b885ba6177016575829ca9cec81fe0fb8d5a6c12871d87ae1c63bb7319ea1e831d0c259084e243294125cad3650a0ffc66d0c09e457283d1
 DIST shorewall6-5.2.3.6.tar.bz2 191857 BLAKE2B 53784b26b8a8a94c525ec50e94d370ac022f4ab214d20580450bd2f083dcd05192442750aeeca17dba7b9e910c148feaa988bf3affcc07010bc0b87751fef47a SHA512 56b72e4821217a57b64a5295cd7fd9556899b946a8ad6d04e343e35109c67401ed5dc7bb3cf96f3b969f90d5d45cf0c0bbab1a3114658d0f6e21d69d4c0e0bb4
+DIST shorewall6-5.2.3.7.tar.bz2 197912 BLAKE2B 20193edb20a6e165cc83391ff36e5601104dbc95f8300d1880253edc451fb086b0b619496cec84f3a6e1ea52c33ebea9de436babeb6517b41688e95eaaa10641 SHA512 45ac97f27569006715156579ca86e9dc580d30f64dabb1557ef25dbb171e76a67251a64e4ff77c8e88017dc2a9e364503c1f565f376312335ca2ac0d961a6043
 DIST shorewall6-lite-5.2.3.5.tar.bz2 39907 BLAKE2B d396c4365d0fedac5afd997c2283c9cfaa05077d786dc95f40f3bcebf778f2cf8a95b386aeed8e8c80f556b000399da8c7c2e3fae9f1cbf2e9ebe4935acd27f4 SHA512 533be2c2bcc6b406eda45916d49bf38d776445fa6a7b43946ab5f11623f45f922d9a49ed47abc141a843c0afbec5ed08f6050d431ff73aba922fd8b5197f6bf0
 DIST shorewall6-lite-5.2.3.6.tar.bz2 40089 BLAKE2B 03552fc8cbcfeeedd5099781a38050896ca36d178faf396a11766c055959d2241e9c9f30e5030001a059b45090914c2c6ee24700b9ee7c1cf96de66665c83e4a SHA512 3bab2d04111ed68e228b5a22db6bc2471eeb4b9fe80da1c826af179a5bb9f8a7377e95850d8e97bf167c6254553304509eee01828da13957f6472c4eb507c1ec
+DIST shorewall6-lite-5.2.3.7.tar.bz2 40641 BLAKE2B d1c3720e7fefe6a20a29ab90e65fe9c0a113894c008377734e274177f6759245c056fb2a7e7abf42c7bddd35bd159f8c2ed2e4135edd1dda9d63ad1b596cec8c SHA512 0727a0e709bb206e4905ae8b5b4b39b2d2eb950b8aa03d8593de71a12464422681b5528a8e06a05e91e9bd1bae6a78962da1810ecbc8707e670073c28daccaaa

diff --git a/net-firewall/shorewall/shorewall-5.2.3.7.ebuild b/net-firewall/shorewall/shorewall-5.2.3.7.ebuild
new file mode 100644
index 00000000000..9f77b3406b1
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.3.7.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
+	!<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-r1.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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-03-30  1:25 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-03-30  1:25 UTC (permalink / raw
  To: gentoo-commits

commit:     4f8a924ed85336f94305fa254edbca33a5d0a392
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 01:22:45 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 01:25:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8a924e

net-firewall/shorewall: x86 stable, applying ALLARCHES policy

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.3.7.ebuild b/net-firewall/shorewall/shorewall-5.2.3.7.ebuild
index 9f77b3406b1..ab98fa11307 100644
--- a/net-firewall/shorewall/shorewall-5.2.3.7.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.7.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-03-30  1:25 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-03-30  1:25 UTC (permalink / raw
  To: gentoo-commits

commit:     87c80b81c2fb94617aeacbde23bc12a6d66834ab
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 01:23:30 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 01:25:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c80b81

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |  14 -
 net-firewall/shorewall/shorewall-5.2.3.5.ebuild | 482 ------------------------
 net-firewall/shorewall/shorewall-5.2.3.6.ebuild | 482 ------------------------
 3 files changed, 978 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 988a7f65c92..a8d5d51b46e 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,7 @@
-DIST shorewall-5.2.3.5.tar.bz2 554891 BLAKE2B 470b2a6d67e18f05262197877dc2bd853a756fcf3ac4e547c4e53a398fc1ddcb7bc2beccecc3146baafce72cae49cb20b41f482ceb036ccbe1c4b21bc2a3c2af SHA512 a93166d77ae29d32719a47912d64c9f0a7fdace61473a2d95c60cd611bab3a9b5faf0cebe6d80c47a34a5164538d61695e951e5d458a6f7ae172ff62dd9b81ea
-DIST shorewall-5.2.3.6.tar.bz2 543859 BLAKE2B 29a7e8068a5920e73bcb832241c2366a31fc54e6671d401ad35dd01a38f719622a5e3d09cb50084887ac52b96ff5f827e433ef06223eaf2d7f279b1299d726c4 SHA512 e6cd5bcf9f3fe57a5220e717985525ef4dac37b36e7e81b583948fc47c73d443e9649395db365829e0b29d213e5ca8e706578ad323983c6851c3cc5f3dccb03f
 DIST shorewall-5.2.3.7.tar.bz2 579234 BLAKE2B 968d9f23f9d66d1326dfd9c0b989959a1a8449f6dd3230d9191cb3f3be805065fe4d1ab5e7bd679b5da7ebbf625654dc0a878a4ebc6346e51a9d2588102e52b5 SHA512 c0f90d5cbbc6a9cad443b3ecfedda79bee71f79685049c421d8bba3826e5c874c7c31f09f243d3728514684983a27c8d4ac6854b55766fbcf34f6937f8ab28bd
-DIST shorewall-core-5.2.3.5.tar.bz2 70007 BLAKE2B 0f7485775fe566e5bc9d67da314f27f1aba3b9faef82a8d51dc5bc00413dba32a24c53cae07531c59c528b0c2b7c87fda81252669c771c749abf5d83f9c02696 SHA512 f8346767d42ae6624b1831b637be3b4f625c4213a75759fc9330ffac7fc31aef0926e89af952f6353faf2a56334fe49fc65635c33a9c77c21b4ae79d93a0e9a6
-DIST shorewall-core-5.2.3.6.tar.bz2 70407 BLAKE2B 084e79d02702dfa3738f593ba029d97b230ccff5fd1741ca2566db7bfabb5ffe7afba5104ec7cca7d54da6e261c85090ecdbc2a0ab3c85b4fc9eb5a22add8ee8 SHA512 8bbd571e4279ea097634632903e3297bad6579152fe0d590db1f04cc1852cef86abdf5720b704bc166185118fa2d90c0463745a930ffe379f87a5d77c8a69141
 DIST shorewall-core-5.2.3.7.tar.bz2 71454 BLAKE2B 3df2b99dfbde169a817f4a5f45876c07dbdcda432763c1227fd86d9f2e2556c639595db9c57f195a404535c72f33ae1211aee080e5df37c342f6ebd4be2a5994 SHA512 e708ee48bc087cef24959b22430c8d8814d5c2f9315988c410e6fa59b4dca9c8b48501fea9515115e760d902d9e9719f33c1310d91a83550030a8768efd18751
-DIST shorewall-docs-html-5.2.3.5.tar.bz2 4291459 BLAKE2B 150345621b93a100ff08b3e38df789a706ef73543022ab963b951d1c19088407c7b4698729935c2717d65199cffceb2652b222247f4610554d21c7d74ef14c07 SHA512 5b638a4eb15a8ab28787cf684003ba02c43f04b691b90f70637a3c981d774ccc52150fa1419e54b5294f59f92118a74b56cb6ca9b5598e7176f92f0cab76c3b8
-DIST shorewall-docs-html-5.2.3.6.tar.bz2 4306757 BLAKE2B b2ef0ec2956b6dccfa0e2c597d3a924ad068f7e627bf86cf508d7db5547def979910a9bfdbf49650b1907716ca45973be23d0470eb1e90825c3cef9ea8c63268 SHA512 fb89f54e6da64fcb59ac76441588d0473e229279aad8cbc394cacf9bdb93d74723c6c7334934dee373527adcfc582d9843ce12aa454ea3a4d3f42597c93a3661
 DIST shorewall-docs-html-5.2.3.7.tar.bz2 4293387 BLAKE2B 6a0ffe8eac171c13961fcf448932b7287cdca3e1da895020d5551d135fe542ca8dba3e0cba7f505ec9a204649dd5fd9849613bbb30d2970a45f321b46aa74ba5 SHA512 19c5bb80f40c9df8262e6ee00908f64d3e2d489c734bdecf6faec5f8d23bf3b6201ed21673900a2906053bc7d59872b7974262caf9883207126a082bbb2cb281
-DIST shorewall-init-5.2.3.5.tar.bz2 35147 BLAKE2B 34fff5474fc60a7526991e5718f2f561ee7e67f339f5d95bef204bbbd4efafef5c1298d9533eae481a6adeb4fe516f45cd1060af33b66c900c054f7b7f9e519e SHA512 ad06ad0c0ddeef278e18babe7aa42935aa3af79052d10b54cd6729fe7b67ed9f210ea3f511b0da23cb2b1f67b82bdcba339f919f1ccbafbde51f77b9f0004606
-DIST shorewall-init-5.2.3.6.tar.bz2 35309 BLAKE2B 963b73e86592fcefa5881273149d8c0c2fcf423d6268ba4ccc60941f2eccebc9d8e5ee2d2e80209fe3109ae43ce43521117f50824c2796b51ea945c9a7d06e01 SHA512 4e3ef2d4a47f8e0b7751dbeab26cbf749a0304c5e64f42642b3e6cdf8df1bfa057666260dc76c628ec193cac880d8574f2aaf91b4a54f2fd4f4ac76ee102093b
 DIST shorewall-init-5.2.3.7.tar.bz2 35860 BLAKE2B b6046004c246113105206f2a034e0d8930a8283c3431675a2cb5c29b1509619b5d79a03bdf8c1daea085a330344ffe519a0b9d7ec860fdcd3603efd739613d2e SHA512 f3f231923a5d352cb8288d051568d4dbf24ef38122a1d8ae0c158b317c09146d938389597a5f57e9099c7c1b283780357b74f8605ea1e14393a0e3b1fa6b1118
-DIST shorewall-lite-5.2.3.5.tar.bz2 39954 BLAKE2B 601e793adaa9d4ac77a1a4c17b7d1726af6a0b19c8dda2621ebbd36be63e3a33deb9ff36cb25d195d0875c5f159fa758a16cd7af2200e748d542f862bc474425 SHA512 3472bc4e96cd1624b5a6dde0bac893d87f57baa0381a230682889c15f841324e67034411e3ceb5229d48256a84e7f63ba04c478a86df9dd0e76ce820bb7c27dc
-DIST shorewall-lite-5.2.3.6.tar.bz2 40125 BLAKE2B 432fe34770b0da68c3fa9955ddebab6ce3fd75fec83d81d2e71ff4c7b74e8923886396acf8d5641cd5f1bd4bbf7a298283dad5db52ff1df04c6df452a947f791 SHA512 5d2802057cd5b3b8cbd15aadd8a4bdad13b2ae88d9839982ff95a98552bf672a2602bb3afa548068fc58f095f31267e07037f6ffc58a8213367a3edc904e5966
 DIST shorewall-lite-5.2.3.7.tar.bz2 40674 BLAKE2B cf7ed3c81ab3a49556e61f48bdabf828dbb79a4c0a6c431f9ce77a4f15ec33ccbfc6bc5b1e6a942d695795679670bdb3ff22c37c54bcc4cd3552f6117bb4834b SHA512 c83f349f2626fe98a2f968a76fb48de2e7412f95ed0e72c48724cd93fe6e3b480d6cc185b5445434432bbf40ffaef7dbb875c4b5494f7875ce1f96f345314ea6
-DIST shorewall6-5.2.3.5.tar.bz2 191963 BLAKE2B b1aa5e5576749313a351eac29b2c247d58c4e38b9d948374f2c64a97a51bd6f7407afd52601ad0856c2899765ff4fe3ac0c96b4507e777a3112ec962a7dc71c9 SHA512 10081615887a5507b885ba6177016575829ca9cec81fe0fb8d5a6c12871d87ae1c63bb7319ea1e831d0c259084e243294125cad3650a0ffc66d0c09e457283d1
-DIST shorewall6-5.2.3.6.tar.bz2 191857 BLAKE2B 53784b26b8a8a94c525ec50e94d370ac022f4ab214d20580450bd2f083dcd05192442750aeeca17dba7b9e910c148feaa988bf3affcc07010bc0b87751fef47a SHA512 56b72e4821217a57b64a5295cd7fd9556899b946a8ad6d04e343e35109c67401ed5dc7bb3cf96f3b969f90d5d45cf0c0bbab1a3114658d0f6e21d69d4c0e0bb4
 DIST shorewall6-5.2.3.7.tar.bz2 197912 BLAKE2B 20193edb20a6e165cc83391ff36e5601104dbc95f8300d1880253edc451fb086b0b619496cec84f3a6e1ea52c33ebea9de436babeb6517b41688e95eaaa10641 SHA512 45ac97f27569006715156579ca86e9dc580d30f64dabb1557ef25dbb171e76a67251a64e4ff77c8e88017dc2a9e364503c1f565f376312335ca2ac0d961a6043
-DIST shorewall6-lite-5.2.3.5.tar.bz2 39907 BLAKE2B d396c4365d0fedac5afd997c2283c9cfaa05077d786dc95f40f3bcebf778f2cf8a95b386aeed8e8c80f556b000399da8c7c2e3fae9f1cbf2e9ebe4935acd27f4 SHA512 533be2c2bcc6b406eda45916d49bf38d776445fa6a7b43946ab5f11623f45f922d9a49ed47abc141a843c0afbec5ed08f6050d431ff73aba922fd8b5197f6bf0
-DIST shorewall6-lite-5.2.3.6.tar.bz2 40089 BLAKE2B 03552fc8cbcfeeedd5099781a38050896ca36d178faf396a11766c055959d2241e9c9f30e5030001a059b45090914c2c6ee24700b9ee7c1cf96de66665c83e4a SHA512 3bab2d04111ed68e228b5a22db6bc2471eeb4b9fe80da1c826af179a5bb9f8a7377e95850d8e97bf167c6254553304509eee01828da13957f6472c4eb507c1ec
 DIST shorewall6-lite-5.2.3.7.tar.bz2 40641 BLAKE2B d1c3720e7fefe6a20a29ab90e65fe9c0a113894c008377734e274177f6759245c056fb2a7e7abf42c7bddd35bd159f8c2ed2e4135edd1dda9d63ad1b596cec8c SHA512 0727a0e709bb206e4905ae8b5b4b39b2d2eb950b8aa03d8593de71a12464422681b5528a8e06a05e91e9bd1bae6a78962da1810ecbc8707e670073c28daccaaa

diff --git a/net-firewall/shorewall/shorewall-5.2.3.5.ebuild b/net-firewall/shorewall/shorewall-5.2.3.5.ebuild
deleted file mode 100644
index ab98fa11307..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.3.5.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-r1.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.3.6.ebuild b/net-firewall/shorewall/shorewall-5.2.3.6.ebuild
deleted file mode 100644
index 9f77b3406b1..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.3.6.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-r1.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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-03-30  1:25 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-03-30  1:25 UTC (permalink / raw
  To: gentoo-commits

commit:     701e5c37dbc2f9bf05a9922943111d634b55af28
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 01:24:17 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 01:25:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701e5c37

net-firewall/shorewall: bump to v5.2.4

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.2.4.ebuild | 482 ++++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a8d5d51b46e..fa732cee324 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.3.7.tar.bz2 579234 BLAKE2B 968d9f23f9d66d1326dfd9c0b989959a1a8449f6dd3230d9191cb3f3be805065fe4d1ab5e7bd679b5da7ebbf625654dc0a878a4ebc6346e51a9d2588102e52b5 SHA512 c0f90d5cbbc6a9cad443b3ecfedda79bee71f79685049c421d8bba3826e5c874c7c31f09f243d3728514684983a27c8d4ac6854b55766fbcf34f6937f8ab28bd
+DIST shorewall-5.2.4.tar.bz2 579480 BLAKE2B 5bbca22cfa11dc482859c2703d54f35f55f1c8db46286c3480879eb47d562358a73412f0ba3ba4af9d3763c838608269a70668daf30accb07314245308f46022 SHA512 2eee8b8e86aef29f646f324dcbd156eae7a687db179361e03172ef4792f2665fd3623830028a748ea3506ffbb2f59afa9f7deba7862643aff7628857aa2ac63c
 DIST shorewall-core-5.2.3.7.tar.bz2 71454 BLAKE2B 3df2b99dfbde169a817f4a5f45876c07dbdcda432763c1227fd86d9f2e2556c639595db9c57f195a404535c72f33ae1211aee080e5df37c342f6ebd4be2a5994 SHA512 e708ee48bc087cef24959b22430c8d8814d5c2f9315988c410e6fa59b4dca9c8b48501fea9515115e760d902d9e9719f33c1310d91a83550030a8768efd18751
+DIST shorewall-core-5.2.4.tar.bz2 71532 BLAKE2B edd3762b39db162775e05d30e3ddeac244ca4375ee74bc1581af85879ddcfda22e6cae7b1357ddf5b0df615a4f5072457b1e34918bde5cb43273b21dd60f76ba SHA512 40add35f175abd62ede0b0b8f84151d7a81d56bcc3d622ed9ac676e382bd33cfee648da205f23ead462b5e6e577784c79ffdcdde5f45c731c6d93c11788d982d
 DIST shorewall-docs-html-5.2.3.7.tar.bz2 4293387 BLAKE2B 6a0ffe8eac171c13961fcf448932b7287cdca3e1da895020d5551d135fe542ca8dba3e0cba7f505ec9a204649dd5fd9849613bbb30d2970a45f321b46aa74ba5 SHA512 19c5bb80f40c9df8262e6ee00908f64d3e2d489c734bdecf6faec5f8d23bf3b6201ed21673900a2906053bc7d59872b7974262caf9883207126a082bbb2cb281
+DIST shorewall-docs-html-5.2.4.tar.bz2 4293639 BLAKE2B c024da5a3fab5f98c0913f294dafd85eced4c259762f5f06d9e98a74ea2e1ac5c0565e027609da472bd911e08027a6524e7cf97e2ec06c70965e5088fa3c331e SHA512 cb3ce47a892e92a032d4f49d693b23ad47ad3a0effb44cb24c0ff86f9b9b75eaa231210369a0ae10789bddedbbfd4c2a8a11bef9695591ef22351570c5abe481
 DIST shorewall-init-5.2.3.7.tar.bz2 35860 BLAKE2B b6046004c246113105206f2a034e0d8930a8283c3431675a2cb5c29b1509619b5d79a03bdf8c1daea085a330344ffe519a0b9d7ec860fdcd3603efd739613d2e SHA512 f3f231923a5d352cb8288d051568d4dbf24ef38122a1d8ae0c158b317c09146d938389597a5f57e9099c7c1b283780357b74f8605ea1e14393a0e3b1fa6b1118
+DIST shorewall-init-5.2.4.tar.bz2 36672 BLAKE2B 9b1d8e4670f2fadca9c3ffb4aade2734ab2714ae86d9b66728595b9e6c222b151be064634ea374767adea4424d578b7f7369acab855a5716e6f8def2f35d7b6f SHA512 7a68eb0c8e40e778123c0ecc60c2210888c1e6c68fd282e0d4f2fb2fdac3f1f00dde521c157520a1edd31ef77fe40e5d15834c5ce7d3d5500ae5fb8d66a6a324
 DIST shorewall-lite-5.2.3.7.tar.bz2 40674 BLAKE2B cf7ed3c81ab3a49556e61f48bdabf828dbb79a4c0a6c431f9ce77a4f15ec33ccbfc6bc5b1e6a942d695795679670bdb3ff22c37c54bcc4cd3552f6117bb4834b SHA512 c83f349f2626fe98a2f968a76fb48de2e7412f95ed0e72c48724cd93fe6e3b480d6cc185b5445434432bbf40ffaef7dbb875c4b5494f7875ce1f96f345314ea6
+DIST shorewall-lite-5.2.4.tar.bz2 41491 BLAKE2B 1cdef18c368d44bf7aae756c2519b3cf8aaa648be0044b6aab22aa6dda989a8a7e51ab77d963f450ab0338ea490ca2629680e1c251e4dbf43594a952a17ded9a SHA512 a222d06e60f889167160cea5107fb534e8c5bec00b42e7027615447875e3ee2513ba1eefd1e14e17ea7c91d08f2e9cfebb1b3fe2bd384f6288961c1258cbb359
 DIST shorewall6-5.2.3.7.tar.bz2 197912 BLAKE2B 20193edb20a6e165cc83391ff36e5601104dbc95f8300d1880253edc451fb086b0b619496cec84f3a6e1ea52c33ebea9de436babeb6517b41688e95eaaa10641 SHA512 45ac97f27569006715156579ca86e9dc580d30f64dabb1557ef25dbb171e76a67251a64e4ff77c8e88017dc2a9e364503c1f565f376312335ca2ac0d961a6043
+DIST shorewall6-5.2.4.tar.bz2 198630 BLAKE2B 4aa511ba5b998835b9aadad3a733b7ea7e4c0940135ae8959895ea499fd5f83e8cad3831560215c41c855f0d02f845ee97b8318af409fa088a98bbd5f3ec7a87 SHA512 b4dce7043b44fc1b84c5f8b07c524b0c9b5a83e06f694646115c448ad1e0407a77613ace99b5866cfa8b7078a98c1aba79a94c094e40453745d6cccc453d8934
 DIST shorewall6-lite-5.2.3.7.tar.bz2 40641 BLAKE2B d1c3720e7fefe6a20a29ab90e65fe9c0a113894c008377734e274177f6759245c056fb2a7e7abf42c7bddd35bd159f8c2ed2e4135edd1dda9d63ad1b596cec8c SHA512 0727a0e709bb206e4905ae8b5b4b39b2d2eb950b8aa03d8593de71a12464422681b5528a8e06a05e91e9bd1bae6a78962da1810ecbc8707e670073c28daccaaa
+DIST shorewall6-lite-5.2.4.tar.bz2 41474 BLAKE2B 123b73281cc4e84f74eef56111af24243eca9706ad03a38cb8bf3763b8645fffdb1847098d33c109b8b481eb66baa9d71a907285cc20ae6094eac9304cf7fd52 SHA512 a2a5f8054e59815e3dc2f3a51f59f29b3880226d5074b78e189e68e6c6f66de44a86791417f088bb4f1d0eead78d2841269cd222450d33b7b5cef1c00b08cfc8

diff --git a/net-firewall/shorewall/shorewall-5.2.4.ebuild b/net-firewall/shorewall/shorewall-5.2.4.ebuild
new file mode 100644
index 00000000000..9f77b3406b1
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.4.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
+	!<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-r1.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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-05-01 13:23 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-05-01 13:23 UTC (permalink / raw
  To: gentoo-commits

commit:     d81c474749f2359031795477c17e202da9132d96
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 12:59:50 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri May  1 13:22:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d81c4747

net-firewall/shorewall: bump to v5.2.4.4

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                            | 14 +++++++-------
 .../{shorewall-5.2.4.3.ebuild => shorewall-5.2.4.4.ebuild} |  0
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 8838edf4288..9ea8ede1bb1 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,21 @@
 DIST shorewall-5.2.3.7.tar.bz2 579234 BLAKE2B 968d9f23f9d66d1326dfd9c0b989959a1a8449f6dd3230d9191cb3f3be805065fe4d1ab5e7bd679b5da7ebbf625654dc0a878a4ebc6346e51a9d2588102e52b5 SHA512 c0f90d5cbbc6a9cad443b3ecfedda79bee71f79685049c421d8bba3826e5c874c7c31f09f243d3728514684983a27c8d4ac6854b55766fbcf34f6937f8ab28bd
-DIST shorewall-5.2.4.3.tar.bz2 581048 BLAKE2B 3d7af20eed72ebb88bfd4958d6421127f2084988f382f9ee9f56fc402dcf257d93cc9c525a2648d4ff12bd5f4f2f437623da146bcc9732a4f33f6342fd80f3b6 SHA512 a162a2c97b4bee35a7cb2d47c68ab6698bad77a20f976bd35264e4bf7a27c86acc55f95d7fb1022bc2956883d3539db1421b6112c222581ec80009e31a824b22
+DIST shorewall-5.2.4.4.tar.bz2 581085 BLAKE2B 6830f1ce9350534a51b0d79efad07b338c511ab3cc1bf151ac958052c5feb1794d994a71e80ebf1546a76fae1718ebc74abab37fbb4d9362d8b3108133b30354 SHA512 c050af24969c2f18c4c020dfb611edaf9c6a5aa09d1dace502ae99b9aa82d7f217695e8099d6615a9a3c9f6de951f6d8b24621021c48ee2f2095edf9815a8d57
 DIST shorewall-5.2.4.tar.bz2 579480 BLAKE2B 5bbca22cfa11dc482859c2703d54f35f55f1c8db46286c3480879eb47d562358a73412f0ba3ba4af9d3763c838608269a70668daf30accb07314245308f46022 SHA512 2eee8b8e86aef29f646f324dcbd156eae7a687db179361e03172ef4792f2665fd3623830028a748ea3506ffbb2f59afa9f7deba7862643aff7628857aa2ac63c
 DIST shorewall-core-5.2.3.7.tar.bz2 71454 BLAKE2B 3df2b99dfbde169a817f4a5f45876c07dbdcda432763c1227fd86d9f2e2556c639595db9c57f195a404535c72f33ae1211aee080e5df37c342f6ebd4be2a5994 SHA512 e708ee48bc087cef24959b22430c8d8814d5c2f9315988c410e6fa59b4dca9c8b48501fea9515115e760d902d9e9719f33c1310d91a83550030a8768efd18751
-DIST shorewall-core-5.2.4.3.tar.bz2 73000 BLAKE2B 642a15ba63be8a530072881dc6baa9693103c5592f2203648768aebd997cfb0af252801175121426fa07098180de9d81f79ce0bee059ac74b26ed6048c9c421f SHA512 67e3ab499cf5859875e78bc7869e2697de5564775eb33c3090387f7816a18a3059bc2632e70409e2327e7ab8b1ac311d7c8b0694b9c43f22853478b45b0110f6
+DIST shorewall-core-5.2.4.4.tar.bz2 73257 BLAKE2B 16b8d3a1d08c9db6a939f946324295063cee71b373bd67dd85d0acb4332502df4b5d9bb932695228ad6d33395c6596e86fd3e77ca59abc99d88bab7e883777c9 SHA512 1868dcd6bad6b0cb5be2c1b0724f076605e7990d0b9dfd19fee06c758b19f2ebcbe18bccaa7a4ea861ceb26038ed07837eecdacdd2a02d0c2a927c732d6bdc30
 DIST shorewall-core-5.2.4.tar.bz2 71532 BLAKE2B edd3762b39db162775e05d30e3ddeac244ca4375ee74bc1581af85879ddcfda22e6cae7b1357ddf5b0df615a4f5072457b1e34918bde5cb43273b21dd60f76ba SHA512 40add35f175abd62ede0b0b8f84151d7a81d56bcc3d622ed9ac676e382bd33cfee648da205f23ead462b5e6e577784c79ffdcdde5f45c731c6d93c11788d982d
 DIST shorewall-docs-html-5.2.3.7.tar.bz2 4293387 BLAKE2B 6a0ffe8eac171c13961fcf448932b7287cdca3e1da895020d5551d135fe542ca8dba3e0cba7f505ec9a204649dd5fd9849613bbb30d2970a45f321b46aa74ba5 SHA512 19c5bb80f40c9df8262e6ee00908f64d3e2d489c734bdecf6faec5f8d23bf3b6201ed21673900a2906053bc7d59872b7974262caf9883207126a082bbb2cb281
-DIST shorewall-docs-html-5.2.4.3.tar.bz2 4294125 BLAKE2B 79a81237fdafc4030b5aa9d85f10c584467389d16382120758c3bc3f5143eaaf8482424a56c5e5b827a23ac170d899a244b19e41f7c0035fb841b6f9846dfe0d SHA512 0b0e955ee91059702d081600a138aefa3a7bbc731cf7e302864a23d52015208216a7ab0d1ff2915e30a8eb2af49bd4fd74509c0e61b2779d6b49f9243a024d07
+DIST shorewall-docs-html-5.2.4.4.tar.bz2 4294159 BLAKE2B 81bb4a9d086f48bf8551be3bc8aff0ed8a0a99d215338f12b711c96115507ea5a7eb567d084db0a93628c4036623a72231f33dd15671e84739d59608268b98c7 SHA512 086096604f5a580906f05b460e1e19df24620b610675a8ec6038c0061199fd6f09cd8aff08f1e8daa8d2898bfaec9db95cf7f4f1397ca9df784d420907b16fac
 DIST shorewall-docs-html-5.2.4.tar.bz2 4293639 BLAKE2B c024da5a3fab5f98c0913f294dafd85eced4c259762f5f06d9e98a74ea2e1ac5c0565e027609da472bd911e08027a6524e7cf97e2ec06c70965e5088fa3c331e SHA512 cb3ce47a892e92a032d4f49d693b23ad47ad3a0effb44cb24c0ff86f9b9b75eaa231210369a0ae10789bddedbbfd4c2a8a11bef9695591ef22351570c5abe481
 DIST shorewall-init-5.2.3.7.tar.bz2 35860 BLAKE2B b6046004c246113105206f2a034e0d8930a8283c3431675a2cb5c29b1509619b5d79a03bdf8c1daea085a330344ffe519a0b9d7ec860fdcd3603efd739613d2e SHA512 f3f231923a5d352cb8288d051568d4dbf24ef38122a1d8ae0c158b317c09146d938389597a5f57e9099c7c1b283780357b74f8605ea1e14393a0e3b1fa6b1118
-DIST shorewall-init-5.2.4.3.tar.bz2 37979 BLAKE2B 5d66b1274c68919e733419a18de22fb79c522225bffc22f25b38d2853edb8ae0884a9a1eae21516f934cdf5624e4992e10f35df05a7db6b2456df45fd0593002 SHA512 18abcea821cb8fa1524a65df60394402577d52e384c1b4384a4ba742252936c286ae80d93fe374c6180559f50d301687a972d650c41425cdd4e1ac8960448acf
+DIST shorewall-init-5.2.4.4.tar.bz2 38048 BLAKE2B 01b4664396933ca303d4013d50f290be850dad51142257a7b1f3081cee3baac219feadc96636c732072c6918f83d847eca2107aa094804691500972a90f222fd SHA512 fdab4aa68429144cbffdf41aad78744feb3e9736df0e8d6ed87ed7ac80aebf7078c6ec28646069a71cacc8d9a6738605d59c6b6fb35d8c4d9a1ed8353a71775c
 DIST shorewall-init-5.2.4.tar.bz2 36672 BLAKE2B 9b1d8e4670f2fadca9c3ffb4aade2734ab2714ae86d9b66728595b9e6c222b151be064634ea374767adea4424d578b7f7369acab855a5716e6f8def2f35d7b6f SHA512 7a68eb0c8e40e778123c0ecc60c2210888c1e6c68fd282e0d4f2fb2fdac3f1f00dde521c157520a1edd31ef77fe40e5d15834c5ce7d3d5500ae5fb8d66a6a324
 DIST shorewall-lite-5.2.3.7.tar.bz2 40674 BLAKE2B cf7ed3c81ab3a49556e61f48bdabf828dbb79a4c0a6c431f9ce77a4f15ec33ccbfc6bc5b1e6a942d695795679670bdb3ff22c37c54bcc4cd3552f6117bb4834b SHA512 c83f349f2626fe98a2f968a76fb48de2e7412f95ed0e72c48724cd93fe6e3b480d6cc185b5445434432bbf40ffaef7dbb875c4b5494f7875ce1f96f345314ea6
-DIST shorewall-lite-5.2.4.3.tar.bz2 42731 BLAKE2B 2a908fd3822bbe16d2f1176daf8d2ea08d32139c8916f3b4b65a1c7172d8e13fcbfe4175d6acba206f74239634d48c62a12f1446309fe4c5e50a85dc2f8e324e SHA512 859f7246164891287ada09be4a0574c65cf83e870e55af50300bc6a594e1d6a6c02e623cc621d353540b23a7c1ee290c216932d94aaa748e613ac26f592adf1d
+DIST shorewall-lite-5.2.4.4.tar.bz2 42806 BLAKE2B d6dd5d9268d40fb88ee99be36b359423a6d7785417752f6e9d7245806bf9677963851327dcfd0d5fe81ea54ab11d59a5e64ee4115d41d3a6c8f4ced1e7cda732 SHA512 b81aa04f124435d3bf63d1796cca4db987f56c3e31953386ab7f3aae290058e5f3240b43864753121ed48b3744f8d6ee2dcd5210105dc1ccf5a4f790b3e22092
 DIST shorewall-lite-5.2.4.tar.bz2 41491 BLAKE2B 1cdef18c368d44bf7aae756c2519b3cf8aaa648be0044b6aab22aa6dda989a8a7e51ab77d963f450ab0338ea490ca2629680e1c251e4dbf43594a952a17ded9a SHA512 a222d06e60f889167160cea5107fb534e8c5bec00b42e7027615447875e3ee2513ba1eefd1e14e17ea7c91d08f2e9cfebb1b3fe2bd384f6288961c1258cbb359
 DIST shorewall6-5.2.3.7.tar.bz2 197912 BLAKE2B 20193edb20a6e165cc83391ff36e5601104dbc95f8300d1880253edc451fb086b0b619496cec84f3a6e1ea52c33ebea9de436babeb6517b41688e95eaaa10641 SHA512 45ac97f27569006715156579ca86e9dc580d30f64dabb1557ef25dbb171e76a67251a64e4ff77c8e88017dc2a9e364503c1f565f376312335ca2ac0d961a6043
-DIST shorewall6-5.2.4.3.tar.bz2 199657 BLAKE2B 86d1d34eb429a56f53b91ce11e60660227ad677b57f8c9d3b0af9b0d8ae85fb4b2dc7e18138026b7579be3e0e09eff728188517e680affbf6f1a20c79596d6eb SHA512 654cbb91c2740412f6213fa988985afb08f9e9450fa2f3fc96c02f50766aa1e22055d9309810cc9744dadfada2ce473343dc114c7daa31f63df83fa7623614f7
+DIST shorewall6-5.2.4.4.tar.bz2 199722 BLAKE2B c5c741ea7108e6edbb35190bccea06d04c6a0d1cf5dbae23481e38d3c05155df6bcaf4deb6397d07a1f51ba0b13b18b4ed22349fbe1f6e605d0303486002d876 SHA512 cf212d1c7c8703319a5c6f34ba8629f115b2f03a0713c1b40cf370adad66b671bfd9536a28bc650aba04bf6a6fd7c396788d40c2eb650a006e8f2eb27baf76f8
 DIST shorewall6-5.2.4.tar.bz2 198630 BLAKE2B 4aa511ba5b998835b9aadad3a733b7ea7e4c0940135ae8959895ea499fd5f83e8cad3831560215c41c855f0d02f845ee97b8318af409fa088a98bbd5f3ec7a87 SHA512 b4dce7043b44fc1b84c5f8b07c524b0c9b5a83e06f694646115c448ad1e0407a77613ace99b5866cfa8b7078a98c1aba79a94c094e40453745d6cccc453d8934
 DIST shorewall6-lite-5.2.3.7.tar.bz2 40641 BLAKE2B d1c3720e7fefe6a20a29ab90e65fe9c0a113894c008377734e274177f6759245c056fb2a7e7abf42c7bddd35bd159f8c2ed2e4135edd1dda9d63ad1b596cec8c SHA512 0727a0e709bb206e4905ae8b5b4b39b2d2eb950b8aa03d8593de71a12464422681b5528a8e06a05e91e9bd1bae6a78962da1810ecbc8707e670073c28daccaaa
-DIST shorewall6-lite-5.2.4.3.tar.bz2 42639 BLAKE2B bd0d37b6e0aafc9585774c6276c25f26d6be96bcde9788ab0bf57792c0085d664144e6f959dea0d20466917636b64145caa45883224027b00e42aef485e4141d SHA512 5d4a7e8116eb7d80517df71fee25962b4844337e644b9afd305614a9426666c350e315050f4a020e88ece0df7ab1fe2a9447781e5dc1c1b845ac5cc64a4332d3
+DIST shorewall6-lite-5.2.4.4.tar.bz2 42739 BLAKE2B 3f1caa78b12f779bd73716dad78a26544bf99204b96da2fa950c709bbb5d68ac1ee062714d5040d961a2df35b4d22e0b6c8747b36a84bb9a5b6805cb6d0158cd SHA512 4a0c6e939bd8ca239734de64ea0b2a94885f8f14d00e37dce291b2f5aa00384227c16cc0595ef1b038f05d3d42212ace3e9482937c8c072d7e194099ab867646
 DIST shorewall6-lite-5.2.4.tar.bz2 41474 BLAKE2B 123b73281cc4e84f74eef56111af24243eca9706ad03a38cb8bf3763b8645fffdb1847098d33c109b8b481eb66baa9d71a907285cc20ae6094eac9304cf7fd52 SHA512 a2a5f8054e59815e3dc2f3a51f59f29b3880226d5074b78e189e68e6c6f66de44a86791417f088bb4f1d0eead78d2841269cd222450d33b7b5cef1c00b08cfc8

diff --git a/net-firewall/shorewall/shorewall-5.2.4.3.ebuild b/net-firewall/shorewall/shorewall-5.2.4.4.ebuild
similarity index 100%
rename from net-firewall/shorewall/shorewall-5.2.4.3.ebuild
rename to net-firewall/shorewall/shorewall-5.2.4.4.ebuild


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-05-09 21:41 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-05-09 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8a49e0d0b695221c0b8eaccdfbab32dfaba1b1cd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 21:38:48 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat May  9 21:41:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a49e0d0

net-firewall/shorewall: rollover keywords

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.4.4.ebuild b/net-firewall/shorewall/shorewall-5.2.4.4.ebuild
index 95a3c0906ea..c6f9c3e5bed 100644
--- a/net-firewall/shorewall/shorewall-5.2.4.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.4.4.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-05-19  9:49 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-05-19  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     4aaa313de1728801df2a46df42be437ea17fe2ef
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 09:37:42 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue May 19 09:48:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aaa313d

net-firewall/shorewall: bump to v5.2.4.5

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.4.5.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a9a781cc953..c812b23e790 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 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

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 00000000000..95a3c0906ea
--- /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
+	!<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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-06-14 23:30 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-06-14 23:30 UTC (permalink / raw
  To: gentoo-commits

commit:     461ea6f85c65b70b7a4d47c9b76644f6ac180d4a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 23:10:38 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 23:30:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461ea6f8

net-firewall/shorewall: bump to v5.2.5

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.2.5.ebuild | 482 ++++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index c812b23e790..5f4e2ffb0af 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 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-5.2.5.tar.bz2 582270 BLAKE2B 6b0e883dd424ec814fb5f2dac601bd4e896c97c73ed0f2a151a054bd4b3db732aeaeb158d5bc453ca7cf3723233e429aa24f0b9908787f384e69da656fd71832 SHA512 6527fae5067bbfedd4d1fe53fb1b110fbac3f6d7f3b1abfe76be373ebb345bc238dabf3f24a8883314bf29ffc847dcd190bddc82ca64183311ba0e5544078743
 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-core-5.2.5.tar.bz2 74420 BLAKE2B ff2a6c2ead74f125785bcb2aea42948f27b88cb39d121a3ab1af1e4df6dc4ec878854499be7c385766af6245f4590c62b4dd2eb3d648b02fa4f16d3e13a302ce SHA512 9bd7e74def89cdc07987cbcbf9b8d8a69500f7b0dfc346c9fbcec6ab8cecad3c2adfcc505136ef0c2f0525345fdb6de4918dd5bd2d382bfb4773b23ce868a937
 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-docs-html-5.2.5.tar.bz2 4310021 BLAKE2B 2d5704f126f6626bf2c934390552c19190fac5fd4231aaf61a2b0eadd770cad7b220d1083df2b0ab26ce8b2c1d97f5a3b0f2b083d14d3c5ce800bb6402603216 SHA512 04ae753f25371c0ce08af2cac5abd19797ec70860714e6891900a45baab0fb24d0f7c3163a5d2f5e419f1c1a8b092c164b7230b8d0c8cc4c3f53bbd0269e419b
 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-init-5.2.5.tar.bz2 39405 BLAKE2B 8259b4618c3b75201e245fd414da7890a80d31535eea71358f9ed3bc9b44ad0e341c3b795f624ac8cb05e2345fac82a8831ad877abe6a9ef13a8c7889bfdcb7e SHA512 61f31287472770fe02a099bddd7a6a5fa42fb676462cb7b16975fb15c6a70fe1fbb40d4c1b714f9e8a1a4bdc0ef3d7542552b1dd780833be781dda1e8dba9879
 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 shorewall-lite-5.2.5.tar.bz2 44120 BLAKE2B 47154b9f7203f5bff279c2e936dd0fe108bcb44bc9dd43abb49dc0c129a54ea381fff71b1dc3ac55e026b4065d8d5ab48edb1dcf52845e5e5f88492a958f4451 SHA512 41e6de25b2b10452bd15c465df5ffaf21019059f511197a6d398af086bba55f80b21b6644747fb2c228414a1e8af381ef5c4174b8e4defc72389664e971a85d3
 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-5.2.5.tar.bz2 201419 BLAKE2B efb1a81ee1bcee982d7cfd1bb5ee9cbae5e59e3ce47895d25332f71c1d79d2bb2421c6fca0645fe9d2d493648caab2b9c233d36fb9210e3fd6f667b89ff66671 SHA512 2b3656490209872c696966129bf4a411d050f561fd82645f494c503013a755854833cdbedfd6bdb971abb974988d11b1c4e29e62d431a4d67bba74822f579692
 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
+DIST shorewall6-lite-5.2.5.tar.bz2 44064 BLAKE2B e4667d1f1c932980d7bea03059b0aae8f83f0f3557f4245cec21aafaae72a942d47a8a355d3581cc459f85a80c10cb16af1c6e08971be2d120644098543bb3af SHA512 0c61c489f79aa51178aa733e1e738a2921c598e9403884322ccbc90461be4ee18dd0225d758371f1c750cfc832ca63652bbd8cac831e2ea026d63b72202c6f2a

diff --git a/net-firewall/shorewall/shorewall-5.2.5.ebuild b/net-firewall/shorewall/shorewall-5.2.5.ebuild
new file mode 100644
index 00000000000..95a3c0906ea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.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
+	!<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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-06-25 21:43 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-06-25 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     795949f18bb4a4d470a7165e46acee532b184942
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 21:01:32 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 21:43:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=795949f1

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |  14 -
 net-firewall/shorewall/shorewall-5.2.4.4.ebuild | 482 ------------------------
 net-firewall/shorewall/shorewall-5.2.4.5.ebuild | 482 ------------------------
 3 files changed, 978 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 5f4e2ffb0af..a3f1403db32 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,7 @@
-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-5.2.5.tar.bz2 582270 BLAKE2B 6b0e883dd424ec814fb5f2dac601bd4e896c97c73ed0f2a151a054bd4b3db732aeaeb158d5bc453ca7cf3723233e429aa24f0b9908787f384e69da656fd71832 SHA512 6527fae5067bbfedd4d1fe53fb1b110fbac3f6d7f3b1abfe76be373ebb345bc238dabf3f24a8883314bf29ffc847dcd190bddc82ca64183311ba0e5544078743
-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-core-5.2.5.tar.bz2 74420 BLAKE2B ff2a6c2ead74f125785bcb2aea42948f27b88cb39d121a3ab1af1e4df6dc4ec878854499be7c385766af6245f4590c62b4dd2eb3d648b02fa4f16d3e13a302ce SHA512 9bd7e74def89cdc07987cbcbf9b8d8a69500f7b0dfc346c9fbcec6ab8cecad3c2adfcc505136ef0c2f0525345fdb6de4918dd5bd2d382bfb4773b23ce868a937
-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-docs-html-5.2.5.tar.bz2 4310021 BLAKE2B 2d5704f126f6626bf2c934390552c19190fac5fd4231aaf61a2b0eadd770cad7b220d1083df2b0ab26ce8b2c1d97f5a3b0f2b083d14d3c5ce800bb6402603216 SHA512 04ae753f25371c0ce08af2cac5abd19797ec70860714e6891900a45baab0fb24d0f7c3163a5d2f5e419f1c1a8b092c164b7230b8d0c8cc4c3f53bbd0269e419b
-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-init-5.2.5.tar.bz2 39405 BLAKE2B 8259b4618c3b75201e245fd414da7890a80d31535eea71358f9ed3bc9b44ad0e341c3b795f624ac8cb05e2345fac82a8831ad877abe6a9ef13a8c7889bfdcb7e SHA512 61f31287472770fe02a099bddd7a6a5fa42fb676462cb7b16975fb15c6a70fe1fbb40d4c1b714f9e8a1a4bdc0ef3d7542552b1dd780833be781dda1e8dba9879
-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 shorewall-lite-5.2.5.tar.bz2 44120 BLAKE2B 47154b9f7203f5bff279c2e936dd0fe108bcb44bc9dd43abb49dc0c129a54ea381fff71b1dc3ac55e026b4065d8d5ab48edb1dcf52845e5e5f88492a958f4451 SHA512 41e6de25b2b10452bd15c465df5ffaf21019059f511197a6d398af086bba55f80b21b6644747fb2c228414a1e8af381ef5c4174b8e4defc72389664e971a85d3
-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-5.2.5.tar.bz2 201419 BLAKE2B efb1a81ee1bcee982d7cfd1bb5ee9cbae5e59e3ce47895d25332f71c1d79d2bb2421c6fca0645fe9d2d493648caab2b9c233d36fb9210e3fd6f667b89ff66671 SHA512 2b3656490209872c696966129bf4a411d050f561fd82645f494c503013a755854833cdbedfd6bdb971abb974988d11b1c4e29e62d431a4d67bba74822f579692
-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
 DIST shorewall6-lite-5.2.5.tar.bz2 44064 BLAKE2B e4667d1f1c932980d7bea03059b0aae8f83f0f3557f4245cec21aafaae72a942d47a8a355d3581cc459f85a80c10cb16af1c6e08971be2d120644098543bb3af SHA512 0c61c489f79aa51178aa733e1e738a2921c598e9403884322ccbc90461be4ee18dd0225d758371f1c750cfc832ca63652bbd8cac831e2ea026d63b72202c6f2a

diff --git a/net-firewall/shorewall/shorewall-5.2.4.4.ebuild b/net-firewall/shorewall/shorewall-5.2.4.4.ebuild
deleted file mode 100644
index c6f9c3e5bed..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.4.4.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.4.5.ebuild b/net-firewall/shorewall/shorewall-5.2.4.5.ebuild
deleted file mode 100644
index 95a3c0906ea..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.4.5.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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-06-25 21:43 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-06-25 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     37f1ba392da23ab9a2c08b9588b7c011567197b2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 21:02:44 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 21:43:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f1ba39

net-firewall/shorewall: bump to v5.2.5.1

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.5.1.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index a3f1403db32..60416d51e98 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
+DIST shorewall-5.2.5.1.tar.bz2 582482 BLAKE2B 6ee3c5a6dc80e9b42ced41eaab36c9ee4fc9f2c6853a17a7dc85f162a8abfdfed2ccd3cec73e1101ea9aa6ce9b773aa76be5c00310dd73b130121b0de73ba77a SHA512 9313bf2effe4572d8898df5d55c461bddbc5d54bec5679af31c02cc494ecff06824d1d46d604078184bdabd7c08be07f30bf81bef2c8d19f03aac99b3525bf6f
 DIST shorewall-5.2.5.tar.bz2 582270 BLAKE2B 6b0e883dd424ec814fb5f2dac601bd4e896c97c73ed0f2a151a054bd4b3db732aeaeb158d5bc453ca7cf3723233e429aa24f0b9908787f384e69da656fd71832 SHA512 6527fae5067bbfedd4d1fe53fb1b110fbac3f6d7f3b1abfe76be373ebb345bc238dabf3f24a8883314bf29ffc847dcd190bddc82ca64183311ba0e5544078743
+DIST shorewall-core-5.2.5.1.tar.bz2 74648 BLAKE2B f00f2a4302361e557fbfae2fe6bfd5e82d47751a86c1ac6ebf729ead6fbe08386f570dde5ef18917ccd48d8a9a97ec467dde34fda93cde5e3d8e15977bdcfbb1 SHA512 3f1f85f388b17f6fa02fe54bbb28bf7bd36b97b14557891644caffcea11eb167a0df91964525b706f2b5eee9d8f325471f5038f6636308e4c99e8818928fdc75
 DIST shorewall-core-5.2.5.tar.bz2 74420 BLAKE2B ff2a6c2ead74f125785bcb2aea42948f27b88cb39d121a3ab1af1e4df6dc4ec878854499be7c385766af6245f4590c62b4dd2eb3d648b02fa4f16d3e13a302ce SHA512 9bd7e74def89cdc07987cbcbf9b8d8a69500f7b0dfc346c9fbcec6ab8cecad3c2adfcc505136ef0c2f0525345fdb6de4918dd5bd2d382bfb4773b23ce868a937
+DIST shorewall-docs-html-5.2.5.1.tar.bz2 4310025 BLAKE2B 4ab4907eade322ec3e9e78d4c1c3c51a86f31fd8f4497d01ba0cfdeddf0294f240307f0d228b923b99d9b0f1b7444046a60a36569c04ef8d9f88043277c89bdc SHA512 a24f6dabed9a7ae9622c9a1f5be323a6c4cb7a8a5a671be3f0bb12d8d0b20ee11c8c11b3f1e8aac49a04a50f2bac6f137524b0e6edf9483a67b1eb44b3997094
 DIST shorewall-docs-html-5.2.5.tar.bz2 4310021 BLAKE2B 2d5704f126f6626bf2c934390552c19190fac5fd4231aaf61a2b0eadd770cad7b220d1083df2b0ab26ce8b2c1d97f5a3b0f2b083d14d3c5ce800bb6402603216 SHA512 04ae753f25371c0ce08af2cac5abd19797ec70860714e6891900a45baab0fb24d0f7c3163a5d2f5e419f1c1a8b092c164b7230b8d0c8cc4c3f53bbd0269e419b
+DIST shorewall-init-5.2.5.1.tar.bz2 39639 BLAKE2B 8c815c7ebb78c0a85cb2aac9b36e6a232c01f5ecb1fb17dd4d6b76c08746861e4e599213e553f7e2894093dc9722d61120f6f0179eda4b38fa93df4989589934 SHA512 d502b7262587b6546071083bb535f97606316c8ce592b01fe875d90b141833c9488750f864233614237b1e9412206c104f54052d7e20ff2067be8eb78acdb72b
 DIST shorewall-init-5.2.5.tar.bz2 39405 BLAKE2B 8259b4618c3b75201e245fd414da7890a80d31535eea71358f9ed3bc9b44ad0e341c3b795f624ac8cb05e2345fac82a8831ad877abe6a9ef13a8c7889bfdcb7e SHA512 61f31287472770fe02a099bddd7a6a5fa42fb676462cb7b16975fb15c6a70fe1fbb40d4c1b714f9e8a1a4bdc0ef3d7542552b1dd780833be781dda1e8dba9879
+DIST shorewall-lite-5.2.5.1.tar.bz2 44367 BLAKE2B 2b6f013fd13e895ac104e277eaf8abedec6a2a3f57a50becb2bce752fd0f9c679110d84634aa82a22bbc9ae2ce2ab9f9dc06a1220cb0f6949cc5da2d59524137 SHA512 6bcd0dfeddaf2bc513610cbecbe16574f2ed65958e8455d83f99486b286bd98ae9fba539b90c2a308d62b7a0eb8526e7af8ef3d0190f3e5ffcb660b3cdd3c769
 DIST shorewall-lite-5.2.5.tar.bz2 44120 BLAKE2B 47154b9f7203f5bff279c2e936dd0fe108bcb44bc9dd43abb49dc0c129a54ea381fff71b1dc3ac55e026b4065d8d5ab48edb1dcf52845e5e5f88492a958f4451 SHA512 41e6de25b2b10452bd15c465df5ffaf21019059f511197a6d398af086bba55f80b21b6644747fb2c228414a1e8af381ef5c4174b8e4defc72389664e971a85d3
+DIST shorewall6-5.2.5.1.tar.bz2 201672 BLAKE2B 9759de6ddf0025175293f04b62ad7aa9c2a9a18d7d1e713fdcc9f859cbb1585207e8822988b91868d706698950cede5e03bc17c44a1983655fc809d330d3fb37 SHA512 c1168a609373b27db194a8eea2a934b7302fd4e3caa583d7527530426968ae5fc81510f2943a1ba1bb14c6edf7f50081841227f5aec337f5faaa54ff83f99b66
 DIST shorewall6-5.2.5.tar.bz2 201419 BLAKE2B efb1a81ee1bcee982d7cfd1bb5ee9cbae5e59e3ce47895d25332f71c1d79d2bb2421c6fca0645fe9d2d493648caab2b9c233d36fb9210e3fd6f667b89ff66671 SHA512 2b3656490209872c696966129bf4a411d050f561fd82645f494c503013a755854833cdbedfd6bdb971abb974988d11b1c4e29e62d431a4d67bba74822f579692
+DIST shorewall6-lite-5.2.5.1.tar.bz2 44252 BLAKE2B 5550703689ff513283ff0656b9f845741f454df4c49e54481316a5bfca5d630b02b45f67bf689ee417b8d411824b71beffde98f6aa2977d4ae6493c0eda2225c SHA512 e5696658195c6d4f4c0953af215fe35bbbcf76532fe572b2613f490716417b042755231db80885293514f21f1b29f8c44c0497df9a7ba7b2ad16431ea7cbe7d2
 DIST shorewall6-lite-5.2.5.tar.bz2 44064 BLAKE2B e4667d1f1c932980d7bea03059b0aae8f83f0f3557f4245cec21aafaae72a942d47a8a355d3581cc459f85a80c10cb16af1c6e08971be2d120644098543bb3af SHA512 0c61c489f79aa51178aa733e1e738a2921c598e9403884322ccbc90461be4ee18dd0225d758371f1c750cfc832ca63652bbd8cac831e2ea026d63b72202c6f2a

diff --git a/net-firewall/shorewall/shorewall-5.2.5.1.ebuild b/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
new file mode 100644
index 00000000000..95a3c0906ea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.5.1.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
+	!<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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-06-25 21:43 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-06-25 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     208356402a073c1aeaf30eb2be6b80b68e00cd84
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 20:24:51 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 21:43:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20835640

net-firewall/shorewall: rollover keywords

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.5.ebuild b/net-firewall/shorewall/shorewall-5.2.5.ebuild
index 95a3c0906ea..c6f9c3e5bed 100644
--- a/net-firewall/shorewall/shorewall-5.2.5.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.5.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-06-29 14:58 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-06-29 14:58 UTC (permalink / raw
  To: gentoo-commits

commit:     0a5c027fa5f4b077c1e22e5a26fa6c0539af5fd7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 14:57:33 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 14:57:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a5c027f

net-firewall/shorewall: rollover keywords

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.5.1.ebuild b/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
index 95a3c0906ea..c6f9c3e5bed 100644
--- a/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.5.1.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-06-29 14:58 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-06-29 14:58 UTC (permalink / raw
  To: gentoo-commits

commit:     549223ae6cd311fd1af24890129545f6e3781e0d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 14:58:00 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 14:58:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549223ae

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 -
 net-firewall/shorewall/shorewall-5.2.5.ebuild | 482 --------------------------
 2 files changed, 489 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 60416d51e98..5931599e3d8 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
 DIST shorewall-5.2.5.1.tar.bz2 582482 BLAKE2B 6ee3c5a6dc80e9b42ced41eaab36c9ee4fc9f2c6853a17a7dc85f162a8abfdfed2ccd3cec73e1101ea9aa6ce9b773aa76be5c00310dd73b130121b0de73ba77a SHA512 9313bf2effe4572d8898df5d55c461bddbc5d54bec5679af31c02cc494ecff06824d1d46d604078184bdabd7c08be07f30bf81bef2c8d19f03aac99b3525bf6f
-DIST shorewall-5.2.5.tar.bz2 582270 BLAKE2B 6b0e883dd424ec814fb5f2dac601bd4e896c97c73ed0f2a151a054bd4b3db732aeaeb158d5bc453ca7cf3723233e429aa24f0b9908787f384e69da656fd71832 SHA512 6527fae5067bbfedd4d1fe53fb1b110fbac3f6d7f3b1abfe76be373ebb345bc238dabf3f24a8883314bf29ffc847dcd190bddc82ca64183311ba0e5544078743
 DIST shorewall-core-5.2.5.1.tar.bz2 74648 BLAKE2B f00f2a4302361e557fbfae2fe6bfd5e82d47751a86c1ac6ebf729ead6fbe08386f570dde5ef18917ccd48d8a9a97ec467dde34fda93cde5e3d8e15977bdcfbb1 SHA512 3f1f85f388b17f6fa02fe54bbb28bf7bd36b97b14557891644caffcea11eb167a0df91964525b706f2b5eee9d8f325471f5038f6636308e4c99e8818928fdc75
-DIST shorewall-core-5.2.5.tar.bz2 74420 BLAKE2B ff2a6c2ead74f125785bcb2aea42948f27b88cb39d121a3ab1af1e4df6dc4ec878854499be7c385766af6245f4590c62b4dd2eb3d648b02fa4f16d3e13a302ce SHA512 9bd7e74def89cdc07987cbcbf9b8d8a69500f7b0dfc346c9fbcec6ab8cecad3c2adfcc505136ef0c2f0525345fdb6de4918dd5bd2d382bfb4773b23ce868a937
 DIST shorewall-docs-html-5.2.5.1.tar.bz2 4310025 BLAKE2B 4ab4907eade322ec3e9e78d4c1c3c51a86f31fd8f4497d01ba0cfdeddf0294f240307f0d228b923b99d9b0f1b7444046a60a36569c04ef8d9f88043277c89bdc SHA512 a24f6dabed9a7ae9622c9a1f5be323a6c4cb7a8a5a671be3f0bb12d8d0b20ee11c8c11b3f1e8aac49a04a50f2bac6f137524b0e6edf9483a67b1eb44b3997094
-DIST shorewall-docs-html-5.2.5.tar.bz2 4310021 BLAKE2B 2d5704f126f6626bf2c934390552c19190fac5fd4231aaf61a2b0eadd770cad7b220d1083df2b0ab26ce8b2c1d97f5a3b0f2b083d14d3c5ce800bb6402603216 SHA512 04ae753f25371c0ce08af2cac5abd19797ec70860714e6891900a45baab0fb24d0f7c3163a5d2f5e419f1c1a8b092c164b7230b8d0c8cc4c3f53bbd0269e419b
 DIST shorewall-init-5.2.5.1.tar.bz2 39639 BLAKE2B 8c815c7ebb78c0a85cb2aac9b36e6a232c01f5ecb1fb17dd4d6b76c08746861e4e599213e553f7e2894093dc9722d61120f6f0179eda4b38fa93df4989589934 SHA512 d502b7262587b6546071083bb535f97606316c8ce592b01fe875d90b141833c9488750f864233614237b1e9412206c104f54052d7e20ff2067be8eb78acdb72b
-DIST shorewall-init-5.2.5.tar.bz2 39405 BLAKE2B 8259b4618c3b75201e245fd414da7890a80d31535eea71358f9ed3bc9b44ad0e341c3b795f624ac8cb05e2345fac82a8831ad877abe6a9ef13a8c7889bfdcb7e SHA512 61f31287472770fe02a099bddd7a6a5fa42fb676462cb7b16975fb15c6a70fe1fbb40d4c1b714f9e8a1a4bdc0ef3d7542552b1dd780833be781dda1e8dba9879
 DIST shorewall-lite-5.2.5.1.tar.bz2 44367 BLAKE2B 2b6f013fd13e895ac104e277eaf8abedec6a2a3f57a50becb2bce752fd0f9c679110d84634aa82a22bbc9ae2ce2ab9f9dc06a1220cb0f6949cc5da2d59524137 SHA512 6bcd0dfeddaf2bc513610cbecbe16574f2ed65958e8455d83f99486b286bd98ae9fba539b90c2a308d62b7a0eb8526e7af8ef3d0190f3e5ffcb660b3cdd3c769
-DIST shorewall-lite-5.2.5.tar.bz2 44120 BLAKE2B 47154b9f7203f5bff279c2e936dd0fe108bcb44bc9dd43abb49dc0c129a54ea381fff71b1dc3ac55e026b4065d8d5ab48edb1dcf52845e5e5f88492a958f4451 SHA512 41e6de25b2b10452bd15c465df5ffaf21019059f511197a6d398af086bba55f80b21b6644747fb2c228414a1e8af381ef5c4174b8e4defc72389664e971a85d3
 DIST shorewall6-5.2.5.1.tar.bz2 201672 BLAKE2B 9759de6ddf0025175293f04b62ad7aa9c2a9a18d7d1e713fdcc9f859cbb1585207e8822988b91868d706698950cede5e03bc17c44a1983655fc809d330d3fb37 SHA512 c1168a609373b27db194a8eea2a934b7302fd4e3caa583d7527530426968ae5fc81510f2943a1ba1bb14c6edf7f50081841227f5aec337f5faaa54ff83f99b66
-DIST shorewall6-5.2.5.tar.bz2 201419 BLAKE2B efb1a81ee1bcee982d7cfd1bb5ee9cbae5e59e3ce47895d25332f71c1d79d2bb2421c6fca0645fe9d2d493648caab2b9c233d36fb9210e3fd6f667b89ff66671 SHA512 2b3656490209872c696966129bf4a411d050f561fd82645f494c503013a755854833cdbedfd6bdb971abb974988d11b1c4e29e62d431a4d67bba74822f579692
 DIST shorewall6-lite-5.2.5.1.tar.bz2 44252 BLAKE2B 5550703689ff513283ff0656b9f845741f454df4c49e54481316a5bfca5d630b02b45f67bf689ee417b8d411824b71beffde98f6aa2977d4ae6493c0eda2225c SHA512 e5696658195c6d4f4c0953af215fe35bbbcf76532fe572b2613f490716417b042755231db80885293514f21f1b29f8c44c0497df9a7ba7b2ad16431ea7cbe7d2
-DIST shorewall6-lite-5.2.5.tar.bz2 44064 BLAKE2B e4667d1f1c932980d7bea03059b0aae8f83f0f3557f4245cec21aafaae72a942d47a8a355d3581cc459f85a80c10cb16af1c6e08971be2d120644098543bb3af SHA512 0c61c489f79aa51178aa733e1e738a2921c598e9403884322ccbc90461be4ee18dd0225d758371f1c750cfc832ca63652bbd8cac831e2ea026d63b72202c6f2a

diff --git a/net-firewall/shorewall/shorewall-5.2.5.ebuild b/net-firewall/shorewall/shorewall-5.2.5.ebuild
deleted file mode 100644
index c6f9c3e5bed..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.5.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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-06-29 14:59 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-06-29 14:59 UTC (permalink / raw
  To: gentoo-commits

commit:     c624c8f5ac6ce02a11e387203c38aaa6ac929581
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 14:59:44 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 14:59:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c624c8f5

net-firewall/shorewall: bump to v5.2.5.2

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.5.2.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 5931599e3d8..27379e5ff7c 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.5.1.tar.bz2 582482 BLAKE2B 6ee3c5a6dc80e9b42ced41eaab36c9ee4fc9f2c6853a17a7dc85f162a8abfdfed2ccd3cec73e1101ea9aa6ce9b773aa76be5c00310dd73b130121b0de73ba77a SHA512 9313bf2effe4572d8898df5d55c461bddbc5d54bec5679af31c02cc494ecff06824d1d46d604078184bdabd7c08be07f30bf81bef2c8d19f03aac99b3525bf6f
+DIST shorewall-5.2.5.2.tar.bz2 582902 BLAKE2B 7065133a2995de061912974270a0eabce904dd6950db3086a6381eea4ee86c8da54e948e50e50ff3f26d99403c6626b826bf09d7866c5cd832b3949b3445c304 SHA512 81e2ca66a86a857919e4b9502fde95630ca4109f8c67bbeb97b3a9a66cef734250f472a7b6503c25408ae7e71e96479af6911a75038135a9d5099db1b782ffa4
 DIST shorewall-core-5.2.5.1.tar.bz2 74648 BLAKE2B f00f2a4302361e557fbfae2fe6bfd5e82d47751a86c1ac6ebf729ead6fbe08386f570dde5ef18917ccd48d8a9a97ec467dde34fda93cde5e3d8e15977bdcfbb1 SHA512 3f1f85f388b17f6fa02fe54bbb28bf7bd36b97b14557891644caffcea11eb167a0df91964525b706f2b5eee9d8f325471f5038f6636308e4c99e8818928fdc75
+DIST shorewall-core-5.2.5.2.tar.bz2 74903 BLAKE2B 12fb7f3912a315eb18c17d74d60edaf764c62a80e568bc4ddd25f6dbb3cb7b7dae1694897d11bce6d2c848c4aa71843003d0880998a7686944752748b9b59707 SHA512 78941ddbf73dd26be12383bf95c43a520bfcbfbeb88bb5fce04eacf223038edb39405c7a0d37a2cfc4eeb60bb9516903220c82a0fdf4ba4501ffd5c8a6201a06
 DIST shorewall-docs-html-5.2.5.1.tar.bz2 4310025 BLAKE2B 4ab4907eade322ec3e9e78d4c1c3c51a86f31fd8f4497d01ba0cfdeddf0294f240307f0d228b923b99d9b0f1b7444046a60a36569c04ef8d9f88043277c89bdc SHA512 a24f6dabed9a7ae9622c9a1f5be323a6c4cb7a8a5a671be3f0bb12d8d0b20ee11c8c11b3f1e8aac49a04a50f2bac6f137524b0e6edf9483a67b1eb44b3997094
+DIST shorewall-docs-html-5.2.5.2.tar.bz2 4310164 BLAKE2B e02def5b187e66aa55125123d6e532e9f4c8bd442b590b5cf6aba41bb6da96146dbda41743341682a07d425ca46fe2ee4b6f6334b47c4ee5a75781ffb8788478 SHA512 78b35e58ad1517477c5210d2df230279f9bf6b3f6a904ee2fd3f7b354dcdb0d0f685d28868a0a9f7b0b78b8f8f4e00aa171e1f181b45836f7c45876270d0c09c
 DIST shorewall-init-5.2.5.1.tar.bz2 39639 BLAKE2B 8c815c7ebb78c0a85cb2aac9b36e6a232c01f5ecb1fb17dd4d6b76c08746861e4e599213e553f7e2894093dc9722d61120f6f0179eda4b38fa93df4989589934 SHA512 d502b7262587b6546071083bb535f97606316c8ce592b01fe875d90b141833c9488750f864233614237b1e9412206c104f54052d7e20ff2067be8eb78acdb72b
+DIST shorewall-init-5.2.5.2.tar.bz2 39779 BLAKE2B b8857e93120bf435419744a277bafdec5b4652ed8009aa915c170b5a1bf385b9b1d8fbc2a884791940304b76316c0e43ee38c2cf4fb2c2c80feca11ecf55426a SHA512 7363752b363d3fc94f51524a730c94dffadad65be39bb258e0b50ff11a880cae25e99975e8abc85394616afa09c29213578861d6723d70f7c87a80b57cabe14b
 DIST shorewall-lite-5.2.5.1.tar.bz2 44367 BLAKE2B 2b6f013fd13e895ac104e277eaf8abedec6a2a3f57a50becb2bce752fd0f9c679110d84634aa82a22bbc9ae2ce2ab9f9dc06a1220cb0f6949cc5da2d59524137 SHA512 6bcd0dfeddaf2bc513610cbecbe16574f2ed65958e8455d83f99486b286bd98ae9fba539b90c2a308d62b7a0eb8526e7af8ef3d0190f3e5ffcb660b3cdd3c769
+DIST shorewall-lite-5.2.5.2.tar.bz2 44483 BLAKE2B 7c6c8a96efa1591738f5eea027ddc2614a03c77cd0f7500e9ba3e40402afabc77a0814834c05e2a9943bc8f72a9b6115cf20fd02b04376d52e6ef644d90fbef8 SHA512 6a9a78085665911e1a88f7befcc1b667e4c60c5f0139b6d489fa78612cb17637806dcbfd141b15a83e7ea87ff69eb0af0a833cba8c7934993e101061b6cb8ca9
 DIST shorewall6-5.2.5.1.tar.bz2 201672 BLAKE2B 9759de6ddf0025175293f04b62ad7aa9c2a9a18d7d1e713fdcc9f859cbb1585207e8822988b91868d706698950cede5e03bc17c44a1983655fc809d330d3fb37 SHA512 c1168a609373b27db194a8eea2a934b7302fd4e3caa583d7527530426968ae5fc81510f2943a1ba1bb14c6edf7f50081841227f5aec337f5faaa54ff83f99b66
+DIST shorewall6-5.2.5.2.tar.bz2 202054 BLAKE2B ef7c5f7230ecb3f1961285a15c73ee08fcb4a79e1f55c62862e84fad1be711146b0ee9be1f7a41e5646817a080f654d3f1c2ee55ffa4a055c22ba14ad8f42211 SHA512 f54410bc2f299327a16f66039575c6c3a42fdbc0f2c51b881012f07a122228ee13029380c2f401d0873fae3dc51173cc759e6680353356e60c95c18cf87490fc
 DIST shorewall6-lite-5.2.5.1.tar.bz2 44252 BLAKE2B 5550703689ff513283ff0656b9f845741f454df4c49e54481316a5bfca5d630b02b45f67bf689ee417b8d411824b71beffde98f6aa2977d4ae6493c0eda2225c SHA512 e5696658195c6d4f4c0953af215fe35bbbcf76532fe572b2613f490716417b042755231db80885293514f21f1b29f8c44c0497df9a7ba7b2ad16431ea7cbe7d2
+DIST shorewall6-lite-5.2.5.2.tar.bz2 44447 BLAKE2B f216cbad432e589c7bfb0b68396c7a0ff8a711dc273910c0657b343202be08910b5d176c769f7fd0da22c4bcaabdb008f73ef9baa4681247fb8c9e0d0932bfe4 SHA512 ab00c53086cca681112603ad73fd8393e4b0b29e6997d6c85fe736481b05305f94af58a6dca31c715d064fc6daf6743b2a13abd7f78ea629158ec142062fb7e5

diff --git a/net-firewall/shorewall/shorewall-5.2.5.2.ebuild b/net-firewall/shorewall/shorewall-5.2.5.2.ebuild
new file mode 100644
index 00000000000..95a3c0906ea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.5.2.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
+	!<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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-07-05 19:12 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-07-05 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     4df32d3b2766842c185ce7e338e7543d0a4e6a86
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 19:10:07 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 19:12:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df32d3b

net-firewall/shorewall: drop old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.2.5.1.ebuild | 482 ------------------------
 2 files changed, 489 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 27379e5ff7c..3e08e20ae79 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-DIST shorewall-5.2.5.1.tar.bz2 582482 BLAKE2B 6ee3c5a6dc80e9b42ced41eaab36c9ee4fc9f2c6853a17a7dc85f162a8abfdfed2ccd3cec73e1101ea9aa6ce9b773aa76be5c00310dd73b130121b0de73ba77a SHA512 9313bf2effe4572d8898df5d55c461bddbc5d54bec5679af31c02cc494ecff06824d1d46d604078184bdabd7c08be07f30bf81bef2c8d19f03aac99b3525bf6f
 DIST shorewall-5.2.5.2.tar.bz2 582902 BLAKE2B 7065133a2995de061912974270a0eabce904dd6950db3086a6381eea4ee86c8da54e948e50e50ff3f26d99403c6626b826bf09d7866c5cd832b3949b3445c304 SHA512 81e2ca66a86a857919e4b9502fde95630ca4109f8c67bbeb97b3a9a66cef734250f472a7b6503c25408ae7e71e96479af6911a75038135a9d5099db1b782ffa4
-DIST shorewall-core-5.2.5.1.tar.bz2 74648 BLAKE2B f00f2a4302361e557fbfae2fe6bfd5e82d47751a86c1ac6ebf729ead6fbe08386f570dde5ef18917ccd48d8a9a97ec467dde34fda93cde5e3d8e15977bdcfbb1 SHA512 3f1f85f388b17f6fa02fe54bbb28bf7bd36b97b14557891644caffcea11eb167a0df91964525b706f2b5eee9d8f325471f5038f6636308e4c99e8818928fdc75
 DIST shorewall-core-5.2.5.2.tar.bz2 74903 BLAKE2B 12fb7f3912a315eb18c17d74d60edaf764c62a80e568bc4ddd25f6dbb3cb7b7dae1694897d11bce6d2c848c4aa71843003d0880998a7686944752748b9b59707 SHA512 78941ddbf73dd26be12383bf95c43a520bfcbfbeb88bb5fce04eacf223038edb39405c7a0d37a2cfc4eeb60bb9516903220c82a0fdf4ba4501ffd5c8a6201a06
-DIST shorewall-docs-html-5.2.5.1.tar.bz2 4310025 BLAKE2B 4ab4907eade322ec3e9e78d4c1c3c51a86f31fd8f4497d01ba0cfdeddf0294f240307f0d228b923b99d9b0f1b7444046a60a36569c04ef8d9f88043277c89bdc SHA512 a24f6dabed9a7ae9622c9a1f5be323a6c4cb7a8a5a671be3f0bb12d8d0b20ee11c8c11b3f1e8aac49a04a50f2bac6f137524b0e6edf9483a67b1eb44b3997094
 DIST shorewall-docs-html-5.2.5.2.tar.bz2 4310164 BLAKE2B e02def5b187e66aa55125123d6e532e9f4c8bd442b590b5cf6aba41bb6da96146dbda41743341682a07d425ca46fe2ee4b6f6334b47c4ee5a75781ffb8788478 SHA512 78b35e58ad1517477c5210d2df230279f9bf6b3f6a904ee2fd3f7b354dcdb0d0f685d28868a0a9f7b0b78b8f8f4e00aa171e1f181b45836f7c45876270d0c09c
-DIST shorewall-init-5.2.5.1.tar.bz2 39639 BLAKE2B 8c815c7ebb78c0a85cb2aac9b36e6a232c01f5ecb1fb17dd4d6b76c08746861e4e599213e553f7e2894093dc9722d61120f6f0179eda4b38fa93df4989589934 SHA512 d502b7262587b6546071083bb535f97606316c8ce592b01fe875d90b141833c9488750f864233614237b1e9412206c104f54052d7e20ff2067be8eb78acdb72b
 DIST shorewall-init-5.2.5.2.tar.bz2 39779 BLAKE2B b8857e93120bf435419744a277bafdec5b4652ed8009aa915c170b5a1bf385b9b1d8fbc2a884791940304b76316c0e43ee38c2cf4fb2c2c80feca11ecf55426a SHA512 7363752b363d3fc94f51524a730c94dffadad65be39bb258e0b50ff11a880cae25e99975e8abc85394616afa09c29213578861d6723d70f7c87a80b57cabe14b
-DIST shorewall-lite-5.2.5.1.tar.bz2 44367 BLAKE2B 2b6f013fd13e895ac104e277eaf8abedec6a2a3f57a50becb2bce752fd0f9c679110d84634aa82a22bbc9ae2ce2ab9f9dc06a1220cb0f6949cc5da2d59524137 SHA512 6bcd0dfeddaf2bc513610cbecbe16574f2ed65958e8455d83f99486b286bd98ae9fba539b90c2a308d62b7a0eb8526e7af8ef3d0190f3e5ffcb660b3cdd3c769
 DIST shorewall-lite-5.2.5.2.tar.bz2 44483 BLAKE2B 7c6c8a96efa1591738f5eea027ddc2614a03c77cd0f7500e9ba3e40402afabc77a0814834c05e2a9943bc8f72a9b6115cf20fd02b04376d52e6ef644d90fbef8 SHA512 6a9a78085665911e1a88f7befcc1b667e4c60c5f0139b6d489fa78612cb17637806dcbfd141b15a83e7ea87ff69eb0af0a833cba8c7934993e101061b6cb8ca9
-DIST shorewall6-5.2.5.1.tar.bz2 201672 BLAKE2B 9759de6ddf0025175293f04b62ad7aa9c2a9a18d7d1e713fdcc9f859cbb1585207e8822988b91868d706698950cede5e03bc17c44a1983655fc809d330d3fb37 SHA512 c1168a609373b27db194a8eea2a934b7302fd4e3caa583d7527530426968ae5fc81510f2943a1ba1bb14c6edf7f50081841227f5aec337f5faaa54ff83f99b66
 DIST shorewall6-5.2.5.2.tar.bz2 202054 BLAKE2B ef7c5f7230ecb3f1961285a15c73ee08fcb4a79e1f55c62862e84fad1be711146b0ee9be1f7a41e5646817a080f654d3f1c2ee55ffa4a055c22ba14ad8f42211 SHA512 f54410bc2f299327a16f66039575c6c3a42fdbc0f2c51b881012f07a122228ee13029380c2f401d0873fae3dc51173cc759e6680353356e60c95c18cf87490fc
-DIST shorewall6-lite-5.2.5.1.tar.bz2 44252 BLAKE2B 5550703689ff513283ff0656b9f845741f454df4c49e54481316a5bfca5d630b02b45f67bf689ee417b8d411824b71beffde98f6aa2977d4ae6493c0eda2225c SHA512 e5696658195c6d4f4c0953af215fe35bbbcf76532fe572b2613f490716417b042755231db80885293514f21f1b29f8c44c0497df9a7ba7b2ad16431ea7cbe7d2
 DIST shorewall6-lite-5.2.5.2.tar.bz2 44447 BLAKE2B f216cbad432e589c7bfb0b68396c7a0ff8a711dc273910c0657b343202be08910b5d176c769f7fd0da22c4bcaabdb008f73ef9baa4681247fb8c9e0d0932bfe4 SHA512 ab00c53086cca681112603ad73fd8393e4b0b29e6997d6c85fe736481b05305f94af58a6dca31c715d064fc6daf6743b2a13abd7f78ea629158ec142062fb7e5

diff --git a/net-firewall/shorewall/shorewall-5.2.5.1.ebuild b/net-firewall/shorewall/shorewall-5.2.5.1.ebuild
deleted file mode 100644
index c6f9c3e5bed..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.5.1.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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-07-05 19:12 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-07-05 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     b241e9887936138fdebd7b154a608b9bc529f1fd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 19:09:45 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 19:12:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b241e988

net-firewall/shorewall: rollover keywords

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.5.2.ebuild b/net-firewall/shorewall/shorewall-5.2.5.2.ebuild
index 95a3c0906ea..c6f9c3e5bed 100644
--- a/net-firewall/shorewall/shorewall-5.2.5.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.5.2.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-07-08 12:49 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-07-08 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     8846560953a10ad489b8edd804dbeafe33c5b64b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  8 11:53:41 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jul  8 12:49:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88465609

net-firewall/shorewall: bump to v5.2.6

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.2.6.ebuild | 482 ++++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 3e08e20ae79..899f62859e4 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 DIST shorewall-5.2.5.2.tar.bz2 582902 BLAKE2B 7065133a2995de061912974270a0eabce904dd6950db3086a6381eea4ee86c8da54e948e50e50ff3f26d99403c6626b826bf09d7866c5cd832b3949b3445c304 SHA512 81e2ca66a86a857919e4b9502fde95630ca4109f8c67bbeb97b3a9a66cef734250f472a7b6503c25408ae7e71e96479af6911a75038135a9d5099db1b782ffa4
+DIST shorewall-5.2.6.tar.bz2 584293 BLAKE2B 2efd724fe06da93e31e9c7f146f4cb860118765a9decbbde8ca4b54832fa97f0152eeee3e4d82c171ae6bf11c4541404935bba5597b293b454bb8dceb976b977 SHA512 fe769c3ee8b3800bd7a55e2296e7ddeef2682653352e7b06bf3fe26238a8791eb1bdb93c96dde8a06fa4485149679429135d9bc838e7a94c3cf4b07530590a36
 DIST shorewall-core-5.2.5.2.tar.bz2 74903 BLAKE2B 12fb7f3912a315eb18c17d74d60edaf764c62a80e568bc4ddd25f6dbb3cb7b7dae1694897d11bce6d2c848c4aa71843003d0880998a7686944752748b9b59707 SHA512 78941ddbf73dd26be12383bf95c43a520bfcbfbeb88bb5fce04eacf223038edb39405c7a0d37a2cfc4eeb60bb9516903220c82a0fdf4ba4501ffd5c8a6201a06
+DIST shorewall-core-5.2.6.tar.bz2 75731 BLAKE2B aef68badb12dcb3c7e7a30b2aae7b0e2dda02c1449fbe71eec7cf513889653d8f026f29f62be39d45c6db61abbadc97c3e24fd8d211cc2773d915c4740e6fa27 SHA512 63448cbd6e7b6444ab11d0dc412469237818717f3e6847c8857c1bf4bc9079b1abfd5cf33d30826252bb990abf611d3a14427dd3e228ea1f97919de6ee10a36e
 DIST shorewall-docs-html-5.2.5.2.tar.bz2 4310164 BLAKE2B e02def5b187e66aa55125123d6e532e9f4c8bd442b590b5cf6aba41bb6da96146dbda41743341682a07d425ca46fe2ee4b6f6334b47c4ee5a75781ffb8788478 SHA512 78b35e58ad1517477c5210d2df230279f9bf6b3f6a904ee2fd3f7b354dcdb0d0f685d28868a0a9f7b0b78b8f8f4e00aa171e1f181b45836f7c45876270d0c09c
+DIST shorewall-docs-html-5.2.6.tar.bz2 4310351 BLAKE2B 6ad3e461657d78c937c80968a5a3404359c6a86b16b2965997f2a37a8d0883b83b285cbb9bb824993d174203e31ccbd0aca811c9948649a438aedbc192bbf038 SHA512 123c84033fc0f470250be7f3cba19d371b658c8e9ec39f382827e5cb6218b3b5c0a730cddec13a3fd41dd3bb0ff94da24543452f59ce3119b2e161c1d9ed4151
 DIST shorewall-init-5.2.5.2.tar.bz2 39779 BLAKE2B b8857e93120bf435419744a277bafdec5b4652ed8009aa915c170b5a1bf385b9b1d8fbc2a884791940304b76316c0e43ee38c2cf4fb2c2c80feca11ecf55426a SHA512 7363752b363d3fc94f51524a730c94dffadad65be39bb258e0b50ff11a880cae25e99975e8abc85394616afa09c29213578861d6723d70f7c87a80b57cabe14b
+DIST shorewall-init-5.2.6.tar.bz2 40640 BLAKE2B 746d72ba6c4d8fae116cef5180286f19f2ace7baa84a027a5f29305cd5a18323dcae316651fd066b71fe6bc9636c016856820215f306e0db1388394bfd15812c SHA512 e5e4e3f2ed24789c0483c93437b6cd41cabd8d3a7940f0c3f7d0b57c52b8a1fac43e073b09d18f5263f00dcd72912778c3230db93136c5cffd67cdbf63e57647
 DIST shorewall-lite-5.2.5.2.tar.bz2 44483 BLAKE2B 7c6c8a96efa1591738f5eea027ddc2614a03c77cd0f7500e9ba3e40402afabc77a0814834c05e2a9943bc8f72a9b6115cf20fd02b04376d52e6ef644d90fbef8 SHA512 6a9a78085665911e1a88f7befcc1b667e4c60c5f0139b6d489fa78612cb17637806dcbfd141b15a83e7ea87ff69eb0af0a833cba8c7934993e101061b6cb8ca9
+DIST shorewall-lite-5.2.6.tar.bz2 45245 BLAKE2B 6b5b16b41ed8eaf3cfe4eeaa831e5a320b57579c072d5d64c051bf099c7e519bd7e8f659b483843e866ae39301284a13a45a257d284aac46bc921dea0bd043d5 SHA512 9c1f3c5729afa5bef6329b797530e2f428992eb235aec7213685b6568af81c5ff93e53182b5d5ef90ec3ba2c8ff8470c9a47b3f1988c90ef1ba125594a6d04c4
 DIST shorewall6-5.2.5.2.tar.bz2 202054 BLAKE2B ef7c5f7230ecb3f1961285a15c73ee08fcb4a79e1f55c62862e84fad1be711146b0ee9be1f7a41e5646817a080f654d3f1c2ee55ffa4a055c22ba14ad8f42211 SHA512 f54410bc2f299327a16f66039575c6c3a42fdbc0f2c51b881012f07a122228ee13029380c2f401d0873fae3dc51173cc759e6680353356e60c95c18cf87490fc
+DIST shorewall6-5.2.6.tar.bz2 202933 BLAKE2B 66cd897e6ae12a5efa5f857020a00f9455123bc767551072b9d6a7f48442c72bdb0bc7c323a9238a8adbf67f9360d14cf777036ba634e809c6103b3a0f1e7ced SHA512 0b64a0d709c8a621b9983b50dfb64d0374c545e59a08b46997be3249826c802b38e06be0248ee7d4ca1c2c207c21640a7152bec2df46f97ab301676237c48063
 DIST shorewall6-lite-5.2.5.2.tar.bz2 44447 BLAKE2B f216cbad432e589c7bfb0b68396c7a0ff8a711dc273910c0657b343202be08910b5d176c769f7fd0da22c4bcaabdb008f73ef9baa4681247fb8c9e0d0932bfe4 SHA512 ab00c53086cca681112603ad73fd8393e4b0b29e6997d6c85fe736481b05305f94af58a6dca31c715d064fc6daf6743b2a13abd7f78ea629158ec142062fb7e5
+DIST shorewall6-lite-5.2.6.tar.bz2 45249 BLAKE2B 0498ae556d2b7f475f40fa0013df3ecea5ca5928b4df582419d2252f6f3e6500657731c687fced47584b3857c138a66eb0d8d90e552a3baf71411bc58510ad70 SHA512 7590765ae943567bc7b18dc18aedcc81ea5737f4a7992f33abdd6cf95dd893c6e2666a2d24e6692b6f531b0e62e5dadd98969b2344dcbf75ba26c650f345b823

diff --git a/net-firewall/shorewall/shorewall-5.2.6.ebuild b/net-firewall/shorewall/shorewall-5.2.6.ebuild
new file mode 100644
index 00000000000..95a3c0906ea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.6.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
+	!<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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-07-26 18:30 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-07-26 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     573aeadf443eb2a23e37d1455ccc8af7aa8d8c43
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 18:27:25 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 18:30:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=573aeadf

net-firewall/shorewall: drop old

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.2.5.2.ebuild | 482 ------------------------
 2 files changed, 489 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 441c9da06ad..650ef17bfa0 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,14 @@
-DIST shorewall-5.2.5.2.tar.bz2 582902 BLAKE2B 7065133a2995de061912974270a0eabce904dd6950db3086a6381eea4ee86c8da54e948e50e50ff3f26d99403c6626b826bf09d7866c5cd832b3949b3445c304 SHA512 81e2ca66a86a857919e4b9502fde95630ca4109f8c67bbeb97b3a9a66cef734250f472a7b6503c25408ae7e71e96479af6911a75038135a9d5099db1b782ffa4
 DIST shorewall-5.2.6.1.tar.bz2 552329 BLAKE2B c4bfd10dd3c4c236761acde39bf9108c8c4d02b1304fc10432600506fefb5aed16c61bd9abc04308f4b5af1db8fea60a9e7cf663b110541bf7040f48d2194ecf SHA512 a9df0d53899e3b5d4590b6690c298ff99be3d0dd8d7a1147b0ed15b45c81c6533087f2edb2b5c670e63f3a171081d9a404b55b08506e61386a77c290c7ff4303
 DIST shorewall-5.2.6.tar.bz2 584293 BLAKE2B 2efd724fe06da93e31e9c7f146f4cb860118765a9decbbde8ca4b54832fa97f0152eeee3e4d82c171ae6bf11c4541404935bba5597b293b454bb8dceb976b977 SHA512 fe769c3ee8b3800bd7a55e2296e7ddeef2682653352e7b06bf3fe26238a8791eb1bdb93c96dde8a06fa4485149679429135d9bc838e7a94c3cf4b07530590a36
-DIST shorewall-core-5.2.5.2.tar.bz2 74903 BLAKE2B 12fb7f3912a315eb18c17d74d60edaf764c62a80e568bc4ddd25f6dbb3cb7b7dae1694897d11bce6d2c848c4aa71843003d0880998a7686944752748b9b59707 SHA512 78941ddbf73dd26be12383bf95c43a520bfcbfbeb88bb5fce04eacf223038edb39405c7a0d37a2cfc4eeb60bb9516903220c82a0fdf4ba4501ffd5c8a6201a06
 DIST shorewall-core-5.2.6.1.tar.bz2 76036 BLAKE2B ab223fa97b11f06c9ab112a828b7eda86e355b706cac7e50e6e403157c8a0eea4ded0e5a4dada431b5bb7b76a6cb1e13d438a8b90ab10fd4d525a389d030410c SHA512 4676ecd743f814dd87c097f2533c69fa333651cf6144a31ac8f7da360dee392c1ae8843b948868a63d58cc7b267e0ecb1fedf7b7ed88cdaa86b6066b73bedd8b
 DIST shorewall-core-5.2.6.tar.bz2 75731 BLAKE2B aef68badb12dcb3c7e7a30b2aae7b0e2dda02c1449fbe71eec7cf513889653d8f026f29f62be39d45c6db61abbadc97c3e24fd8d211cc2773d915c4740e6fa27 SHA512 63448cbd6e7b6444ab11d0dc412469237818717f3e6847c8857c1bf4bc9079b1abfd5cf33d30826252bb990abf611d3a14427dd3e228ea1f97919de6ee10a36e
-DIST shorewall-docs-html-5.2.5.2.tar.bz2 4310164 BLAKE2B e02def5b187e66aa55125123d6e532e9f4c8bd442b590b5cf6aba41bb6da96146dbda41743341682a07d425ca46fe2ee4b6f6334b47c4ee5a75781ffb8788478 SHA512 78b35e58ad1517477c5210d2df230279f9bf6b3f6a904ee2fd3f7b354dcdb0d0f685d28868a0a9f7b0b78b8f8f4e00aa171e1f181b45836f7c45876270d0c09c
 DIST shorewall-docs-html-5.2.6.1.tar.bz2 4328494 BLAKE2B 9640a9ca63c9797f5318cf62ffd5c36c1e3c683c0b58ae99eb692a9eaaec4474a98d08c299a63fea09c779aaecbf189e9f93aa4a84c314bf62bae6830ee22dfa SHA512 374716993c25884a0aef2e1d6b261dab9dd64be5afb681489c3b40b4de05dd1dab93e0f34c1a74df7faffe27793d24d277865ad6a72b6c54f223ee1bce9b5a65
 DIST shorewall-docs-html-5.2.6.tar.bz2 4310351 BLAKE2B 6ad3e461657d78c937c80968a5a3404359c6a86b16b2965997f2a37a8d0883b83b285cbb9bb824993d174203e31ccbd0aca811c9948649a438aedbc192bbf038 SHA512 123c84033fc0f470250be7f3cba19d371b658c8e9ec39f382827e5cb6218b3b5c0a730cddec13a3fd41dd3bb0ff94da24543452f59ce3119b2e161c1d9ed4151
-DIST shorewall-init-5.2.5.2.tar.bz2 39779 BLAKE2B b8857e93120bf435419744a277bafdec5b4652ed8009aa915c170b5a1bf385b9b1d8fbc2a884791940304b76316c0e43ee38c2cf4fb2c2c80feca11ecf55426a SHA512 7363752b363d3fc94f51524a730c94dffadad65be39bb258e0b50ff11a880cae25e99975e8abc85394616afa09c29213578861d6723d70f7c87a80b57cabe14b
 DIST shorewall-init-5.2.6.1.tar.bz2 41005 BLAKE2B e625569376c303fc5baab6e786ae5c13892c3b498421a369550de0e56a9207b5cf1d6838f7fdf9a0a344d6a1c62d102e4abc6414baec3bc96ad92f9399c74695 SHA512 9cf993217f40a3a948a58db1aca4dd76916e08e1dd0c4b2d23e1e416b24a7be53ef40e6358070b8c05a0b8bc44a0dacbf8b381c7fc2921ceed7df193c11e7578
 DIST shorewall-init-5.2.6.tar.bz2 40640 BLAKE2B 746d72ba6c4d8fae116cef5180286f19f2ace7baa84a027a5f29305cd5a18323dcae316651fd066b71fe6bc9636c016856820215f306e0db1388394bfd15812c SHA512 e5e4e3f2ed24789c0483c93437b6cd41cabd8d3a7940f0c3f7d0b57c52b8a1fac43e073b09d18f5263f00dcd72912778c3230db93136c5cffd67cdbf63e57647
-DIST shorewall-lite-5.2.5.2.tar.bz2 44483 BLAKE2B 7c6c8a96efa1591738f5eea027ddc2614a03c77cd0f7500e9ba3e40402afabc77a0814834c05e2a9943bc8f72a9b6115cf20fd02b04376d52e6ef644d90fbef8 SHA512 6a9a78085665911e1a88f7befcc1b667e4c60c5f0139b6d489fa78612cb17637806dcbfd141b15a83e7ea87ff69eb0af0a833cba8c7934993e101061b6cb8ca9
 DIST shorewall-lite-5.2.6.1.tar.bz2 45611 BLAKE2B f1da73d50b2ce4da8d3123f1cd2ebf4a76fc98613a8149aaf8a32ecca0358bd70d57438de30fda2559845975c9e95d35239f43341a45b210ae903ee176af700b SHA512 51f4354969e98dc3c6173d19d07d73b66d219a9e1cbbb5a2fcf5dcfbe0ecf421260b46c815cc7af6e3104b737082fdb0c48345af2228739c0bf880ad1179f5f6
 DIST shorewall-lite-5.2.6.tar.bz2 45245 BLAKE2B 6b5b16b41ed8eaf3cfe4eeaa831e5a320b57579c072d5d64c051bf099c7e519bd7e8f659b483843e866ae39301284a13a45a257d284aac46bc921dea0bd043d5 SHA512 9c1f3c5729afa5bef6329b797530e2f428992eb235aec7213685b6568af81c5ff93e53182b5d5ef90ec3ba2c8ff8470c9a47b3f1988c90ef1ba125594a6d04c4
-DIST shorewall6-5.2.5.2.tar.bz2 202054 BLAKE2B ef7c5f7230ecb3f1961285a15c73ee08fcb4a79e1f55c62862e84fad1be711146b0ee9be1f7a41e5646817a080f654d3f1c2ee55ffa4a055c22ba14ad8f42211 SHA512 f54410bc2f299327a16f66039575c6c3a42fdbc0f2c51b881012f07a122228ee13029380c2f401d0873fae3dc51173cc759e6680353356e60c95c18cf87490fc
 DIST shorewall6-5.2.6.1.tar.bz2 201076 BLAKE2B d41764a5a64bdc3cd86cdf80aaff89ad0bf9077267958d1c9de484f98a652ef42469964fb71b8841299b52e387605bfee1bca5df1ffc24ece9db5a999e09b09f SHA512 03444f976ba64c76eda866dbad6eaa61e766156fde6fcede31acc834ef9f6e45897538be54c99f62a0d6ae857f694921f7ee5d1f2f4209e37cff3f392554e8b0
 DIST shorewall6-5.2.6.tar.bz2 202933 BLAKE2B 66cd897e6ae12a5efa5f857020a00f9455123bc767551072b9d6a7f48442c72bdb0bc7c323a9238a8adbf67f9360d14cf777036ba634e809c6103b3a0f1e7ced SHA512 0b64a0d709c8a621b9983b50dfb64d0374c545e59a08b46997be3249826c802b38e06be0248ee7d4ca1c2c207c21640a7152bec2df46f97ab301676237c48063
-DIST shorewall6-lite-5.2.5.2.tar.bz2 44447 BLAKE2B f216cbad432e589c7bfb0b68396c7a0ff8a711dc273910c0657b343202be08910b5d176c769f7fd0da22c4bcaabdb008f73ef9baa4681247fb8c9e0d0932bfe4 SHA512 ab00c53086cca681112603ad73fd8393e4b0b29e6997d6c85fe736481b05305f94af58a6dca31c715d064fc6daf6743b2a13abd7f78ea629158ec142062fb7e5
 DIST shorewall6-lite-5.2.6.1.tar.bz2 45613 BLAKE2B 0c54e6d86d0831ddf3f38d96f32f6a76d57a646dabb9ec7e3d7fa1811d28aaf8dad308e98dadabb5696b228ce393889ec78ec7422d1148e96e3b435fef05d362 SHA512 bf2f4d15c5faf52c9fb1ed918ce3afeab6c1cc01e67758ca93ede3a507fa798a3751155f9145e672d987f2ed8f53f29fcc1f9590f6808c63d1c748a898365472
 DIST shorewall6-lite-5.2.6.tar.bz2 45249 BLAKE2B 0498ae556d2b7f475f40fa0013df3ecea5ca5928b4df582419d2252f6f3e6500657731c687fced47584b3857c138a66eb0d8d90e552a3baf71411bc58510ad70 SHA512 7590765ae943567bc7b18dc18aedcc81ea5737f4a7992f33abdd6cf95dd893c6e2666a2d24e6692b6f531b0e62e5dadd98969b2344dcbf75ba26c650f345b823

diff --git a/net-firewall/shorewall/shorewall-5.2.5.2.ebuild b/net-firewall/shorewall/shorewall-5.2.5.2.ebuild
deleted file mode 100644
index c6f9c3e5bed..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.5.2.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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-07-26 18:30 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-07-26 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     51051d0c4191ece65b3b1126556b9624b70f5813
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 18:25:49 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 18:30:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51051d0c

net-firewall/shorewall: bump to v5.2.6.1

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 +
 net-firewall/shorewall/shorewall-5.2.6.1.ebuild | 482 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 899f62859e4..441c9da06ad 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.2.5.2.tar.bz2 582902 BLAKE2B 7065133a2995de061912974270a0eabce904dd6950db3086a6381eea4ee86c8da54e948e50e50ff3f26d99403c6626b826bf09d7866c5cd832b3949b3445c304 SHA512 81e2ca66a86a857919e4b9502fde95630ca4109f8c67bbeb97b3a9a66cef734250f472a7b6503c25408ae7e71e96479af6911a75038135a9d5099db1b782ffa4
+DIST shorewall-5.2.6.1.tar.bz2 552329 BLAKE2B c4bfd10dd3c4c236761acde39bf9108c8c4d02b1304fc10432600506fefb5aed16c61bd9abc04308f4b5af1db8fea60a9e7cf663b110541bf7040f48d2194ecf SHA512 a9df0d53899e3b5d4590b6690c298ff99be3d0dd8d7a1147b0ed15b45c81c6533087f2edb2b5c670e63f3a171081d9a404b55b08506e61386a77c290c7ff4303
 DIST shorewall-5.2.6.tar.bz2 584293 BLAKE2B 2efd724fe06da93e31e9c7f146f4cb860118765a9decbbde8ca4b54832fa97f0152eeee3e4d82c171ae6bf11c4541404935bba5597b293b454bb8dceb976b977 SHA512 fe769c3ee8b3800bd7a55e2296e7ddeef2682653352e7b06bf3fe26238a8791eb1bdb93c96dde8a06fa4485149679429135d9bc838e7a94c3cf4b07530590a36
 DIST shorewall-core-5.2.5.2.tar.bz2 74903 BLAKE2B 12fb7f3912a315eb18c17d74d60edaf764c62a80e568bc4ddd25f6dbb3cb7b7dae1694897d11bce6d2c848c4aa71843003d0880998a7686944752748b9b59707 SHA512 78941ddbf73dd26be12383bf95c43a520bfcbfbeb88bb5fce04eacf223038edb39405c7a0d37a2cfc4eeb60bb9516903220c82a0fdf4ba4501ffd5c8a6201a06
+DIST shorewall-core-5.2.6.1.tar.bz2 76036 BLAKE2B ab223fa97b11f06c9ab112a828b7eda86e355b706cac7e50e6e403157c8a0eea4ded0e5a4dada431b5bb7b76a6cb1e13d438a8b90ab10fd4d525a389d030410c SHA512 4676ecd743f814dd87c097f2533c69fa333651cf6144a31ac8f7da360dee392c1ae8843b948868a63d58cc7b267e0ecb1fedf7b7ed88cdaa86b6066b73bedd8b
 DIST shorewall-core-5.2.6.tar.bz2 75731 BLAKE2B aef68badb12dcb3c7e7a30b2aae7b0e2dda02c1449fbe71eec7cf513889653d8f026f29f62be39d45c6db61abbadc97c3e24fd8d211cc2773d915c4740e6fa27 SHA512 63448cbd6e7b6444ab11d0dc412469237818717f3e6847c8857c1bf4bc9079b1abfd5cf33d30826252bb990abf611d3a14427dd3e228ea1f97919de6ee10a36e
 DIST shorewall-docs-html-5.2.5.2.tar.bz2 4310164 BLAKE2B e02def5b187e66aa55125123d6e532e9f4c8bd442b590b5cf6aba41bb6da96146dbda41743341682a07d425ca46fe2ee4b6f6334b47c4ee5a75781ffb8788478 SHA512 78b35e58ad1517477c5210d2df230279f9bf6b3f6a904ee2fd3f7b354dcdb0d0f685d28868a0a9f7b0b78b8f8f4e00aa171e1f181b45836f7c45876270d0c09c
+DIST shorewall-docs-html-5.2.6.1.tar.bz2 4328494 BLAKE2B 9640a9ca63c9797f5318cf62ffd5c36c1e3c683c0b58ae99eb692a9eaaec4474a98d08c299a63fea09c779aaecbf189e9f93aa4a84c314bf62bae6830ee22dfa SHA512 374716993c25884a0aef2e1d6b261dab9dd64be5afb681489c3b40b4de05dd1dab93e0f34c1a74df7faffe27793d24d277865ad6a72b6c54f223ee1bce9b5a65
 DIST shorewall-docs-html-5.2.6.tar.bz2 4310351 BLAKE2B 6ad3e461657d78c937c80968a5a3404359c6a86b16b2965997f2a37a8d0883b83b285cbb9bb824993d174203e31ccbd0aca811c9948649a438aedbc192bbf038 SHA512 123c84033fc0f470250be7f3cba19d371b658c8e9ec39f382827e5cb6218b3b5c0a730cddec13a3fd41dd3bb0ff94da24543452f59ce3119b2e161c1d9ed4151
 DIST shorewall-init-5.2.5.2.tar.bz2 39779 BLAKE2B b8857e93120bf435419744a277bafdec5b4652ed8009aa915c170b5a1bf385b9b1d8fbc2a884791940304b76316c0e43ee38c2cf4fb2c2c80feca11ecf55426a SHA512 7363752b363d3fc94f51524a730c94dffadad65be39bb258e0b50ff11a880cae25e99975e8abc85394616afa09c29213578861d6723d70f7c87a80b57cabe14b
+DIST shorewall-init-5.2.6.1.tar.bz2 41005 BLAKE2B e625569376c303fc5baab6e786ae5c13892c3b498421a369550de0e56a9207b5cf1d6838f7fdf9a0a344d6a1c62d102e4abc6414baec3bc96ad92f9399c74695 SHA512 9cf993217f40a3a948a58db1aca4dd76916e08e1dd0c4b2d23e1e416b24a7be53ef40e6358070b8c05a0b8bc44a0dacbf8b381c7fc2921ceed7df193c11e7578
 DIST shorewall-init-5.2.6.tar.bz2 40640 BLAKE2B 746d72ba6c4d8fae116cef5180286f19f2ace7baa84a027a5f29305cd5a18323dcae316651fd066b71fe6bc9636c016856820215f306e0db1388394bfd15812c SHA512 e5e4e3f2ed24789c0483c93437b6cd41cabd8d3a7940f0c3f7d0b57c52b8a1fac43e073b09d18f5263f00dcd72912778c3230db93136c5cffd67cdbf63e57647
 DIST shorewall-lite-5.2.5.2.tar.bz2 44483 BLAKE2B 7c6c8a96efa1591738f5eea027ddc2614a03c77cd0f7500e9ba3e40402afabc77a0814834c05e2a9943bc8f72a9b6115cf20fd02b04376d52e6ef644d90fbef8 SHA512 6a9a78085665911e1a88f7befcc1b667e4c60c5f0139b6d489fa78612cb17637806dcbfd141b15a83e7ea87ff69eb0af0a833cba8c7934993e101061b6cb8ca9
+DIST shorewall-lite-5.2.6.1.tar.bz2 45611 BLAKE2B f1da73d50b2ce4da8d3123f1cd2ebf4a76fc98613a8149aaf8a32ecca0358bd70d57438de30fda2559845975c9e95d35239f43341a45b210ae903ee176af700b SHA512 51f4354969e98dc3c6173d19d07d73b66d219a9e1cbbb5a2fcf5dcfbe0ecf421260b46c815cc7af6e3104b737082fdb0c48345af2228739c0bf880ad1179f5f6
 DIST shorewall-lite-5.2.6.tar.bz2 45245 BLAKE2B 6b5b16b41ed8eaf3cfe4eeaa831e5a320b57579c072d5d64c051bf099c7e519bd7e8f659b483843e866ae39301284a13a45a257d284aac46bc921dea0bd043d5 SHA512 9c1f3c5729afa5bef6329b797530e2f428992eb235aec7213685b6568af81c5ff93e53182b5d5ef90ec3ba2c8ff8470c9a47b3f1988c90ef1ba125594a6d04c4
 DIST shorewall6-5.2.5.2.tar.bz2 202054 BLAKE2B ef7c5f7230ecb3f1961285a15c73ee08fcb4a79e1f55c62862e84fad1be711146b0ee9be1f7a41e5646817a080f654d3f1c2ee55ffa4a055c22ba14ad8f42211 SHA512 f54410bc2f299327a16f66039575c6c3a42fdbc0f2c51b881012f07a122228ee13029380c2f401d0873fae3dc51173cc759e6680353356e60c95c18cf87490fc
+DIST shorewall6-5.2.6.1.tar.bz2 201076 BLAKE2B d41764a5a64bdc3cd86cdf80aaff89ad0bf9077267958d1c9de484f98a652ef42469964fb71b8841299b52e387605bfee1bca5df1ffc24ece9db5a999e09b09f SHA512 03444f976ba64c76eda866dbad6eaa61e766156fde6fcede31acc834ef9f6e45897538be54c99f62a0d6ae857f694921f7ee5d1f2f4209e37cff3f392554e8b0
 DIST shorewall6-5.2.6.tar.bz2 202933 BLAKE2B 66cd897e6ae12a5efa5f857020a00f9455123bc767551072b9d6a7f48442c72bdb0bc7c323a9238a8adbf67f9360d14cf777036ba634e809c6103b3a0f1e7ced SHA512 0b64a0d709c8a621b9983b50dfb64d0374c545e59a08b46997be3249826c802b38e06be0248ee7d4ca1c2c207c21640a7152bec2df46f97ab301676237c48063
 DIST shorewall6-lite-5.2.5.2.tar.bz2 44447 BLAKE2B f216cbad432e589c7bfb0b68396c7a0ff8a711dc273910c0657b343202be08910b5d176c769f7fd0da22c4bcaabdb008f73ef9baa4681247fb8c9e0d0932bfe4 SHA512 ab00c53086cca681112603ad73fd8393e4b0b29e6997d6c85fe736481b05305f94af58a6dca31c715d064fc6daf6743b2a13abd7f78ea629158ec142062fb7e5
+DIST shorewall6-lite-5.2.6.1.tar.bz2 45613 BLAKE2B 0c54e6d86d0831ddf3f38d96f32f6a76d57a646dabb9ec7e3d7fa1811d28aaf8dad308e98dadabb5696b228ce393889ec78ec7422d1148e96e3b435fef05d362 SHA512 bf2f4d15c5faf52c9fb1ed918ce3afeab6c1cc01e67758ca93ede3a507fa798a3751155f9145e672d987f2ed8f53f29fcc1f9590f6808c63d1c748a898365472
 DIST shorewall6-lite-5.2.6.tar.bz2 45249 BLAKE2B 0498ae556d2b7f475f40fa0013df3ecea5ca5928b4df582419d2252f6f3e6500657731c687fced47584b3857c138a66eb0d8d90e552a3baf71411bc58510ad70 SHA512 7590765ae943567bc7b18dc18aedcc81ea5737f4a7992f33abdd6cf95dd893c6e2666a2d24e6692b6f531b0e62e5dadd98969b2344dcbf75ba26c650f345b823

diff --git a/net-firewall/shorewall/shorewall-5.2.6.1.ebuild b/net-firewall/shorewall/shorewall-5.2.6.1.ebuild
new file mode 100644
index 00000000000..95a3c0906ea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.6.1.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
+	!<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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-07-26 18:30 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-07-26 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     0b6eea4171fc8b0f10499d3b657266dbf934e66d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 18:27:01 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 18:30:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6eea41

net-firewall/shorewall: x86 stable, applying ALLARCHES policy

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.6.ebuild b/net-firewall/shorewall/shorewall-5.2.6.ebuild
index 95a3c0906ea..c6f9c3e5bed 100644
--- a/net-firewall/shorewall/shorewall-5.2.6.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.6.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-08-06 13:50 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-08-06 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     16039004ccde4597ae51e288463510d31450f434
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 11:53:04 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 13:49:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16039004

net-firewall/shorewall: bump to v5.2.7

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.2.7.ebuild | 482 ++++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 650ef17bfa0..7839ef38258 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,21 @@
 DIST shorewall-5.2.6.1.tar.bz2 552329 BLAKE2B c4bfd10dd3c4c236761acde39bf9108c8c4d02b1304fc10432600506fefb5aed16c61bd9abc04308f4b5af1db8fea60a9e7cf663b110541bf7040f48d2194ecf SHA512 a9df0d53899e3b5d4590b6690c298ff99be3d0dd8d7a1147b0ed15b45c81c6533087f2edb2b5c670e63f3a171081d9a404b55b08506e61386a77c290c7ff4303
 DIST shorewall-5.2.6.tar.bz2 584293 BLAKE2B 2efd724fe06da93e31e9c7f146f4cb860118765a9decbbde8ca4b54832fa97f0152eeee3e4d82c171ae6bf11c4541404935bba5597b293b454bb8dceb976b977 SHA512 fe769c3ee8b3800bd7a55e2296e7ddeef2682653352e7b06bf3fe26238a8791eb1bdb93c96dde8a06fa4485149679429135d9bc838e7a94c3cf4b07530590a36
+DIST shorewall-5.2.7.tar.bz2 585135 BLAKE2B 614a993d34927b6f976f8d783608832014e1e2c94d02f53904cc977d3a05cc7ef21bc3dd32545c11b705da7c84ca472f0dc2ec6438af6b60eb705f741d432269 SHA512 abe3f2bfa8944cdecf24e8a2b3bcc5a786bc6bafb1e85e10257f4ff3002689b1e0ed23ddf866f63ce301c6bec43959b6ce77bbbbe8ffeb0f48a18c858be226a2
 DIST shorewall-core-5.2.6.1.tar.bz2 76036 BLAKE2B ab223fa97b11f06c9ab112a828b7eda86e355b706cac7e50e6e403157c8a0eea4ded0e5a4dada431b5bb7b76a6cb1e13d438a8b90ab10fd4d525a389d030410c SHA512 4676ecd743f814dd87c097f2533c69fa333651cf6144a31ac8f7da360dee392c1ae8843b948868a63d58cc7b267e0ecb1fedf7b7ed88cdaa86b6066b73bedd8b
 DIST shorewall-core-5.2.6.tar.bz2 75731 BLAKE2B aef68badb12dcb3c7e7a30b2aae7b0e2dda02c1449fbe71eec7cf513889653d8f026f29f62be39d45c6db61abbadc97c3e24fd8d211cc2773d915c4740e6fa27 SHA512 63448cbd6e7b6444ab11d0dc412469237818717f3e6847c8857c1bf4bc9079b1abfd5cf33d30826252bb990abf611d3a14427dd3e228ea1f97919de6ee10a36e
+DIST shorewall-core-5.2.7.tar.bz2 76504 BLAKE2B 5456b0f844c3f1c99cd8a89dff58ab5cf86d085a763a8de3918c2cf6fb5e59779912fae103f8b4284ba7a2c474beb786422a5de77eb3a67480d1d6ee0b316839 SHA512 0ed2f2e05abafa60e5d1560c5ee8419e7a3d0afe20192597a1efd263cfbe9331369682d6caa22ebdda128a410197010bb4429a3fa1500f9ac06ce8afcc1e6cc8
 DIST shorewall-docs-html-5.2.6.1.tar.bz2 4328494 BLAKE2B 9640a9ca63c9797f5318cf62ffd5c36c1e3c683c0b58ae99eb692a9eaaec4474a98d08c299a63fea09c779aaecbf189e9f93aa4a84c314bf62bae6830ee22dfa SHA512 374716993c25884a0aef2e1d6b261dab9dd64be5afb681489c3b40b4de05dd1dab93e0f34c1a74df7faffe27793d24d277865ad6a72b6c54f223ee1bce9b5a65
 DIST shorewall-docs-html-5.2.6.tar.bz2 4310351 BLAKE2B 6ad3e461657d78c937c80968a5a3404359c6a86b16b2965997f2a37a8d0883b83b285cbb9bb824993d174203e31ccbd0aca811c9948649a438aedbc192bbf038 SHA512 123c84033fc0f470250be7f3cba19d371b658c8e9ec39f382827e5cb6218b3b5c0a730cddec13a3fd41dd3bb0ff94da24543452f59ce3119b2e161c1d9ed4151
+DIST shorewall-docs-html-5.2.7.tar.bz2 4316006 BLAKE2B a981e050501d7fa9bdd2ecfc3fba279989089b1e6977abc881c2bc04df698e88cf7260acb28a06ce90d296e17944140ab24af98914839717811f2eb6af84da33 SHA512 4e381ad8fe8db5fe614c6dd6e4b595539519091c4aac2f7aa7ff8655e97fa8d07bec651c428492f334f632968ad94e1c863aeb1888964d696aca011e980fcbc6
 DIST shorewall-init-5.2.6.1.tar.bz2 41005 BLAKE2B e625569376c303fc5baab6e786ae5c13892c3b498421a369550de0e56a9207b5cf1d6838f7fdf9a0a344d6a1c62d102e4abc6414baec3bc96ad92f9399c74695 SHA512 9cf993217f40a3a948a58db1aca4dd76916e08e1dd0c4b2d23e1e416b24a7be53ef40e6358070b8c05a0b8bc44a0dacbf8b381c7fc2921ceed7df193c11e7578
 DIST shorewall-init-5.2.6.tar.bz2 40640 BLAKE2B 746d72ba6c4d8fae116cef5180286f19f2ace7baa84a027a5f29305cd5a18323dcae316651fd066b71fe6bc9636c016856820215f306e0db1388394bfd15812c SHA512 e5e4e3f2ed24789c0483c93437b6cd41cabd8d3a7940f0c3f7d0b57c52b8a1fac43e073b09d18f5263f00dcd72912778c3230db93136c5cffd67cdbf63e57647
+DIST shorewall-init-5.2.7.tar.bz2 41377 BLAKE2B d39cf687ed4a5592fb8ea7b2d0a4b1313cb80ba81000e3692700a5a95d8035260991626c3e7466d3b9d1a9e8b3e61c559286f08b20494b81b59e5edbc8383378 SHA512 2dd81a4ae87496079990864a7b7a42814855d13210b996e3881e34d7cfb692035a2394adc912337800c72bc8565ae90426a0f1ddbf3e0384048a7c2d3e18aa43
 DIST shorewall-lite-5.2.6.1.tar.bz2 45611 BLAKE2B f1da73d50b2ce4da8d3123f1cd2ebf4a76fc98613a8149aaf8a32ecca0358bd70d57438de30fda2559845975c9e95d35239f43341a45b210ae903ee176af700b SHA512 51f4354969e98dc3c6173d19d07d73b66d219a9e1cbbb5a2fcf5dcfbe0ecf421260b46c815cc7af6e3104b737082fdb0c48345af2228739c0bf880ad1179f5f6
 DIST shorewall-lite-5.2.6.tar.bz2 45245 BLAKE2B 6b5b16b41ed8eaf3cfe4eeaa831e5a320b57579c072d5d64c051bf099c7e519bd7e8f659b483843e866ae39301284a13a45a257d284aac46bc921dea0bd043d5 SHA512 9c1f3c5729afa5bef6329b797530e2f428992eb235aec7213685b6568af81c5ff93e53182b5d5ef90ec3ba2c8ff8470c9a47b3f1988c90ef1ba125594a6d04c4
+DIST shorewall-lite-5.2.7.tar.bz2 45949 BLAKE2B 9d56d57c8bbf0d6478aa2b834750c6545fb323bb8ac513eb8df4f377ec70faa1c71c2105ac40bb5c88272bf56e34f39d93d41215b96b889a4fa9bd80339993ac SHA512 9e48d6d48a0a12577518a3b729cb2ad63e5be9a748fd58ef4c450d9f31527773f2fa790f38e7b1547257b49786a56dc293a16fe97b9c6eddd007edcd35efaee8
 DIST shorewall6-5.2.6.1.tar.bz2 201076 BLAKE2B d41764a5a64bdc3cd86cdf80aaff89ad0bf9077267958d1c9de484f98a652ef42469964fb71b8841299b52e387605bfee1bca5df1ffc24ece9db5a999e09b09f SHA512 03444f976ba64c76eda866dbad6eaa61e766156fde6fcede31acc834ef9f6e45897538be54c99f62a0d6ae857f694921f7ee5d1f2f4209e37cff3f392554e8b0
 DIST shorewall6-5.2.6.tar.bz2 202933 BLAKE2B 66cd897e6ae12a5efa5f857020a00f9455123bc767551072b9d6a7f48442c72bdb0bc7c323a9238a8adbf67f9360d14cf777036ba634e809c6103b3a0f1e7ced SHA512 0b64a0d709c8a621b9983b50dfb64d0374c545e59a08b46997be3249826c802b38e06be0248ee7d4ca1c2c207c21640a7152bec2df46f97ab301676237c48063
+DIST shorewall6-5.2.7.tar.bz2 203996 BLAKE2B b8b721d54c5aafae773d0d80b38106a17000793ff16f217ac6ec21f8702afe7a3fd8e99941056e508a8d8c93819e0e5644f1f8ce83c61dc6e3be49fb8fcd70c9 SHA512 039e0092770262f22ba08c2cfd536eccb9530da48306791fa6683e34c34f862001ca827dcb79b535243e68a24bffe92dbd866cf9d7ea8754161b5a8326a86d8e
 DIST shorewall6-lite-5.2.6.1.tar.bz2 45613 BLAKE2B 0c54e6d86d0831ddf3f38d96f32f6a76d57a646dabb9ec7e3d7fa1811d28aaf8dad308e98dadabb5696b228ce393889ec78ec7422d1148e96e3b435fef05d362 SHA512 bf2f4d15c5faf52c9fb1ed918ce3afeab6c1cc01e67758ca93ede3a507fa798a3751155f9145e672d987f2ed8f53f29fcc1f9590f6808c63d1c748a898365472
 DIST shorewall6-lite-5.2.6.tar.bz2 45249 BLAKE2B 0498ae556d2b7f475f40fa0013df3ecea5ca5928b4df582419d2252f6f3e6500657731c687fced47584b3857c138a66eb0d8d90e552a3baf71411bc58510ad70 SHA512 7590765ae943567bc7b18dc18aedcc81ea5737f4a7992f33abdd6cf95dd893c6e2666a2d24e6692b6f531b0e62e5dadd98969b2344dcbf75ba26c650f345b823
+DIST shorewall6-lite-5.2.7.tar.bz2 45989 BLAKE2B ae698fb3b580bcc373958932d07b8e27bc805616dabe3b6cbf349fd29fa10299f91fffa6d1a74530b008d8806c62cdaf3868d1830cb3869bcfc6ca422cd9a2ef SHA512 c694c00c96e45d437e62ff600f85bb70b9431211ef9ff84753e880b165d694c5cd1a581a8163ed580cee78e790893b6239a8504b422554f14b4d4b7dd3c70601

diff --git a/net-firewall/shorewall/shorewall-5.2.7.ebuild b/net-firewall/shorewall/shorewall-5.2.7.ebuild
new file mode 100644
index 00000000000..95a3c0906ea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.7.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
+	!<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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-08-06 13:50 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-08-06 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     3058697460413d3aa74c7e24b12a2649fd032cda
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 11:52:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 13:49:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30586974

net-firewall/shorewall: amd64 stable, applying ALLARCHES policy

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.6.1.ebuild b/net-firewall/shorewall/shorewall-5.2.6.1.ebuild
index 95a3c0906ea..c6f9c3e5bed 100644
--- a/net-firewall/shorewall/shorewall-5.2.6.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.6.1.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-08-06 13:50 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-08-06 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f5285c572261d26202ff0ff61c491201c9508958
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 11:53:49 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 13:49:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5285c57

net-firewall/shorewall: drop old

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 -
 net-firewall/shorewall/shorewall-5.2.6.ebuild | 482 --------------------------
 2 files changed, 489 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 7839ef38258..09f5087d579 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,14 @@
 DIST shorewall-5.2.6.1.tar.bz2 552329 BLAKE2B c4bfd10dd3c4c236761acde39bf9108c8c4d02b1304fc10432600506fefb5aed16c61bd9abc04308f4b5af1db8fea60a9e7cf663b110541bf7040f48d2194ecf SHA512 a9df0d53899e3b5d4590b6690c298ff99be3d0dd8d7a1147b0ed15b45c81c6533087f2edb2b5c670e63f3a171081d9a404b55b08506e61386a77c290c7ff4303
-DIST shorewall-5.2.6.tar.bz2 584293 BLAKE2B 2efd724fe06da93e31e9c7f146f4cb860118765a9decbbde8ca4b54832fa97f0152eeee3e4d82c171ae6bf11c4541404935bba5597b293b454bb8dceb976b977 SHA512 fe769c3ee8b3800bd7a55e2296e7ddeef2682653352e7b06bf3fe26238a8791eb1bdb93c96dde8a06fa4485149679429135d9bc838e7a94c3cf4b07530590a36
 DIST shorewall-5.2.7.tar.bz2 585135 BLAKE2B 614a993d34927b6f976f8d783608832014e1e2c94d02f53904cc977d3a05cc7ef21bc3dd32545c11b705da7c84ca472f0dc2ec6438af6b60eb705f741d432269 SHA512 abe3f2bfa8944cdecf24e8a2b3bcc5a786bc6bafb1e85e10257f4ff3002689b1e0ed23ddf866f63ce301c6bec43959b6ce77bbbbe8ffeb0f48a18c858be226a2
 DIST shorewall-core-5.2.6.1.tar.bz2 76036 BLAKE2B ab223fa97b11f06c9ab112a828b7eda86e355b706cac7e50e6e403157c8a0eea4ded0e5a4dada431b5bb7b76a6cb1e13d438a8b90ab10fd4d525a389d030410c SHA512 4676ecd743f814dd87c097f2533c69fa333651cf6144a31ac8f7da360dee392c1ae8843b948868a63d58cc7b267e0ecb1fedf7b7ed88cdaa86b6066b73bedd8b
-DIST shorewall-core-5.2.6.tar.bz2 75731 BLAKE2B aef68badb12dcb3c7e7a30b2aae7b0e2dda02c1449fbe71eec7cf513889653d8f026f29f62be39d45c6db61abbadc97c3e24fd8d211cc2773d915c4740e6fa27 SHA512 63448cbd6e7b6444ab11d0dc412469237818717f3e6847c8857c1bf4bc9079b1abfd5cf33d30826252bb990abf611d3a14427dd3e228ea1f97919de6ee10a36e
 DIST shorewall-core-5.2.7.tar.bz2 76504 BLAKE2B 5456b0f844c3f1c99cd8a89dff58ab5cf86d085a763a8de3918c2cf6fb5e59779912fae103f8b4284ba7a2c474beb786422a5de77eb3a67480d1d6ee0b316839 SHA512 0ed2f2e05abafa60e5d1560c5ee8419e7a3d0afe20192597a1efd263cfbe9331369682d6caa22ebdda128a410197010bb4429a3fa1500f9ac06ce8afcc1e6cc8
 DIST shorewall-docs-html-5.2.6.1.tar.bz2 4328494 BLAKE2B 9640a9ca63c9797f5318cf62ffd5c36c1e3c683c0b58ae99eb692a9eaaec4474a98d08c299a63fea09c779aaecbf189e9f93aa4a84c314bf62bae6830ee22dfa SHA512 374716993c25884a0aef2e1d6b261dab9dd64be5afb681489c3b40b4de05dd1dab93e0f34c1a74df7faffe27793d24d277865ad6a72b6c54f223ee1bce9b5a65
-DIST shorewall-docs-html-5.2.6.tar.bz2 4310351 BLAKE2B 6ad3e461657d78c937c80968a5a3404359c6a86b16b2965997f2a37a8d0883b83b285cbb9bb824993d174203e31ccbd0aca811c9948649a438aedbc192bbf038 SHA512 123c84033fc0f470250be7f3cba19d371b658c8e9ec39f382827e5cb6218b3b5c0a730cddec13a3fd41dd3bb0ff94da24543452f59ce3119b2e161c1d9ed4151
 DIST shorewall-docs-html-5.2.7.tar.bz2 4316006 BLAKE2B a981e050501d7fa9bdd2ecfc3fba279989089b1e6977abc881c2bc04df698e88cf7260acb28a06ce90d296e17944140ab24af98914839717811f2eb6af84da33 SHA512 4e381ad8fe8db5fe614c6dd6e4b595539519091c4aac2f7aa7ff8655e97fa8d07bec651c428492f334f632968ad94e1c863aeb1888964d696aca011e980fcbc6
 DIST shorewall-init-5.2.6.1.tar.bz2 41005 BLAKE2B e625569376c303fc5baab6e786ae5c13892c3b498421a369550de0e56a9207b5cf1d6838f7fdf9a0a344d6a1c62d102e4abc6414baec3bc96ad92f9399c74695 SHA512 9cf993217f40a3a948a58db1aca4dd76916e08e1dd0c4b2d23e1e416b24a7be53ef40e6358070b8c05a0b8bc44a0dacbf8b381c7fc2921ceed7df193c11e7578
-DIST shorewall-init-5.2.6.tar.bz2 40640 BLAKE2B 746d72ba6c4d8fae116cef5180286f19f2ace7baa84a027a5f29305cd5a18323dcae316651fd066b71fe6bc9636c016856820215f306e0db1388394bfd15812c SHA512 e5e4e3f2ed24789c0483c93437b6cd41cabd8d3a7940f0c3f7d0b57c52b8a1fac43e073b09d18f5263f00dcd72912778c3230db93136c5cffd67cdbf63e57647
 DIST shorewall-init-5.2.7.tar.bz2 41377 BLAKE2B d39cf687ed4a5592fb8ea7b2d0a4b1313cb80ba81000e3692700a5a95d8035260991626c3e7466d3b9d1a9e8b3e61c559286f08b20494b81b59e5edbc8383378 SHA512 2dd81a4ae87496079990864a7b7a42814855d13210b996e3881e34d7cfb692035a2394adc912337800c72bc8565ae90426a0f1ddbf3e0384048a7c2d3e18aa43
 DIST shorewall-lite-5.2.6.1.tar.bz2 45611 BLAKE2B f1da73d50b2ce4da8d3123f1cd2ebf4a76fc98613a8149aaf8a32ecca0358bd70d57438de30fda2559845975c9e95d35239f43341a45b210ae903ee176af700b SHA512 51f4354969e98dc3c6173d19d07d73b66d219a9e1cbbb5a2fcf5dcfbe0ecf421260b46c815cc7af6e3104b737082fdb0c48345af2228739c0bf880ad1179f5f6
-DIST shorewall-lite-5.2.6.tar.bz2 45245 BLAKE2B 6b5b16b41ed8eaf3cfe4eeaa831e5a320b57579c072d5d64c051bf099c7e519bd7e8f659b483843e866ae39301284a13a45a257d284aac46bc921dea0bd043d5 SHA512 9c1f3c5729afa5bef6329b797530e2f428992eb235aec7213685b6568af81c5ff93e53182b5d5ef90ec3ba2c8ff8470c9a47b3f1988c90ef1ba125594a6d04c4
 DIST shorewall-lite-5.2.7.tar.bz2 45949 BLAKE2B 9d56d57c8bbf0d6478aa2b834750c6545fb323bb8ac513eb8df4f377ec70faa1c71c2105ac40bb5c88272bf56e34f39d93d41215b96b889a4fa9bd80339993ac SHA512 9e48d6d48a0a12577518a3b729cb2ad63e5be9a748fd58ef4c450d9f31527773f2fa790f38e7b1547257b49786a56dc293a16fe97b9c6eddd007edcd35efaee8
 DIST shorewall6-5.2.6.1.tar.bz2 201076 BLAKE2B d41764a5a64bdc3cd86cdf80aaff89ad0bf9077267958d1c9de484f98a652ef42469964fb71b8841299b52e387605bfee1bca5df1ffc24ece9db5a999e09b09f SHA512 03444f976ba64c76eda866dbad6eaa61e766156fde6fcede31acc834ef9f6e45897538be54c99f62a0d6ae857f694921f7ee5d1f2f4209e37cff3f392554e8b0
-DIST shorewall6-5.2.6.tar.bz2 202933 BLAKE2B 66cd897e6ae12a5efa5f857020a00f9455123bc767551072b9d6a7f48442c72bdb0bc7c323a9238a8adbf67f9360d14cf777036ba634e809c6103b3a0f1e7ced SHA512 0b64a0d709c8a621b9983b50dfb64d0374c545e59a08b46997be3249826c802b38e06be0248ee7d4ca1c2c207c21640a7152bec2df46f97ab301676237c48063
 DIST shorewall6-5.2.7.tar.bz2 203996 BLAKE2B b8b721d54c5aafae773d0d80b38106a17000793ff16f217ac6ec21f8702afe7a3fd8e99941056e508a8d8c93819e0e5644f1f8ce83c61dc6e3be49fb8fcd70c9 SHA512 039e0092770262f22ba08c2cfd536eccb9530da48306791fa6683e34c34f862001ca827dcb79b535243e68a24bffe92dbd866cf9d7ea8754161b5a8326a86d8e
 DIST shorewall6-lite-5.2.6.1.tar.bz2 45613 BLAKE2B 0c54e6d86d0831ddf3f38d96f32f6a76d57a646dabb9ec7e3d7fa1811d28aaf8dad308e98dadabb5696b228ce393889ec78ec7422d1148e96e3b435fef05d362 SHA512 bf2f4d15c5faf52c9fb1ed918ce3afeab6c1cc01e67758ca93ede3a507fa798a3751155f9145e672d987f2ed8f53f29fcc1f9590f6808c63d1c748a898365472
-DIST shorewall6-lite-5.2.6.tar.bz2 45249 BLAKE2B 0498ae556d2b7f475f40fa0013df3ecea5ca5928b4df582419d2252f6f3e6500657731c687fced47584b3857c138a66eb0d8d90e552a3baf71411bc58510ad70 SHA512 7590765ae943567bc7b18dc18aedcc81ea5737f4a7992f33abdd6cf95dd893c6e2666a2d24e6692b6f531b0e62e5dadd98969b2344dcbf75ba26c650f345b823
 DIST shorewall6-lite-5.2.7.tar.bz2 45989 BLAKE2B ae698fb3b580bcc373958932d07b8e27bc805616dabe3b6cbf349fd29fa10299f91fffa6d1a74530b008d8806c62cdaf3868d1830cb3869bcfc6ca422cd9a2ef SHA512 c694c00c96e45d437e62ff600f85bb70b9431211ef9ff84753e880b165d694c5cd1a581a8163ed580cee78e790893b6239a8504b422554f14b4d4b7dd3c70601

diff --git a/net-firewall/shorewall/shorewall-5.2.6.ebuild b/net-firewall/shorewall/shorewall-5.2.6.ebuild
deleted file mode 100644
index c6f9c3e5bed..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.6.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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-08-19 19:52 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-08-19 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     11b731d3a241339fcf644507096b00ca4d7f42de
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 19:52:41 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 19:52:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b731d3

net-firewall/shorewall: x86 stable, applying ALLARCHES policy

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.7.ebuild b/net-firewall/shorewall/shorewall-5.2.7.ebuild
index 95a3c0906ea..c6f9c3e5bed 100644
--- a/net-firewall/shorewall/shorewall-5.2.7.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.7.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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-08-30 17:35 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-08-30 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     f7a11aae37d2ca9c0686eb86ed4d0c4cde4d306a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 17:35:46 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 17:35:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a11aae

net-firewall/shorewall: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest                 |   7 -
 net-firewall/shorewall/shorewall-5.2.6.1.ebuild | 482 ------------------------
 2 files changed, 489 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 09f5087d579..92454967a99 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-DIST shorewall-5.2.6.1.tar.bz2 552329 BLAKE2B c4bfd10dd3c4c236761acde39bf9108c8c4d02b1304fc10432600506fefb5aed16c61bd9abc04308f4b5af1db8fea60a9e7cf663b110541bf7040f48d2194ecf SHA512 a9df0d53899e3b5d4590b6690c298ff99be3d0dd8d7a1147b0ed15b45c81c6533087f2edb2b5c670e63f3a171081d9a404b55b08506e61386a77c290c7ff4303
 DIST shorewall-5.2.7.tar.bz2 585135 BLAKE2B 614a993d34927b6f976f8d783608832014e1e2c94d02f53904cc977d3a05cc7ef21bc3dd32545c11b705da7c84ca472f0dc2ec6438af6b60eb705f741d432269 SHA512 abe3f2bfa8944cdecf24e8a2b3bcc5a786bc6bafb1e85e10257f4ff3002689b1e0ed23ddf866f63ce301c6bec43959b6ce77bbbbe8ffeb0f48a18c858be226a2
-DIST shorewall-core-5.2.6.1.tar.bz2 76036 BLAKE2B ab223fa97b11f06c9ab112a828b7eda86e355b706cac7e50e6e403157c8a0eea4ded0e5a4dada431b5bb7b76a6cb1e13d438a8b90ab10fd4d525a389d030410c SHA512 4676ecd743f814dd87c097f2533c69fa333651cf6144a31ac8f7da360dee392c1ae8843b948868a63d58cc7b267e0ecb1fedf7b7ed88cdaa86b6066b73bedd8b
 DIST shorewall-core-5.2.7.tar.bz2 76504 BLAKE2B 5456b0f844c3f1c99cd8a89dff58ab5cf86d085a763a8de3918c2cf6fb5e59779912fae103f8b4284ba7a2c474beb786422a5de77eb3a67480d1d6ee0b316839 SHA512 0ed2f2e05abafa60e5d1560c5ee8419e7a3d0afe20192597a1efd263cfbe9331369682d6caa22ebdda128a410197010bb4429a3fa1500f9ac06ce8afcc1e6cc8
-DIST shorewall-docs-html-5.2.6.1.tar.bz2 4328494 BLAKE2B 9640a9ca63c9797f5318cf62ffd5c36c1e3c683c0b58ae99eb692a9eaaec4474a98d08c299a63fea09c779aaecbf189e9f93aa4a84c314bf62bae6830ee22dfa SHA512 374716993c25884a0aef2e1d6b261dab9dd64be5afb681489c3b40b4de05dd1dab93e0f34c1a74df7faffe27793d24d277865ad6a72b6c54f223ee1bce9b5a65
 DIST shorewall-docs-html-5.2.7.tar.bz2 4316006 BLAKE2B a981e050501d7fa9bdd2ecfc3fba279989089b1e6977abc881c2bc04df698e88cf7260acb28a06ce90d296e17944140ab24af98914839717811f2eb6af84da33 SHA512 4e381ad8fe8db5fe614c6dd6e4b595539519091c4aac2f7aa7ff8655e97fa8d07bec651c428492f334f632968ad94e1c863aeb1888964d696aca011e980fcbc6
-DIST shorewall-init-5.2.6.1.tar.bz2 41005 BLAKE2B e625569376c303fc5baab6e786ae5c13892c3b498421a369550de0e56a9207b5cf1d6838f7fdf9a0a344d6a1c62d102e4abc6414baec3bc96ad92f9399c74695 SHA512 9cf993217f40a3a948a58db1aca4dd76916e08e1dd0c4b2d23e1e416b24a7be53ef40e6358070b8c05a0b8bc44a0dacbf8b381c7fc2921ceed7df193c11e7578
 DIST shorewall-init-5.2.7.tar.bz2 41377 BLAKE2B d39cf687ed4a5592fb8ea7b2d0a4b1313cb80ba81000e3692700a5a95d8035260991626c3e7466d3b9d1a9e8b3e61c559286f08b20494b81b59e5edbc8383378 SHA512 2dd81a4ae87496079990864a7b7a42814855d13210b996e3881e34d7cfb692035a2394adc912337800c72bc8565ae90426a0f1ddbf3e0384048a7c2d3e18aa43
-DIST shorewall-lite-5.2.6.1.tar.bz2 45611 BLAKE2B f1da73d50b2ce4da8d3123f1cd2ebf4a76fc98613a8149aaf8a32ecca0358bd70d57438de30fda2559845975c9e95d35239f43341a45b210ae903ee176af700b SHA512 51f4354969e98dc3c6173d19d07d73b66d219a9e1cbbb5a2fcf5dcfbe0ecf421260b46c815cc7af6e3104b737082fdb0c48345af2228739c0bf880ad1179f5f6
 DIST shorewall-lite-5.2.7.tar.bz2 45949 BLAKE2B 9d56d57c8bbf0d6478aa2b834750c6545fb323bb8ac513eb8df4f377ec70faa1c71c2105ac40bb5c88272bf56e34f39d93d41215b96b889a4fa9bd80339993ac SHA512 9e48d6d48a0a12577518a3b729cb2ad63e5be9a748fd58ef4c450d9f31527773f2fa790f38e7b1547257b49786a56dc293a16fe97b9c6eddd007edcd35efaee8
-DIST shorewall6-5.2.6.1.tar.bz2 201076 BLAKE2B d41764a5a64bdc3cd86cdf80aaff89ad0bf9077267958d1c9de484f98a652ef42469964fb71b8841299b52e387605bfee1bca5df1ffc24ece9db5a999e09b09f SHA512 03444f976ba64c76eda866dbad6eaa61e766156fde6fcede31acc834ef9f6e45897538be54c99f62a0d6ae857f694921f7ee5d1f2f4209e37cff3f392554e8b0
 DIST shorewall6-5.2.7.tar.bz2 203996 BLAKE2B b8b721d54c5aafae773d0d80b38106a17000793ff16f217ac6ec21f8702afe7a3fd8e99941056e508a8d8c93819e0e5644f1f8ce83c61dc6e3be49fb8fcd70c9 SHA512 039e0092770262f22ba08c2cfd536eccb9530da48306791fa6683e34c34f862001ca827dcb79b535243e68a24bffe92dbd866cf9d7ea8754161b5a8326a86d8e
-DIST shorewall6-lite-5.2.6.1.tar.bz2 45613 BLAKE2B 0c54e6d86d0831ddf3f38d96f32f6a76d57a646dabb9ec7e3d7fa1811d28aaf8dad308e98dadabb5696b228ce393889ec78ec7422d1148e96e3b435fef05d362 SHA512 bf2f4d15c5faf52c9fb1ed918ce3afeab6c1cc01e67758ca93ede3a507fa798a3751155f9145e672d987f2ed8f53f29fcc1f9590f6808c63d1c748a898365472
 DIST shorewall6-lite-5.2.7.tar.bz2 45989 BLAKE2B ae698fb3b580bcc373958932d07b8e27bc805616dabe3b6cbf349fd29fa10299f91fffa6d1a74530b008d8806c62cdaf3868d1830cb3869bcfc6ca422cd9a2ef SHA512 c694c00c96e45d437e62ff600f85bb70b9431211ef9ff84753e880b165d694c5cd1a581a8163ed580cee78e790893b6239a8504b422554f14b4d4b7dd3c70601

diff --git a/net-firewall/shorewall/shorewall-5.2.6.1.ebuild b/net-firewall/shorewall/shorewall-5.2.6.1.ebuild
deleted file mode 100644
index c6f9c3e5bed..00000000000
--- a/net-firewall/shorewall/shorewall-5.2.6.1.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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-09-27 13:39 Jeroen Roovers
  0 siblings, 0 replies; 159+ messages in thread
From: Jeroen Roovers @ 2020-09-27 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     0a6a3b42cd5f936a02ae3ae5a185c3ceb195df4d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 13:37:45 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 13:39:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6a3b42

net-firewall/shorewall: Version 5.2.8

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 +
 net-firewall/shorewall/shorewall-5.2.8.ebuild | 482 ++++++++++++++++++++++++++
 2 files changed, 489 insertions(+)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 92454967a99..c943e4957d3 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,7 +1,14 @@
 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

diff --git a/net-firewall/shorewall/shorewall-5.2.8.ebuild b/net-firewall/shorewall/shorewall-5.2.8.ebuild
new file mode 100644
index 00000000000..95a3c0906ea
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.8.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
+	!<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
+}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-09-30 22:18 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-09-30 22:18 UTC (permalink / raw
  To: gentoo-commits

commit:     5c579431fa27fb92ff506c6668a89757da63dc8b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 22:17:56 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 22:18:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c579431

net-firewall/shorewall: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/Manifest               |   7 -
 net-firewall/shorewall/shorewall-5.2.7.ebuild | 482 --------------------------
 2 files changed, 489 deletions(-)

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index c943e4957d3..3517007e6d7 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,7 @@
-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

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 c6f9c3e5bed..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2020-09-30 22:18 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2020-09-30 22:18 UTC (permalink / raw
  To: gentoo-commits

commit:     247c6713dd9b1f3aeb342086ec572b9803e6f5b9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 22:17:26 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 22:18:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=247c6713

net-firewall/shorewall: x86 stable, applying ALLARCHES policy

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.8.ebuild b/net-firewall/shorewall/shorewall-5.2.8.ebuild
index 95a3c0906ea..c6f9c3e5bed 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="


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2021-02-03 20:16 Thomas Deutschmann
  0 siblings, 0 replies; 159+ messages in thread
From: Thomas Deutschmann @ 2021-02-03 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     fb825faab161d53eb2b4450990c06d0b94e6d412
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  3 20:11:29 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Feb  3 20:13:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb825faa

net-firewall/shorewall: fix incomplete EAPI 7 migration

When ebuild was migrated to EAPI 7, a call to version_is_at_least() in
pkg_postinst wasn't migrated causing upgrade notice not to be displayed.

Reported-by: Ben Kohler <bkohler <AT> gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.8.ebuild b/net-firewall/shorewall/shorewall-5.2.8.ebuild
index a388cba86f3..566917fbfb3 100644
--- a/net-firewall/shorewall/shorewall-5.2.8.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -428,7 +428,7 @@ pkg_postinst() {
 
 	local v
 	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+		if ! ver_test ${v} -ge ${MY_MAJOR_RELEASE_NUMBER}; then
 			# This is an upgrade
 
 			elog "You are upgrading from a previous major version. It is highly recommended that you read"


^ permalink raw reply related	[flat|nested] 159+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/
@ 2024-01-08  9:48 Sam James
  0 siblings, 0 replies; 159+ messages in thread
From: Sam James @ 2024-01-08  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     fc46617f11804841a1fbd5fe3e5a284b52967623
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 09:38:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 09:42:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc46617f

net-firewall/shorewall: sys-devel/bc -> app-alternatives/bc

All of these will be using app-alternatives/bc anyway as they're not calling

bc-reference, so make the dep reflect reality.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/shorewall/shorewall-5.2.8-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/shorewall/shorewall-5.2.8-r1.ebuild b/net-firewall/shorewall/shorewall-5.2.8-r1.ebuild
index 0053c3c05ee4..a6be3bc94a36 100644
--- a/net-firewall/shorewall/shorewall-5.2.8-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -95,7 +95,7 @@ DEPEND=""
 RDEPEND="
 	>=net-firewall/iptables-1.4.20
 	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
+	app-alternatives/bc
 	ipv4? (
 		>=dev-lang/perl-5.16
 		virtual/perl-Digest-SHA


^ permalink raw reply related	[flat|nested] 159+ messages in thread

end of thread, other threads:[~2024-01-08  9:48 UTC | newest]

Thread overview: 159+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-24 17:28 [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2024-01-08  9:48 Sam James
2021-02-03 20:16 Thomas Deutschmann
2020-09-30 22:18 Thomas Deutschmann
2020-09-30 22:18 Thomas Deutschmann
2020-09-27 13:39 Jeroen Roovers
2020-08-30 17:35 Thomas Deutschmann
2020-08-19 19:52 Thomas Deutschmann
2020-08-06 13:50 Thomas Deutschmann
2020-08-06 13:50 Thomas Deutschmann
2020-08-06 13:50 Thomas Deutschmann
2020-07-26 18:30 Thomas Deutschmann
2020-07-26 18:30 Thomas Deutschmann
2020-07-26 18:30 Thomas Deutschmann
2020-07-08 12:49 Thomas Deutschmann
2020-07-05 19:12 Thomas Deutschmann
2020-07-05 19:12 Thomas Deutschmann
2020-06-29 14:59 Thomas Deutschmann
2020-06-29 14:58 Thomas Deutschmann
2020-06-29 14:58 Thomas Deutschmann
2020-06-25 21:43 Thomas Deutschmann
2020-06-25 21:43 Thomas Deutschmann
2020-06-25 21:43 Thomas Deutschmann
2020-06-14 23:30 Thomas Deutschmann
2020-05-19  9:49 Thomas Deutschmann
2020-05-09 21:41 Thomas Deutschmann
2020-05-01 13:23 Thomas Deutschmann
2020-03-30  1:25 Thomas Deutschmann
2020-03-30  1:25 Thomas Deutschmann
2020-03-30  1:25 Thomas Deutschmann
2020-03-09 15:01 Thomas Deutschmann
2020-02-24 17:28 Thomas Deutschmann
2020-02-24 17:28 Thomas Deutschmann
2020-01-18  9:51 Thomas Deutschmann
2019-09-12 21:35 Thomas Deutschmann
2019-09-12 21:35 Thomas Deutschmann
2019-09-04  9:06 Thomas Deutschmann
2019-09-03 22:23 Thomas Deutschmann
2019-04-18  1:40 Thomas Deutschmann
2019-03-20 19:29 Thomas Deutschmann
2019-03-06 22:52 Thomas Deutschmann
2019-03-06 22:52 Thomas Deutschmann
2019-02-28  3:06 Thomas Deutschmann
2019-02-16 18:17 Thomas Deutschmann
2019-01-26 19:35 Thomas Deutschmann
2018-12-22 19:22 Thomas Deutschmann
2018-12-22 19:22 Thomas Deutschmann
2018-12-17 23:20 Thomas Deutschmann
2018-12-03  0:55 Thomas Deutschmann
2018-11-11 22:37 Thomas Deutschmann
2018-11-11 22:37 Thomas Deutschmann
2018-10-29 14:54 Thomas Deutschmann
2018-10-07 16:02 Thomas Deutschmann
2018-10-07 16:02 Thomas Deutschmann
2018-08-06 23:56 Thomas Deutschmann
2018-06-07  0:02 Thomas Deutschmann
2018-05-21 19:02 Thomas Deutschmann
2018-05-16 23:12 Thomas Deutschmann
2018-05-08  7:57 Thomas Deutschmann
2018-05-04 15:25 Thomas Deutschmann
2018-05-04 15:24 Thomas Deutschmann
2018-04-16 11:37 Thomas Deutschmann
2018-03-13 21:41 Thomas Deutschmann
2018-03-13 21:41 Thomas Deutschmann
2018-03-05 14:07 Thomas Deutschmann
2018-02-22  0:34 Thomas Deutschmann
2018-02-12 23:32 Thomas Deutschmann
2018-02-09 14:30 Thomas Deutschmann
2018-02-01 20:49 Thomas Deutschmann
2018-01-29  2:38 Thomas Deutschmann
2018-01-20 20:58 Thomas Deutschmann
2018-01-01 21:15 Thomas Deutschmann
2017-12-30 19:55 Thomas Deutschmann
2017-12-30 19:55 Thomas Deutschmann
2017-12-30 19:02 Thomas Deutschmann
2017-12-29 17:49 Thomas Deutschmann
2017-12-21 22:08 Thomas Deutschmann
2017-12-18 21:49 Thomas Deutschmann
2017-12-18 21:49 Thomas Deutschmann
2017-12-14 15:41 Thomas Deutschmann
2017-11-27  4:39 Thomas Deutschmann
2017-11-09 18:53 Thomas Deutschmann
2017-10-10 18:58 Thomas Deutschmann
2017-10-01 15:03 Thomas Deutschmann
2017-09-26 13:52 Thomas Deutschmann
2017-09-05 16:43 Thomas Deutschmann
2017-08-20 20:07 Thomas Deutschmann
2017-08-02 17:38 Thomas Deutschmann
2017-07-24 17:20 Thomas Deutschmann
2017-07-03 15:17 Thomas Deutschmann
2017-07-03 15:17 Thomas Deutschmann
2017-07-03 15:17 Thomas Deutschmann
2017-07-03 15:17 Thomas Deutschmann
2017-06-26  1:16 Thomas Deutschmann
2017-06-20  8:11 Thomas Deutschmann
2017-06-13 15:57 Thomas Deutschmann
2017-06-13 15:56 Thomas Deutschmann
2017-05-27 15:30 Thomas Deutschmann
2017-05-09 22:40 Thomas Deutschmann
2017-04-16 13:05 Thomas Deutschmann
2017-04-16  4:29 Thomas Deutschmann
2017-03-30  6:43 Thomas Deutschmann
2017-03-30  6:43 Thomas Deutschmann
2017-02-24 11:38 Thomas Deutschmann
2017-01-10 23:52 Thomas Deutschmann
2017-01-02 18:42 Thomas Deutschmann
2016-12-27 23:37 Thomas Deutschmann
2016-12-20 14:19 Thomas Deutschmann
2016-12-20 14:19 Thomas Deutschmann
2016-11-10  0:08 Thomas Deutschmann
2016-11-07 16:41 Thomas Deutschmann
2016-11-01 15:45 Thomas Deutschmann
2016-10-18 23:46 Thomas Deutschmann
2016-10-18 23:46 Thomas Deutschmann
2016-10-16 11:46 Thomas Deutschmann
2016-10-16  7:00 Jeroen Roovers
2016-10-12 22:05 Thomas Deutschmann
2016-10-04  7:37 Tobias Klausmann
2016-10-03 23:48 Thomas Deutschmann
2016-08-13  0:26 Thomas Deutschmann
2016-08-13  0:26 Thomas Deutschmann
2016-08-13  0:26 Thomas Deutschmann
2016-08-10 19:47 Thomas Deutschmann
2016-08-10 19:47 Thomas Deutschmann
2016-08-04  8:57 Jeroen Roovers
2016-08-03  8:03 Patrice Clement
2016-08-03  8:03 Patrice Clement
2016-08-03  8:03 Patrice Clement
2016-07-08 18:55 Patrice Clement
2016-06-16  7:01 Patrice Clement
2016-06-11 20:20 Patrice Clement
2016-06-11 20:20 Patrice Clement
2016-05-31 13:58 Tobias Klausmann
2016-05-23 11:33 Ian Delaney
2016-05-23 11:33 Ian Delaney
2016-05-13  8:41 Agostino Sarubbo
2016-05-09 16:44 Patrice Clement
2016-04-18  8:13 Patrice Clement
2016-04-01  6:44 Patrice Clement
2016-03-29 13:53 Ian Delaney
2016-03-21 21:50 Patrice Clement
2016-03-21 21:50 Patrice Clement
2016-03-15  9:01 Agostino Sarubbo
2016-03-15  2:24 Ian Delaney
2016-03-14 14:34 Agostino Sarubbo
2016-02-28 19:04 Patrice Clement
2016-02-28 19:04 Patrice Clement
2016-02-20  8:18 Jeroen Roovers
2016-02-04 11:01 Tobias Klausmann
2016-02-03  8:33 Amy Winston
2016-02-03  8:33 Amy Winston
2016-02-01  8:14 Agostino Sarubbo
2015-12-15  4:45 Ian Delaney
2015-12-15  4:45 Ian Delaney
2015-11-10  6:12 Ian Delaney
2015-10-27  3:09 Ian Delaney
2015-09-26  9:09 Ian Delaney
2015-09-18  5:46 Ian Delaney
2015-08-26 10:32 Agostino Sarubbo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox