diff options
| -rw-r--r-- | network/ntop/doinst.sh | 24 | ||||
| -rw-r--r-- | network/ntop/ntop.SlackBuild | 24 | ||||
| -rw-r--r-- | network/ntop/ntop.info | 6 |
3 files changed, 35 insertions, 19 deletions
diff --git a/network/ntop/doinst.sh b/network/ntop/doinst.sh index d7977216d6d24..17fa8ad81f90b 100644 --- a/network/ntop/doinst.sh +++ b/network/ntop/doinst.sh @@ -10,12 +10,22 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same perms on rc.ntop.new: -if [ -e etc/rc.d/rc.ntop ]; then - cp -a etc/rc.d/rc.ntop etc/rc.d/rc.ntop.new.incoming - cat etc/rc.d/rc.ntop.new > etc/rc.d/rc.ntop.new.incoming - mv etc/rc.d/rc.ntop.new.incoming etc/rc.d/rc.ntop.new -fi +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} -config etc/rc.d/rc.ntop.new +preserve_perms etc/rc.d/rc.ntop.new config etc/logrotate.d/ntop.new +config etc/ntop/specialMAC.txt.gz.new +config etc/ntop/ntop-cert.pem.new +config etc/ntop/GeoIPASNum.dat.new +config etc/ntop/GeoLiteCity.dat.new +config etc/ntop/etter.finger.os.gz.new +config etc/ntop/oui.txt.gz.new diff --git a/network/ntop/ntop.SlackBuild b/network/ntop/ntop.SlackBuild index dc3e2c341b153..8d1b196740f16 100644 --- a/network/ntop/ntop.SlackBuild +++ b/network/ntop/ntop.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for ntop # Copyright 2007-2008 Michiel van Wessem, Manchester, United Kingdom +# Copyright 2009-2011 Niels Horn, Rio de Janeiro, RJ, Brazil # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +23,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Maintained as of version >= 3.3.10 by Niels Horn <niels.horn@gmail.com> -# revision date: 2010/08/23 +# revision date: 2011/08/25 PRGNAM=ntop -VERSION=4.0.1 +VERSION=${VERSION:-4.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -102,10 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --with-tcpwrap \ - --enable-sslwatchdog \ --enable-snmp \ - --enable-i18n \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG @@ -124,9 +121,18 @@ fi mkdir -p $PKG/etc/logrotate.d $PKG/etc/rc.d install -m 0644 $CWD/$PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new -sed -e "s%@NTOPUSER@%$NTOPUSER%" -e "s%@NTOPGROUP@%$NTOPGROUP%" \ +sed \ + -e "s%@NTOPUSER@%$NTOPUSER%" \ + -e "s%@NTOPGROUP@%$NTOPGROUP%" \ $CWD/rc.ntop > $PKG/etc/rc.d/rc.ntop.new -chmod 0755 $PKG/etc/rc.d/rc.ntop.new + +# Rename some data to .new to avoid overwriting existing files +cd $PKG/etc/$PRGNAM + for f in \ + specialMAC.txt.gz ntop-cert.pem GeoIPASNum.dat GeoLiteCity.dat etter.finger.os.gz oui.txt.gz; do + mv $f $f.new + done +cd - # Change the permissions on ntops homedir so we can write logs chown -R $NTOPUSER:$NTOPGROUP $PKG/var/lib/$PRGNAM @@ -135,7 +141,7 @@ chown -R $NTOPUSER:$NTOPGROUP $PKG/var/lib/$PRGNAM # 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 MANIFESTO NEWS PORTING \ +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 diff --git a/network/ntop/ntop.info b/network/ntop/ntop.info index 159cd6d0e4af8..45e8e84157542 100644 --- a/network/ntop/ntop.info +++ b/network/ntop/ntop.info @@ -1,8 +1,8 @@ PRGNAM="ntop" -VERSION="4.0.1" +VERSION="4.1.0" HOMEPAGE="http://www.ntop.org" -DOWNLOAD="http://downloads.sourceforge.net/ntop/ntop-4.0.1.tar.gz" -MD5SUM="22f916327f0e92d8c470aaadcb80d84d" +DOWNLOAD="http://downloads.sourceforge.net/ntop/ntop-4.1.0.tar.gz" +MD5SUM="116df99cf548431393991ea15443c52f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Niels Horn" |