wok-next diff ntop/receipt @ rev 21156

Small updates.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Feb 02 16:32:35 2019 +0200 (2019-02-02)
parents 0ed3f456a542
children
line diff
     1.1 --- a/ntop/receipt	Fri Jan 11 14:45:46 2019 +0200
     1.2 +++ b/ntop/receipt	Sat Feb 02 16:32:35 2019 +0200
     1.3 @@ -10,46 +10,46 @@
     1.4  
     1.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.6  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     1.7 +TARBALL_SHA1="bbb8de893b1d0bb3c20785445ff62c7dbf398d0b"
     1.8  
     1.9  BUILD_DEPENDS="libtool automake autoconf wget subversion libpcap-dev gdbm-dev \
    1.10  pcre-dev rrdtool-dev openssl-dev zlib-dev python-dev geoip-dev"
    1.11  SPLIT="$PACKAGE-dev"
    1.12 +
    1.13 +CONFIG_FILES_std="/etc/ntop/"
    1.14 +DEPENDS_std="gdbm geoip libpcap openssl python rrdtool zlib" # ? libpng perl pcre libwrap
    1.15 +TAGS_std="network"
    1.16 +
    1.17  COOKOPTS="skip-log-errors"
    1.18  
    1.19  compile_rules() {
    1.20 +	# config nDPI
    1.21 +	cd nDPI
    1.22 +	./configure --with-pic $CONFIGURE_ARGS
    1.23 +	cd ..
    1.24 +
    1.25 +	export DISTRO="SliTaz"
    1.26 +	export DISTRO_VERSION="Next"
    1.27  	./autogen.sh \
    1.28 -		--prefix=/usr \
    1.29 -		--sysconfdir=/usr/share \
    1.30 -		--localstatedir=/var/lib \
    1.31  		--disable-snmp \
    1.32  		$CONFIGURE_ARGS &&
    1.33 +	fix libtool &&
    1.34  	make &&
    1.35  	make install-recursive || return 1
    1.36  
    1.37  	mkdir -p $install/var/lib/ntop $install/var/lib/ntop/rrd
    1.38  
    1.39  	for i in $install/usr/lib/ntop/plugins/*.so; do
    1.40 +		cmp -s "../../lib$(basename $i)" $i &&
    1.41  		ln -sf "../../lib$(basename $i)" $i
    1.42  	done
    1.43  
    1.44 -	install -Dm755 $stuff/ntop $install/etc/init.d/ntop
    1.45 +	install -Dm755 $stuff/ntop      $install/etc/init.d/ntop
    1.46 +	install -Dm644 $stuff/ntop.conf $install/etc/daemons.conf.d/ntop.conf
    1.47 +
    1.48  	mkdir -p $install/var/log/ntop/
    1.49  	chown -R root:root $install
    1.50 -}
    1.51 -
    1.52 -genpkg_rules() {
    1.53 -	case $PACKAGE in
    1.54 -		ntop)
    1.55 -			copy @std
    1.56 -			chown -R www:www $fs/usr/share/ntop/
    1.57 -			CONFIG_FILES="/etc/ntop/"
    1.58 -			DEPENDS="libgdbm geoip libpcap openssl python rrdtool zlib" # ? libpng perl pcre libwrap
    1.59 -			TAGS="network"
    1.60 -			;;
    1.61 -		ntop-dev)
    1.62 -			copy @dev
    1.63 -			;;
    1.64 -	esac
    1.65 +	find $install -type f -exec chmod g-w '{}' \; # 664->644, 775->755
    1.66  }
    1.67  
    1.68  post_install_ntop() {
    1.69 @@ -65,7 +65,7 @@
    1.70  	chroot "$1/" chown -R $user.$group /var/lib/ntop /var/log/ntop
    1.71  
    1.72  	# Start package daemon if we are on running system
    1.73 -	[ "$1" ] || /etc/init.d/$PACKAGE start
    1.74 +	[ "$1" ] || /etc/init.d/ntop start
    1.75  
    1.76  	# post_install message
    1.77  	[ -n "$quiet" ] || cat <<EOT
    1.78 @@ -80,7 +80,7 @@
    1.79  }
    1.80  
    1.81  pre_remove_ntop() {
    1.82 -	[ "$1" ] || /etc/init.d/$PACKAGE stop
    1.83 +	[ "$1" ] || /etc/init.d/ntop stop
    1.84  }
    1.85  
    1.86  post_remove_ntop() {