summaryrefslogtreecommitdiffstats
path: root/source/n/iptraf-ng
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-06-01 18:27:22 +0000
committer Eric Hameleers <alien@slackware.com>2020-06-02 08:59:52 +0200
commitdde17c90daf1862b4526cc71afaa426c05cca8de (patch)
treee02f9a93f40b39ae1c07d24cb7b49bdd6269a72e /source/n/iptraf-ng
parent4490f144069d8cb4c754c5b87efc58c0e06a10ec (diff)
downloadcurrent-dde17c90daf1862b4526cc71afaa426c05cca8de.tar.gz
current-dde17c90daf1862b4526cc71afaa426c05cca8de.tar.xz
Mon Jun 1 18:27:22 UTC 202020200601182722
a/pciutils-3.7.0-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_16-x86_64-1.txz: Upgraded. l/lcms2-2.10-x86_64-1.txz: Upgraded. l/netpbm-10.90.03-x86_64-1.txz: Upgraded. l/qt5-5.15.0-x86_64-1.txz: Upgraded. n/iptraf-ng-1.2.0-x86_64-1.txz: Upgraded. xap/gnuchess-6.2.7-x86_64-1.txz: Upgraded. xap/mozilla-firefox-68.9.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/68.9.0/releasenotes/ (* Security fix *) extra/pure-alsa-system/qt5-5.15.0-x86_64-1_alsa.txz: Upgraded.
Diffstat (limited to 'source/n/iptraf-ng')
-rwxr-xr-xsource/n/iptraf-ng/iptraf-ng.SlackBuild24
-rw-r--r--source/n/iptraf-ng/iptraf-ng.paths.diff15
-rw-r--r--source/n/iptraf-ng/iptraf-ng.url1
3 files changed, 22 insertions, 18 deletions
diff --git a/source/n/iptraf-ng/iptraf-ng.SlackBuild b/source/n/iptraf-ng/iptraf-ng.SlackBuild
index eee74671e..a96c55c7f 100755
--- a/source/n/iptraf-ng/iptraf-ng.SlackBuild
+++ b/source/n/iptraf-ng/iptraf-ng.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=iptraf-ng
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -66,9 +66,11 @@ PKG=$TMP/package-$PKGNAM
cd $TMP
rm -rf $PKG
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION
+zcat $CWD/iptraf-ng.paths.diff.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,29 +78,15 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --sbindir=/usr/sbin \
- --sysconfdir=/etc \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --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
# Make symlinks to the old names:
( cd $PKG/usr/sbin
ln -sf iptraf-ng iptraf
- ln -sf rvnamed-ng rvnamed
)
( cd $PKG/usr/man/man8
ln -sf iptraf-ng.8 iptraf.8
- ln -sf rvnamed-ng.8 rvnamed.8
)
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/source/n/iptraf-ng/iptraf-ng.paths.diff b/source/n/iptraf-ng/iptraf-ng.paths.diff
new file mode 100644
index 000000000..312dc9488
--- /dev/null
+++ b/source/n/iptraf-ng/iptraf-ng.paths.diff
@@ -0,0 +1,15 @@
+--- ./Makefile.orig 2020-06-01 06:24:13.000000000 -0500
++++ ./Makefile 2020-06-01 13:08:36.184687581 -0500
+@@ -24,10 +24,10 @@
+ ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+
+-prefix = $(HOME)
++prefix = /usr
+ sbindir_relative = sbin
+ sbindir = $(prefix)/$(sbindir_relative)
+-mandir = $(prefix)/share/man
++mandir = $(prefix)/man
+ sharedir = $(prefix)/share
+ localedir = $(sharedir)/locale
+ lib = lib
diff --git a/source/n/iptraf-ng/iptraf-ng.url b/source/n/iptraf-ng/iptraf-ng.url
new file mode 100644
index 000000000..1c102c5db
--- /dev/null
+++ b/source/n/iptraf-ng/iptraf-ng.url
@@ -0,0 +1 @@
+https://github.com/iptraf-ng/iptraf-ng