Version bump to 4.5.21.10; fixes bug #509258 and bug #509258, proxied commit for Thomas D. (whissi).

(Portage version: 2.2.10_p125/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

9 files changed, 291 insertions, 7 deletions

diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index ee6c7a3dc220..e4b8cdd2ed31 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.98 2014/06/04 00:47:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.99 2014/06/12 14:26:06 tomwij Exp $
+
+*shorewall6-4.5.21.10 (12 Jun 2014)
+
+  12 Jun 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/4.5.21.10/shorewall6.confd, +files/4.5.21.10/shorewall6.initd,
+  +files/4.5.21.10/shorewall6.systemd, +files/4.5.21.10/shorewallrc,
+  +shorewall6-4.5.21.10.ebuild, shorewall6-4.5.18-r1.ebuild,
+  shorewall6-4.5.21.7.ebuild, shorewall6-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> shorewall6-4.5.21.9.ebuild:
   Stable for HPPA (bug #511620).
diff --git a/net-firewall/shorewall6/files/4.5.21.10/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.confd
new file mode 100644
index 000000000000..e5957167b5b9
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.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/shorewall6/files/4.5.21.10/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.initd
new file mode 100644
index 000000000000..974a52826986
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.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/shorewall6/files/4.5.21.10/shorewall6.initd,v 1.1 2014/06/12 14:26:06 tomwij Exp $
+
+description='The Shoreline Firewall 6, more commonly known as "Shorewall6", 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} Shorewall6. 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/shorewall6 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"
+	/sbin/shorewall6 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall6"
+	/sbin/shorewall6 ${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 shorewall6"
+	/sbin/shorewall6 status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		/sbin/shorewall6 ${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/shorewall6 ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall6"
+	/sbin/shorewall6 ${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 shorewall6 rules"
+	/sbin/shorewall6 ${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 shorewall6 configuration"
+	/sbin/shorewall6 ${OPTIONS} check 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall6/files/4.5.21.10/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.systemd
new file mode 100644
index 000000000000..448226c88736
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.21.10/shorewall6.systemd
@@ -0,0 +1,17 @@
+#
+#	The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.5
+#
+[Unit]
+Description=Shorewall IPv6 firewall
+Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall6
+ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6/files/4.5.21.10/shorewallrc b/net-firewall/shorewall6/files/4.5.21.10/shorewallrc
new file mode 100644
index 000000000000..46f5eb9a3603
--- /dev/null
+++ b/net-firewall/shorewall6/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/shorewall6/shorewall6-4.5.18-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.18-r1.ebuild
index 1b15edab5aed..4865c863889f 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.18-r1.ebuild
+++ b/net-firewall/shorewall6/shorewall6-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/shorewall6/shorewall6-4.5.18-r1.ebuild,v 1.8 2014/03/23 18:01:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.18-r1.ebuild,v 1.9 2014/06/12 14:26:06 tomwij Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ MY_PN="${PN/6/}"
 MY_P="${MY_PN}-${MY_PV_BASE}"
 MY_P_DOCS="${MY_PN}-docs-html-${PV}"
 
-DESCRIPTION="Shoreline Firewall with IPv6 support."
+DESCRIPTION="Shoreline Firewall with IPv6 support"
 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/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.10.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.10.ebuild
new file mode 100644
index 000000000000..971b0a328fc6
--- /dev/null
+++ b/net-firewall/shorewall6/shorewall6-4.5.21.10.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.10.ebuild,v 1.1 2014/06/12 14:26:06 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,'
+DESCRIPTION+=' IPv6 component'
+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-${PVR}"
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4.20[ipv6]
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=dev-perl/Socket6-0.230.0
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
+
+	local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+	local WARNING_CONNTRACK_IPV6+=" 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 Samples6
+		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 shorewall6-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/shorewall6/shorewall6-4.5.21.7.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.7.ebuild
index d614cecfc24c..d49b8c38b9c0 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.21.7.ebuild
+++ b/net-firewall/shorewall6/shorewall6-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/shorewall6/shorewall6-4.5.21.7.ebuild,v 1.1 2014/03/15 22:59:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.7.ebuild,v 1.2 2014/06/12 14:26:06 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,'
-DESCRIPTION+=' IPv6 component.'
+DESCRIPTION+=' IPv6 component'
 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/shorewall6/shorewall6-4.5.21.9.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild
index 5ea205d21d30..a5baf9dbde81 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild
+++ b/net-firewall/shorewall6/shorewall6-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/shorewall6/shorewall6-4.5.21.9.ebuild,v 1.2 2014/06/04 00:47:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild,v 1.3 2014/06/12 14:26:06 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,'
-DESCRIPTION+=' IPv6 component.'
+DESCRIPTION+=' IPv6 component'
 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