- Update to 3.1

Notes:
    - IPv6 support is disabled
    - now startup script prompts for admin password, if unset.

3 files changed, 26 insertions, 37 deletions

diff --git a/net/ntop/files/ntop.sh b/net/ntop/files/ntop.sh
index a4afe32a9b03..577d8a77f0f7 100644
--- a/net/ntop/files/ntop.sh
+++ b/net/ntop/files/ntop.sh
@@ -28,7 +28,7 @@ additional_args=''
 # End of user-configurable variables
 #----------------------------------------------------------------------
 
-args='-d -L --set-pcap-nonblocking'
+args='-d -L --set-pcap-nonblocking --skip-version-check'
 
 [ ! -z $interfaces ] && args="$args -i $interfaces"
 [ ! -z $http_port ] && args="$args -w $http_port"
@@ -39,6 +39,17 @@ args='-d -L --set-pcap-nonblocking'
 
 case "$1" in
 start)
+  # is it the first time we run ntop
+  [ ! -e %%DBDIR%%/ntop/ntop_pw.db ] && {
+	# just in case...
+	[ ! -d  %%DBDIR%%/ntop ] && {
+		echo "Reinstalling database directory"
+		mkdir -p  %%DBDIR%%/ntop
+		chown -R $userid:$userid  %%DBDIR%%/ntop
+	}
+	%%PREFIX%%/bin/ntop -u $userid -A || exit 1
+	echo "Now we can start ntop!"
+  }
   if [ -d $logdir ]; then
     touch ${logdir}/ntop.access.log
     chown $userid ${logdir}/ntop.access.log
diff --git a/net/ntop/files/patch-configure b/net/ntop/files/patch-configure
index 3f0bbae6a3df..c2b8791b843e 100644
--- a/net/ntop/files/patch-configure
+++ b/net/ntop/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Mar 21 23:45:17 2004
-+++ configure	Tue Mar 23 14:37:28 2004
-@@ -4898,7 +4898,7 @@
+--- configure.orig	Tue Dec 21 05:07:24 2004
++++ configure	Sun Jan 16 10:19:25 2005
+@@ -5173,7 +5173,7 @@
          exit 1
          ;;
      *1\.3\.[45]\-freebsd\-ports*)
@@ -9,7 +9,7 @@
          echo "*"
          echo "* Fasten your seat belt and good luck!  If you are injured, the"
          echo "* development team will disavow any knowledge of your intentions."
-@@ -20276,13 +20276,13 @@
+@@ -22928,13 +22928,13 @@
  
  
  
@@ -25,9 +25,9 @@
 -LIBS="-lglib  $LIBS"
 +LIBS="-lglib-2.0  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -20297,11 +20297,11 @@
+ _ACEOF
+@@ -22948,11 +22948,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -41,29 +41,7 @@
    ;
    return 0;
  }
-@@ -20318,24 +20318,24 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_glib_g_date_julian=yes
-+  ac_cv_lib_glib_g_date_new_julian=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_glib_g_date_julian=no
-+ac_cv_lib_glib_g_date_new_julian=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_glib_g_date_julian" >&5
--echo "${ECHO_T}$ac_cv_lib_glib_g_date_julian" >&6
--if test $ac_cv_lib_glib_g_date_julian = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_glib_g_date_new_julian" >&5
-+echo "${ECHO_T}$ac_cv_lib_glib_g_date_new_julian" >&6
-+if test $ac_cv_lib_glib_g_date_new_julian = yes; then
-   cat >>confdefs.h <<_ACEOF
+@@ -22997,7 +22997,7 @@
  #define HAVE_LIBGLIB 1
  _ACEOF
  
@@ -72,7 +50,7 @@
  
  fi
  
-@@ -24989,7 +24989,7 @@
+@@ -28604,7 +28604,7 @@
     test ".${ac_cv_header_glibconfig_h}" = ".yes"      &&
     test ".${ac_cv_header_xmlversion_h}" = ".yes"      &&
     test ".${ac_cv_header_gdome_h}" = ".yes"           &&
@@ -81,7 +59,7 @@
     test ".${ac_cv_lib_xml2_xmlCheckVersion}" = ".yes" &&
     test ".${ac_cv_lib_gdome_gdome_di_saveDocToFile}" = ".yes"; then
      echo "$as_me:$LINENO: result: ok" >&5
-@@ -25008,7 +25008,7 @@
+@@ -28623,7 +28623,7 @@
      echo "*                  gdome.h...${ac_cv_header_gdome_h}"
      echo "*                  libgdome.so or libgdome.a...${ac_cv_lib_gdome_gdome_di_saveDocToFile}"
      echo "*                  glib.h...${ac_cv_header_glib_h}"
diff --git a/net/ntop/files/patch-util.c b/net/ntop/files/patch-util.c
index 0fa09ede8247..abb1c662541a 100644
--- a/net/ntop/files/patch-util.c
+++ b/net/ntop/files/patch-util.c
@@ -1,12 +1,12 @@
---- util.c.orig	Thu Oct 28 03:00:09 2004
-+++ util.c	Thu Oct 28 02:58:27 2004
-@@ -453,7 +453,8 @@
+--- util.c.orig	Thu Dec 16 20:13:26 2004
++++ util.c	Sun Jan 16 12:05:04 2005
+@@ -494,7 +494,8 @@
      if(!strcmp(ii->name,device))
        if(iface_if_getinfo(ii) & IFACE_INFO_UP) {
  	/* Allocate memory for IPv6 addresses*/
 -	count = iface_if_addrcount(ii, AF_INET6);
 +	if ((count = iface_if_addrcount(ii, AF_INET6)) == 0)
-+	    return NULL;
++		return NULL;
+ 	if(count == 0) break;
  	addrs = (NtopIfaceAddr *)calloc(count, sizeof(NtopIfaceAddr));
  	addr_pos = 0;
- 	for(ia = iface_getaddr_first(ii, AF_INET6) ; ia ;