network/ntop: Updated for version 3.3.8

3 files changed, 23 insertions, 23 deletions

diff --git a/network/ntop/ntop.SlackBuild b/network/ntop/ntop.SlackBuild
index 8c8262a726..ac2e46554f 100644
--- a/network/ntop/ntop.SlackBuild
+++ b/network/ntop/ntop.SlackBuild
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for ntop
-# Written by (Michiel van Wessem (michiel@slackbuilds.org)
 
-# Copyright  2007 Michiel van Wessem (http://michielvwessem.wordpress.com)
+# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,33 +22,29 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -e
-
 PRGNAM=ntop
-VERSION=3.3
+VERSION=3.3.8
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="AUTHORS CONTENTS COPYING ChangeLog INSTALL MANIFESTO NEWS PORTING \
-          README SUPPORT_NTOP.txt THANKS ntop.html ntop.txt docs/* NetFlow www"
+set -e
 
 # Bail out if user or group isn't valid on your system
 # For slackbuilds.org, assigned ntop uid/gid are 212/212
-# see http://slackbuilds.org/uid_gid.txt
+# See http://slackbuilds.org/uid_gid.txt
 if ! grep ^ntop: /etc/group 2>&1 > /dev/null; then
-    echo "  Must have a ntop group to run this script."
+    echo "  You must have a \"ntop\" group to run this script."
     echo "    # groupadd -g 212 ntop"
-    echo "  Or something similar."
     exit 1
 elif ! grep ^ntop: /etc/passwd 2>&1 > /dev/null; then
-    echo "  Must have a ntop user to run this script."
+    echo "  You must have a \"ntop\" user to run this script."
     echo "    # useradd -u 212 -g ntop -d /var/lib/ntop -s /bin/false ntop"
-    echo "  Or something similar."
     exit 1
 fi
 
@@ -66,7 +61,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
 
 # Since ntop calls their ./configure from autogen.sh anything passed onto 
 # autogen.sh (ie $@) is passed off as command line arguments to configure.
@@ -77,13 +76,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var/lib \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-tcpwrap \
   --enable-sslv3 \
   --enable-sslwatchdog \
   --enable-snmp \
   --enable-i18n \
-  --program-prefix="" \
-  --program-suffix=""
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -108,16 +107,17 @@ fi
 # some arkane reason. Rename some docs to prevent them copying over each other.
 for FILE in {README,INSTALL}; do mv docs/$FILE docs/$FILE.docs ; done
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CONTENTS COPYING ChangeLog INSTALL MANIFESTO NEWS PORTING \
+  README SUPPORT_NTOP.txt THANKS ntop.html ntop.txt docs/* NetFlow www \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/etc/logrotate.d $PKG/etc/rc.d 
 install -m 0644 $CWD/$PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new
 install -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 
 # Change the permissions on ntops homedir so we can write logs 
-chown -R ntop:ntop $PKG/var/lib/$PRGNAM/
+chown -R ntop:ntop $PKG/var/lib/$PRGNAM
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/ntop/ntop.info b/network/ntop/ntop.info
index 7f0dfeb440..e12f269d38 100644
--- a/network/ntop/ntop.info
+++ b/network/ntop/ntop.info
@@ -1,8 +1,8 @@
 PRGNAM="ntop"
-VERSION="3.3"
+VERSION="3.3.8"
 HOMEPAGE="http://www.ntop.org"
-DOWNLOAD="http://downloads.sourceforge.net/ntop/ntop-3.3.tar.gz"
-MD5SUM="a0e52a85587c8a5519d822d04862dab4  "
+DOWNLOAD="http://downloads.sourceforge.net/ntop/ntop-3.3.8.tar.gz"
+MD5SUM="19c6a582c285ffae18bf0c3b599d184e"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/network/ntop/slack-desc b/network/ntop/slack-desc
index d73cd0030b..d36ea76b92 100644
--- a/network/ntop/slack-desc
+++ b/network/ntop/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-ntop: ntop (Network usage with shiny graphs)
+ntop: ntop (Network probe to show net usage with shiny graphs)
 ntop:
 ntop: ntop is a network probe that shows network usage in a way similar to 
 ntop: what top does for processes. In interactive mode, it displays the