summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/ntop/README.SLACKWARE5
-rw-r--r--network/ntop/ntop.SlackBuild25
-rw-r--r--network/ntop/ntop.info10
-rw-r--r--network/ntop/rc.ntop6
4 files changed, 22 insertions, 24 deletions
diff --git a/network/ntop/README.SLACKWARE b/network/ntop/README.SLACKWARE
index fc5a973188..66ce381786 100644
--- a/network/ntop/README.SLACKWARE
+++ b/network/ntop/README.SLACKWARE
@@ -113,9 +113,8 @@ Don't forget to make the script executable.
The following scripts are examples for the GeoIP and OUI tables, feel free
to adapt them to your reality.
-The "OS Fingerprint" table has not changed for over five years, so I did not
-create a script for it.
-It you want, you can check for updates at:
+The "OS Fingerprint" table has not changed since 2005, so I did not
+create a script for it. If you want, you can check for updates at:
http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share/etter.finger.os?rev=HEAD
=============================================================================
diff --git a/network/ntop/ntop.SlackBuild b/network/ntop/ntop.SlackBuild
index e76237075e..59f9055364 100644
--- a/network/ntop/ntop.SlackBuild
+++ b/network/ntop/ntop.SlackBuild
@@ -23,10 +23,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# revision date: 2011/08/25
+# Maintained by David Spencer <baildon.research@googlemail.com>
PRGNAM=ntop
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-5.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -83,10 +83,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
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 Makefile so we won't do automatic downloads
patch -p1 < $CWD/no_downloads.patch
@@ -132,17 +132,16 @@ cd $PKG/etc/$PRGNAM
specialMAC.txt.gz ntop-cert.pem GeoIPASNum.dat GeoLiteCity.dat etter.finger.os.gz oui.txt.gz; do
mv $f $f.new
done
-cd -
+cd - >/dev/null
-# Change the permissions on ntops homedir so we can write logs
+# Change the permissions on ntop's homedir so we can write logs
chown -R $NTOPUSER:$NTOPGROUP $PKG/var/lib/$PRGNAM
-# Copy *all* documentation over (docs/ is not included in make install for
-# 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 AUTHORS CONTENTS COPYING ChangeLog INSTALL LICENSE* MANIFESTO NEWS PORTING \
- README SUPPORT_NTOP.txt THANKS ntop.html ntop.txt docs/* NetFlow www \
+cp -a \
+ AUTHORS CONTENTS COPYING ChangeLog INSTALL LICENSE* 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
cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
diff --git a/network/ntop/ntop.info b/network/ntop/ntop.info
index 9dbe542864..7758ecffc4 100644
--- a/network/ntop/ntop.info
+++ b/network/ntop/ntop.info
@@ -1,10 +1,10 @@
PRGNAM="ntop"
-VERSION="4.1.0"
+VERSION="5.0.1"
HOMEPAGE="http://www.ntop.org"
-DOWNLOAD="http://downloads.sourceforge.net/ntop/ntop-4.1.0.tar.gz"
-MD5SUM="116df99cf548431393991ea15443c52f"
+DOWNLOAD="http://downloads.sourceforge.net/ntop/ntop-5.0.1.tar.gz"
+MD5SUM="01710b6925a8a5ffe1a41b8b512ebd69"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="GeoIP graphviz rrdtool"
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/network/ntop/rc.ntop b/network/ntop/rc.ntop
index 1b89f4804a..441d7dbe4f 100644
--- a/network/ntop/rc.ntop
+++ b/network/ntop/rc.ntop
@@ -49,9 +49,9 @@ ntop_stop() {
# Give it some time to die gracefully
for second in 0 1 2 3 4 5 6 7 8 9 10 ; do
if $(! /sbin/pidof ntop > /dev/null 2>&1 ) ; then
- # ntop is a dirty little deamon:
+ # ntop is a dirty little daemon:
rm -f /var/run/ntop.pid
- break;
+ break
fi
sleep 1
done
@@ -66,7 +66,7 @@ ntop_stop() {
echo "Done"
fi
fi
- rm -f /var/lock/ntop
+ rm -f /var/lock/ntop
fi
return $RETVAL
}