diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2014-04-26 09:34:38 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2014-04-26 09:34:38 +0000 |
| commit | 6da2543c83d6c650cf8f1794475ea106b6fef145 (patch) | |
| tree | d78a5c0b29e91517c24e0472750d45d9911d402a /net-firewall/shorewall6 | |
| parent | Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de> (diff) | |
| download | gentoo-2-6da2543c83d6c650cf8f1794475ea106b6fef145.tar.gz gentoo-2-6da2543c83d6c650cf8f1794475ea106b6fef145.tar.bz2 gentoo-2-6da2543c83d6c650cf8f1794475ea106b6fef145.zip | |
Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de>
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Diffstat (limited to 'net-firewall/shorewall6')
21 files changed, 24 insertions, 763 deletions
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog index cf87ab3548a8..4463ca96359d 100644 --- a/net-firewall/shorewall6/ChangeLog +++ b/net-firewall/shorewall6/ChangeLog @@ -1,6 +1,23 @@ # 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.96 2014/03/23 18:01:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.97 2014/04/26 09:34:36 hwoarang Exp $ + +*shorewall6-4.5.21.9 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras <hwoarang@gentoo.org> + +files/4.5.21.9/shorewall6.confd, +files/4.5.21.9/shorewall6.initd, + +files/4.5.21.9/shorewall6.systemd, +files/4.5.21.9/shorewallrc, + +shorewall6-4.5.21.9.ebuild, -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, + -files/4.5.21.2/shorewall6.confd, -files/4.5.21.2/shorewall6.initd, + -files/4.5.21.2/shorewall6.systemd, -files/4.5.21.2/shorewallrc, + -files/4.5.21.4/shorewall6.confd, -files/4.5.21.4/shorewall6.initd, + -files/4.5.21.4/shorewall6.systemd, -files/4.5.21.4/shorewallrc, + -files/shorewall6.initd, -files/shorewall6.systemd, -files/shorewallrc_new, + -shorewall6-4.5.18.ebuild, -shorewall6-4.5.19.ebuild, + -shorewall6-4.5.21.2.ebuild, -shorewall6-4.5.21.4.ebuild: + Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de> 23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> shorewall6-4.5.18-r1.ebuild: Stable for alpha, wrt bug #487690 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 deleted file mode 100644 index 9f3742a83568..000000000000 --- a/net-firewall/shorewall6/files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/shorewallrc b/net-firewall/shorewall6/files/4.5.19/shorewallrc deleted file mode 100644 index c2fce7246c1b..000000000000 --- a/net-firewall/shorewall6/files/4.5.19/shorewallrc +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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/files/4.5.21.2/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.2/shorewall6.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.2/shorewall6.confd +++ /dev/null @@ -1,15 +0,0 @@ -# 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.2/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.2/shorewall6.initd deleted file mode 100644 index f29a4c74cc88..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.2/shorewall6.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/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.21.2/shorewall6.initd,v 1.1 2013/10/26 18:38:21 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.21.2/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.2/shorewall6.systemd deleted file mode 100644 index 448226c88736..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.2/shorewall6.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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.4/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.4/shorewall6.confd deleted file mode 100644 index e5957167b5b9..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.4/shorewall6.confd +++ /dev/null @@ -1,15 +0,0 @@ -# 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.4/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.4/shorewall6.initd deleted file mode 100644 index 6417a25d18bd..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.4/shorewall6.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/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.21.4/shorewall6.initd,v 1.1 2013/12/02 20:04:55 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.21.4/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.4/shorewall6.systemd deleted file mode 100644 index 448226c88736..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.4/shorewall6.systemd +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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.4/shorewallrc b/net-firewall/shorewall6/files/4.5.21.4/shorewallrc deleted file mode 100644 index 46f5eb9a3603..000000000000 --- a/net-firewall/shorewall6/files/4.5.21.4/shorewallrc +++ /dev/null @@ -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. diff --git a/net-firewall/shorewall6/files/4.5.19/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd index e5957167b5b9..e5957167b5b9 100644 --- a/net-firewall/shorewall6/files/4.5.19/shorewall6.confd +++ b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd diff --git a/net-firewall/shorewall6/files/4.5.19/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd index ce5f305c69c5..7ddd90b0c681 100644 --- a/net-firewall/shorewall6/files/4.5.19/shorewall6.initd +++ b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# 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.19/shorewall6.initd,v 1.1 2013/08/28 16:59:04 constanze Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd,v 1.1 2014/04/26 09:34:36 hwoarang Exp $ description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is' description="${description} a high-level tool for configuring Netfilter." diff --git a/net-firewall/shorewall6/files/4.5.19/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd index 448226c88736..448226c88736 100644 --- a/net-firewall/shorewall6/files/4.5.19/shorewall6.systemd +++ b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd diff --git a/net-firewall/shorewall6/files/4.5.21.2/shorewallrc b/net-firewall/shorewall6/files/4.5.21.9/shorewallrc index 46f5eb9a3603..46f5eb9a3603 100644 --- a/net-firewall/shorewall6/files/4.5.21.2/shorewallrc +++ b/net-firewall/shorewall6/files/4.5.21.9/shorewallrc diff --git a/net-firewall/shorewall6/files/shorewall6.initd b/net-firewall/shorewall6/files/shorewall6.initd deleted file mode 100644 index 0ab2f6bd12bf..000000000000 --- a/net-firewall/shorewall6/files/shorewall6.initd +++ /dev/null @@ -1,89 +0,0 @@ -#!/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/shorewall6.initd,v 1.4 2013/07/13 14:12:23 constanze Exp $ - -extra_commands="check clear" -extra_started_commands="refresh reset" - -checkconfig() { - if [ ! -d /var/lock/subsys ] ; then - checkpath -d -m 755 /var/lock/subsys - fi -} - -depend() { - need net - provide firewall - after ulogd -} - -start() { - checkconfig - ebegin "Starting shorewall6" - /sbin/shorewall6 -f start 1>/dev/null - eend $? -} - -stop() { - ebegin "Stopping shorewall6" - /sbin/shorewall6 stop 1>/dev/null - eend $? -} - -restart() { - checkconfig - # 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 >/dev/null - if [ $? != 0 ] ; then - svc_start - else - if [ -f /var/lib/shorewall6/restore ] ; then - /sbin/shorewall6 restore - else - /sbin/shorewall6 restart 1>/dev/null - fi - 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 rules and setting policy to ACCEPT" - /sbin/shorewall6 clear - eend $? -} - -reset() { - # reset the packet and byte counters in the firewall - - ebegin "Resetting the packet and byte counters in the shorewall6" - /sbin/shorewall6 reset - 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 refresh - 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 configuration files" - /sbin/shorewall6 check - eend $? -} diff --git a/net-firewall/shorewall6/files/shorewall6.systemd b/net-firewall/shorewall6/files/shorewall6.systemd deleted file mode 100644 index 1c6e95374a80..000000000000 --- a/net-firewall/shorewall6/files/shorewall6.systemd +++ /dev/null @@ -1,20 +0,0 @@ -# -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4 -# -# Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com) -# -[Unit] -Description=Shorewall IPv6 firewall -After=syslog.target -After=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/etc/shorewall6 -StandardOutput=syslog -ExecStart=/sbin/shorewall6 $OPTIONS start -ExecStop=/sbin/shorewall6 $OPTIONS stop - -[Install] -WantedBy=multi-user.target diff --git a/net-firewall/shorewall6/files/shorewallrc_new b/net-firewall/shorewall6/files/shorewallrc_new deleted file mode 100644 index 06253dc2b8cb..000000000000 --- a/net-firewall/shorewall6/files/shorewallrc_new +++ /dev/null @@ -1,22 +0,0 @@ -# -# Gentoo Shorewall 4.5 rc file -# -HOST=linux #Generic Linux -BUILD= #Default is to detect the build system -PREFIX=/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=/etc #Directory where subsystem configurations are installed -SBINDIR=/sbin #Directory where system administration programs are installed -MANDIR=${PREFIX}/share/man #Directory where manpages are installed. -INITDIR=etc/init.d #Directory where SysV init scripts are installed. -INITFILE=$PRODUCT #Name of the product's installed SysV init script -INITSOURCE=init.sh #Name of the distributed file to be installed as the SysV init script -ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMD= #Directory where .service files are installed (systems running systemd only) -SYSCONFFILE= #Name of the distributed file to be installed in $SYSCONFDIR -SYSCONFDIR= #Directory where SysV init parameter files are installed -SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR -VARLIB=/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.ebuild b/net-firewall/shorewall6/shorewall6-4.5.18.ebuild deleted file mode 100644 index 2cea7fbbf920..000000000000 --- a/net-firewall/shorewall6/shorewall6-4.5.18.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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.18.ebuild,v 1.8 2013/08/17 16:18:57 jer Exp $ - -EAPI="4" - -inherit linux-info systemd versionator - -# Select version (stable, RC, Beta, upstream patched): -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) # which shorewall-common to use - -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." -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 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" - -IUSE="doc" - -RDEPEND=">=net-firewall/iptables-1.4.0 - sys-apps/iproute2 - >=net-firewall/shorewall-${MY_PV_BASE} - dev-perl/Socket6" - -pkg_pretend() { - if kernel_is lt 2 6 25 ; then - die "${PN} requires at least kernel 2.6.25." - fi -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - keepdir /var/lib/${PN} - - cd "${WORKDIR}/${P}" - DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed" - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_newunit "${FILESDIR}"/shorewall6.systemd 'shorewall6.service' || die - - dodoc changelog.txt releasenotes.txt - if use doc; then - dodoc -r Samples6 - cd "${WORKDIR}/${MY_P_DOCS}" - dohtml -r * - fi -} diff --git a/net-firewall/shorewall6/shorewall6-4.5.19.ebuild b/net-firewall/shorewall6/shorewall6-4.5.19.ebuild deleted file mode 100644 index e37ebd9b3d87..000000000000 --- a/net-firewall/shorewall6/shorewall6-4.5.19.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# 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 -} diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.4.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.4.ebuild deleted file mode 100644 index 1fa7ea20e4b9..000000000000 --- a/net-firewall/shorewall6/shorewall6-4.5.21.4.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# 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.21.4.ebuild,v 1.1 2013/12/02 20:04:55 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_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[-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}"/${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.2.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild index f5c5ba72e6b5..70c45d80a373 100644 --- a/net-firewall/shorewall6/shorewall6-4.5.21.2.ebuild +++ b/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.2.ebuild,v 1.1 2013/10/26 18:38:21 constanze Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild,v 1.1 2014/04/26 09:34:36 hwoarang Exp $ EAPI="5" @@ -39,8 +39,8 @@ DEPEND="=net-firewall/shorewall-${PVR}" RDEPEND=" ${DEPEND} >=net-firewall/iptables-1.4.20[ipv6] - sys-apps/iproute2[-minimal] - dev-perl/Socket6 + >=sys-apps/iproute2-3.8.0[-minimal] + >=dev-perl/Socket6-0.230.0 " S=${WORKDIR}/${MY_P} |