Version bump to 4.5.21.10; fixes bug #509258 and bug #509258, proxied commit for Thomas D. (whissi).

Package-Manager: portage-2.2.10_p125/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

11 files changed, 440 insertions, 11 deletions

diff --git a/net-firewall/shorewall-init/ChangeLog b/net-firewall/shorewall-init/ChangeLog
index 27f8cfa8d079..8fab1f8fb414 100644
--- a/net-firewall/shorewall-init/ChangeLog
+++ b/net-firewall/shorewall-init/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-firewall/shorewall-init
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/ChangeLog,v 1.5 2014/06/04 00:46:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/ChangeLog,v 1.6 2014/06/12 14:13:48 tomwij Exp $
+
+*shorewall-init-4.5.21.10 (12 Jun 2014)
+
+  12 Jun 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/4.5.21.10/01_Remove-ipset-functionality.patch,
+  +files/4.5.21.10/README.Gentoo.txt, +files/4.5.21.10/shorewall-init.confd,
+  +files/4.5.21.10/shorewall-init.initd,
+  +files/4.5.21.10/shorewall-init.systemd, +files/4.5.21.10/shorewallrc,
+  +shorewall-init-4.5.21.10.ebuild, shorewall-init-4.5.21.7.ebuild,
+  shorewall-init-4.5.21.9.ebuild:
+  Version bump to 4.5.21.10; fixes bug #509258 and bug #509258, proxied commit
+  for Thomas D. (whissi).
 
   04 Jun 2014; Jeroen Roovers <jer@gentoo.org> shorewall-init-4.5.21.9.ebuild:
   Stable for HPPA (bug #511620).
diff --git a/net-firewall/shorewall-init/Manifest b/net-firewall/shorewall-init/Manifest
index 3e9313117ef0..f871c58346e3 100644
--- a/net-firewall/shorewall-init/Manifest
+++ b/net-firewall/shorewall-init/Manifest
@@ -1,6 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 4.5.21.10/01_Remove-ipset-functionality.patch 563 SHA256 ed4e8debb0eac40527f4c63df929e84d54bce066f1c7f002cafd9e34b01079ce SHA512 d4b9c4aea7a0d1eea24c6e7f045ce7b61b24969e962fee0f95b28c6fad490eb20c6c6cb568813d0bebf91fa6da22b9de06da03ed5bf7b2284309d0bd7d236394 WHIRLPOOL 1c3cb1f5a3829e317e834fb56a6be9a1d3ed3c63f5e4825875bbb71a85f9db195de09f6b36002e25b477e70ddf57ce6921290c31a001bb6f7036dc6600943708
+AUX 4.5.21.10/README.Gentoo.txt 1233 SHA256 01439a974c15797954f3b9ce8fc7dbd8c81baff79e6a4e81e745416103896ce3 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a WHIRLPOOL a4293a49656253e3d7903b5a067d67b1bffdb1fffb3d92a43a2c32dd8a796998c67ad66beb756b4c45db618ab72b0dbc1bc81f183976c174b483bb4a2401a643
+AUX 4.5.21.10/shorewall-init.confd 230 SHA256 f3845fcdf5e76492c23238a42e03ef028a63841f383213e8d7ba229d4396470a SHA512 c032f7eddded7c29212fa363cb7af7305bdea70e48de45c42747331cd6fd5f3319f3f0d9172f02a33e925d8a1bd6d02a6a27bcaaa3bf6006005873d293577e62 WHIRLPOOL 60057322b80f785924b832d3bdd0a0efc4dcd10358d0589f31cb7a932ecd363b43910f2b2f23c43e66fddc52f563b034fe547ddc43541ef07967e76055f7c3d8
+AUX 4.5.21.10/shorewall-init.initd 4478 SHA256 359d0e510339074553815d678a17643c72c7540ebc3260f662e1a959ac3d6ecb SHA512 7b0bd7335806efccaa6add253fb8b2022422f8e2b63035459e5819bef872abdb9391f02c9843c6b5ef8ffb17135c78a2414fbe1c0ef3f683c56f7050d1d68058 WHIRLPOOL 6ffabc64eb8b7cb163d68ec2a8f5d2900432b1e42235a848275dbf32e8a0948491e3cf063fc0a20d6cff2300379281e6c9419efdda4cd67d99d8fd8e2dc7c31e
+AUX 4.5.21.10/shorewall-init.systemd 343 SHA256 54b9800171441271808a4fe01b85d7e6408cfb284b69d88c1abdd9491a5e6921 SHA512 d326933f4ebcc7a6780e64c2a32413d553fb8cfd7d183395efacc7348e30f7e7f62589917025996694f46a4fc31fdca7404dd5de8b8f90e52518f812597451a0 WHIRLPOOL d7ab450c30e10588fcacb19382fecd0a0654ce308275392945148d7353af69a51d20cde8199fafded80098522452ca2a4ff42314d8b63f18e347ca66283c5d90
+AUX 4.5.21.10/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/01_Remove-ipset-functionality.patch 563 SHA256 ed4e8debb0eac40527f4c63df929e84d54bce066f1c7f002cafd9e34b01079ce SHA512 d4b9c4aea7a0d1eea24c6e7f045ce7b61b24969e962fee0f95b28c6fad490eb20c6c6cb568813d0bebf91fa6da22b9de06da03ed5bf7b2284309d0bd7d236394 WHIRLPOOL 1c3cb1f5a3829e317e834fb56a6be9a1d3ed3c63f5e4825875bbb71a85f9db195de09f6b36002e25b477e70ddf57ce6921290c31a001bb6f7036dc6600943708
 AUX 4.5.21.7/10-releasenotes.patch 672 SHA256 2a7638cdf09e6fe8440f83c239e473878453749b7485c7d697fa33193364a0f6 SHA512 eae8a680840080efcd08ba2e3f252cea7eb89a5d8d8ecf0f0481af6cac11e2e6322e1f42f89b1c5cd950c635a5ed72be0bb5a6707fbc80914afc58f4c246e98a WHIRLPOOL 90cce01ece70f660aee3ac84a63f43f9c08c3cafecc58722870d7d99259d066e26533909506458a9db467e57954edd8796d2045d7cf4c3d9f5885ef757148d88
 AUX 4.5.21.7/README.Gentoo.txt 1233 SHA256 01439a974c15797954f3b9ce8fc7dbd8c81baff79e6a4e81e745416103896ce3 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a WHIRLPOOL a4293a49656253e3d7903b5a067d67b1bffdb1fffb3d92a43a2c32dd8a796998c67ad66beb756b4c45db618ab72b0dbc1bc81f183976c174b483bb4a2401a643
@@ -14,16 +20,22 @@ AUX 4.5.21.9/shorewall-init.confd 230 SHA256 f3845fcdf5e76492c23238a42e03ef028a6
 AUX 4.5.21.9/shorewall-init.initd 4479 SHA256 3e011a6a726e3890bdbdd9d3c7226352ceffcebba8f3424eb4d2372eaf990bbc SHA512 9c33e0a9400cdc600c31f50baedad92236ca98e0c2e47f3f48dc637275d5dfff80ad64f204e4e6ff610e9a08897ecea75da38f76f69b15fcaad4b3894db6fda0 WHIRLPOOL 4fc6643cd576a0a257300951c7291119621b5c1ed064da123f3402ee350e60b5842c3ee9fce053294472a61e1f8dd905e3b28989997b835faa1cc3ca288efdf1
 AUX 4.5.21.9/shorewall-init.systemd 343 SHA256 54b9800171441271808a4fe01b85d7e6408cfb284b69d88c1abdd9491a5e6921 SHA512 d326933f4ebcc7a6780e64c2a32413d553fb8cfd7d183395efacc7348e30f7e7f62589917025996694f46a4fc31fdca7404dd5de8b8f90e52518f812597451a0 WHIRLPOOL d7ab450c30e10588fcacb19382fecd0a0654ce308275392945148d7353af69a51d20cde8199fafded80098522452ca2a4ff42314d8b63f18e347ca66283c5d90
 AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
+DIST shorewall-init-4.5.21.10.tar.bz2 66287 SHA256 53dc29e61d2ed91b7d47f5d4ef51f751567288b2bf0c4459ddbae8dc8259dc32 SHA512 4856816b4f7c5d9015f4c8e65246297ccf927b979050cb955253ef24947938fc31e5aed9b8f6f4a0f5d2ae390a97cf5cd6010639c677befb981ec85234435f6e WHIRLPOOL a5463c06a7c60129f5b969cc28c4c94701d12955192179055deed9e29bb07cab24c4885b8ec279f247fac83b72fa8e39880bceae153ba82c41f7bd4a7cff0740
 DIST shorewall-init-4.5.21.7.tar.bz2 66069 SHA256 333904c191c670d463bbf9c3143df51ecf1e33454a89f3917a07817f0f3ce68b SHA512 2c44a6ec5d5b4395b8e41b8a54cff066c75b8c8b8aba87d97f98d7011841a947b497e91272cd31e7422db306b237d102c02b76bacd9537574e359d275fe33286 WHIRLPOOL 49251ed0600a4ab387b5d36882c049cd95bfd4aa7e6d6cc8782731707d739725348bcfcb3c3e1115ce9387e730b71ebff5773f70f2045a05ed00438d15a266ee
 DIST shorewall-init-4.5.21.9.tar.bz2 66436 SHA256 53867182aac095777d08830260596eaad8893c64715a27c837ac928546803f20 SHA512 973302b3f74f655b6b284e36caaa02e95ed3e3afabf5f0eae5307381cf95f8e33f3a85696b573e928dad91b121123ab07903954dfb6fa3b57a4759dfa72f93f6 WHIRLPOOL 43f527cbb4b36b725a981076df1a2efd5213058439916d56baf94dc6981b305286e42d7f8d406f8c6e47362cac92a5674975642e8d2535f0cf6e685db9d918c5
-EBUILD shorewall-init-4.5.21.7.ebuild 3132 SHA256 70ab6fa401f6d31a30a7f54034552ae585c947d90909d461865a098b846b26db SHA512 398510d555a64e09b99062e43493fa5903c2cb18b863d2645846c5a65c3d7475a8ecd9d5fdee1a312f9f5ac91bdf2034c479144d151f87f98b90d8b86c63e619 WHIRLPOOL 68f7b47281f5e9c106f36ce8399c7a22f9ddcf5e445ad61ca1f4fbb777d9a15ce70481bb1793cec62f134add95be85ca765f450465e293c9629729192601bbd0
-EBUILD shorewall-init-4.5.21.9.ebuild 3075 SHA256 084ab879513beb8e9494bf8b23f3f1c60f0c220f81cc5dc10465323c71a7d75f SHA512 7810509e79d13515c816c21361fe6cd95be2e8f12a7492971d668d1f2e1607fbd1b62d58c5ae5d2f1da250e398a2bab6b054d08a0db1b9f9ad3f302e005da74c WHIRLPOOL a4a8cd75aba3fb01e6c220344977ee0d2d5a2d83aea34160053713a08ab84fa2d1a96a8ada65fdaf2b53bf88cd9c5bb66745b8d881c8290813d7fce951bf7435
-MISC ChangeLog 2654 SHA256 7d0b82563fb31518ee29463255b5500d725ab29b01f3dceb458846e520c789ac SHA512 b16084e7f07aea6c19c40202f350f0138a41ebdf63fbc3985432f23beb2837c3d2e395ef0926af3fddafd8000a26379a3f6e39b16a848464a360cbfe2a567004 WHIRLPOOL 02b7f221254a57797aae95cd5e3f561b66a7df1347336346e7c784a3e4b36839e8118c0b4d17c3bb7bff520ed432abad674620cfe05d7444c08b6acec453f692
+EBUILD shorewall-init-4.5.21.10.ebuild 3079 SHA256 b528d9dd572bfe0768b31061171f8f716ea9a6377c49d58f57e26a1a08fbac00 SHA512 ec1c898a75c04478e9757568418fb741ab1a6bf79fa04fdc9d643b90b92eaec5517c095be19133ec10bfbe23db9705ab481215529edd18b786dcc0efa3522663 WHIRLPOOL 1689d20029db82b0b011c83cabe6b937bb42d94ec253763d490d29d1b0b7d25b5e806bdc1b1ce05a3ce4c8f7d50d4662a7e1505b788fd3daba3a2783f0fc691e
+EBUILD shorewall-init-4.5.21.7.ebuild 3129 SHA256 d7bb0ef915d388b353cdd7afb5197c94afd15698cdb847d5d23763362a820250 SHA512 0816b59c76d3770b5aed64a3cb30234b222b43af1f3615bfc5b9966a22f72dfd62a6dccec30a74ec77cf195239641549917a1847fc38b896dfa1d4c8437a77ef WHIRLPOOL a3c5bae68e43241547c7ecaf1c440126e9acbbf6784534e8d6183249e44e36bac0a547337a9349e129e12c648681b0ef61b24f08e9c94d358e2a8d1aed0e3ca3
+EBUILD shorewall-init-4.5.21.9.ebuild 3077 SHA256 f7744db5144e52173ba190e5c992b9b2551f97b635b763cb188440400a9ae199 SHA512 5f68853eb12fce9d54c47be34d355b3ee89e76ab7c3817b6fa4347cbacd972b8ee1de08edf4bc75cac3b9afa7cca6b0a651bdae55ee12a6a256ef462f4c6af05 WHIRLPOOL d4e5b60b756f310867cb39f5e5a3a2b07f6411b285e8448d8f1f7dc6ab71c7331dc76963a18af8f254b4469e55375eec1566609d513bea19004703fd01a51948
+MISC ChangeLog 3200 SHA256 e8cdea2f851cf36d47119bb04aac0ce9d733aa07c155b37e3a56275b16f205f4 SHA512 4ce48cd8b5b84ad330257aa076451dccd27646465f31b9f88d0ce844b7611443ce97f94c5f4cf948251631815321fcbf1d29c6f8e0235a98245f769904e0b77f WHIRLPOOL d2b00d45f4a74a4c2e7f24650b23102d6e35369e0955842fdc23162e65f3a81e9b74a3ac530fc01613e4492a5b91d3d275697b7fc1b812feffe85407c39d6ff8
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOObE0ACgkQVWmRsqeSphPrPQCfVt61L1Wau5fVOekqFtoPQ4Uc
-zTQAn1jdJuIdzv0xy5PC7CZIOL9Evsxv
-=fftC
+iQEcBAEBCAAGBQJTmbVcAAoJEJWyH81tNOV9YFsH/2nFQ3miMiWedXwk5aRb7It/
+mtwfg9WhbiekVS5NDJjRHOTJRGf6hUcmF9ps0M+104bEcF17MCIfzcEWa2LhZBEO
+TxCZAAr3AMqjVK5Ub/X11iSNEgfTKkLFrLYtTzE4muTjHSg8RdNeA8sUD027Sr2c
+XVJje/o6jXAcvZxtvB5eZMqu8ei/nSgRQgMXF83vOq/0R78ZxEIMr/y379QhVj41
+Y4RsS3sbPrJgM//l2WrlG6tj5D//4B3vbS1TKXmz6f5NPIakVA2GLPrMWe9bgsS/
+yEB7/nCVFDGEIg4YqTpBk46wPcmlLlJKYv2/O9QBvyAFXsUuIfBFl/LKyw/w2aE=
+=ALW0
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-init/files/4.5.21.10/01_Remove-ipset-functionality.patch b/net-firewall/shorewall-init/files/4.5.21.10/01_Remove-ipset-functionality.patch
new file mode 100644
index 000000000000..620e479f92fc
--- /dev/null
+++ b/net-firewall/shorewall-init/files/4.5.21.10/01_Remove-ipset-functionality.patch
@@ -0,0 +1,27 @@
+--- shorewall-init.old	2013-09-08 23:25:36.364924304 +0200
++++ shorewall-init	2013-09-08 23:29:27.418736392 +0200
+@@ -79,10 +79,6 @@
+       fi
+   done
+ 
+-  if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
+-      ipset -R < "$SAVE_IPSETS"
+-  fi
+-
+   return 0
+ }
+ 
+@@ -100,13 +96,6 @@
+       fi
+   done
+ 
+-  if [ -n "$SAVE_IPSETS" ]; then
+-      mkdir -p $(dirname "$SAVE_IPSETS")
+-      if ipset -S > "${SAVE_IPSETS}.tmp"; then
+-	  grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS"
+-      fi
+-  fi
+-
+   return 0
+ }
+ 
diff --git a/net-firewall/shorewall-init/files/4.5.21.10/README.Gentoo.txt b/net-firewall/shorewall-init/files/4.5.21.10/README.Gentoo.txt
new file mode 100644
index 000000000000..f7b13fed3de6
--- /dev/null
+++ b/net-firewall/shorewall-init/files/4.5.21.10/README.Gentoo.txt
@@ -0,0 +1,30 @@
+shorewall-init from upstream offers two features (taken from [1]):
+
+	1. It can 'close' the firewall before the network interfaces are
+	   brought up during boot.
+	
+	2. It can change the firewall state as the result of interfaces
+	   being brought up or taken down.
+
+On Gentoo we only support the first feature -- the firewall lockdown during
+boot.
+
+We do not support the second feature, because Gentoo doesn't support a
+if-{up,down}.d folder like other distributions do. If you would want to use
+such a feature, you would have to add a custom action to /etc/conf.d/net
+(please refer to the Gentoo Linux Handbook [2] for more information).
+If you are able to add your custom {pre,post}{up,down} action, your are
+also able to specify what shorewall{6,-lite,6-lite} should do, so there is
+no need for upstream's scripts in Gentoo.
+
+If you disagree with us, feel free to open a bug [3] and contribute your
+solution for Gentoo.
+
+Upstream's original init script also supports saving and restoring of
+ipsets. Please use the init script from net-firewall/ipset if you need
+such a feature.
+
+
+[1] http://www.shorewall.net/Shorewall-init.html
+[2] http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=4&chap=5
+[3] https://bugs.gentoo.org
diff --git a/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.confd b/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.confd
new file mode 100644
index 000000000000..4ca0024579f7
--- /dev/null
+++ b/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.confd
@@ -0,0 +1,9 @@
+# List the Shorewall products that Shorewall-init is to
+# initialize (space-separated list).
+#
+# Sample: PRODUCTS="shorewall shorewall6-lite"
+#
+PRODUCTS=""
+
+# Startup options - set verbosity to 0 (minimal reporting)
+OPTIONS="-V0"
diff --git a/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.initd b/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.initd
new file mode 100644
index 000000000000..ef38a1c51470
--- /dev/null
+++ b/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.initd
@@ -0,0 +1,196 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.initd,v 1.1 2014/06/12 14:13:48 tomwij Exp $
+
+SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc"
+CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}"
+
+description="Puts Shorewall in a safe state at boot time"
+description="${description} prior to bringing up the network."
+
+required_files="$SHOREWALLRC_FILE"
+
+depend() {
+	need localmount
+	before net
+	after bootmisc ipset tmpfiles.setup ulogd
+}
+
+
+. $SHOREWALLRC_FILE
+
+checkconfig() {
+	local PRODUCT=
+	
+	if [ -z "${VARLIB}" ]; then
+		eerror "\"VARLIB\" isn't defined or empty! Please check" \
+			"\"${SHOREWALLRC_FILE}\"."
+		
+		
+		return 1
+	fi
+	
+	if [ -z "${PRODUCTS}" ]; then
+		eerror "${SVCNAME} isn't configured! Please check" \
+			"\"${CONFIG_FILE}\"."
+		
+		
+		return 1
+	fi
+	
+	for PRODUCT in ${PRODUCTS}; do
+		if [ ! -x ${SBINDIR}/${PRODUCT} ]; then
+			eerror "Invalid product \"${PRODUCT}\" specified" \
+				"in \"${CONFIG_FILE}\"!"
+			eerror "Maybe \"${PRODUCT}\" isn't installed?"
+			
+			
+			return 1
+		fi
+	done
+	
+	
+	return 0
+}
+
+check_firewall_script() {
+	if [ ! -x ${STATEDIR}/firewall ]; then
+		if [ ${PRODUCT} = shorewall -o ${PRODUCT} = shorewall6 ]; then
+			ebegin "Creating \"${STATEDIR}/firewall\""
+			${SBINDIR}/${PRODUCT} compile 1>/dev/null
+			eend $?
+		else
+			eerror "\"${PRODUCT}\" isn't configured!"
+			eerror "Please go to your 'administrative system'" \
+				"and deploy the compiled firewall" \
+				"configuration for this system."
+			
+			
+			return 1
+		fi
+	fi
+	
+	
+	return 0
+}
+
+is_allowed_to_be_executed() {
+	# This is not a real service. shorewall-init is an intermediate
+	# script to put your Shorewall-based firewall into a safe state
+	# at boot time prior to bringing up the network.
+	# Please read /usr/share/doc/shorewall-init-*/README.gentoo.gz
+	# for more information.
+	# When your system is up, there is no need to call shorewall-init.
+	# Please call shorewall{,6,-lite,6-lite} directly. That's the
+	# reason why we are preventing start, stop or restart here.
+	
+	local PRODUCT=
+	
+	if [ "${RC_RUNLEVEL}" != "boot" -a "${RC_CMD}" = "start" ]; then
+		# Starting shorewall-init is only allowed at boot time
+		eerror "This is a boot service, which can only be started" \
+			"at boot."
+		eerror "If you want to get your shorewall-based firewall" \
+			"into the same safe boot state again, run"
+		eerror ""
+		eindent
+		for PRODUCT in ${PRODUCTS}; do
+			eerror "/etc/init.d/${PRODUCT} stop"
+		done
+		eoutdent
+		eerror ""
+		eerror "Yes, \"stop\" and not start."
+		eerror ""
+		return 1
+	fi
+	
+	if [ "${RC_RUNLEVEL}" != "shutdown" -a "${RC_CMD}" = "stop" ]; then
+		# Stopping shorewall-init is only allowed at shutdown
+		eerror "This is a boot service, which cannot be stopped."
+		eerror "If you really want to stop your Shorewall-based" \
+			"firewall the same way this service would stop" \
+			"Shorewall at shutdown, please run"
+		eerror ""
+		eindent
+		for PRODUCT in ${PRODUCTS}; do
+			eerror "/etc/init.d/${PRODUCT} clear"
+		done
+		eoutdent
+		eerror ""
+		eerror "Keep in mind that this will clear (=bring down)" \
+			"your firewall!"
+		eerror ""
+		return 1
+	fi
+	
+	if [ "${RC_CMD}" = "restart" ]; then
+		eerror "This is a boot service, which cannot be restarted."
+		eerror "If you want to restart any of your Shorewall-based" \
+			"firewalls, run"
+		eerror ""
+		eindent
+		for PRODUCT in ${PRODUCTS}; do
+			eerror "/etc/init.d/${PRODUCT} restart"
+		done
+		eoutdent
+		eerror ""
+		return 1
+	fi
+	
+	
+	return 0
+}
+
+set_statedir() {
+	STATEDIR=
+	local VARDIR=
+	
+	if [ -f ${CONFDIR}/${PRODUCT}/vardir ]; then
+		STATEDIR=$( . ${CONFDIR}/${PRODUCT}/vardir && echo ${VARDIR} )
+	fi
+	
+	[ ! -n "${STATEDIR}" ] && STATEDIR=${VARLIB}/${PRODUCT}
+}
+
+start_pre() {
+	checkconfig || return 1
+	
+	is_allowed_to_be_executed || return 1
+}
+
+start() {
+	local PRODUCT=
+	local STATEDIR=
+	
+	for PRODUCT in ${PRODUCTS}; do
+		set_statedir
+		
+		check_firewall_script || return 1
+		
+		ebegin "Initializing \"${PRODUCT}\""
+		${STATEDIR}/firewall stop 1>/dev/null
+		eend $?
+	done
+}
+
+stop_pre() {
+	checkconfig || return 1
+	
+	is_allowed_to_be_executed || return 1
+}
+
+stop() {
+	local PRODUCT=
+	local STATEDIR=
+	
+	for PRODUCT in ${PRODUCTS}; do
+		set_statedir
+		
+		check_firewall_script || return 1
+		
+		ebegin "Clearing \"${PRODUCT}\""
+		${STATEDIR}/firewall clear 1>/dev/null
+		eend $?
+	done
+}
diff --git a/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.systemd b/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.systemd
new file mode 100644
index 000000000000..e48a729105b8
--- /dev/null
+++ b/net-firewall/shorewall-init/files/4.5.21.10/shorewall-init.systemd
@@ -0,0 +1,16 @@
+#
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
+#
+[Unit]
+Description=shorewall-init
+Documentation=http://www.shorewall.net/Shorewall-init.html
+Before=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/sbin/shorewall-init start
+ExecStop=/sbin/shorewall-init stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-init/files/4.5.21.10/shorewallrc b/net-firewall/shorewall-init/files/4.5.21.10/shorewallrc
new file mode 100644
index 000000000000..46f5eb9a3603
--- /dev/null
+++ b/net-firewall/shorewall-init/files/4.5.21.10/shorewallrc
@@ -0,0 +1,23 @@
+#
+# Gentoo Shorewall 4.5 rc file
+#
+BUILD=                                  #Default is to detect the build system
+HOST=gentoo                             #Gentoo GNU Linux
+PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
+CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
+SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
+MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
+INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
+INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
+INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
+ANNOTATED=                              #If non-zero, annotated configuration files are installed
+SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
+SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
+SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
+SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
+VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.10.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.10.ebuild
new file mode 100644
index 000000000000..e752b91501a5
--- /dev/null
+++ b/net-firewall/shorewall-init/shorewall-init-4.5.21.10.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.10.ebuild,v 1.1 2014/06/12 14:13:48 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils versionator prefix
+
+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_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network"
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/coreutils-8.20"
+RDEPEND="
+	${DEPEND}
+	|| ( =net-firewall/shorewall-${PVR} =net-firewall/shorewall6-${PVR} =net-firewall/shorewall-lite-${PVR} =net-firewall/shorewall6-lite-${PVR} )
+"
+
+S=${WORKDIR}/${MY_P}
+
+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"
+	eprefixify "${S}"/init.gentoo.sh
+
+	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
+
+	epatch "${FILESDIR}"/${PVR}/01_Remove-ipset-functionality.patch
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+
+	if [ -d "${D}/etc/logrotate.d" ]; then
+		# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+		# so we don't need a logrotate folder at all
+		rm -rf "${D}"/etc/logrotate.d
+	fi
+
+	if [ -d "${D}/etc/NetworkManager" ]; then
+		# On Gentoo, we don't support NetworkManager
+		# so we don't need these folder at all
+		rm -rf "${D}"/etc/NetworkManager
+	fi
+
+	if [ -f "${D}/usr/share/shorewall-init/ifupdown" ]; then
+		# This script won't work on Gentoo
+		rm -rf "${D}"/usr/share/shorewall-init/ifupdown
+	fi
+
+	dodoc changelog.txt releasenotes.txt "${FILESDIR}"/${PVR}/README.Gentoo.txt
+}
+
+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/conf.d/${PN}"
+		elog ""
+		elog "To use ${PN}, please add ${PN} to your boot runlevel:"
+		elog ""
+		elog "  # rc-update add ${PN} boot"
+		elog ""
+		ewarn "Notice:"
+		ewarn "${PN} is more like a start script than a service."
+		ewarn "Therefore you cannot start or stop ${PN} at default runlevel."
+		ewarn ""
+		ewarn "For more information read ${EPREFIX}/usr/share/doc/${PF}/README.Gentoo.txt.bz2"
+	fi
+}
diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.7.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.7.ebuild
index 9d281367d6cf..b1fa3a2b6ad7 100644
--- a/net-firewall/shorewall-init/shorewall-init-4.5.21.7.ebuild
+++ b/net-firewall/shorewall-init/shorewall-init-4.5.21.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.7.ebuild,v 1.1 2014/03/15 23:01:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.7.ebuild,v 1.2 2014/06/12 14:13:48 tomwij Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ 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)
 
-DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network."
+DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network"
 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"
 
diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild
index 36cadbd8098a..43e884dbe60f 100644
--- a/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild
+++ b/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild,v 1.2 2014/06/04 00:46:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild,v 1.3 2014/06/12 14:13:48 tomwij Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ 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)
 
-DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network."
+DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network"
 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"