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, 202 insertions, 6 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index b714ea298b78..d1057af0f7a2 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.137 2013/08/29 19:01:51 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.138 2013/09/22 13:17:02 constanze Exp $
+
+*shorewall-lite-4.5.18-r1 (22 Sep 2013)
+
+  22 Sep 2013; Constanze Hausner <constanze@gentoo.org>
+  +files/4.5.18-r1/shorewall-lite.initd,
+  +files/4.5.18-r1/shorewall-lite.systemd, +files/4.5.18-r1/shorewallrc_new,
+  +shorewall-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/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
index fa53bd95fae0..8df26c427647 100644
--- a/net-firewall/shorewall-lite/Manifest
+++ b/net-firewall/shorewall-lite/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.19/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.19/shorewall-lite.initd 2267 SHA256 6f4a60e75ed61290918e776e8556b1009b687aca9d86542d8e780b5b33472b5f SHA512 c1424571594e585e48652ce9ac1b602f4763f7494e58d6d981fbd8a14f0193c6f52510e38225a70d0e8f74b6171f1a319ad89ae6682674384d74509fbc22fb62 WHIRLPOOL 8be4243da4f6f81f1f50807593861c3fc34e4857df50cb1ebb12deed74262050d0bb63a47b7b9c83597063a881eaf9b01b923478ca3b50fe3aa69ca9e28022fb
 AUX 4.5.19/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
@@ -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 shorewall-lite-4.5.18.tar.bz2 73702 SHA256 b66680361c527ac710d33d643f4c233ab8e754e7916de0891a863ca7a973d03c SHA512 de181f2878402bb86b550bcfd4aaa86d874ef8be2674d145052322c80499bcc4691086a2b09612a0228de7d1c9e75c335ac99dbc63dcc0d5c8c2fc305f377be6 WHIRLPOOL cd29da8106f7fb2faa84e07fe2a2fa7e080a36db15c04b09926855a7735310c20e4c29f26695bc3c1dbc91b2c262223b8f83341018da2fa91fad1f8edc99a026
 DIST shorewall-lite-4.5.19.tar.bz2 74489 SHA256 f5d1e8f2ae4b42461e5b414b52b4ac6614a144e4f6ad211b025f94716f898aec SHA512 c7d1edf2bad8c5ef4cb51fd5ef1d2dddd6bfc4d5d984b85b6fe8b6686a762bdd888c3a7dc2f7ce21cc6e7e217f51e7f5c00d534d7ee2b7bddcdfd534f936768e WHIRLPOOL 0d61e9648e4b34ad58d942cbb4e7e38d2551f877cc82cba7ea64f72362010067b2d663b984c052acdb9c1c544f184abf42e51b9e6797adcacaa8fa9064e5aaed
+EBUILD shorewall-lite-4.5.18-r1.ebuild 1743 SHA256 c92bb6267742c0c1e3afacc9d38b44e02e716f5a4550085ccd98722bd6ff2fbe SHA512 c6810af32f55abecf46151b44db3bb9f81eeb16e26a2cb42064ede4ea91398b7199aae5eff466cdecc7be523204230e7c97a9793bc6bbcc46e51040f06cff1c5 WHIRLPOOL c3006bdf25a1edc24ed2a5dd7b13752a335f25f0ae2d100344281ce0d3939fc9e08596822cb21206bf079e507c54d43b40c9a08e00028433227f68aff61ffd4f
 EBUILD shorewall-lite-4.5.18.ebuild 1499 SHA256 132580bd50bb8c41b4cf78a7918a4fe2efe4c9d51560c00de4806aedb828af75 SHA512 9e5b470129fdce4a6b060456b711e8d60f54a2cf2531deb7b0df9c566194075db6e4a4254c6484cb799a2dc4115d6f3d5374e6f01763bb3bc8936e2ddcfe608d WHIRLPOOL 3be3ab13d1d30c414559a9e83ed99efcce89f9d839eb6a95e66266186a270b1adf0e4ee7c7571c1da8719d0b442ab7947890be69f982e9f908d96d11bf45f1e3
 EBUILD shorewall-lite-4.5.19.ebuild 2693 SHA256 dd25aa829df0951166104c7215f453054d249b8f3b2fdc9505783ab76039ce1a SHA512 a79983efdaca8e1285e03541fb63e1bf375494340d38132a5106a89e65e15d7cc34526a7d0ee6805a78d5d08b3b0a7989a49177b5a32f75b4015a495ce372bac WHIRLPOOL cde182feea22895f512ade2fa0deda207e7156dadfc5adf3343e1036fba70143852a13dfb2faa666df69e2c2d66e99b353d8ec5aab12601de35f858729ba7bbb
-MISC ChangeLog 21554 SHA256 e0ebdbce6e02ab6a3f01c889751ae7d658fb1d9ecfe4ff6485ada24c0dcf5640 SHA512 e38d098057403ad87fd4264538b4437fad0191fffffb99e9206b40f3aed48c7586a9ca620b6ddb799c1d42fe375633b7c1ac613fba061197f4960adefe3fa1b0 WHIRLPOOL 3768961ee10b545d2c4140c3cd43b328695bcfba32511260a307eb01aa4dfbc30515872dba8212d1777acc88d138ffb066631547a20059e6786c2bffbe7d3fdc
+MISC ChangeLog 21854 SHA256 290d3ba2b5c2635e330ad7b15b2e87e7a788c688ce5af03d38b7156c48427c9b SHA512 a1f454444d1af61f3cae68bce1d6763bb8af4de7a88783a1e3f57958184daf25e9937d21fb4709cc6fb5951c02188526503b5f0830b7c937477ff06088084045 WHIRLPOOL 792ee8898a213f9a4ce6bc75e48cd85fdc1b3a0b16c77e3833db31f203a51926f44e7c894b953086ed6d32658d6efa812c7ebfca974fba3098a7a3a2fdb94108
 MISC metadata.xml 335 SHA256 343bf632281281ef9049e8d52c7e6e3b5629373a74b5bf1a4354466a83871875 SHA512 92b629d285c6f27de039844c97220a2a16139adca066fc4ab6ce379ad8ac3133e689044037302ca176d4d13ecf001aae35e29b5342d5ba94036ae7b478460d7b WHIRLPOOL 6e05ad4629c63dec8e7c9bddce0d14a5c83515366e38be765b68e04e4dd958805343a7c0ecaf05fc4669f0d6a7f47cdb8c2cba0d71c20be431c0a8b5930cabf1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iL4EAREIAGYFAlIfmqBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlI+8NFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
-ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsPa4wD/TqepWQmZ44K8k42tL0DQKOWe
-rUN11EZUEd0sH6f6BVoA/2sMpBGpisfsqz+DvYNt5gG0AS/cVJjmbrD3+pm7Uc9v
-=QRNr
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsOyvwEAnRnY1UtJGpEtvk47KctQfpSt
+GQZjDL1T3Fxowc5+m8IA/RiMknjMYLdqkx9A1nCG7Z5MRboafYb+i9UUoovH3kWG
+=1IXy
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.initd
new file mode 100644
index 000000000000..3511ba19408c
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-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/shorewall-lite/files/4.5.18-r1/shorewall-lite.initd,v 1.1 2013/09/22 13:17:02 constanze 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 start 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall-lite"
+	/sbin/shorewall-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 shorewall-lite"
+	/sbin/shorewall-lite status 1>/dev/null
+	if [ $? != 0 ] ; then
+	    svc_start
+	else
+		/sbin/shorewall-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 shorewall-lite rules and setting policy to ACCEPT"
+	/sbin/shorewall-lite 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 reset 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-lite.systemd
new file mode 100644
index 000000000000..aeb89b5abccb
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.18-r1/shorewall-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 IPv4 firewall (lite)
+After=syslog.target
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/shorewall-lite
+StandardOutput=syslog
+ExecStart=/sbin/shorewall-lite $OPTIONS start
+ExecStop=/sbin/shorewall-lite $OPTIONS stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.18-r1/shorewallrc_new b/net-firewall/shorewall-lite/files/4.5.18-r1/shorewallrc_new
new file mode 100644
index 000000000000..0f9301cfeb49
--- /dev/null
+++ b/net-firewall/shorewall-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/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild
new file mode 100644
index 000000000000..c27135f80a75
--- /dev/null
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.5.18-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 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.1 2013/09/22 13:17:02 constanze Exp $
+
+EAPI="5"
+
+inherit eutils 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/-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."
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2
+	=net-firewall/shorewall-core-${PVR}"
+
+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/shorewall-lite
+
+	cd "${WORKDIR}/${P}"
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+	systemd_newunit "${FILESDIR}"/${PVR}/shorewall-lite.systemd 'shorewall-lite.service'
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		dohtml -r *
+	fi
+}