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, 278 insertions, 14 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 3b75bcdc4b06..b4e9aaa8767c 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.150 2014/06/04 00:45:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.151 2014/06/12 14:20:53 tomwij Exp $
+
+*shorewall-lite-4.5.21.10 (12 Jun 2014)
+
+  12 Jun 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/4.5.21.10/shorewall-lite.confd, +files/4.5.21.10/shorewall-lite.initd,
+  +files/4.5.21.10/shorewall-lite.systemd, +files/4.5.21.10/shorewallrc,
+  +shorewall-lite-4.5.21.10.ebuild, shorewall-lite-4.5.18-r1.ebuild,
+  shorewall-lite-4.5.21.7.ebuild, shorewall-lite-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-lite-4.5.21.9.ebuild:
   Stable for HPPA (bug #511620).
diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
index 3a44d88cc3a8..40c4fa8b0431 100644
--- a/net-firewall/shorewall-lite/Manifest
+++ b/net-firewall/shorewall-lite/Manifest
@@ -4,6 +4,10 @@ Hash: SHA256
 AUX 4.5.18-r1/shorewall-lite.initd 2169 SHA256 0cb07ea957fca5feffe7956c30ef2bec5748c8d016845c05d0fd1adbaea6bfb8 SHA512 4e537f1fdf5a6fdd609b36d588cf9440cb5aa58076e9df45d286ff5c2e2b7d9f231cdc5effbe03ffcbaab5e2d0b6bed392ba4fa441c74288d9f9d0554bc6bb6d WHIRLPOOL 5378dc4c019b881095ac562b1e77cfaff96497f3bb005f8538f2ee290b41f53aed0871625c8eda8953d5e05215ed40158099c670fddecddda4eb4abca2912983
 AUX 4.5.18-r1/shorewall-lite.systemd 472 SHA256 9958fae5cb6b172f764e7cbb91991cb37e608453e161ce9f10ee3e5013932e2f SHA512 219a60a720224ef305eec288032983f68c43aa98528b6d84684fc1907bc97f0b0ded9b3edc16cbab48338b640206fabdac5fa1520d3a0f588d717559dfe6c11f WHIRLPOOL b6a91090d44d05e2b999b0c82b624253a4a67321e96800201733b8aa7a731d5de2a7e63fc378100687560f0ff5526ef91bc5f485049ad006491b074855638f1a
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
+AUX 4.5.21.10/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.21.10/shorewall-lite.initd 2267 SHA256 4b2b082773fdb1a68e05f05536fb3c49b8b9fe6e806280a65546c30b2e219663 SHA512 3e9ffa910841da8e57b4758ebf2ad7522c9a5cf81c7725f27e81d650ec988cf8eba89ea78e61289989c918a74c73fa6021c389825190176d69307ea5db2db57d WHIRLPOOL 0e1c73727b99dececaa9898e8dbc38b2fad78e49c9de3130b3f3c7b8c07952c4ffa521e9ace1064c6845d92dfebcf1ca166b37e34b26d709d3b42243316d8e8d
+AUX 4.5.21.10/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
+AUX 4.5.21.10/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 672 SHA256 2e8e88602618a8743da26400efa6f03dc35895f1f4fb85eee588b3455736d313 SHA512 c256541844cd6ef91b2143426fb8e377a6429428d9ccdd451097b306c72514f7783183cc5de8cd2afccd30d4e4708b533ad53cd5e5b7d9a2dfa3dbca16df7636 WHIRLPOOL 97ed911bd6d8a862ef0e4b66939c594aa6f5d276444dd12363a7f2a413f0b3b9b65fc977a419452046379101cf2a75f07c0df0414d041badadb91971bb0c42dd
 AUX 4.5.21.7/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.21.7/shorewall-lite.initd 2268 SHA256 5229e81106b30a16ae734bd8c4650c52802bef2ef43ae79df1af53720deb8e3f SHA512 da05ffb087abddd6b28125e1f7132d665ebc9f733582a26ebe1222c62a6d8ed178c665e9103ccecf7a79277a397be0199d401083f9e06eb8dcee9003302c7b18 WHIRLPOOL e302812eca3dbf8828db3b323300136394b95a9d7f8dc8756c9cefd2a84aef1ffaea9101cd0a33e9255794b7d343060d288cd720a4463dc891478c7884a43d4c
@@ -14,20 +18,27 @@ AUX 4.5.21.9/shorewall-lite.initd 2268 SHA256 03d574c26e35b33bed7f035cff2242c0f1
 AUX 4.5.21.9/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
 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 shorewall-lite-4.5.18.tar.bz2 73702 SHA256 b66680361c527ac710d33d643f4c233ab8e754e7916de0891a863ca7a973d03c SHA512 de181f2878402bb86b550bcfd4aaa86d874ef8be2674d145052322c80499bcc4691086a2b09612a0228de7d1c9e75c335ac99dbc63dcc0d5c8c2fc305f377be6 WHIRLPOOL cd29da8106f7fb2faa84e07fe2a2fa7e080a36db15c04b09926855a7735310c20e4c29f26695bc3c1dbc91b2c262223b8f83341018da2fa91fad1f8edc99a026
+DIST shorewall-lite-4.5.21.10.tar.bz2 79456 SHA256 73f2e7101ca7ff296fa3a7be4dec6b6ec3ec562f5c0d746fe6e2355d2b8931e3 SHA512 145c18f7a2859bea9ce265d243a875e83fbbaa2c982f269f1401b73253133d8d48e1060c3b18aefdee09dbc8755fe3e875014dda354f38e90829f0d970b52718 WHIRLPOOL 0d7187d7ede8b01819c241fec61eeef03e17743845188f8e41b3448d814466994b8822e3dc166793d9b5b2b5f4b04dc33bd85664e09771746bc655756790e813
 DIST shorewall-lite-4.5.21.7.tar.bz2 78771 SHA256 7dd14965cb0de08271f5852458287145e48b5ccea92c33206847ff4a5e2aaf84 SHA512 7d6b145dad4001c5cf1f295a6a7fee6677a1d2ab84e3c848159c2896ccbc068d05499d6f08d0e4452617a578781c576c495997ff89761466f1cc82e86533d299 WHIRLPOOL 14b385944b5a7be25050d930deb39a3d7721257397f71adba51b5f1098e220450e2f26d9ab03dcfc9a0bc15f6e0c50659e215c53de9199631ab8e6154c056bf5
 DIST shorewall-lite-4.5.21.9.tar.bz2 79121 SHA256 af6c039d880581a6eaf7aba9f638ff86e471567b15e16adc607053651d1f50f5 SHA512 fb15881dc4d5fd05c8ca8421ee4a5deb0c9f6fdab955d0fc7dd371bf710706bf6d851bdb8ba00d0d34c1f7f1d2bc2cc39e9e9fe0a6d8b48ed4accc27c011462c WHIRLPOOL 2f8eb61da9b3eafdd184718054d14dfdef39afdf6e3724ee62c0386f12ea3aa3badcf959ee0351f8cdcd744cf4b262e168e5cd6afa677a8674d515541f0f2f80
-EBUILD shorewall-lite-4.5.18-r1.ebuild 1730 SHA256 94301e9ac96ffee58b3e5eb1b441db0bb5a1e8ec223bf21e3ffb797999584b9b SHA512 f43851e1165a2c6c57308b8325cfc6779d7fbf7f18113893628f8f6d4162cbee858c26f8f4eba2f77bc4bcfee9c862d976d601e12c3769fa48df06a25cb00218 WHIRLPOOL 436cfe0d0cefbdecf8fda87bdf00647c02b5b4e9c12f475effca166bf815b47ec93319c365852ba6a300fe5b7339b404cb03400c222ca3109d5d16cedd77d37d
-EBUILD shorewall-lite-4.5.21.7.ebuild 3117 SHA256 1a8880eca7f48cbdfd515221e514f7da493dd884b125d7268c07ff6edcdc2a4c SHA512 f0a0c4a78225d3bb6dbe8bdf02634b2d2bcd98e61eb45ff7f7882f6fc7558789d79fcfe768bf04341ecef8973b991149f8e7854c72df2b781917777372f28876 WHIRLPOOL a4f234ef189e4d7d770de6f507a33ea13bff4be2c8f170d3a53b0c10845bcfb29d8c02f1fe2f4495c88a594630298f8af805c3a8f7f229c837e8789d3676359e
-EBUILD shorewall-lite-4.5.21.9.ebuild 3059 SHA256 d33511851d5cd654fd272bf800f30de0e77e8b534795e815d243d7083897df05 SHA512 f98d36075dfd3a851c50ee5c98437a4969f3e6a65067705b24d40b2d828f63548d7d4ecc4f93c7cb66272528c2612fcc2c3afdd9cfe42cc04c0a943f3c575592 WHIRLPOOL 92635234bc0f07ec412ce4d4977057e97b2f06bbe4d93d62352b3c9a3c66e0291c879dcc2a8cefcf3f3dfda9c6c0a8af7411e5dd2bfee114261b12d1e6a91048
-MISC ChangeLog 24816 SHA256 30cad278708ae220c3eba4fea5a093e03f1cfb92a911219a66d73ca5f15e0632 SHA512 8cb4b276a65cedd183cc042358f45b8d39b3144541a7f46736f73c4e3b7ce8c69d16da4510741a8364ffd98b2e3a27f3f890f9db7ae779fa4d0d361d29f670ac WHIRLPOOL 6d6e1391285e786b0fbb4e363638c267526791c5cbccd2c676e51b822a31beb15cca5c9ff00f99e6b55bfb297b4487fc508d0941234c5837ce036e4b47cb7691
+EBUILD shorewall-lite-4.5.18-r1.ebuild 1732 SHA256 3e186b780ce3a2c77350edf786df600cdc67b573d11e6e75d0739b5811c83245 SHA512 de37642533e0cbed9c765f83448e635bf3b43e0df8c23abded6c2758d10c8b1b672d3f56e0fb47ce6bee98e9e8bef7675b62e83497d0649d4fa71704cae86cc6 WHIRLPOOL 4510093637a25220e477cfe70920f6e986980973fd126b1d619ce165c1b25a9390ff4db16f70d52b59da060f4c9767e0dab234a917336e0c2dc7ac3615ff3897
+EBUILD shorewall-lite-4.5.21.10.ebuild 3063 SHA256 9958f7bc9ab4dc8777d62037f87cd46762128e8575e83367d4849b129c79cbb6 SHA512 e05547494b223eefd18bbbf781667595a4fb4c5baf1516029b8df53a63fdc414998aa9decabdb591a243d9529e9c8f33c1dfd4f48d634ea05557c07cb32ec86a WHIRLPOOL fe3fbb92e89d13a4531eab5447b28ae7a87204d9990b2f3701d438685e7c99cae6da815227f5f373685bf50ae5de7d1c5c2d65624dfc9ecd1781675f85ec92a4
+EBUILD shorewall-lite-4.5.21.7.ebuild 3114 SHA256 bf92db6db78ac5b14fcaf6c3a53a7efcabc392ede65f4fa015f22595d3b4491a SHA512 2c2a929f471352ba657cf1d729de9e7f23f1513b9161386d28723cff0e3fd5385b2c4428a1fdea95ca2fc29a8ad0b0845f581f63f6eef2ff31e23faaa290a06c WHIRLPOOL ebdcbf7255fffd91c55b40ef9c1371b93f0867d45fa00fc22c85b9b7c243568cd9fa454827523a42e38e9c6fad6e6644d5137538b1725ad2c83e6820389fe86e
+EBUILD shorewall-lite-4.5.21.9.ebuild 3061 SHA256 ab50fc77c635fcc1a08e7989faba89b8fc40d5be3aaa9669cebad60c824f19cc SHA512 53b6660ec73ff2b02cafa719a991023931f7aafa5d282e9a33c1fed2318cdf86627bdc38e5d5ecf4fdb547f62e80340ee034ba34da87af598a5274f853d24196 WHIRLPOOL 42113d15527f91fc0c338c3659c3c375c0c0bf60f669c7620dc0620422157659e81389f6b5f9c91070a24f3f526e4e3ba402c40a1db02ad1a02e3088421e252c
+MISC ChangeLog 25301 SHA256 0a69a224b4f23dc2409485c85def0764c5d469c8ce80875f4578491f54117c63 SHA512 e4fdaa6394acf6ada7dd0c64a60e937d2e989b19788b1322f3bd53dd7ae7c5624050476a83f8a668cfdb5bce6ebf111609f0dc4360f2fe28725b84b2ad82604f WHIRLPOOL 8676df33122e82d57f1537f53e64011fe8cfa139e1033efe591ce0307f9214635b5ae1e467cafb6a9823994c9bcf2e8bd41f84ae5401062b651cd35c32e4f687
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOObCgACgkQVWmRsqeSphPi4wCeOgVFs72Yt6E/G0XyBSCB6Ycw
-7k8An3M2IIM9lfN7vcri4v3KVAd4/IZX
-=URyy
+iQEcBAEBCAAGBQJTmbcGAAoJEJWyH81tNOV9938H/2v5f3Jw0kPvW9BswUSx5+mO
+Lsaxc3eou/AyrQDIDk45yS0y32S2305sz1hnhZj0DLbThUAoKptIoat33ciMX46M
+j7Oz+EwCbn7K1eIerRD6ge6nQUPA8LqZy8PdBev9Isc0WbOILm3AQAMaQvMj7FA4
+I5PKOwIERF1m5CCwkSfep6mb79bTM6oeueowVGgs2WhcfAEivkvOKNltBdUO0yT/
++H8PaoWam7yaSKDoNMZkd4aaJv7mVBcQZWCqoTn1qynzumPTM/P4hQbpR+nlFFZY
+uJbe9F4veWwrvrPdizTt4FEwF0fhhhavowSlsSgx3CFszhdAKoC9SewZZMNgQtk=
+=pXRz
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-lite/files/4.5.21.10/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.10/shorewall-lite.confd
new file mode 100644
index 000000000000..e5957167b5b9
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.21.10/shorewall-lite.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/shorewall-lite/files/4.5.21.10/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.10/shorewall-lite.initd
new file mode 100644
index 000000000000..b73f49c41b8b
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.21.10/shorewall-lite.initd
@@ -0,0 +1,82 @@
+#!/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-lite/files/4.5.21.10/shorewall-lite.initd,v 1.1 2014/06/12 14:20:54 tomwij Exp $
+
+description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="clear"
+extra_started_commands="reset"
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall Lite. The firewall is"
+description_clear="${description_clear} then wide open and unprotected."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+	need net
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	/sbin/shorewall-lite 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 shorewall-lite"
+	/sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall-lite"
+	/sbin/shorewall-lite ${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 shorewall-lite"
+	/sbin/shorewall-lite status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		/sbin/shorewall-lite ${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-lite rules and setting policy to ACCEPT"
+	/sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall-lite"
+	/sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall-lite/files/4.5.21.10/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.10/shorewall-lite.systemd
new file mode 100644
index 000000000000..a7c932418a9c
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.21.10/shorewall-lite.systemd
@@ -0,0 +1,17 @@
+#
+#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5
+#
+[Unit]
+Description=Shorewall IPv4 firewall lite
+Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall-lite
+ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.21.10/shorewallrc b/net-firewall/shorewall-lite/files/4.5.21.10/shorewallrc
new file mode 100644
index 000000000000..46f5eb9a3603
--- /dev/null
+++ b/net-firewall/shorewall-lite/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-lite/shorewall-lite-4.5.18-r1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild
index 79351bc90b51..55ec4c408bed 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-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/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild,v 1.8 2014/03/23 18:01:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild,v 1.9 2014/06/12 14:20:53 tomwij Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ MY_PN="${PN/-lite/}"
 MY_P="${MY_PN}-${MY_PV_BASE}"
 MY_P_DOCS="${MY_PN}-docs-html-${PV}"
 
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
+DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall"
 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/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10.ebuild
new file mode 100644
index 000000000000..1714bd8257f4
--- /dev/null
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.21.10.ebuild,v 1.1 2014/06/12 14:20:53 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="An iptables-based firewall whose config is handled by a normal Shorewall"
+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-core-${PVR}"
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
+
+	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
+
+	local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support."
+
+	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
+		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 provide a configuration, which you can"
+		elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)."
+		elog ""
+		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
+		elog ""
+		elog "  # rc-update add ${PN} default"
+	fi
+
+	if ! has_version ${CATEGORY}/shorewall-init; then
+		elog ""
+		elog "Starting with shorewall-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
+		elog "which we recommend to install, to protect your firewall at system boot."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.7.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.7.ebuild
index f49a25f3c046..c9a63f85bd1b 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.7.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-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-lite/shorewall-lite-4.5.21.7.ebuild,v 1.1 2014/03/15 22:58:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.21.7.ebuild,v 1.2 2014/06/12 14:20:53 tomwij Exp $
 
 EAPI="5"
 
@@ -22,7 +22,7 @@ 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="An iptables-based firewall whose config is handled by a normal Shorewall."
+DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall"
 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-lite/shorewall-lite-4.5.21.9.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild
index a34236b804e6..515982a3c538 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-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-lite/shorewall-lite-4.5.21.9.ebuild,v 1.2 2014/06/04 00:45:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild,v 1.3 2014/06/12 14:20:53 tomwij Exp $
 
 EAPI="5"
 
@@ -22,7 +22,7 @@ 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="An iptables-based firewall whose config is handled by a normal Shorewall."
+DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall"
 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