diff options
| -rw-r--r-- | network/shorewall6/README | 3 | ||||
| -rw-r--r-- | network/shorewall6/doinst.sh | 42 | ||||
| -rw-r--r-- | network/shorewall6/shorewall6.SlackBuild | 18 | ||||
| -rw-r--r-- | network/shorewall6/shorewall6.info | 10 |
4 files changed, 32 insertions, 41 deletions
diff --git a/network/shorewall6/README b/network/shorewall6/README index fdf49e9983..b09c9ccaf7 100644 --- a/network/shorewall6/README +++ b/network/shorewall6/README @@ -11,5 +11,4 @@ The IPv6 part is started by /etc/rc.d/rc.shorewall6 from rc.firewall rc.shorewall provided by shorewall-common will only start the IPv4 part of the firewall. Both can run simultaneously. -You will also need the shorewall-common and shorewall-perl packages. -Note that you cannot use the shell compiler to have IPv6 support. +You will also need the shorewall package. diff --git a/network/shorewall6/doinst.sh b/network/shorewall6/doinst.sh index 5beaa1d282..48bfcdf984 100644 --- a/network/shorewall6/doinst.sh +++ b/network/shorewall6/doinst.sh @@ -1,3 +1,6 @@ +#!/bin/sh +# vim: et ts=2 sw=2 + config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -11,32 +14,15 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/rc.d/rc.shorewall6.new - -config etc/shorewall6/accounting.new -config etc/shorewall6/actions.new -config etc/shorewall6/blacklist.new -config etc/shorewall6/hosts.new -config etc/shorewall6/init.new -config etc/shorewall6/interfaces.new -config etc/shorewall6/maclist.new -config etc/shorewall6/notrack.new -config etc/shorewall6/params.new -config etc/shorewall6/policy.new -config etc/shorewall6/providers.new -config etc/shorewall6/restored.new -config etc/shorewall6/route_rules.new -config etc/shorewall6/routestopped.new -config etc/shorewall6/rules.new -config etc/shorewall6/shorewall6.conf.new -config etc/shorewall6/start.new -config etc/shorewall6/started.new -config etc/shorewall6/stop.new -config etc/shorewall6/stopped.new -config etc/shorewall6/tcclasses.new -config etc/shorewall6/tcdevices.new -config etc/shorewall6/tcrules.new -config etc/shorewall6/tos.new -config etc/shorewall6/tunnels.new -config etc/shorewall6/zones.new +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} +preserve_perms etc/rc.d/rc.shorewall6.new diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild index ea378606b4..02602c2773 100644 --- a/network/shorewall6/shorewall6.SlackBuild +++ b/network/shorewall6/shorewall6.SlackBuild @@ -1,4 +1,5 @@ #!/bin/sh +# vim: et ts=2 sw=2 # Slackware build script for shorewall-common @@ -23,12 +24,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=shorewall6 -VERSION=${VERSION:-4.2.10} +VERSION=${VERSION:-4.4.7} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -BASEVERS=4.2.10 +BASEVERS=4.4.7 CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -46,8 +47,8 @@ cd $TMP/$PRGNAM-$BASEVERS chown -R root:root . # Patch the base against all the patchlevel patches in order if present -if [ $(ls $CWD/patches 2>/dev/null | wc -l) -gt 0 ]; then - for PATCH in $CWD/patches/* ; do +if [ $(ls $CWD/patch-6-$BASEVERS.* 2>/dev/null | wc -l) -gt 0 ]; then + for PATCH in $CWD/patch-6-$BASEVERS.* ; do patch -p1 < $PATCH done fi @@ -85,13 +86,16 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +for NEW in $PKG/etc/shorewall6/*.new; +do + echo $NEW | sed 's/.*etc/config etc/' >> $PKG/install/doinst.sh +done + cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} # Clean up the extra stuff: if [ "$1" = "--cleanup" ]; then rm -rf $TMP/$PRGNAM-$BASEVERS rm -rf $PKG fi - -# vim: et ts=2 diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info index 8480a79a5c..394e41d129 100644 --- a/network/shorewall6/shorewall6.info +++ b/network/shorewall6/shorewall6.info @@ -1,8 +1,10 @@ PRGNAM="shorewall6" -VERSION="4.2.10" +VERSION="4.4.7" HOMEPAGE="http://www.shorewall.net" -DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.2/shorewall-4.2.10/base/shorewall6-4.2.10.tar.bz2" -MD5SUM="9451ee3fffece868cba041e7c74fc8ef" +DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.7/base/shorewall6-4.4.7.tar.bz2" +MD5SUM="c29c224059f8d4d8560e077b2418c414" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="ArTourter" EMAIL="artourter@gmail.com" -APPROVED="rworkman" +APPROVED="dsomero" |