diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-31 22:30:36 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-31 22:30:36 +0000 |
commit | 618c3037024b4e5328531cdc07c6ceb7486f5329 (patch) | |
tree | 7c9f8d50c6f5fbd53f3df583c471f5d2e5c34202 /net-firewall/shorewall | |
parent | 76dfef0cec9170000357d2f354e412daf48941fc (diff) |
gentoo resync : 31.12.2017 (final resync this year)
Diffstat (limited to 'net-firewall/shorewall')
-rw-r--r-- | net-firewall/shorewall/Manifest | 5 | ||||
-rw-r--r-- | net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch | 21 | ||||
-rw-r--r-- | net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild (renamed from net-firewall/shorewall/shorewall-5.1.9.ebuild) | 5 | ||||
-rw-r--r-- | net-firewall/shorewall/shorewall-5.1.9-r1.ebuild | 2 |
4 files changed, 28 insertions, 5 deletions
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest index 22581fc4ac31..d78e8f19cf48 100644 --- a/net-firewall/shorewall/Manifest +++ b/net-firewall/shorewall/Manifest @@ -1,3 +1,4 @@ +AUX shorewall-5.1.10.1-fix-find.patch 674 BLAKE2B 4bb05ba775c0fdde4ceed50b381cfad29e51f54fbc10927a6b11088ee4c02825959206750ab6d099f9444bbd306c10f932a86389e8c7a9d2ad21172a55410e53 SHA512 d2e985e84bd0122aaed1e6a955c53344794ec1458ff4d97e138a355aa9549f7ae60d9ab556c0ffbedd5078a523a8e38267c51dab6eda2f25b1285d3231826080 AUX shorewall-add-iproute2-4.13.0+-support.patch 889 BLAKE2B 45a9b0fbaffbf284f943c627b8b5bfb5e820f8c132ec5dd08247f17a325303e72afb28eeae0a6d5bf72d45f88d8eef5894321135da572dfaeefd41a37507cb94 SHA512 821dc1104671f1f5781ee597c1f5c5bff6a77935255be5329064a82b8d645f17dad106e505290620809c6ae1ba25239e667640eda9a003616ebc7b0f422210f3 AUX shorewall-init-01_remove-ipset-functionality-r1.patch 799 BLAKE2B 5cbf0835d291464eca10356fcfe1de13bc90cf0e3b9869d0daf8e3ad3864a44939774179047cbf5e192f0e294d8e8765c6d7b60a02178c9c149cbda4d3342b83 SHA512 c8686cb9345abd1036a8fdc6cbdaacc21a69df9dc536393a65675a2ae19c9cfb71d71cc66a9776135ad923414bde783f01dfa69600d1cfaafd618fcea65c8dcf AUX shorewall-init.confd 152 BLAKE2B b670db8a1da8e37c9d0f856c27ceb9644ec7baebf82e8d053c02a6f133df15a04087340ac430c8dddc57295332834c3e8e1c6fcb994e96e7224452a5a039d1c4 SHA512 105393c3cbdd1820066e41ed941b6a79cafde3196eb723c06ca984fc663370d6902757467339b6b4ebfb8d00167b9f85311b6842dadc564029313eb36f1a389b @@ -27,7 +28,7 @@ DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d4 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 +EBUILD shorewall-5.1.10.1-r2.ebuild 16190 BLAKE2B 5953e5fbfaacd1bc2bb37e2c83564fc173f292ad3912731ad4b9fcab8db0d6676d8dcbc9d19ab9698d471a36536ef09f219e5f1cf9053ed2cc1bae046f154b53 SHA512 b9af71fab802e904062cd2f28c04511f95541de81679314766a4b6ebb06c3a8236f39988846603129da1656c2be2343549b9c88dd0962ce9e84e4bedf0d732f8 EBUILD shorewall-5.1.10.1.ebuild 16138 BLAKE2B 773362be92a5387b429438909a85900c0b0c44860149693ff3e1bc5b0262585160b309166b0e1fce6ef66f577e0ebfbfd9190c7745cadf9c2d541a0ae9729ded SHA512 0eed0236de6f7a2f336e052cbfd7c57a95687520df51b580557bc5ba11aabd5d6dd8ac23809950ec76dcce24e78922d254f52187df5d82bd4e70c6af020a9893 -EBUILD shorewall-5.1.9-r1.ebuild 16200 BLAKE2B a931f89d20368834293d50faa37f38d4224146f9ab11d247f6be5d85fab6bf258e60f5aedbaa28f5245a9ece5d4a3bdb0634ad7d90a32e203980417ceee70bf1 SHA512 9f3e31d7991a3960f8cfff37eb10b791c8f8f2fc260be12f7dc57a032ee16ef20fd618e905268f59d716b5aa132557d4d210bbbb3dccb34b042012deb959e1bc -EBUILD shorewall-5.1.9.ebuild 16131 BLAKE2B 66da436b07968eb3cc2f17e7b18b30d1bf345c00d5df68f33ef0bba04d1ea99b08ad3b1b9269ec2967ef63ede1df8fbf5f6c6bd36dc848f0a66f87b2926d3d6f SHA512 4b7290fde74bb035b8c4b2e9b4d7865b3c45eba0f9814f2f046fa482a3d89606fdb42faeadbfe8cb3b39dd85a95171a1e05f6db2432def12e076784dcd93e8e3 +EBUILD shorewall-5.1.9-r1.ebuild 16199 BLAKE2B 99451766a294d056ba5c0a0ea807584c241e187abe425c7d42473a8fd92a743c68cb1bb6aec6fc9df1551ec35a3aa25a45f17fd86a5ca98c63ad982ed4a19617 SHA512 2282ce7bd8962f0733fe1e2d2c0696b40c29abf0519f058fec6d87b0cce2ff164a1658935aa59f4f22c04095e1cb70dd19800d1518f0b390f3d5de8c24d675c4 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33 diff --git a/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch b/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch new file mode 100644 index 000000000000..2850d12297f0 --- /dev/null +++ b/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch @@ -0,0 +1,21 @@ +commit 4e5b98d3d928579bc3530893ceaf166337ea8e22 +Author: Tom Eastep <teastep@shorewall.net> +Date: Fri Dec 29 15:32:05 2017 -0800 + + Only search files in each CONFIG_PATH directory - no recursion + + Signed-off-by: Tom Eastep <teastep@shorewall.net> + +diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std +index 6f220aa3d..95eafdf65 100644 +--- a/shorewall-5.1.10.1/lib.cli-std ++++ b/shorewall-5.1.10.1/lib.cli-std +@@ -386,7 +386,7 @@ uptodate() { + IFS=':' + + for dir in $g_shorewalldir $CONFIG_PATH; do +- if [ -n "$(find ${dir} -newer $1)" ]; then ++ if [ -n "$(find ${dir} -mindepth 1 -maxdepth 1 -newer $1)" ]; then + IFS="$ifs" + return 1; + fi diff --git a/net-firewall/shorewall/shorewall-5.1.9.ebuild b/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild index 3f5247ae95c5..ffef283075da 100644 --- a/net-firewall/shorewall/shorewall-5.1.9.ebuild +++ b/net-firewall/shorewall/shorewall-5.1.10.1-r2.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=" @@ -94,7 +94,7 @@ DEPEND="" RDEPEND=" >=net-firewall/iptables-1.4.20 - <sys-apps/iproute2-4.13.0[-minimal] + >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 @@ -164,6 +164,7 @@ src_prepare() { 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 + eapply "${FILESDIR}"/${PN}-5.1.10.1-fix-find.patch # shorewall if use ipv4; then diff --git a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild index 22419c59ec5f..f6ef8b56e58f 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=" |