--- old/net-firewall/shorewall/files/4.5.21.10-r1/shorewallrc 2014-11-18 12:12:24.000000000 +0100 +++ old/net-firewall/shorewall/files/4.5.21.10-r1/shorewallrc 2014-11-26 11:32:38.844933685 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall/files/4.5.21.9/shorewallrc 2014-04-26 11:29:56.000000000 +0200 +++ old/net-firewall/shorewall/files/4.5.21.9/shorewallrc 2014-11-26 11:32:47.904090528 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall/files/4.6/shorewall6.initd 2014-11-18 13:54:56.000000000 +0100 +++ old/net-firewall/shorewall/files/4.6/shorewall6.initd 2014-11-26 15:06:07.000000000 +0100 @@ -1,7 +1,7 @@ -#!/sbin/openrc-run +#!/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/shorewall/files/4.6/shorewall6.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $ +# $Header: $ description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is' description="${description} a high-level tool for configuring Netfilter." --- old/net-firewall/shorewall/files/4.6/shorewall6-lite.initd 2014-11-18 13:54:56.000000000 +0100 +++ old/net-firewall/shorewall/files/4.6/shorewall6-lite.initd 2014-11-26 15:05:56.000000000 +0100 @@ -1,7 +1,7 @@ -#!/sbin/openrc-run +#!/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/shorewall/files/4.6/shorewall6-lite.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $ +# $Header: $ description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is' description="${description} a high-level tool for configuring Netfilter." --- old/net-firewall/shorewall/files/4.6/shorewall.initd 2014-11-18 13:54:56.000000000 +0100 +++ old/net-firewall/shorewall/files/4.6/shorewall.initd 2014-11-26 15:05:48.000000000 +0100 @@ -1,7 +1,7 @@ -#!/sbin/openrc-run +#!/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/shorewall/files/4.6/shorewall.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $ +# $Header: $ description='The Shoreline Firewall, more commonly known as "Shorewall", is' description="${description} a high-level tool for configuring Netfilter." --- old/net-firewall/shorewall/files/4.6/shorewall-init.initd 2014-11-18 13:54:56.000000000 +0100 +++ old/net-firewall/shorewall/files/4.6/shorewall-init.initd 2014-11-26 15:05:26.000000000 +0100 @@ -1,7 +1,7 @@ -#!/sbin/openrc-run +#!/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/shorewall/files/4.6/shorewall-init.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $ +# $Header: $ SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc" CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}" --- old/net-firewall/shorewall/files/4.6/shorewall-lite.initd 2014-11-18 13:54:56.000000000 +0100 +++ old/net-firewall/shorewall/files/4.6/shorewall-lite.initd 2014-11-26 15:05:37.000000000 +0100 @@ -1,7 +1,7 @@ -#!/sbin/openrc-run +#!/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/shorewall/files/4.6/shorewall-lite.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $ +# $Header: $ description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is' description="${description} a high-level tool for configuring Netfilter." --- old/net-firewall/shorewall/files/4.6/shorewallrc 2014-11-18 13:54:56.000000000 +0100 +++ old/net-firewall/shorewall/files/4.6/shorewallrc 2014-11-26 11:32:57.726260581 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.6 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall/files/4.6/shorewallrc-r1 2014-11-18 13:54:56.000000000 +0100 +++ old/net-firewall/shorewall/files/4.6/shorewallrc-r1 2014-11-26 11:33:04.942408177 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.6 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall/shorewall-4.6.5.2.ebuild 2014-11-18 13:54:56.000000000 +0100 +++ old/net-firewall/shorewall/shorewall-4.6.5.2.ebuild 2014-11-26 15:04:31.000000000 +0100 @@ -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/shorewall/shorewall-4.6.5.2.ebuild,v 1.1 2014/11/18 12:54:56 xmw Exp $ +# $Header: $ EAPI="5" @@ -117,7 +117,6 @@ RDEPEND=" !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init - !/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 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall6-lite" - /sbin/shorewall6-lite ${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-lite" - /sbin/shorewall6-lite status 1>/dev/null - if [ $? != 0 ] ; then - svc_start - else - /sbin/shorewall6-lite ${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 shorewall6-lite rules and setting policy to ACCEPT" - /sbin/shorewall6-lite ${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-lite" - /sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null - eend $? -} --- old/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.systemd 2014-06-12 16:32:38.000000000 +0200 +++ old/net-firewall/shorewall6-lite/files/4.5.21.10/shorewall6-lite.systemd 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# -# The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5 -# -[Unit] -Description=Shorewall IPv6 firewall lite -Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/conf.d/shorewall6-lite -ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS -ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS - -[Install] -WantedBy=multi-user.target --- old/net-firewall/shorewall6-lite/files/4.5.21.10/shorewallrc 2014-06-12 16:32:38.000000000 +0200 +++ old/net-firewall/shorewall6-lite/files/4.5.21.10/shorewallrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# -# 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. --- old/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewallrc 2014-11-18 12:17:03.000000000 +0100 +++ old/net-firewall/shorewall6-lite/files/4.5.21.10-r1/shorewallrc 2014-11-26 11:35:13.554851646 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc 2014-04-26 11:31:42.000000000 +0200 +++ old/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc 2014-11-26 11:35:22.695079408 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall-core/files/4.5.21.10-r1/shorewallrc 2014-11-18 12:13:04.000000000 +0100 +++ old/net-firewall/shorewall-core/files/4.5.21.10-r1/shorewallrc 2014-11-26 11:33:21.290874071 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc 2014-04-26 11:33:11.000000000 +0200 +++ old/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc 2014-11-26 11:33:29.373100547 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewallrc 2014-11-18 12:13:58.000000000 +0100 +++ old/net-firewall/shorewall-init/files/4.5.21.10-r1/shorewallrc 2014-11-26 11:33:43.476489942 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc 2014-04-26 11:30:51.000000000 +0200 +++ old/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc 2014-11-26 11:33:52.061723514 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewallrc 2014-11-18 12:15:05.000000000 +0100 +++ old/net-firewall/shorewall-lite/files/4.5.21.10-r1/shorewallrc 2014-11-26 11:34:06.099100020 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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. --- old/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc 2014-04-26 11:32:38.000000000 +0200 +++ old/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc 2014-11-26 11:34:14.145315157 +0100 @@ -1,7 +1,7 @@ # # Gentoo Shorewall 4.5 rc file # -BUILD= #Default is to detect the build system +BUILD=gentoo #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.