aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rw@rlworkman.net>2010-05-16 01:54:41 +0100
committerMichiel van Wessem <michiel.van.wessem@gmail.com>2010-05-16 22:26:39 -0500
commit0a1ff17a80cdd02129a3a611ee41f86d7dbdff16 (patch)
tree16d0da86273964f111943d0ec0ff594a33aea5ec
parentcc24ceeeb65f753280f0a068d9c3823228d5b78f (diff)
network/xtables-addons: updated for version 1.26
-rw-r--r--network/xtables-addons/xtables-addons.SlackBuild27
-rw-r--r--network/xtables-addons/xtables-addons.info8
2 files changed, 21 insertions, 14 deletions
diff --git a/network/xtables-addons/xtables-addons.SlackBuild b/network/xtables-addons/xtables-addons.SlackBuild
index b3d5cccdb1b8..a201a8c4e588 100644
--- a/network/xtables-addons/xtables-addons.SlackBuild
+++ b/network/xtables-addons/xtables-addons.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xtables-addons
-# Copyright 2008,2009 Robby Workman, Northport, Alabama, USA
+# Copyright 2008,2009,2010 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,22 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xtables-addons
-VERSION=1.18
-ARCH=${ARCH:-i486}
+VERSION=1.26
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
KERNEL=${KERNEL:-$(uname -r)}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -47,6 +56,9 @@ elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
SRCARCH=x86
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -71,7 +83,6 @@ CFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-kbuild=/lib/modules/${KERNEL}/build \
- --with-ksource=/lib/modules/${KERNEL}/source \
--build=$ARCH-slackware-linux || true
make SRCARCH=$SRCARCH
@@ -80,12 +91,8 @@ make install DESTDIR=$PKG SRCARCH=$SRCARCH
# Hrm, we don't want to install these
rm -f $PKG/lib/modules/${KERNEL}/modules.*
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
( cd $PKG/usr/man
find . -type f -exec gzip -9 {} \;
diff --git a/network/xtables-addons/xtables-addons.info b/network/xtables-addons/xtables-addons.info
index 891b69e39b5b..c8f270aabab7 100644
--- a/network/xtables-addons/xtables-addons.info
+++ b/network/xtables-addons/xtables-addons.info
@@ -1,10 +1,10 @@
PRGNAM="xtables-addons"
-VERSION="1.18"
+VERSION="1.26"
HOMEPAGE="http://xtables-addons.sf.net/"
-DOWNLOAD="http://downloads.sourceforge.net/xtables-addons/xtables-addons-1.18.tar.bz2"
-MD5SUM="5a8d2edbf5a3470bba58d6a60c350805"
+DOWNLOAD="http://download.sourceforge.net/xtables-addons/xtables-addons-1.26.tar.bz2"
+MD5SUM="6091032318ee7fb46d82dec9ae5ae422"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
-APPROVED="dsomero"
+APPROVED="michiel"