diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /net-firewall | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'net-firewall')
-rw-r--r-- | net-firewall/Manifest.gz | bin | 5550 -> 5556 bytes | |||
-rw-r--r-- | net-firewall/iptables/Manifest | 6 | ||||
-rw-r--r-- | net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch | 26 | ||||
-rw-r--r-- | net-firewall/iptables/files/iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch | 44 | ||||
-rw-r--r-- | net-firewall/iptables/iptables-1.8.2.ebuild (renamed from net-firewall/iptables/iptables-1.8.0-r1.ebuild) | 11 | ||||
-rw-r--r-- | net-firewall/shorewall/Manifest | 18 | ||||
-rw-r--r-- | net-firewall/shorewall/shorewall-5.2.0.5.ebuild | 459 | ||||
-rw-r--r-- | net-firewall/shorewall/shorewall-5.2.1.1.ebuild | 2 | ||||
-rw-r--r-- | net-firewall/shorewall/shorewall-5.2.1.ebuild | 479 |
9 files changed, 8 insertions, 1037 deletions
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz Binary files differindex 7ba19f669e4a..bc2ac5e70325 100644 --- a/net-firewall/Manifest.gz +++ b/net-firewall/Manifest.gz diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index e7fcf419b1c5..dda5ffdb9cf4 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -3,8 +3,6 @@ AUX iptables-1.4.13-r1.init 2766 BLAKE2B 1941ba5383055bfedd57b8eb6a390cab5fc3438 AUX iptables-1.4.13.confd 687 BLAKE2B 78b2242454b5f3228661f1e41b790aaa458c1225162a222da5a309a15eca56a531c756a5ceb49e506095461998305189efe136fde0bfe5916cc2d00661de1789 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70 AUX iptables-1.4.21-configure.patch 1066 BLAKE2B 59bf725aeaae131b57e04b556957dd3316f2282ea5a1d9e931f63865dd48484831c9f7674085b7134e2ef4c2dcddbc3b06c8f8e85a45840746a25e386c390f86 SHA512 45445d1460072ed19ba617be983be82094fdd0535a25de4f6159173de4a08be9bee9da13c7aeea419291beb92402ca25efba3a0e269510e221f7eacc8bcd5176 AUX iptables-1.4.21-static-connlabel-config.patch 2195 BLAKE2B 237c59c2fd3312efa26181f363c2ad4dfe19b0cb494f90048e50ff464ed8abbb8ec46d406df51b9f3ba75f717a045ebb4fa38cc0ca5741f5efbfc3322171e04f SHA512 d838773bf2db9f97548d2f7eaab0ce3205265a7ec8b274df479fcecb474ba09ed061abae50534c0379a1290479c2e94927595eca0f4570b27744ec165348b6b1 -AUX iptables-1.8.0-fix-building-without-nft-backend.patch 1324 BLAKE2B 3393141e30d41250b7dc89c8e7c353bade835ce718156873f78d05036bae573a881d0a3c883a2437302498716613bc278c608f3ce9dfa57236467ab91b9a8203 SHA512 77382aedac7829654fa6af0537cb1e7fdffe5cc0609b8255b42de5eb077ac915b48db9e99e99b834ab3c2a3e96f38b36fd862fa27af522a82f719c8eca1bd839 -AUX iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch 1792 BLAKE2B ab5e961f279e1fadcd5f892f869ec1a0f5499c54cc79c21b85e01ad6617753dc51ba001df36e5cb1d5074b062af664c80e751d0010d8dc5951e11d2c11542bdf SHA512 1722b4a49ec8c397df9de5a3748fd5b90053dcee2121b4fd40e0f9f2efe5b27dc09e0321ca6855cf6158bbe400372d119ed825bde7a0b4e6c597f7630ac83c93 AUX iptables-1.8.1-build_limit_without_libnftnl_fix.patch 1499 BLAKE2B 01b8f257577b37749da8c7449e5a830373fc7556885be0e1fd8233b2105cde52e95e6393eaee3f2c7b0e335286b89d0b7b638a23921998375b333d8ccf8223df SHA512 a900d1544098f58326537684bd5de20df114402abacf1971c625431a0c03e988382a9b9f4860c761923c9bd54600424ae1a3769e16518a6c6e7ba1f61caf5ddd AUX iptables.init 2787 BLAKE2B 79c17ba2970d63791dd4d137536b3ccf0f9b6a637d0445049a6fac338ca4e2d1fad927038dfa7ad42a1eb321feac1dc834af09ce0baec554fc9767f199e10b6b SHA512 317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db AUX systemd/ip6tables-restore.service 404 BLAKE2B 35cdf804e787aa5cc382cc638de523735ab47b878168c41d8eef85eb592e5bebd9319e75a10db28f0eba6618efae355c90f03ac0798239edeb80d01108e98a47 SHA512 34730df7464354bce11ca5bdceb5cf305e8ab7e2ded2c2689448379e74ff93252e7a83cfe05c2f3238f59a2ade69cd9c328291c28c43b6612bfb7b29fcb0feee @@ -16,12 +14,12 @@ AUX systemd/iptables.service 130 BLAKE2B 1b4881253eae9fd24c831931e5836efc3d3bb6f DIST iptables-1.4.21.tar.bz2 547439 BLAKE2B e30f25581a118b91781dcc02761d4c8c420fb19876ec9e8ade3aff22b574931065f9a1c1ec31983a444c406dd928c47673d02698553da85c3db4f31484b1597d SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b DIST iptables-1.6.1.tar.bz2 620890 BLAKE2B b45ac26e1fb7e8b17a6df0afab3b6c0e2f0a5df9191367548136b3ce9aadc1bcb875b8bc0403e6f12fcf487054e96418f4ef34da827af8989fd4dcf83cd3cd8d SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8 DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86ded14834a45db21b964d82840b62216ce3cea4ae4960e8c5f0671df3cc6bfb222f68d29cf3a8c99e0eee14bf017 SHA512 04f22e969c794246b9aa28055b202638081cfb0bb4a5625c049a30c48ac84cdd41db12a53c5831398cfe47c8f5691aa02b30b0ae3b5afe0f20ec48cf86a799c0 -DIST iptables-1.8.0.tar.bz2 677980 BLAKE2B ce874572d736087f46ea5a6e393cf9b32bf7328efda0fd9faee94dfa11428fc0e124d5ed81329484032ac4ebe89b2604b26dbb135e152c0e0f4c74d88db52d00 SHA512 5f3fe4c15f02e29a2e6ee2905a242f450f8a3b51553618e0cdc59301c35b8bb663e8f2ea70dfcaed8d4e53192c01519906b60ff649385c693e0602622742890f DIST iptables-1.8.1.tar.bz2 678706 BLAKE2B 671e7329cc07dae0fbc54c1f6061bc148c4823e1f675369ee36a7cd2346cc1a9a516d5aa2e8a3506d5400027c1ba306cbe426940894117710bc61aacd256fccd SHA512 96a896b6dd26c2d0b4e1672d428ea3c3aab0a3c9e56a896af3a2b8428c4212d7378ba555e0be198b0ccb3fd370bca529466ab8b4edc1777eb7deed600d3f0e11 +DIST iptables-1.8.2.tar.bz2 679858 BLAKE2B 2004d85c89ecbc37ef0d571ac8ece680fd2e11a51b074f6387d6e9c4892da524c785d6bf3f30e26af4e7c2cb1f401d51bf8bcb21a91e380e24945374553139cb SHA512 8cf0f515764e1dc6e03284581d682d1949b33e8f25fea29c27ae856f1089fe8ca7b1814524b85f4378fd1fc7c7c7d002f06557b257ae2bbc945f8555bad0dc76 EBUILD iptables-1.4.21-r1.ebuild 2442 BLAKE2B caa1b23d35ccb9a8e5631f932fe4a6816358782ea620d71ad1d64498df64b18015b3610f48b345a13caafaca51bb504d364ed4167804383c03d70439ca4154c2 SHA512 b0d5b1de2c24dbe4aa3eec29e3adefac12f72529fa850fbe5b956d1835fc5ea25ceed8172d8b5bc2d5c1bff63a609cae04c3da923c783ccdfeed126ef2bde831 EBUILD iptables-1.4.21-r5.ebuild 2975 BLAKE2B f9fdeaf8c242b1553b59586346e81735dae31100a435a9cf2d0817c69a8fb6a0652b76944f5261eca8b5c5be60f38db50fb22a3940573e493c3326ec068396e0 SHA512 dab27d6601b69dae4c0be6b48f0cbc7daf7b93066ad398d962f81ec625628d6d2ce9e0188810941364e1cbc7d9c6b4511f3ab832ee736d69d8b977f80d52657d EBUILD iptables-1.6.1-r3.ebuild 3252 BLAKE2B f563c16417790e7f44eae5f0492e39b76cbcf88173e29d4e7321aa9cedce927d8c0fd96a342e6c654ba99cae50a92373b935e68c8b057a3f3d01bf4a1f59dda4 SHA512 5d338acc6ac76f184086d244d23a7634af7b7001c4e9520125a284329636275aca456cb3a36f6801e94ef840d4625d5d4eb27aed57172bf2f49dd948e8801861 EBUILD iptables-1.6.2-r2.ebuild 3327 BLAKE2B c4d683d81f4d3be5efb9d043d63b8ee7b20f4b735cce0d7e31c85e159d2693568b83b28fe1e517ba658ee240dfd063b7810590cbf94029975992b0e5aeab479e SHA512 dc12b299d205f5404bd6486b36a933b611d567be45e00f8f02dd010036c701510824184a3d3d0d52798c89e5b57bfbe402e79bbfbeb50e4f0d26de1627b387d3 -EBUILD iptables-1.8.0-r1.ebuild 3657 BLAKE2B 4ba94eef2bf4cf41b4d102932cec1e913f1b0296115e665feedc8f1f719b4185e3c79bc4482e201a8ef419227b56722f8c40737182ad82fb9265ffb0b9d7a7dc SHA512 0701b7c7400b189a14f74e9c56b446bb52e75f7a9b8d7522354254371af8fb1f24eadad0655d6d68b103287f6d6ccc1a1c38e8945a28092d3034363fba9b87b0 EBUILD iptables-1.8.1-r1.ebuild 3543 BLAKE2B 9b18e81d1994868695bc098229f612997cedadf8b2970e84650893f4ed6281216121ea56f982ad7621f5da766850189c5e4011039659bc6fd488cb3e9a2afaf5 SHA512 f4d64da35788ffac7391c9b4a7e111bfff519e5d3757c1050ff74eac9da136c8f7f0a05fd32cba63f8e19b42c6f40299e75a13992c10d965643d280bc8b3ac85 +EBUILD iptables-1.8.2.ebuild 3468 BLAKE2B 40dd2a8b377d6354604cef6f68f86feb86050f2aa3f3d185cb7019b4ba8aa0ed4c5e198eb3f51590431421fdb715851aff9194c682fd4a11079a75385c525d61 SHA512 13cdd43b8f3c1f9d1a60730275f565bc45499382af4d5a71155e3bccbe5cc750b6b65434c0c642eb3fc40d9cc00f950aaf911f0fd07be3fbfdb773d14d818eda MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987 diff --git a/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch b/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch deleted file mode 100644 index 6b19c87678b1..000000000000 --- a/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch +++ /dev/null @@ -1,26 +0,0 @@ -extensions: don't bother to build libebt/libarp extensions if nft backend was disabled - -Bug: https://bugs.gentoo.org/660790 -Reported-by: Thomas Deutschmann <whissi@gentoo.org> -Signed-off-by: Florian Westphal <fw@strlen.de> ---- - extensions/GNUmakefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in -index bee666e80e45..c0d73cd28c03 100644 ---- a/extensions/GNUmakefile.in -+++ b/extensions/GNUmakefile.in -@@ -40,8 +40,8 @@ endif - # Wildcard module list - # - pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(sort $(wildcard ${srcdir}/libxt_*.c))) --pfb_build_mod := $(patsubst ${srcdir}/libebt_%.c,%,$(sort $(wildcard ${srcdir}/libebt_*.c))) --pfa_build_mod := $(patsubst ${srcdir}/libarpt_%.c,%,$(sort $(wildcard ${srcdir}/libarpt_*.c))) -+@ENABLE_NFTABLES_TRUE@ pfb_build_mod := $(patsubst ${srcdir}/libebt_%.c,%,$(sort $(wildcard ${srcdir}/libebt_*.c))) -+@ENABLE_NFTABLES_TRUE@ pfa_build_mod := $(patsubst ${srcdir}/libarpt_%.c,%,$(sort $(wildcard ${srcdir}/libarpt_*.c))) - pfx_symlinks := NOTRACK state - @ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(sort $(wildcard ${srcdir}/libipt_*.c))) - @ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c))) --- -2.17.1 diff --git a/net-firewall/iptables/files/iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch b/net-firewall/iptables/files/iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch deleted file mode 100644 index 1053c0a338ed..000000000000 --- a/net-firewall/iptables/files/iptables-1.8.0-support-nft-suffix-for-arptables-and-ebtables.patch +++ /dev/null @@ -1,44 +0,0 @@ -Backport of - -https://git.netfilter.org/iptables/commit/?id=565a22395c4c620bf26a002515d9016db0c35824 - -Bug: https://bugs.gentoo.org/660886 ---- a/iptables/Makefile.am -+++ b/iptables/Makefile.am -@@ -80,7 +80,9 @@ x_sbin_links = iptables-nft iptables-nft-restore iptables-nft-save \ - ip6tables-nft ip6tables-nft-restore ip6tables-nft-save \ - iptables-translate ip6tables-translate \ - iptables-restore-translate ip6tables-restore-translate \ -- arptables ebtables xtables-monitor -+ arptables-nft arptables \ -+ ebtables-nft ebtables \ -+ xtables-monitor - endif - - iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man ---- a/iptables/Makefile.in -+++ b/iptables/Makefile.in -@@ -526,7 +526,9 @@ vx_bin_links = iptables-xml - @ENABLE_NFTABLES_TRUE@ ip6tables-nft ip6tables-nft-restore ip6tables-nft-save \ - @ENABLE_NFTABLES_TRUE@ iptables-translate ip6tables-translate \ - @ENABLE_NFTABLES_TRUE@ iptables-restore-translate ip6tables-restore-translate \ --@ENABLE_NFTABLES_TRUE@ arptables ebtables xtables-monitor -+@ENABLE_NFTABLES_TRUE@ arptables-nft arptables \ -+@ENABLE_NFTABLES_TRUE@ ebtables-nft ebtables \ -+@ENABLE_NFTABLES_TRUE@ xtables-monitor - - pkgconfig_DATA = xtables.pc - all: $(BUILT_SOURCES) ---- a/iptables/xtables-nft-multi.c -+++ b/iptables/xtables-nft-multi.c -@@ -31,8 +31,10 @@ static const struct subcommand multi_subcommands[] = { - {"iptables-restore-translate", xtables_ip4_xlate_restore_main}, - {"ip6tables-restore-translate", xtables_ip6_xlate_restore_main}, - {"arptables", xtables_arp_main}, -+ {"arptables-nft", xtables_arp_main}, - {"ebtables-translate", xtables_eb_xlate_main}, - {"ebtables", xtables_eb_main}, -+ {"ebtables-nft", xtables_eb_main}, - {"xtables-monitor", xtables_monitor_main}, - {NULL}, - }; diff --git a/net-firewall/iptables/iptables-1.8.0-r1.ebuild b/net-firewall/iptables/iptables-1.8.2.ebuild index cbef20783c21..cbf85327a99a 100644 --- a/net-firewall/iptables/iptables-1.8.0-r1.ebuild +++ b/net-firewall/iptables/iptables-1.8.2.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 @@ -42,12 +42,6 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { - eapply "${FILESDIR}"/${P}-fix-building-without-nft-backend.patch - touch -r configure extensions/GNUmakefile.in || die - - eapply "${FILESDIR}"/${P}-support-nft-suffix-for-arptables-and-ebtables.patch - touch -r configure iptables/Makefile.{am,in} || die - # use the saner headers from the kernel rm -f include/linux/{kernel,types}.h @@ -118,6 +112,9 @@ src_install() { # Bug 660886 rm "${ED%/}"/sbin/{arptables,ebtables} || die + + # Bug 669894 + rm "${ED%/}"/sbin/ebtables-{save,restore} || die fi systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest index 53b604650fa9..c8592ba2a120 100644 --- a/net-firewall/shorewall/Manifest +++ b/net-firewall/shorewall/Manifest @@ -15,28 +15,12 @@ AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b39 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8 -DIST shorewall-5.2.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 -EBUILD shorewall-5.2.0.5.ebuild 16266 BLAKE2B 69e32d9dd1ffb111a0b2a570176d43ccdaa14a0dfa58a16bf183f14c1006637b98bd9d56dc11ca75f9965b13483a51b50f29010d4898e9485e5e181af942843a SHA512 d218f924678252ab7e91b2b6965299993ce9ee77bda85174e5b93a35ad4d742ae1c205c9ca8d43f3225f75584f684ded0a02e4fec95211a27fb77726f42586ef -EBUILD shorewall-5.2.1.1.ebuild 17009 BLAKE2B fa636310f8f6746a98a83c5600b95dc697214a8239977f87dceb7ff520ca0a57ee5763feee0b6ac25a1fa311c9f00707e8c4a18fff91435ac59ce9188cd52dbe SHA512 8ff2886be685745c26cc0ac8274f2c0061b6ce9ae454412809c4230af9d53afc24e73898dd574c719bd7aba9226bd718085c49a3feaef101fbd96a7962b4273c -EBUILD shorewall-5.2.1.ebuild 17009 BLAKE2B fa636310f8f6746a98a83c5600b95dc697214a8239977f87dceb7ff520ca0a57ee5763feee0b6ac25a1fa311c9f00707e8c4a18fff91435ac59ce9188cd52dbe SHA512 8ff2886be685745c26cc0ac8274f2c0061b6ce9ae454412809c4230af9d53afc24e73898dd574c719bd7aba9226bd718085c49a3feaef101fbd96a7962b4273c +EBUILD shorewall-5.2.1.1.ebuild 17002 BLAKE2B 72da8a4b999f3cdefcc487019542ab52e0fb6a701d4dbed620fd27ebb4b081469894333efd08dc72e9f044a5c634b97178d95e0930ffdec635d3069ab5146876 SHA512 420539c11f0d5aa81595bd96cd4dabb3036eeba90d604761b845d5b2fd7b2c23d0047e9a367b0fb26c766ead0295e37cb584ae8acc4e65fff32ecff6164503ba MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33 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 3794662afa62..000000000000 --- 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.1.ebuild b/net-firewall/shorewall/shorewall-5.2.1.1.ebuild index 1666426f5c3c..9bbd07625123 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=" 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 1666426f5c3c..000000000000 --- 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 -} |