Version bump; Add new files/ structure

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key BB80F419010E3EC3)

7 files changed, 300 insertions, 1 deletions

diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 0f9ca612b462..d96fe64d553c 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.83 2013/08/28 15:18:49 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.84 2013/08/28 16:59:04 constanze Exp $
+
+*shorewall6-4.5.19 (28 Aug 2013)
+
+  28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
+  +files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch,
+  +files/4.5.19/shorewall6.confd, +files/4.5.19/shorewall6.initd,
+  +files/4.5.19/shorewall6.systemd, +files/4.5.19/shorewallrc,
+  +shorewall6-4.5.19.ebuild:
+  Version bump; Add new files/ structure
 
   28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
   -shorewall6-4.5.15.ebuild, -shorewall6-4.5.17.ebuild:
diff --git a/net-firewall/shorewall6/files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch b/net-firewall/shorewall6/files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch
new file mode 100644
index 000000000000..9f3742a83568
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch
@@ -0,0 +1,22 @@
+--- configfiles/shorewall6.conf		2013-06-24 22:07:38.000000000 +0200
++++ configfiles/shorewall6.conf.new	2013-07-01 15:50:54.747711444 +0200
+@@ -85,7 +85,7 @@
+ 
+ SHOREWALL_SHELL=/bin/sh
+ 
+-SUBSYSLOCK=/var/lock/subsys/shorewall6
++SUBSYSLOCK=/run/lock/shorewall6
+ 
+ TC=
+ 
+--- configfiles/shorewall6.conf.annotated	2013-06-27 20:32:22.000000000 +0200
++++ configfiles/shorewall6.conf.annotated.new	2013-07-01 15:51:38.448332964 +0200
+@@ -444,7 +444,7 @@
+ #     or specified as a null value, /bin/sh is assumed. Using a light-weight
+ #     shell such as ash or dash can significantly improve performance.
+ # 
+-SUBSYSLOCK=/var/lock/subsys/shorewall6
++SUBSYSLOCK=/run/lock/shorewall6
+ #
+ # SUBSYSLOCK=[pathname]
+ # 
diff --git a/net-firewall/shorewall6/files/4.5.19/shorewall6.confd b/net-firewall/shorewall6/files/4.5.19/shorewall6.confd
new file mode 100644
index 000000000000..e5957167b5b9
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.19/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.19/shorewall6.initd b/net-firewall/shorewall6/files/4.5.19/shorewall6.initd
new file mode 100644
index 000000000000..ce5f305c69c5
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.19/shorewall6.initd
@@ -0,0 +1,107 @@
+#!/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/files/4.5.19/shorewall6.initd,v 1.1 2013/08/28 16:59:04 constanze 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.19/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.19/shorewall6.systemd
new file mode 100644
index 000000000000..448226c88736
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.19/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.19/shorewallrc b/net-firewall/shorewall6/files/4.5.19/shorewallrc
new file mode 100644
index 000000000000..c2fce7246c1b
--- /dev/null
+++ b/net-firewall/shorewall6/files/4.5.19/shorewallrc
@@ -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=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.19.ebuild b/net-firewall/shorewall6/shorewall6-4.5.19.ebuild
new file mode 100644
index 000000000000..e37ebd9b3d87
--- /dev/null
+++ b/net-firewall/shorewall6/shorewall6-4.5.19.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.19.ebuild,v 1.1 2013/08/28 16:59:04 constanze 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_MAJORMINOR=$(get_version_component_range 1-2)
+
+DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, with'
+DESCRIPTION+=' IPv6 support.'
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P}.tar.bz2
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P_DOCS}.tar.bz2 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="=net-firewall/shorewall-${PV}"
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4.20[ipv6]
+	sys-apps/iproute2[-minimal]
+	dev-perl/Socket6
+"
+
+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}"/${PV}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	cp "${FILESDIR}"/${PV}/${PN}.confd "${S}"/default.gentoo || die "Copying shorewall.confd failed"
+	cp "${FILESDIR}"/${PV}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
+
+	epatch "${FILESDIR}"/${PV}/shorewall6.conf-SUBSYSLOCK.patch
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/${PN}
+
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+	systemd_newunit "${FILESDIR}"/${PV}/${PN}.systemd ${PN}.service
+
+	# Currently, install.sh from upstream is broken and will always
+	# default.debian so have to do it on our own:
+	newconfd "${FILESDIR}"/${PV}/${PN}.confd ${PN}
+
+	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
+}