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

4 files changed, 116 insertions, 5 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
+}