summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Willy Sudiarto Raharjo <willysr@slackbuilds.org>2017-05-31 23:32:14 +0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2017-06-03 07:59:45 +0700
commit83013e4959e81c3fea9b6f0b42ea4a9b41d4f3ba (patch)
treee27ffe099cac4a4a2e3f5424d1fb30bebea56ee2
parent3928c1391c095e21a6c137ab036aea487f484bb7 (diff)
downloadslackbuilds-83013e4959e81c3fea9b6f0b42ea4a9b41d4f3ba.tar.gz
slackbuilds-83013e4959e81c3fea9b6f0b42ea4a9b41d4f3ba.tar.xz
network/ngrep: Fix build.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/ngrep/ngrep.SlackBuild17
1 files changed, 9 insertions, 8 deletions
diff --git a/network/ngrep/ngrep.SlackBuild b/network/ngrep/ngrep.SlackBuild
index 15c927e9e7..1923b4d5c4 100644
--- a/network/ngrep/ngrep.SlackBuild
+++ b/network/ngrep/ngrep.SlackBuild
@@ -11,7 +11,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -52,10 +52,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Patch adds IPv4 and IPv6 fragment reassembly for ngrep 1.45
if [ $REASSEM_PATCH == yes ]; then
@@ -72,12 +72,13 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-ipv6=${NGREP_IPV6} \
--with-pcap-includes=/usr/include/pcap \
--disable-static \
+ --disable-pcap-restart \
--build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG mandir=/usr/man
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
find $PKG/usr/man -type f -exec gzip -9 {} \;