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

10 files changed, 309 insertions, 14 deletions

diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index ee6c7a3dc220..e4b8cdd2ed31 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.98 2014/06/04 00:47:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.99 2014/06/12 14:26:06 tomwij Exp $
+
+*shorewall6-4.5.21.10 (12 Jun 2014)
+
+  12 Jun 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/4.5.21.10/shorewall6.confd, +files/4.5.21.10/shorewall6.initd,
+  +files/4.5.21.10/shorewall6.systemd, +files/4.5.21.10/shorewallrc,
+  +shorewall6-4.5.21.10.ebuild, shorewall6-4.5.18-r1.ebuild,
+  shorewall6-4.5.21.7.ebuild, shorewall6-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> shorewall6-4.5.21.9.ebuild:
   Stable for HPPA (bug #511620).
diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest
index 0b310a9ed9ae..1c5b302c8170 100644
--- a/net-firewall/shorewall6/Manifest
+++ b/net-firewall/shorewall6/Manifest
@@ -5,6 +5,10 @@ AUX 4.5.18-r1/shorewall6.conf-SUBSYSLOCK.patch 709 SHA256 6fcf06104fade54ae601b5
 AUX 4.5.18-r1/shorewall6.initd 2844 SHA256 ce1e60d23ecce4a2c6d9e0829c152411439c275e1eafc1b8a8e834e5da72f3f7 SHA512 a8d03bf3652a6488bb7d5bc8ecaa9febeefac1b7d1f2e86ab52a7de79a8d01ac70b243cfe626c244e4ffbcf64de13dfd3500d5222009b6955636303433e22e6a WHIRLPOOL dd2957be764ba457b6e537de0337b39fb2ebbf6061f1da84c6939f2a5b5ed58067ce446ca248e74274ef2a60fa9c002df7b6e576bc70a5d1302df8f5985768a5
 AUX 4.5.18-r1/shorewall6.systemd 453 SHA256 9e1e5d7657591a395b3f66849f323e00226c0bf739e7c875b9787b43cc64d11c SHA512 a7cfe34c106bdc2d50cceb607d92888f4c6b0d618d5dfa96f0c3a78689ab1f2092db609427393718495ed6753f89a4279e6883d44743da6bdeb1da3a111b1da3 WHIRLPOOL bd4253a8b58975674bd40b0606efcbcbdc6facf8ecb48e9c14792f96fa1fe49eb84fb05f89e7a54b1cd01d7f9b4463894670738b3b0b0ad2b7a01fbadc64ade6
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
+AUX 4.5.21.10/shorewall6.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.21.10/shorewall6.initd 2964 SHA256 f0ad91278b72c138d2ce47575c303440c32e7a6111b3c25955c87c2123faf724 SHA512 946c21b4132516f47d1e818d2348025b00f3e30fbe95d3282d5e708658b88173c50bd85c5942a328aab624f494d824ea7f7d0fc4c1e165664d4b47e31d09bd56 WHIRLPOOL b5c35650bfe7d8645837209fdeb9efcb2b44baea05101f56559e365af6590a6f734b463ac3958a55fd092478e9df024e1325d16ffe01d5ab03e1b61b6d2d6245
+AUX 4.5.21.10/shorewall6.systemd 453 SHA256 8d6bb489efaef58a09c0588feb3e281c3fc2b8bfbe44306c6fd9f4cf6b7a1546 SHA512 df02db52e24ba80ec2b9c25e68049ddc6ee49aa0468fafc882d322faf05bc4e000fc57d06301252723e6f6f43fee603c805f26d0ac9174c944c3af2ca816ca68 WHIRLPOOL 215fc9911a1e77a69c9a53334d7d9e2b2e0c27cdbd06cfd8ad93049bba0f0b0bd86c41836dd1a56836836785aeb4207df607dad81817e2b9577de9b03178b6d7
+AUX 4.5.21.10/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 664 SHA256 4ee659b57587ef099e7a3b14f29045cbdaf19ce7a9bf65399cf605b4468f99af SHA512 89c5b3f065a7424de74c0e56ccd82c57319c12f574df3ff61b28f758f7a3745a5cf4570febd9229709fe1b309fcf4d19c49c55f4b558b1bd6db1f6e2991fd321 WHIRLPOOL 636149cfe237cd3186b92e8fecc922c76f11620f2c416c338a80e72d45cc480fa3c17cb3bbaf237ef4d301c986aec256548ff428c5e70859b38a3a6b83e8596d
 AUX 4.5.21.7/shorewall6.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.21.7/shorewall6.initd 2965 SHA256 8971419be63eb1dcd52038b633f3ddf2d393347471f4ccaad6ad198058091d6a SHA512 0d1a266e453a801ea154fdea8bb7573747e7e1a573daeee0e7e3513a6ace9e05feb3100c1633fa0dc7d006ade82b58640e78320dc52b7c6e89734a924229c2ea WHIRLPOOL 7c1f7bec4bddbf34979da840dc682126ed5a2ecabb4b502f7a074aaa03c8fd3886b10288501e27e68ba484ed326c6fc1451190dc835308094e92593c38d9f779
@@ -15,20 +19,27 @@ AUX 4.5.21.9/shorewall6.initd 2965 SHA256 c307d2c49141dc5d9cb1dce5af82a6cea95fb0
 AUX 4.5.21.9/shorewall6.systemd 453 SHA256 8d6bb489efaef58a09c0588feb3e281c3fc2b8bfbe44306c6fd9f4cf6b7a1546 SHA512 df02db52e24ba80ec2b9c25e68049ddc6ee49aa0468fafc882d322faf05bc4e000fc57d06301252723e6f6f43fee603c805f26d0ac9174c944c3af2ca816ca68 WHIRLPOOL 215fc9911a1e77a69c9a53334d7d9e2b2e0c27cdbd06cfd8ad93049bba0f0b0bd86c41836dd1a56836836785aeb4207df607dad81817e2b9577de9b03178b6d7
 AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
+DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
 DIST shorewall-docs-html-4.5.21.7.tar.bz2 4146237 SHA256 cd7de8343924828cea0959496a96f830086421d8583783158a80ba0900ae021d SHA512 4a945aff7d03b726ca14cc9f0bf9b1d42d06ea670f7aa917bb3ec085eadc3dee004582228702885b3d6ed56bf24e291bd7cae03e327e2dc9c8d7dc616962ddc7 WHIRLPOOL 09fe3c7f532a3092abc4aede6bcd62dcda962de4e9ad4179797a0e653e971fe3e8199f751fecd9cacb35f03ba69d8eb4664e8faea215538ebc40dc7bf50c1ada
 DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 DIST shorewall6-4.5.18.tar.bz2 245009 SHA256 f3fb0cec903b98bed6c968e2d6af6faf49b346cbb6508731888304e1372cf62c SHA512 d3ce8d70239cc76d05520d244b958078240af795cfbbfddf010cb31681f1453d40817497939ff02b7e0a5da57291b707254a9eea420d7ad4921edad126eb585f WHIRLPOOL ed6e83b67d680493574818f0ada820f704aad37baf9dd973ea7702890d25a2989c53c5a4f1d8272ca4741aac595c9124011fe95071ee87ab3064e048d65192d8
+DIST shorewall6-4.5.21.10.tar.bz2 252715 SHA256 1932c54f16750840985257abf27d7dc77235eacdb00560be8424ec9357747c62 SHA512 e436e7020213bbd1da688461eeac969d47b862a8f97c870af610c1e6aae9e01c626d5f9e15c2b500257c3ff5ac97fa63722cf99e10deac03fda9bd284baf907a WHIRLPOOL 15f5e07bce8d88c6fae69d05d261ebc107e2a2f340107748427bc6cfcddec7ad26caee61c28ca006d60425c9cfd6e4eaa1b2b59ea6fcb6f8c8ba44c5c00789ba
 DIST shorewall6-4.5.21.7.tar.bz2 251998 SHA256 af7e247f1c4598c24c6128eb791bab9b59eaed2b0f832ff548a02658f20c6c5b SHA512 64f0b21c3b505a222af17947f26bd320945b73a760bd2a7fdeb010b671c2b4ec883a1899cc966dee8abda2e9689a7c355b3e6a34e5f1c46d832174ff03e4d0c8 WHIRLPOOL ad29f38a671aa6ab54a272f415996f340d48ef6d6566915e6a7d9a83c8eada07ea7db3a6b84266efa1603b51342bfa0a8f2aac20f82bf7b77a168950c6d906ca
 DIST shorewall6-4.5.21.9.tar.bz2 252533 SHA256 2c4606fffc49b0129ec79142493949d8efe15bdef4f6e1619af32e694cbd5aba SHA512 91be0dd55485d56b33f52a91f315562998e6aaf7f2f5ddcb1882fcda589146132810d0f1d5ae2ab6e6ec1256319084969e1499bdd3f37e5a63e0cc65d5ed77bb WHIRLPOOL 7e129116662c8501fb12b23f9552a01d9ae14501194376026ea43758d1470ee7739ff90e26985c7d1e9e9a8c7db7cfdc26b64943e8e470893f5d38d7ef51509a
-EBUILD shorewall6-4.5.18-r1.ebuild 1928 SHA256 aec9bd90a4575ec255e979c8a31ae65b391ce8ce4dd6c1dc349ac6b006eeb730 SHA512 4a30ea4326adfcb1470e47cb08fea7261423f034f3ecd41197eee79f38be3075bc5eba875e425db222f339472971af7f5a71bc07de7d7c2162df77d86106f722 WHIRLPOOL a1411fdcb29e8c89d3c2fa14df99afbf88238e3c2261a723da036562ae35a1bfa9575138279fba5ba7e61b7dcfff5f4fa6ef7da25734b193b0624a27735e4db5
-EBUILD shorewall6-4.5.21.7.ebuild 3277 SHA256 4a41224a316cd117a436e733ebf6a89aa711d8d16f23d653ce043fe8f8cac624 SHA512 3cba75c6ea5f9236b2f18a7f4a14848ff52a0da53aac57ae145e812ce07e774fa6bf5ede2470761d7fea57b32974f7ed804f337f55cea75670a35d65f8ee6dc0 WHIRLPOOL 888b3840acba529705867843bc067954593dfe4b833e1086d610f4a5a671eab342b3adeb11f21296d200e1d001a6b24d52e82d7aee603e4717e58c36bd5842d8
-EBUILD shorewall6-4.5.21.9.ebuild 3219 SHA256 dcdf95b56b3ba04124888b035b4ccc26c1feee1bf2a6ae29b44c74b0e8674c81 SHA512 2aad33f79bcb4b7ce3bd38c66e541316262142ae064d3be8e262406f800ab88c1c945fb4589c2a667031bf0c708e1cd691f4dfae0ca533246f8362a2cbba2b9c WHIRLPOOL 3a1097864257ec228da5ed65fbbf025ada1f43d7e71abcb87b2921bc5c32e6af60b61f9b5eca98aa585cf00019c68ae0e2f3e386688da3748f9ea17fbd0183a5
-MISC ChangeLog 16638 SHA256 4676c4c002a4c504a4954266db37baf2de5616d25e9569851553416df68086ce SHA512 3d6e2471ddcf1fbaa3370b10f660f223f2b9dfad13b972d0d06605537e0b3fa302863fb4ac5e6ad245d4ca94ef452b23382cfd18eeebc4b9812b8c1d70fc27c5 WHIRLPOOL c7b80d5388c6fd67752dc29a72a181b217f867a37b9ec850f48c060b2567520f50526dfdd58bf41e755d48a7624cc65676821f0b92c73ea9f8b79f9424ffae5b
+EBUILD shorewall6-4.5.18-r1.ebuild 1930 SHA256 59bfd1a57162496de5651cdeb6701eb1b91c8eb60ffcf83b4d76c5311425c1e3 SHA512 74540dd7d2d8a69271462558e232d2959fa278bdf95c931bebf1ee20065a905c2f75cecf354008257c7e93508d61e3c3f11a7ff76092843c087d409ed7fc28d7 WHIRLPOOL d0f71a359560b31f93ee1e6f0d833a3376e19e60d3bac04585fba43941eb6267641477ba494b3f2f6dc81f682b251e4a46a89dd9cd9c76dc4222d2e03c27935d
+EBUILD shorewall6-4.5.21.10.ebuild 3223 SHA256 7490e5eb0876a5f3939359ac0f763d8183b8e82931acb6303ba56516bc68d8ea SHA512 8c03e288ca332804e442023551128e7208175517fcf192f6531460a7d5cd90b8205fa32ac72a069b6c07562427e78148856a6c7bdf4c061614c98a4d5ffb1c56 WHIRLPOOL aebe469b8fb797cf5f8f0c252f9a91c3a1115062eb06fd8a246fba25fe3dd8be21984d8076cad7e679768e44ee009323bb34161b10be393bdcf0b26e1a4f4087
+EBUILD shorewall6-4.5.21.7.ebuild 3274 SHA256 0fb72aad9b2aadd2d72735a489434f1495a10cc72464ed80e48c7759b1f2592a SHA512 53207e9cc85921c85adaa4dbe8545bfe6a9cdd604a4b67233ba1e42fba0ec49701a77ee5b06ef08d97e705394a57b1d5a55ecff2fef99397c1999b65905b1387 WHIRLPOOL ae3ce99aa590b0f7a1cb76efa9f3884465b2cce79157e7c507881a234dcb0e088178dec8879e55982dfd445e6b9dc5dea8212162ccd853785607e9ba7ce2c724
+EBUILD shorewall6-4.5.21.9.ebuild 3221 SHA256 31f17193da9584e3dabc5a23b074e64faa9a36b29c464f2ebd7e0bbace2e44f2 SHA512 0b9feb5f29a8fedf30d5e970f9815bf4ea12e7a81c6207ff9ca6876d232acc416cb6cfb458319cef7a27ef2493f69ef9907a6005aee46cd5567def8b2c65bf46 WHIRLPOOL fe34fd2ca31dafe7c61e376ceea059c3ecdb63f9d99996b401360d4af0b58d77b5a9552bfc32a4a7ed7274ce652d46eba52fbb3d37a9445572bf9def4d3c52c0
+MISC ChangeLog 17091 SHA256 c926f5964c56c0b346dcc3400a1b83b953429915d1ef45bbda5fb7af64c163c0 SHA512 f0cbd322377ef8ceb182631dda5742ab7325a0a9b91ffa0a0d4c81f960a7e4c38eac1ae08292750049f81f950e482fcc6a04d598539e04e5415ca6d712bef4d7 WHIRLPOOL 0478db9e8daf2db7477e48ee9264fcb6b03798521a0f555aaa83adc90b791e1196df2fce0d86ff45b38cc44100eba1db55757ae4fd92861cead1e2bf8ca33a9f
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOObI4ACgkQVWmRsqeSphOKNQCfREFdg0Yo5ntKs6nRI8XsPZ2t
-9z0AnjrSKAebP5Vcif92rizJSxCkn0PY
-=b0xF
+iQEcBAEBCAAGBQJTmbg+AAoJEJWyH81tNOV9qVAH/RnQmd8v8ZV8YJ/Q7872xs0z
++6g18OlleMS8c0YNIMWaz8RlIvygzbZq/cmroNaxsvltV0eP5kRkrSGMjjxJU/QF
+LPVxFwrBo8oIqbhPVlWk9d9YOIT58Iw2aMy9WPtcnz8RMmQNTJxw8QT/BK9nq0o1
+3Gs4yYc1+uPnz/kIxdJyIboAGwzxmZ1EYOauM8wC3SwKPT+inhxI/Ay1h7lXEIW6
+UtVar5OATxiOGtwCR5nJEEzm1QBiQnS10wUge+ZnippPrAsE7oT4xKt4bdrOXeNs
+zNd1itvrjAg8QGII+KOYjkvdoWjp3OjPRX3XYaGsLoDxcAuKuMF6pCNKl79/+pc=
+=zU5m
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6/files/4.5.21.10/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.confd
new file mode 100644
index 000000000000..e5957167b5b9
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.confd
@@ -0,0 +1,15 @@
+# Global start/restart/stop options
+# 
+OPTIONS=""
+
+# Start options
+# 
+STARTOPTIONS=""
+
+# Stop options
+# 
+STOPOPTIONS=""
+
+# Restart options
+# 
+RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6/files/4.5.21.10/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.initd
new file mode 100644
index 000000000000..974a52826986
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.initd
@@ -0,0 +1,107 @@
+#!/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/shorewall6/files/4.5.21.10/shorewall6.initd,v 1.1 2014/06/12 14:26:06 tomwij Exp $
+
+description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="check clear"
+extra_started_commands="refresh reset"
+
+description_check="Checks if the configuration will compile or not."
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall6. The firewall is then"
+description_clear="${description_clear} wide open and unprotected."
+
+description_refresh="The mangle table will be refreshed along with the"
+description_refresh="${description_refresh} blacklist chain (if any)."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+	need net
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	/sbin/shorewall6 status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'	
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+start() {
+	ebegin "Starting shorewall6"
+	/sbin/shorewall6 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall6"
+	/sbin/shorewall6 ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
+
+restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
+
+	ebegin "Restarting shorewall6"
+	/sbin/shorewall6 status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		/sbin/shorewall6 ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
+	/sbin/shorewall6 ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall6"
+	/sbin/shorewall6 ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
+
+refresh() {
+	# refresh the rules involving the broadcast addresses of firewall 
+	# interfaces, the black list, traffic control rules and 
+	# ECN control rules
+
+	ebegin "Refreshing shorewall6 rules"
+	/sbin/shorewall6 ${OPTIONS} refresh 1>/dev/null
+	eend $?
+}
+
+check() {
+	# perform cursory validation of the zones, interfaces, hosts, rules
+	# and policy files. CAUTION: does not parse and validate the generated 
+	# iptables commands.
+
+	ebegin "Checking shorewall6 configuration"
+	/sbin/shorewall6 ${OPTIONS} check 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall6/files/4.5.21.10/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.systemd
new file mode 100644
index 000000000000..448226c88736
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.systemd
@@ -0,0 +1,17 @@
+#
+#	The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.5
+#
+[Unit]
+Description=Shorewall IPv6 firewall
+Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall6
+ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6/files/4.5.21.10/shorewallrc b/net-firewall/shorewall6/files/4.5.21.10/shorewallrc
new file mode 100644
index 000000000000..46f5eb9a3603
--- /dev/null
+++ b/net-firewall/shorewall6/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/shorewall6/shorewall6-4.5.18-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.18-r1.ebuild
index 1b15edab5aed..4865c863889f 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.18-r1.ebuild
+++ b/net-firewall/shorewall6/shorewall6-4.5.18-r1.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/shorewall6/shorewall6-4.5.18-r1.ebuild,v 1.8 2014/03/23 18:01:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.18-r1.ebuild,v 1.9 2014/06/12 14:26:06 tomwij Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ MY_PN="${PN/6/}"
 MY_P="${MY_PN}-${MY_PV_BASE}"
 MY_P_DOCS="${MY_PN}-docs-html-${PV}"
 
-DESCRIPTION="Shoreline Firewall with IPv6 support."
+DESCRIPTION="Shoreline Firewall with IPv6 support"
 HOMEPAGE="http://www.shorewall.net/"
 SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
 	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.10.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.10.ebuild
new file mode 100644
index 000000000000..971b0a328fc6
--- /dev/null
+++ b/net-firewall/shorewall6/shorewall6-4.5.21.10.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.10.ebuild,v 1.1 2014/06/12 14:26:06 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+MY_URL_PREFIX=
+case ${P} in
+	*_beta* | \
+	*_rc*)
+		MY_URL_PREFIX='development/'
+		;;
+esac
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+MY_P_DOCS=shorewall-docs-html-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall,'
+DESCRIPTION+=' IPv6 component'
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="
+	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="=net-firewall/shorewall-${PVR}"
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4.20[ipv6]
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=dev-perl/Socket6-0.230.0
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
+
+	local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+	local WARNING_CONNTRACK_IPV6+=" be unable to run ${PN} on the local system."
+
+	check_extra_config
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
+	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
+	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/${PN}
+
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		dodoc -r Samples6
+		cd "${WORKDIR}"/${MY_P_DOCS}
+		dohtml -r *
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "Before you can use ${PN}, you need to edit its configuration in:"
+		elog ""
+		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
+		elog ""
+		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
+		elog ""
+		elog "  # rc-update add ${PN} default"
+	fi
+
+	if ! has_version ${CATEGORY}/shorewall-init; then
+		elog ""
+		elog "Starting with shorewall6-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
+		elog "which we recommend to install, to protect your firewall at system boot."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.7.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.7.ebuild
index d614cecfc24c..d49b8c38b9c0 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.21.7.ebuild
+++ b/net-firewall/shorewall6/shorewall6-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/shorewall6/shorewall6-4.5.21.7.ebuild,v 1.1 2014/03/15 22:59:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.7.ebuild,v 1.2 2014/06/12 14:26:06 tomwij Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
 MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
 
 DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall,'
-DESCRIPTION+=' IPv6 component.'
+DESCRIPTION+=' IPv6 component'
 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/shorewall6/shorewall6-4.5.21.9.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild
index 5ea205d21d30..a5baf9dbde81 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild
+++ b/net-firewall/shorewall6/shorewall6-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/shorewall6/shorewall6-4.5.21.9.ebuild,v 1.2 2014/06/04 00:47:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild,v 1.3 2014/06/12 14:26:06 tomwij Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
 MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
 
 DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall,'
-DESCRIPTION+=' IPv6 component.'
+DESCRIPTION+=' IPv6 component'
 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