summaryrefslogtreecommitdiffstats
path: root/source/n/ebtables
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-12-03 19:07:24 +0000
committer Eric Hameleers <alien@slackware.com>2019-12-04 08:59:50 +0100
commitd29002b2b2bba13ec5d668a22febddf2e4001f62 (patch)
tree7f3c963421bdacb55eb3bdf675bd15d547381952 /source/n/ebtables
parent4355ff4c77d0aea75488f167a7cb890c80d1164b (diff)
downloadcurrent-d29002b2b2bba13ec5d668a22febddf2e4001f62.tar.gz
current-d29002b2b2bba13ec5d668a22febddf2e4001f62.tar.xz
Tue Dec 3 19:07:24 UTC 201920191203190724
n/ebtables-2.0.11-x86_64-1.txz: Upgraded. n/iptables-1.8.4-x86_64-1.txz: Upgraded. n/libnftnl-1.1.5-x86_64-1.txz: Upgraded. n/nftables-0.9.3-x86_64-1.txz: Upgraded. n/whois-5.5.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/ebtables')
-rwxr-xr-xsource/n/ebtables/ebtables.SlackBuild46
-rw-r--r--source/n/ebtables/ebtables.url1
-rw-r--r--source/n/ebtables/slack-desc2
3 files changed, 27 insertions, 22 deletions
diff --git a/source/n/ebtables/ebtables.SlackBuild b/source/n/ebtables/ebtables.SlackBuild
index 738a7862e..c59127779 100755
--- a/source/n/ebtables/ebtables.SlackBuild
+++ b/source/n/ebtables/ebtables.SlackBuild
@@ -25,8 +25,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ebtables
-VERSION=${VERSION:-2.0.10}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.0.11}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -44,6 +44,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -64,9 +66,9 @@ fi
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $PKGNAM-v$VERSION-4
-tar xvf $CWD/$PKGNAM-v$VERSION-4.tar.xz || exit 1
-cd $PKGNAM-v$VERSION-4 || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -74,22 +76,24 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Set our CFLAGS and avoid a "warning-as-error" that breaks build
-sed -i \
- -e "s|-fPIC -O3|${SLKCFLAGS}|" \
- -e "s|-Wunused|-Wno-error=unused-but-set-variable|" \
- Makefile
-
-make -j 4 || exit 1
-
-make install \
- DESTDIR=$PKG \
- LIBDIR=/usr/lib${LIBDIRSUFFIX} \
- MANDIR=/usr/man \
- BINDIR=/usr/sbin \
- ETCDIR=/etc \
- INITDIR=/etc/rc.d/init.d \
- SYSCONFIGDIR=/etc/sysconfig || exit 1
+# Configure, build, and install:
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --disable-static \
+ --build=$ARCH-slackware-linux || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/source/n/ebtables/ebtables.url b/source/n/ebtables/ebtables.url
new file mode 100644
index 000000000..c1f4b66b7
--- /dev/null
+++ b/source/n/ebtables/ebtables.url
@@ -0,0 +1 @@
+ftp://ftp.netfilter.org/pub/ebtables
diff --git a/source/n/ebtables/slack-desc b/source/n/ebtables/slack-desc
index 5b22a3680..fc28d1dc8 100644
--- a/source/n/ebtables/slack-desc
+++ b/source/n/ebtables/slack-desc
@@ -13,7 +13,7 @@ ebtables: Linux bridge, logging, MAC NAT and brouting. It only provides basic
ebtables: IP filtering, the full-fledged IP filtering on a Linux bridge is
ebtables: done with iptables.
ebtables:
-ebtables: Homepage: http://ebtables.sourceforge.net/
+ebtables: Homepage: https://ebtables.netfilter.org
ebtables:
ebtables:
ebtables: