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

14 files changed, 429 insertions, 19 deletions

diff --git a/net-firewall/shorewall-core/ChangeLog b/net-firewall/shorewall-core/ChangeLog
index 4ca9d866ecfe..f0217ec5b980 100644
--- a/net-firewall/shorewall-core/ChangeLog
+++ b/net-firewall/shorewall-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/ChangeLog,v 1.56 2014/06/04 00:44:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/ChangeLog,v 1.57 2014/06/12 13:59:29 tomwij Exp $
+
+*shorewall-core-4.5.21.10 (12 Jun 2014)
+
+  12 Jun 2014; Tom Wijsman <TomWij@gentoo.org> +files/4.5.21.10/shorewallrc,
+  +shorewall-core-4.5.21.10.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-core-4.5.21.9.ebuild:
   Stable for HPPA (bug #511620).
diff --git a/net-firewall/shorewall-core/Manifest b/net-firewall/shorewall-core/Manifest
index 3b1d0a5ec3a2..895a16342bb3 100644
--- a/net-firewall/shorewall-core/Manifest
+++ b/net-firewall/shorewall-core/Manifest
@@ -2,21 +2,28 @@
 Hash: SHA256
 
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
+AUX 4.5.21.10/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 672 SHA256 d5f16a63647b7b507ca004ba2aa80074be7dee18e0c5a976d3d60f77f3c72931 SHA512 ee60f92b6ef2879ea1aa37043a5fc67a65244df91e29feb748b36ffeffffcbf7a33548a0f55f4f0d8f54d753ba0b67f0dc72f11320c7fbfd886040ebf4498ce0 WHIRLPOOL c56117bda178d8c66f12ece1554b182d60bf787f53eb4b40619c78739706ded4793242610e368ab30e8b323e324661c26d394445a776e062aa4cdb1730a9b567
 AUX 4.5.21.7/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-core-4.5.18.tar.bz2 79521 SHA256 41b1e9e2d09c6344d546f814531996eaf52b3a30ae6c8db7ff009a8a17bde3cd SHA512 8b2dd691b84c5ca3beac705b4aecb7ac3c09e794c5e255915bf5a55cebef23ca4cd8fac2b3118d6e6cbbf7e432699cc447d5811de80e1d3bae0516ede27398d1 WHIRLPOOL 4c2416dab6f4fa73dbc010c3ab3a884d65f2ab814da6301b7d8a46545347b6c94b0444ea8e3357c9a80d03a08064c67fdd0c80d8167bca8fa1a2c54d4fd7b6b8
+DIST shorewall-core-4.5.21.10.tar.bz2 86185 SHA256 57e4b96ae3258b5150fbb188921845e8843d6b6ccb77d60a10bb984f87951334 SHA512 ad96fd91d5d8eb900b7a2180a37fa1826c7448fd5ff0f94f938e897b2cdf9d7b2a064cb4499fb76107bb8cf8f32c1265a7ff6d5966dae1d1d76a4a61482d6c81 WHIRLPOOL f08ccd4c59bac5f7f1fc8ea1bec853e5286aa1f13ad0b09fd3578d5002266ec210382a73f8a2f8b45dd09dda93cdd695f259ee60803820ed2715dc046ff16e7c
 DIST shorewall-core-4.5.21.7.tar.bz2 85447 SHA256 31bbb0a8ea6da1b6392e30e682994557e3af6c89ede80b3ec904bae4040eda08 SHA512 d53aad4ebb944bc5cd47720ddcf16deb6dfd8e17c793749ef7b9113518ff999424eea90715888994cfe1e9b9b0628f4358d12dc2a8b48c7e256d584e420d74cc WHIRLPOOL 9e931940e99b40d18c4710ec4cb1c74a65269dd248b6b690f95ccef570aa2daa8b2cc65559c22c292dad8b83c3e8c8b3a699456782b3783203125f4e3f5587ce
 DIST shorewall-core-4.5.21.9.tar.bz2 86021 SHA256 f431edf0109641b7fd7c9568e39917b16f1d776393d58aef328f82bf5ef20656 SHA512 53525a3159e33aefbc39ff59fe300e5da3f51a4c2c363ecb4b56888d87ef48f56b8ec7c4d09668407148898f2704ff60627a90b42203cf48d2e4c3d3c5fd8f41 WHIRLPOOL 032ee33b1e1e3effc1a7b97ad4000b4e9eaf0a1f4d45cffeb252298aaea06444484ccc80b4c5115d59ffb6e2d76e2fac97b2ceb6b2b2c4b7283f4cdd4778a6f6
 EBUILD shorewall-core-4.5.18-r1.ebuild 1331 SHA256 e223d79f2c97eb140d90ad5479d0ea6288f564934078b3b6f0ae32ee00725958 SHA512 e1330c804f31c399e9a1adb68fa635b9e6baf2c18201ea9180b1e922941da94866b9b51a764ec59431d254c2d9745b0d0edcc0d0efcc03c368da3aaa931988d4 WHIRLPOOL 5ad58b1b2d9b47cecd48b8e8af5ec0a084d9339adfac0656b32f01cbad54d9070a500c92fde9302f568de2c07ff4316f7e719c974e71e5d2b15cda5b89d76e50
+EBUILD shorewall-core-4.5.21.10.ebuild 1861 SHA256 28c4c8f827bda47011b9ab2c7db33128f7598c838d2ccea1e4050804eb19c9b2 SHA512 6debb50222dd1e0cc87f8508fdf4e5b43c26ce17c2d86e08c8532242598123a62f8b67b2b46b613922065872fae13b061ec0f5c936e67ca545e506fcaa0d344f WHIRLPOOL f5a14b4f5608025c84308e3659dbb8c77d53a3c7f8931f14852452070ad5da77a915a84961a960f5d96d12f3e949d0a1be7a5184fcd1fb0d0e23526b84d4fb85
 EBUILD shorewall-core-4.5.21.7.ebuild 1914 SHA256 3932bf042c0f14d0f75ff66ce9143fe975b3be67826f61da8dd567d50f552280 SHA512 4da23ac9ace2aa546cbafb7b979d340cc01223876f121fff4fe12eeff2523e82229cae8913d1fb4dea693dd765308bad4acdb189e472def35a2d4de4288e924b WHIRLPOOL a234ba7ea5bdb6e2fc90aa4182024a9ab359276cf36e3420d51d945d8471b6675aed95c25e9d5d4ef26616a5bbbb9bd767df0007a5a96f08bd820a5091b41eef
 EBUILD shorewall-core-4.5.21.9.ebuild 1856 SHA256 f0b4d872da1ce2cf209264f18c6fbb38d08f6a12de3abd62a3e61126180e2d15 SHA512 c4655a8e16728a519ae2bf2ba20f9e0c04300f5b9a1a34669857535d1ff19be91f6e00f1c9a1fa3cdb5ff9b099db4fa14ef8dc666f7d88448b149187a3621cfe WHIRLPOOL ae3615005c9906251099e41249d9922677aefad00784ee2fb2a932aa18fc7367c1d695f3c207b559f2bd68224c91dfd365028ab584e19f73dff261552a275d00
-MISC ChangeLog 8850 SHA256 636b608f4ae27d5e0ec699798864f808afb8043554cd0835720a04eb36b67aac SHA512 5497c2123005e1f8bf4295e8ba36dac2498044f6c9ca7b81fa9626024de0d93ac2830529083f2cc4d5c1b6d671221d2c9f6b8a14e208bbe9055c20257cc2356d WHIRLPOOL afda7c54f7a519219bc2f3d117438b0f4438446efcff7a01f33f9254afbc5dcd2f0b70fbecc5b05b2f96b317a7df22036b39fe024c0e56b0828aba8b7f594489
+MISC ChangeLog 9113 SHA256 5df4b964ef670fc3451f39480e8ab442ce7138f743cf2745b46b337c3ff5b7b4 SHA512 f1a90294f70f3a80b86419f028c7f1256d8617f4dfb6cb4916c57a497db384353d3b18992a9e001c6dbc3087b0584fa91ca99752df7bacf2a327a2ca7ca1ed4c WHIRLPOOL a3c89a915a9f8c9dd7ee00ae4243415b4ba2b9dd29ef6cf9cea2bc09321e7a1c9fc19c3ed76d00fd9d5536cbc7291cd3875cbf5ddcab6be44fdb4293f97f3f9d
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOOa+wACgkQVWmRsqeSphM/SACfRxXJMHzv/qbd60fJbYUNgeeY
-UTgAmwVjXhIdWkXtClkTPTjfuV7L0vyh
-=RV0a
+iQEcBAEBCAAGBQJTmbIAAAoJEJWyH81tNOV9WQEH/3Oo6umMYcFgijukbeHqrJTU
+mUYdvlDu+uJ1I3ye14BXuBIa/F2QOnszX15+Kk9T048uYzsMXCrw/HArHJwtcVFN
+2r4Vm/wgyVDptVGuZm6sqgBHk+aIrbbmt8JyvXOvr0WukcAy4XJe76fQIsjDQUsx
+KHsAS6Kaf/+7taHwCZgId2dsemze8qHSe90ME/sO9IAhK8JeMAfQFlvd3RV3Kh6j
+SUp2Nzzm/WX0A5EdSFeI0nRh9y3C6IKu33gXkJI5q+R52PyuB+Gl75iSKuX3aNMB
+n0TitdhFGQBB+adZ6h07Y/Z2IfBjnR8X+83ru2cjX+SWdwMe0PLMxJjbf0gkJNQ=
+=3gqE
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-core/files/4.5.21.10/shorewallrc b/net-firewall/shorewall-core/files/4.5.21.10/shorewallrc
new file mode 100644
index 000000000000..46f5eb9a3603
--- /dev/null
+++ b/net-firewall/shorewall-core/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-core/shorewall-core-4.5.21.10.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.21.10.ebuild
new file mode 100644
index 000000000000..8093a85d3de2
--- /dev/null
+++ b/net-firewall/shorewall-core/shorewall-core-4.5.21.10.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.21.10.ebuild,v 1.1 2014/06/12 13:59:29 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils prefix 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_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
+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="selinux"
+
+DEPEND="
+	>=dev-lang/perl-5.10
+	virtual/perl-Digest-SHA
+	!<net-firewall/shorewall-4.5.0.1
+	selinux? ( >=sec-policy/selinux-shorewall-2.20130424-r2 )
+"
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	>=sys-apps/coreutils-8.20
+"
+
+DOCS=( changelog.txt releasenotes.txt )
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_install() {
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+	default
+}
+
+pkg_postinst() {
+	if ! has_version sys-apps/net-tools; then
+		elog "It is recommended to install sys-apps/net-tools which will provide the"
+		elog "the 'arp' utility which will give you a better 'shorewall-lite dump' output:"
+		elog ""
+		elog "  # emerge sys-apps/net-tools"
+	fi
+}
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index c88009dba8ad..953d25bedd83 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.258 2014/06/04 00:45:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.259 2014/06/12 14:02:16 tomwij Exp $
+
+*shorewall-4.5.21.10 (12 Jun 2014)
+
+  12 Jun 2014; Tom Wijsman <TomWij@gentoo.org> +files/4.5.21.10/shorewall.confd,
+  +files/4.5.21.10/shorewall.initd, +files/4.5.21.10/shorewall.systemd,
+  +files/4.5.21.10/shorewallrc, +shorewall-4.5.21.10.ebuild,
+  shorewall-4.5.18-r1.ebuild, shorewall-4.5.21.7.ebuild,
+  shorewall-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-4.5.21.9.ebuild:
   Stable for HPPA (bug #511620).
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 82fb4800329b..54610b460e88 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -5,6 +5,10 @@ AUX 4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch 700 SHA256 81ea118b54d7801eab04e70
 AUX 4.5.18-r1/shorewall.initd 2823 SHA256 94a766154c830d8c698ca4cd6c1b70243821efa940e89fa020a5733a19fb7850 SHA512 e72cd7ce37769d5c4b68d948955a9c36de9b9c842a0350d323aec2bbaa885f45da68ba8a8ea2c2e81cb14d4e6ace726f7b538632671db186f0858ad2b1dc886a WHIRLPOOL ccf43e58a61276a5ba55f8247d2d99fba79c623f521c10ef40cb77581689596419126134622a81268d2eef6aac6ce5b7ea4676cc889dc754d278dca7e0abe2b6
 AUX 4.5.18-r1/shorewall.systemd 450 SHA256 7af76981195a12e4cf0181f710d606e53d1964fd5cd033a4db489f8eb98a8495 SHA512 181c701b8aa6a18f21b578a536841616424bff96e220fb06de991d6c7ebd0209ce672d9a1f0b44976c2fe98b5638d0fcc5f6823c6f0bfef81afb2817609a7cc0 WHIRLPOOL af6666199890f43f81a2b67c89e3b06cf081ae4351e24925e92c8f24164be81f5d2fcedaafc262eda672733e809a1a2a4f3042375893eafa0bd58de28c1cb966
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
+AUX 4.5.21.10/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.21.10/shorewall.initd 2943 SHA256 88e1f36e1b158986524ac909f0258344f0237539eec21d8fd84e32d65e840708 SHA512 87e1e9980514714ee17ef24b76a1338f6053422dcd0d0fb0b71498d33d03c8fc3d2d6c5e1d338e14bd4097a9580d5b167b67b1509dd5ced6559fcd1d9db53e49 WHIRLPOOL e2681493537ea25b3cd1609fd3960f3c4b89ad2fb414536bdccea7889149512cb0121a515c361ae3aac0ba4a589bcf7022c1e77b63298603211a855b300ae124
+AUX 4.5.21.10/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3abfbba6d63ce9d0521303b504c17 SHA512 63cb819570a249ce97bd0bf3b29e27bc84116c201348c49cb52688eb86bb45e30fb78f6b73055ea54db2392d75c77638ec64d636b9c801345e446402d43b27a2 WHIRLPOOL 98ff8938b7998a20fbf0acd0f1186ac13e543b4e2df99f55feea0e8f038e6a6724083ef221efba33f5c1af0844a8e53d1dcd266686ea2a2dcbd65d67a75b251d
+AUX 4.5.21.10/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 662 SHA256 4f2f884d61a44419be9414f6563ae1fb80e1cb55e88c05fe3b2c23d92b44a762 SHA512 d0c120b72dcb1f38253e5bd533efa4941ee46b833e70eaea687f659a5c736b9a7b8ec828c75c9a58d0e91d2f587d6c63ce0047082716d93ea310ca7dffe31a4c WHIRLPOOL b428a3f126edff93db8b80763ef1506b94da8b00ebb9cfd9e43cb79386b83186ea1d2aebf1b16af6101e958e70f5fba33bd875a63a55efc8b2761a743a60e309
 AUX 4.5.21.7/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.21.7/shorewall.initd 2944 SHA256 cb61ec0e9b9485749f49fe3ab72523b0cf6b75f2e5a477cba1bc453a86034b7f SHA512 c0e60d7dad0a1dfde1b8ca1aa470bb3fc8ae93fd3b608a8b11c9beb8703bca7f2a82c3d94c57eb8a4a8e7368022de3991e9ee35aec7cc126c042e9a40ab07537 WHIRLPOOL 2700a1bd287eff66a08d852319e520854fcfc649177e4ec52bace86e4d0e6f7149dc33fcc65d7d3f5bed12772560165fda99e28433b3fb8b8d169b7def6d4fdf
@@ -15,20 +19,27 @@ AUX 4.5.21.9/shorewall.initd 2944 SHA256 2dd8631c82895b4e16849b3423625d66f59ce2a
 AUX 4.5.21.9/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3abfbba6d63ce9d0521303b504c17 SHA512 63cb819570a249ce97bd0bf3b29e27bc84116c201348c49cb52688eb86bb45e30fb78f6b73055ea54db2392d75c77638ec64d636b9c801345e446402d43b27a2 WHIRLPOOL 98ff8938b7998a20fbf0acd0f1186ac13e543b4e2df99f55feea0e8f038e6a6724083ef221efba33f5c1af0844a8e53d1dcd266686ea2a2dcbd65d67a75b251d
 AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-4.5.18.tar.bz2 470187 SHA256 81bbcb2cc24d0b54769fb153cb472d78e6eed9cdc9f005f1dd70ef2ae9efe131 SHA512 69857ba9181989a0d0b8ce691e637b313b59d4f5643784e62a801f8d74add0605452011e19e5344aaca97a329fe66980627181e69d9c0fc0625ff23afb192f78 WHIRLPOOL 2aaa1d5fce8170507e4989cb5c11cedeca938a161795894edad0ced658c9af42eac299ff4385b15d5fde003ece87f856ac57b985e4d26ea0adc870f109596082
+DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5
 DIST shorewall-4.5.21.7.tar.bz2 489095 SHA256 ac319243a583c31fb6cabacd28157a3c05085b951fb841b068028744b0d825e0 SHA512 1427780e4b75c9af26a90b916d4c410ea2622aea5740ad92a18994dcbbac3ce06989bf39ff60b6af9d10ac79db6e88b63921663e64f1a76298056e799763e859 WHIRLPOOL eba4975e96a2dd6c96bb19d3666a8734d62608fe864e78d9a0d6d4a0b4747c1c6ac720cd722b8d1b4adeacb13bded633f845809a45e1d01db7e7d4d7d59404bc
 DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
 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
-EBUILD shorewall-4.5.18-r1.ebuild 1795 SHA256 a0eda816fcc4f3c8595559fbadc5d5775d1e012d5d60227f6277d5244c714f60 SHA512 d1f580824e97ca3dade7fb08233c558e92717757a3fb760d79efbb41ca01bcdfbed5dcdf4fec5c0a2006c9ae2602250a7002a89d070164cdce04b75b989e0de6 WHIRLPOOL 2fb1319b011987ef2bf47e97da063651506ef0eb8bc715b21ccd9bc40ad5e7e682dd9b806a8cb5aec27b8a24280522eddcce967644ed1c495e783eee78014790
-EBUILD shorewall-4.5.21.7.ebuild 3350 SHA256 1eff6d45644f3c1bba65e379fa25450948f36aea822626112fae9e30be9f6e2b SHA512 cceb7b3de221b0cf86e3f4b7e21a483b1de088c00f5fca0100306f43ff1ae28b8d67dfa3e377b22e9240c4c13c68b61043f5c254b2cd457d333523baf6f61971 WHIRLPOOL 6d47032aba34802a41f8dab69f6d6be52a8bede7cddd7cd618cfbfcb83637c1729de79970b1f82550a4d726038cdf1fcba363651fef4b0dd8016d5694978791f
-EBUILD shorewall-4.5.21.9.ebuild 3292 SHA256 b81f00c3885e0358a92ad58edc18e44ff7e8b800f98f43bb63afbe54c966d0be SHA512 f21ec96c7f1bb1ab6ca5a90030deefcec3bd5f7726363eaedab1cb1adff2d67bcac9e281e257fcd36cc325a124e7313ca372c870831706a2be943e5c8d988a10 WHIRLPOOL 4a5e6bc513d87db58e51b643b6b587cbba11ee883e532b7e79d71b3de27e7580dd9314205de3ee7a67a3b850f94dc79d3f6fc97578e7ba4f3c3f9647827e7f69
-MISC ChangeLog 37921 SHA256 ae73f87bb1484b62e5f8813233d3bca1db6c8dc1c4ff36d45a28b45dbc436eae SHA512 17aa3584d5f9f1bb1755dd91a77190d05b8ab57a7e76848a0ee25f4143120df85a65c68a030ad5b0d65128e70a720c048c65ebce48cc632d12f545fb98011789 WHIRLPOOL 7a78a1fc3cd28f0c77d41c39decab0f616171f009151c810c77a30bb537ca52e660246aa1557934c990c6a183c8576ad94d7f48f88ac9b77abf5bb6f6ac3ab38
+EBUILD shorewall-4.5.18-r1.ebuild 1797 SHA256 d8537c2c5580ee455b24cda4bbb43482e1efcab5e60e95477d199f6d4d5d0f6f SHA512 d93f15726d781d463bff8e43aec855d296baee8f9fad4486c931d2f4a4c738d3669e5fca6a2081a183e8c247056c5778d06c1bb103d5d1c7f1398c0e9cc67c0d WHIRLPOOL f7672bf53fbe5fd0cb4cac5fb1b5d0b3383638da38599b9df3d7acfa17326da8e46b6bbefc5adcd0c695c6980942204b69db400d906073f90c0446072455db6e
+EBUILD shorewall-4.5.21.10.ebuild 3296 SHA256 23c8659c083c99f847c9d64cca355bd14f6057a4a23e35d2acc141e92926e807 SHA512 e7c0742e0dd54e336c46a7f3130f2fe1ab9f5a700a075de765903a2b85468c2a57416dc2947d9066ea88438353726436016c2bb8f93233bb60ee9d3993442414 WHIRLPOOL 2bee0e59dd5236d95c151d8a9f7dc5a155de807e031c3880b5e82c78c34b572d5bc7a9e6f3a002871b9bd1958f29bedd892174c1f3f6cade0fe3bc80809d98f9
+EBUILD shorewall-4.5.21.7.ebuild 3347 SHA256 b3458ad72d9db6bd4baf1c05e58297d724993f7b10a5d3d34e0e9b0fafd2396c SHA512 10a9773100b4f234690eb94cb281b57d80b40ca07cf21baf29908fdd2586f347a11aee1d85caf6a8ebd36d53e320d1ce160e105e04e931783193b2963be115f4 WHIRLPOOL 58c877f361b4f90d54695c0d4d1bbfd4a5a74c13d0df82ae78a81f224e7b5ca3e220b055be2a192a20cc30dffe03c4195a479f3da61fec3fd31b4396bfbeef61
+EBUILD shorewall-4.5.21.9.ebuild 3294 SHA256 7f7591283bd702cba8d98a5ba2fcfe001463e6ca12771b1f915caa7a406fd444 SHA512 390cb6354ab8b37980b290b71f7de8d92238c907bb93139a12a046fcbebccebf88e0033a0461212ff570ce4e5f3b0df740accc2f5a57476a32ad2d7849b01f0e WHIRLPOOL 35953cb70448837f76bcc11955f01d2a7db2dfbd028c484a81d1bb6f2ce48ff33bb911541bfe486343ad742b9a350ab0110d8ef096367128c159eec4b67c34fe
+MISC ChangeLog 38366 SHA256 d4adfbbcb239d06b0c63d869e207b0646f9f49069273a0cf947b26f42fdfd30f SHA512 6c7e7cf364bcb0329ae5714c8d7bca75489bb70dc31fd5f789cae478a87168da49832f1a0ce0055e845cb7df4f8fa62818b7843ee3e3ca938f7ada245d0fc71b WHIRLPOOL d05601c796d35aa93d48b45a1adcd5b48aba8a7cb8d783c94fe91a9da7697950e421a319e58662bf38f3786e57864739bd1b897735b7c9e7ded3e0b210ce8c87
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOObB4ACgkQVWmRsqeSphNsDgCfdStL7VD3sdJLdsPioQOOSFyH
-uFoAniuHknG4XZnZLjg0sQgDqQzqTRXa
-=SZdR
+iQEcBAEBCAAGBQJTmbKqAAoJEJWyH81tNOV9DNIH/234qgzVaOhTc90ibM5FPaX6
+d+BtX8vxk0OCeLDVpr4SO3RVDHeSLTTiPsQP1QBKNZ3fT3Rhoglnxqgdw2dJyFjn
+cftIMJfbPNrcCJuxa/30/OH5c2Z5OyhCKk2SMWdgdenOeTvTMOjL+vRwE6VdnjSe
+biRehB94x6LbVnTU/10/yE7t4l9GY9D8KEwyRASD+okTco/1wcdb8Be+dP7+KP5s
+g0U08Ciuvl+SXe/kuzm84D1+WVeMu7v9oq9AXZlmVth3EAb5u8k6MOsUY3txugb3
+9++im7oy17+0dz3vqgE5Rq8HpRyDDVTdxq81/Dvh6VH0WhXCGI1OfDqxICK2Fd4=
+=/ues
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/4.5.21.10/shorewall.confd b/net-firewall/shorewall/files/4.5.21.10/shorewall.confd
new file mode 100644
index 000000000000..e5957167b5b9
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.21.10/shorewall.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/files/4.5.21.10/shorewall.initd b/net-firewall/shorewall/files/4.5.21.10/shorewall.initd
new file mode 100644
index 000000000000..0c430ade393c
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.21.10/shorewall.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/shorewall/files/4.5.21.10/shorewall.initd,v 1.1 2014/06/12 14:02:18 tomwij Exp $
+
+description='The Shoreline Firewall, more commonly known as "Shorewall", 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} Shorewall. 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/shorewall 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"
+	/sbin/shorewall ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall"
+	/sbin/shorewall ${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"
+	/sbin/shorewall status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		/sbin/shorewall ${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/shorewall ${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"
+	/sbin/shorewall ${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 shorewall rules"
+	/sbin/shorewall ${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 shorewall configuration"
+	/sbin/shorewall ${OPTIONS} check 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/4.5.21.10/shorewall.systemd b/net-firewall/shorewall/files/4.5.21.10/shorewall.systemd
new file mode 100644
index 000000000000..db278fd54585
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.21.10/shorewall.systemd
@@ -0,0 +1,17 @@
+#
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
+#
+[Unit]
+Description=Shorewall IPv4 firewall
+Documentation=man:shorewall(8) http://www.shorewall.net/Documentation_Index.html
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall
+ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall/files/4.5.21.10/shorewallrc b/net-firewall/shorewall/files/4.5.21.10/shorewallrc
new file mode 100644
index 000000000000..46f5eb9a3603
--- /dev/null
+++ b/net-firewall/shorewall/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/shorewall-4.5.18-r1.ebuild b/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild
index ef264b7e898e..dda79113e663 100644
--- a/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-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/shorewall-4.5.18-r1.ebuild,v 1.8 2014/03/23 18:01:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild,v 1.9 2014/06/12 14:02:16 tomwij Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ MY_PV_BASE=$(get_version_component_range 1-3)
 MY_P="${PN}-${MY_PV_BASE}"
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
+DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux"
 HOMEPAGE="http://www.shorewall.net/"
 SRC_URI="http://www1.shorewall.net/pub/${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/shorewall/shorewall-4.5.21.10.ebuild b/net-firewall/shorewall/shorewall-4.5.21.10.ebuild
new file mode 100644
index 000000000000..d259883c44d5
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.5.21.10.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.10.ebuild,v 1.1 2014/06/12 14:02:16 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, is'
+DESCRIPTION+=' a high-level tool for configuring Netfilter'
+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="
+	>=dev-lang/perl-5.10
+	virtual/perl-Digest-SHA
+	=net-firewall/shorewall-core-${PVR}
+"
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
+
+	local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+	local WARNING_CONNTRACK_IPV4+=" 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 Samples
+		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 shorewall-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/shorewall-4.5.21.7.ebuild b/net-firewall/shorewall/shorewall-4.5.21.7.ebuild
index 6465c7ee9805..9aa253abe05a 100644
--- a/net-firewall/shorewall/shorewall-4.5.21.7.ebuild
+++ b/net-firewall/shorewall/shorewall-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/shorewall-4.5.21.7.ebuild,v 1.1 2014/03/15 22:54:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.7.ebuild,v 1.2 2014/06/12 14:02:16 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, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter.'
+DESCRIPTION+=' a high-level tool for configuring Netfilter'
 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/shorewall-4.5.21.9.ebuild b/net-firewall/shorewall/shorewall-4.5.21.9.ebuild
index d2758411ffdf..f0a85497bf87 100644
--- a/net-firewall/shorewall/shorewall-4.5.21.9.ebuild
+++ b/net-firewall/shorewall/shorewall-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/shorewall-4.5.21.9.ebuild,v 1.2 2014/06/04 00:45:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.9.ebuild,v 1.3 2014/06/12 14:02:16 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, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter.'
+DESCRIPTION+=' a high-level tool for configuring Netfilter'
 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