# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1329581881 -3600
# Node ID ba5507fa22f8d197e84d91568af5dd1613970b6d
# Parent  fcb3e7fb7bfaead273ebeaf40f8bb41d7ab12997
ntop: update bdep

diff -r fcb3e7fb7bfa -r ba5507fa22f8 ntop/receipt
--- a/ntop/receipt	Sat Feb 18 17:02:28 2012 +0100
+++ b/ntop/receipt	Sat Feb 18 17:18:01 2012 +0100
@@ -13,7 +13,7 @@
 
 DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip"
 BUILD_DEPENDS="zlib-dev openssl-dev libpng-dev libpcap-dev libtool glibc-dev gdbm-dev rrdtool \
- autoconf automake rrdtool-dev wget geoip-dev "
+ autoconf automake rrdtool-dev wget geoip-dev libwrap"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r fcb3e7fb7bfa -r ba5507fa22f8 ntop/stuff/etc/init.d/ntop
--- a/ntop/stuff/etc/init.d/ntop	Sat Feb 18 17:02:28 2012 +0100
+++ b/ntop/stuff/etc/init.d/ntop	Sat Feb 18 17:18:01 2012 +0100
@@ -22,7 +22,7 @@
 
 case "$1" in
   start)
-    if [ -f $PIDFILE ] ; then
+    if active_pidfile $PIDFILE $NAME ; then
       echo "$NAME already running."
       exit 1
     fi
@@ -35,7 +35,7 @@
     status
     ;;
   stop)
-    if [ ! -f $PIDFILE ] ; then
+    if ! active_pidfile $PIDFILE $NAME ; then
       echo "$NAME is not running."
       exit 1
     fi
@@ -44,7 +44,7 @@
     status
     ;;
   restart)
-    if [ ! -f $PIDFILE ] ; then
+    if ! active_pidfile $PIDFILE $NAME ; then
       echo "$NAME is not running."
       exit 1
     fi
diff -r fcb3e7fb7bfa -r ba5507fa22f8 partimage/receipt
--- a/partimage/receipt	Sat Feb 18 17:02:28 2012 +0100
+++ b/partimage/receipt	Sat Feb 18 17:18:01 2012 +0100
@@ -26,7 +26,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/etc/init.d
+	mkdir -p $fs/usr $fs/etc/init.d $fs/var/lib/partimaged
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/etc $fs/
 	install -g root -o root -m 0600 stuff/etc/partimaged/partimaged.* $fs/etc/partimaged
diff -r fcb3e7fb7bfa -r ba5507fa22f8 partimage/stuff/etc/init.d/partimaged
--- a/partimage/stuff/etc/init.d/partimaged	Sat Feb 18 17:02:28 2012 +0100
+++ b/partimage/stuff/etc/init.d/partimaged	Sat Feb 18 17:18:01 2012 +0100
@@ -22,7 +22,7 @@
 	
 case "$1" in
     start)
-   	if [ -f $PIDFILE ] ; then
+	if active_pidfile $PIDFILE $NAME ; then
       		echo "$NAME already running."
       		exit 1
     	fi
@@ -38,7 +38,7 @@
     	fi
 	;;
     stop)
-        if [ ! -f $PIDFILE ] ; then
+	if ! active_pidfile $PIDFILE $NAME ; then
            echo "$NAME is not running."
            exit 1
         fi