Bugfix 459316 for 4.5.18; Thanks to Thomas D.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB80F419010E3EC3

6 files changed, 208 insertions, 6 deletions

diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index 7378c572b6e3..5bdd8416a282 100644
--- a/net-firewall/shorewall6-lite/ChangeLog
+++ b/net-firewall/shorewall6-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall6-lite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.64 2013/08/29 19:04:47 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.65 2013/09/22 13:19:08 constanze Exp $
+
+*shorewall6-lite-4.5.18-r1 (22 Sep 2013)
+
+  22 Sep 2013; Constanze Hausner <constanze@gentoo.org>
+  +files/4.5.18-r1/shorewall6-lite.initd,
+  +files/4.5.18-r1/shorewall6-lite.systemd, +files/4.5.18-r1/shorewallrc_new,
+  +shorewall6-lite-4.5.18-r1.ebuild:
+  Bugfix 459316 for 4.5.18; Thanks to Thomas D.
 
   29 Aug 2013; Constanze Hausner <constanze@gentoo.org> metadata.xml:
   Added Thomas D. as new maintainer
diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest
index 128f838a40ce..7722a948bdd6 100644
--- a/net-firewall/shorewall6-lite/Manifest
+++ b/net-firewall/shorewall6-lite/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 4.5.18-r1/shorewall6-lite.initd 2187 SHA256 f09a31e2c7595411b85e4e17d6970d24634cfd75b21393b6d725eb9a727723b0 SHA512 55291fcb03c8751b779f383dfff719d7a8c2f4754015b8a5696179349b95cc8883b3df0699f1cea6fb1a7864b2271065e3804a69471d1067d7f8d5aaef340d08 WHIRLPOOL 5849838cf3f32c3da921ffec92c1f5768f6f5f0ebe10d68064ef0466b3ec8224bd959e079cde76def2ef5f286d1ae48b53ec4cb9efac8be5df500399d5ba3346
+AUX 4.5.18-r1/shorewall6-lite.systemd 475 SHA256 95dec92e61eda3543ada0bc05c9eecf87ca5dcc449448b5c04dbcf72045006cb SHA512 a9a258b0b430a88bcf6d6ccec56ded96422c0c52574cd45b552c04f4c1b5758476ea708d13b517dab686d859f4a503a348de6bd2acb5e60797172e502e387831 WHIRLPOOL c38c053ade59895c5605182241e154ab2624187a8367f7d371111ccdf5f4145d32b3c3bc358fb590d85cd044ad1c76a7f49af57d6ea6ec71fa25f773b644fd0f
+AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
 AUX 4.5.19/shorewall6-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.19/shorewall6-lite.initd 2285 SHA256 c91073e6c99d2e1dd36992f6682989c6b911bf637fc61a01ac3a8c5eb6b40b4d SHA512 2d9462a58533738038609d3b1fa7484fa58b25c82f31251354a9401bcd0bfa4d47b92b25e23b79c14ee67aa0700ebe942d98175cc3f161dba2359ebdcb50aabc WHIRLPOOL bfd66560c5a2aee6affbffb78460af26065d9bd7435eed486ed7729d8ccb98e09233c62f2fa345b9e220db598a9592db77495aceded80cd04cb1d49a32f6e164
 AUX 4.5.19/shorewall6-lite.systemd 488 SHA256 f8e0a127bb4e7216120a38ec09e35e2928b54dd5fc4e2bdefc66dbe20897ba43 SHA512 3710760fe27ee07a92170be6ebf423a6353e4712080a6c0c2c63958ec4f658add4743d60dcc91348b734c896d029227a4f6024d316ba96ea558f6c1db2246074 WHIRLPOOL 7541bddbce4c105c3a0dc1aab3ab64d96b41a27a87650fc48b63b07cb5a0b55524c1f4b50fee05104e82afa1b256ce8b809ddda5d9ac05da8b06991220c9da55
@@ -12,16 +15,17 @@ DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb178
 DIST shorewall-docs-html-4.5.19.tar.bz2 4033970 SHA256 7be6ebfa73a52151137201e098588ff6e67aa6fc21cf530a0fba564eeb8e77d1 SHA512 8ce06db614a6114cfe2c5c78acfaf111cba0ae5aa488df3879af6b5ecb20205ee453e308a7299e5df243a71067f93dcd8f4cf5faefbd8729ba11acee35cf34e0 WHIRLPOOL b55f90c6f9ca28cccddfb7bd899ce5815573db3ff4b4deabe454c6f30a9b01196ec4609d5251413d9761a28944a6acb19b6748c4dd41ea58fe2fa8da9845ed49
 DIST shorewall6-lite-4.5.18.tar.bz2 73212 SHA256 f4fa454812ac0fa3da96569dcac3c6bff0022477e1ba55eee0df5d260f8091f0 SHA512 42939a8fbd6190f396ad31d5107dd28df831ee5236329d714f209c33cdaa00976931da3e3c0e6e92f5f963d054aac6987686e90f47fd4879a96320e93a769e8a WHIRLPOOL 156e60c4c4665cc6b8c5c0687880f07a9d27151dc0919cc6add388c84e1c3e23dd9ac46fa0ae941e0ccd674a70ff89b8573bf1463b350574cab469cdac7d9945
 DIST shorewall6-lite-4.5.19.tar.bz2 73853 SHA256 c42b43c95ccb4de1f4ba2392321909c4e060b1facf1265745ec320a2b27b92a5 SHA512 51e72981acf5421db84472f707ccfd4af6c3b761453d144b6d57def3937d02c2200afc4669e3a9b3e7c200e308ce6cc8e1526231546ac9e3b8aa72b4593b93ac WHIRLPOOL 8f5c7c490b8f2346686d68c6c6e7d0227ff47a52eb70d9220b2f967eab725e2ed2486d91ded8c0944dd1d0a294e9e192a0bfb7cab4a5284e1837bcb8bba35219
+EBUILD shorewall6-lite-4.5.18-r1.ebuild 1848 SHA256 3e80de99a3599aba29153bebce0c33e36167648193f89d306f23f38c9da98cbe SHA512 15f7bcaa4260223cc10a2a4e19bfa129f679bf57a3792f1d38514b2cdcbd84b6371247e4556b96404c12fb610a17479596df219fbede98caf812fb7d518f5469 WHIRLPOOL 4b3decd5bf36dcc0652f603469b3bffd3fc4147c67c4b67bfc3b092fa9153d51075573ee3241adf54594f74bebb83ab32b952d961a57007b3a4a7d7707d40659
 EBUILD shorewall6-lite-4.5.18.ebuild 1594 SHA256 16b1e974275ce30be5e1310e73d24e135a0117960574d8a886c46c27fed2be03 SHA512 67190d8004b43680bc478262685ff089d97d081906aace42828921a7ea1dd2ecde9a1660b79aca758c0155beae77baa93d6eb7b5d8625bdc5eadb350f9f9c081 WHIRLPOOL 2f15e9a17b6271c0d6c0bbd737c8b4e70a5d11b84ae1089cf9bb1cca45ba9ec29d0dc9432dd56dc2897dfa68aec46b1bba6d08a966af7b0cbd2cfc48e4138ec4
 EBUILD shorewall6-lite-4.5.19.ebuild 2722 SHA256 d60a581080ad0437af974cdbf39521332a3082b47215550af38728c0ae3c5ec1 SHA512 be7e4cd1e36212fb0eee055777eb7e44d5b4ad531a450db9c1b8624173074d2e4cd519ca613a61be4a4e44d3da22154fafc707c4f67a9bd99fc0524856d1c34b WHIRLPOOL 605f56a6b59f7809d994392224b7376561f0b7ec3b8df209d686f9edc2bb2ab30a51cd638ca636b54d9e365138c5a038022f8d77a3d92ec62f98f611f5283ec1
-MISC ChangeLog 11229 SHA256 730f89ecf3dba3bfd29517a63c594b2250be6068ace959fb1034dd1e198b28b1 SHA512 5f87a17415e65ce175eb0d92b6c88bb5250277586d45d3a1b950f74d60ab53b4f622d964b2c7b1deda4e12ffd214a019441073caeaf93accb0414c445b48c380 WHIRLPOOL ea5f85a80ac33a66c9c707ec15c3fd4c94c401dfa8fae319f99c609e973e780f13c1d3b551ad6ed4ccec938b6b72a6e75e93a0304fe42d72ef329ac7792d6000
+MISC ChangeLog 11533 SHA256 362f713ba46d7001494f248c8f12007eb624584b7846952fe26debd4002b6a5b SHA512 ec4e09af989cc942e6153b08690e4f7be2893a46ff2bc0dcf501861a9c3267258b193e13ab8cdab39c689159bccb197d0b22a487c2a5b0a93fcfdf3265ddefe4 WHIRLPOOL d483b12ff34e84c2d51174b4835f15f18cfcb7093d8da9636d55e01bed75b0b2d309da709f555d0a7501cd17995c631465df37bed168038e5e51ccfa501b2baf
 MISC metadata.xml 361 SHA256 ea12ad6e474c28d25b9203225c99d9a0336bd606fd3c2cd260c11d4982712357 SHA512 da1d88bdae3187e1c5d63b90da4fb2798f0a3f79558a57eb5ae0fab42eaa7268bfbd4102a870cbff73aa83c64bc1b10c1c7f71c01ee29f64772f7635e7da0ac9 WHIRLPOOL ae0b57811bf7617fb9cf3840a2e182d334a8303fda841c879c2791b893bd5515cae72fc0bb38f6554045bb531774798539f80b474a6152ebc04c31e5bc2f0464
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iL4EAREIAGYFAlIfm1BfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlI+8U9fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
-ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsPSVQD/VXsSKGdkGqItsKaHvP7Engkd
-eoVy1Hya4r6feQ6BpaIBAIXLNIuWJsg7Os2vqqesujB8XwDz7JoyKwXkkh0HI0F5
-=AtiW
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsN9/wEAgsZc12IOWBfDOi5p4XYvuaoC
+zAoPwe8LpOG76HtwZKoA/3zVUE6pR7e2i+UBbl9l/dqu/3DPKbo8z4X7b8uoSEtb
+=Dubs
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewall6-lite.initd
new file mode 100644
index 000000000000..3f2e01f77e35
--- /dev/null
+++ b/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewall6-lite.initd
@@ -0,0 +1,82 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewall6-lite.initd,v 1.1 2013/09/22 13:19:08 constanze Exp $
+
+description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 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} Shorewall6 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/shorewall6-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 shorewall6-lite"
+	/sbin/shorewall6-lite start 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall6-lite"
+	/sbin/shorewall6-lite stop 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-lite"
+	/sbin/shorewall6-lite status 1>/dev/null
+	if [ $? != 0 ] ; then
+	    svc_start
+	else
+		/sbin/shorewall6-lite restart 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 shorewall6-lite rules and setting policy to ACCEPT"
+	/sbin/shorewall6-lite clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall6-lite"
+	/sbin/shorewall6-lite reset 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewall6-lite.systemd
new file mode 100644
index 000000000000..c34c688b137d
--- /dev/null
+++ b/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewall6-lite.systemd
@@ -0,0 +1,20 @@
+#
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
+#
+#     Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
+#
+[Unit]
+Description=Shorewall IPv6 firewall (lite)
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/shorewall6-lite
+StandardOutput=syslog
+ExecStart=/sbin/shorewall6-lite $OPTIONS start
+ExecStop=/sbin/shorewall6-lite $OPTIONS stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewallrc_new b/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewallrc_new
new file mode 100644
index 000000000000..0f9301cfeb49
--- /dev/null
+++ b/net-firewall/shorewall6-lite/files/4.5.18-r1/shorewallrc_new
@@ -0,0 +1,22 @@
+#
+# Gentoo Shorewall 4.5 rc file
+#
+BUILD=                                  #Default is to detect the build system
+HOST=linux                              #Generic 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)
+SYSCONFFILE=                            #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-lite/shorewall6-lite-4.5.18-r1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18-r1.ebuild
new file mode 100644
index 000000000000..b17cf51f3e80
--- /dev/null
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18-r1.ebuild,v 1.1 2013/09/22 13:19:08 constanze Exp $
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_PN="${PN/6-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 Shorewall6."
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=net-firewall/iptables-1.4.0
+	sys-apps/iproute2
+	=net-firewall/shorewall-core-${PVR}"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 25 ; then
+		die "${PN} requires at least kernel 2.6.25."
+	fi
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/${PVR}/shorewallrc_new "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/${PN}
+
+	cd "${WORKDIR}/${P}"
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+	systemd_newunit "${FILESDIR}"/${PVR}/shorewall6-lite.systemd 'shorewall6-lite.service'
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		dohtml -r *
+	fi
+}