-diff -urN ntop-1.3.2.org/Makefile.am ntop-1.3.2/Makefile.am
---- ntop-1.3.2.org/Makefile.am Sun Oct 29 11:37:42 2000
-+++ ntop-1.3.2/Makefile.am Sun Oct 29 13:08:06 2000
-@@ -212,15 +212,15 @@
+diff -urN ntop.org/Makefile.am ntop/Makefile.am
+--- ntop.org/Makefile.am Mon Mar 26 19:30:37 2001
++++ ntop/Makefile.am Mon Mar 26 20:14:32 2001
+@@ -214,15 +214,15 @@
@echo ""
install-data-local:
fi; \
done
-diff -urN ntop-1.3.2.org/configure.in ntop-1.3.2/configure.in
---- ntop-1.3.2.org/configure.in Sun Oct 29 11:37:42 2000
-+++ ntop-1.3.2/configure.in Sun Oct 29 12:36:52 2000
-@@ -405,12 +405,18 @@
+diff -urN ntop.org/configure.in ntop/configure.in
+--- ntop.org/configure.in Mon Mar 26 19:30:37 2001
++++ ntop/configure.in Mon Mar 26 20:16:17 2001
+@@ -385,12 +385,18 @@
echo "checking for ncurses.h... yes"
AC_DEFINE(HAVE_NCURSES_H)
else
fi
fi
-@@ -545,7 +551,23 @@
+@@ -534,7 +540,23 @@
dnl>
if test ".$ac_enable_tcpwrap" = ".yes"; then
AC_MSG_WARN([TCP Wrap support enabled, if available, via command line option!])
fi
-@@ -923,11 +945,14 @@
+@@ -860,12 +882,9 @@
+ if test ".${GDCHART_ROOT}" != .; then
+ if test -d $GDCHART_ROOT &&
+ test -r $GDCHART_ROOT/libgdchart.a &&
+- test -r $GDCHART_ROOT/gdc.h &&
+- test -r $GDCHART_ROOT/gd-1.8.3/libgd.a &&
+- test -r $GDCHART_ROOT/gd-1.8.3/gd.h &&
+- test -r $GDCHART_ROOT/zlib-1.1.3/libz.a; then
++ test -r $GDCHART_ROOT/gdc.h; then
+ GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
+- MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng -L$GDCHART_ROOT/zlib-1.1.3 -lz"
++ MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -lgd -lpng -lz"
+ INCS="${INCS} -I$GDCHART_ROOT"
+ AC_DEFINE(HAVE_GDCHART)
+ AC_MSG_RESULT([found in $GDCHART_ROOT])
+@@ -883,14 +902,10 @@
+ else
+ if test -d ../gdchart0.94c &&
+ test -r ../gdchart0.94c/gdc.h &&
+- test -r ../gdchart0.94c/libgdchart.a &&
+- test -r ../gdchart0.94c/gd-1.8.3/libgd.a &&
+- test -r ../gdchart0.94c/gd-1.8.3/gd.h &&
+- test -r ../gdchart0.94c/gd-1.8.3/libpng-1.0.8/libpng.a &&
+- test -r ../gdchart0.94c/gd-1.8.3/libpng-1.0.8/gd.h; then
++ test -r ../gdchart0.94c/libgdchart.a; then
+ GDCHART_ROOT="../gdchart0.94c"
+ GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
+- MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng"
++ MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -lgd -lpng"
+ INCS="${INCS} -I$GDCHART_ROOT"
+ AC_DEFINE(HAVE_GDCHART)
+ AC_MSG_RESULT([found in $GDCHART_ROOT])
+@@ -921,11 +936,14 @@
AC_MSG_CHECKING([for OpenSSL Library by Open SLL Project (optional package)])
if test ".${OSSL_ROOT}" != .; then
if test -d $OSSL_ROOT &&
AC_DEFINE(HAVE_OPENSSL)
AC_MSG_RESULT([found in $OSSL_ROOT])
else
-diff -urN ntop-1.3.2.org/intop/intop.c ntop-1.3.2/intop/intop.c
---- ntop-1.3.2.org/intop/intop.c Sun Oct 29 11:37:43 2000
-+++ ntop-1.3.2/intop/intop.c Sun Oct 29 12:52:55 2000
+@@ -1005,8 +1023,7 @@
+ dnl> Do not walk in the plugins/ subdir if the user decided he/she does not need any plugin.
+ dnl>
+ if test "$ac_disable_plugins" = yes; then
+- PLUGINS=''
+-else
++ PLUGINS=''
+ AC_MSG_WARN([compilation of ntop's plugins disabled via command line option!])
+ fi
+
+diff -urN ntop.org/intop/intop.c ntop/intop/intop.c
+--- ntop.org/intop/intop.c Mon Mar 26 19:30:37 2001
++++ ntop/intop/intop.c Mon Mar 26 20:14:32 2001
@@ -66,6 +66,10 @@
int active = -1; /* an index for the active interface (if any) */
int previous = -1; /* an index for the previous interface (if any) */
/*
* You are welcome!
-diff -urN ntop-1.3.2.org/main.c ntop-1.3.2/main.c
---- ntop-1.3.2.org/main.c Sun Oct 29 11:37:42 2000
-+++ ntop-1.3.2/main.c Sun Oct 29 12:38:28 2000
+diff -urN ntop.org/main.c ntop/main.c
+--- ntop.org/main.c Mon Mar 26 19:30:37 2001
++++ ntop/main.c Mon Mar 26 20:14:32 2001
@@ -67,6 +67,10 @@
/* That's the meat */
int main(int argc, char *argv[]) {
+#ifdef HAVE_LIBWRAP
-+ int allow_severity = LOG_INFO;
-+ int deny_severity = LOG_WARNING;
-+#endif
- int pflag, i, fd;
++ int allow_severity = LOG_INFO;
++ int deny_severity = LOG_WARNING;
++#endif
+ int pflag, i;
#ifdef WIN32
int optind=0;
-diff -urN ntop-1.3.2.org/plugins/Makefile.am ntop-1.3.2/plugins/Makefile.am
---- ntop-1.3.2.org/plugins/Makefile.am Sun Oct 29 11:37:43 2000
-+++ ntop-1.3.2/plugins/Makefile.am Sun Oct 29 13:11:31 2000
-@@ -99,9 +99,9 @@
+diff -urN ntop.org/plugins/Makefile.am ntop/plugins/Makefile.am
+--- ntop.org/plugins/Makefile.am Mon Mar 26 19:30:37 2001
++++ ntop/plugins/Makefile.am Mon Mar 26 20:14:32 2001
+@@ -93,9 +93,9 @@
@ln -s .libs/libwapPlugin.so wapPlugin.so
install-data-local:
--- /dev/null
+diff -urN ntop.org/plugins/pep/pep.c ntop/plugins/pep/pep.c
+--- ntop.org/plugins/pep/pep.c Mon Mar 26 19:30:37 2001
++++ ntop/plugins/pep/pep.c Mon Mar 26 20:03:37 2001
+@@ -52,7 +52,7 @@
+ /*
+ * a private instance of Perl
+ */
+-static PerlInterpreter * pep_perl = NULL;
++static PerlInterpreter * my_perl = NULL;
+
+
+ /*
+@@ -63,9 +63,9 @@
+ /*
+ * free the previously allocated perl instance
+ */
+- perl_destruct (pep_perl);
+- perl_free (pep_perl);
+- pep_perl = NULL;
++ perl_destruct (my_perl);
++ perl_free (my_perl);
++ my_perl = NULL;
+
+ traceEvent (TRACE_INFO, "\n");
+ traceEvent (TRACE_INFO, "Thanks for having used PeP....\n");
+@@ -176,7 +176,7 @@
+ /*
+ * compile the file
+ */
+- perl_parse (pep_perl, NULL, pep_argc, pep_argv, NULL);
++ perl_parse (my_perl, NULL, pep_argc, pep_argv, NULL);
+
+ /*
+ * create a new variable, the %traffic hash
+@@ -381,7 +381,7 @@
+ /*
+ * and then execute the script
+ */
+- perl_run (pep_perl);
++ perl_run (my_perl);
+
+ if (traffic)
+ hv_undef (traffic);
+@@ -410,8 +410,8 @@
+ /*
+ * initialization: allocate a private instance of the Perl Interpreter
+ */
+- pep_perl = perl_alloc ();
+- perl_construct (pep_perl);
++ my_perl = perl_alloc ();
++ perl_construct (my_perl);
+
+ return (plugininfo);
+ }
projects / packages / ntop.git / commitdiff