+++ /dev/null
---- Makefile.am.orig Sat Mar 30 00:05:08 2002
-+++ Makefile.am Thu Apr 4 12:44:48 2002
-@@ -128,7 +128,6 @@
-
- libntop_la_DEPENDENCIES = config.h
- libntop_la_LIBADD = $(CORELIBS)
--libntop_la_LDFLAGS = -version-info @NTOP_VERSION_INFO@ -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
-
- # Archive for http representation, or the 'viewer'
- libntopreport_la_SOURCES = admin.c emitter.c \
-@@ -142,7 +141,6 @@
-
- libntopreport_la_DEPENDENCIES = config.h
- libntopreport_la_LIBADD = $(MORELIBS)
--libntopreport_la_LDFLAGS = -version-info @NTOP_VERSION_INFO@ -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
-
- man_MANS = ntop.8
-
+++ /dev/null
-diff -urN ntop.org/Makefile.am ntop/Makefile.am
---- ntop.org/Makefile.am Fri Oct 26 23:41:38 2001
-+++ ntop/Makefile.am Fri Oct 26 23:41:52 2001
-@@ -56,7 +56,7 @@
-
- SUBDIRS = . @PLUGINS@ @INTOP@
-
--DIST_COMMON = AUTHORS CONTENTS COPYING ChangeLog \
-+DIST_COMMON_X = AUTHORS CONTENTS COPYING ChangeLog \
- MANIFESTO NEWS PORTING \
- SUPPORT_NTOP.txt \
- THANKS \
-diff -urN ntop.org/intop/Makefile.am ntop/intop/Makefile.am
---- ntop.org/intop/Makefile.am Fri Oct 26 23:41:40 2001
-+++ ntop/intop/Makefile.am Fri Oct 26 23:44:50 2001
-@@ -24,7 +24,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
--DIST_COMMON = Makefile.am Makefile.in intop.1
-+DIST_COMMON_X = Makefile.am Makefile.in intop.1
-
- DISTCLEANFILES = logger.db ntop.db ntop_pw.db intops
- CLEANFILES = $(DISTCLEANFILES)
-diff -urN ntop.org/plugins/Makefile.am ntop/plugins/Makefile.am
---- ntop.org/plugins/Makefile.am Fri Oct 26 23:41:40 2001
-+++ ntop/plugins/Makefile.am Fri Oct 26 23:45:05 2001
-@@ -26,7 +26,7 @@
-
- SUBDIRS = . #pep
-
--DIST_COMMON = Makefile.am Makefile.in
-+DIST_COMMON_X = Makefile.am Makefile.in
- CLEANFILES =
- EXTRA_DIST =
-
-diff -urN ntop.org/plugins/pep/Makefile.am ntop/plugins/pep/Makefile.am
---- ntop.org/plugins/pep/Makefile.am Fri Oct 26 23:41:40 2001
-+++ ntop/plugins/pep/Makefile.am Fri Oct 26 23:45:17 2001
-@@ -23,7 +23,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
--DIST_COMMON = Makefile.am Makefile.in
-+DIST_COMMON_X = Makefile.am Makefile.in
- CLEANFILES =
- EXTRA_DIST = available.pl hosts.pl
-
-@@ -56,4 +56,4 @@
- pep.so: pep.c
- # ${CC} -shared ${libpep_la_OBJECTS} ${PEPLIBS} -Wl,-soname -Wl,libpep.so.0 -o pep.so
- @${CC} -shared ${libpep_la_OBJECTS} ${PEPLIBS} -o pep.so
-- (cd .. && ln -fs pep/pep.so .)
-\ No newline at end of file
-+ (cd .. && ln -fs pep/pep.so .)
+++ /dev/null
-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:
-- @cp -p ntop-cert.pem $(bindir)/ntop-cert.pem
-- @$(top_srcdir)/mkinstalldirs $(libdir)/plugins;
-- @$(top_srcdir)/mkinstalldirs $(datadir)/ntop;
-- @$(top_srcdir)/mkinstalldirs $(datadir)/ntop/html;
-+ @cp -p ntop-cert.pem $(DESTDIR)$(bindir)/ntop-cert.pem
-+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/plugins;
-+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop;
-+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop/html;
- @for file in $(NTOPHTML); do \
- if test -d $$file; then \
-- $(top_srcdir)/mkinstalldirs $(datadir)/ntop/$$file; \
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop/$$file; \
- else \
-- cp -p $$file $(datadir)/ntop/$$file; \
-+ cp -p $$file $(DESTDIR)$(datadir)/ntop/$$file; \
- fi; \
- done
-
-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
-+ if test -f "/usr/include/ncurses/ncurses.h"; then
-+ echo "checking for ncurses/ncurses.h... yes"
-+ CFLAGS="$CFLAGS -I/usr/include/ncurses"
-+ AC_DEFINE(HAVE_NCURSES_H)
-+ else
- if test -f "/usr/include/curses.h"; then
- echo "checking for curses.h... yes"
- AC_DEFINE(HAVE_CURSES_H)
- else
- AC_MSG_WARN([It looks that you don't have ncurses.h/curses.h installed. Some ntop's features will be disabled.])
- fi
-+ fi
- fi
- fi
-
-@@ -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!])
-- AC_CHECK_LIB(wrap, request_init, MORELIBS="$MORELIBS -lwrap" && AC_DEFINE(HAVE_LIBWRAP))
-+ AC_MSG_CHECKING(for libwrap)
-+ saved_LIBS="$LIBS"
-+ LIBS="$LIBS -lwrap"
-+ AC_TRY_LINK([
-+#include <tcpd.h>
-+int deny_severity = 0, allow_severity = 0;
-+ ],
-+ [hosts_access(0);],
-+ [
-+ AC_MSG_RESULT(yes)
-+ MORELIBS="$MORELIBS -lwrap"
-+ AC_DEFINE(HAVE_LIBWRAP)
-+ ],
-+ [
-+ AC_MSG_RESULT(no)
-+ ])
-+ LIBS="$saved_LIBS"
- fi
-
-
-@@ -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 &&
-- test -r $OSSL_ROOT/libssl.a &&
-- test -r $OSSL_ROOT/openssl/ssl.h; then
-+ test -r $OSSL_ROOT/lib/libssl.so &&
-+ test -r $OSSL_ROOT/include/openssl/ssl.h; then
-+ if test -f $OSSL_ROOT/lib/libcrypto.so; then
-+ MORELIBS="${MORELIBS} -lcrypto"
-+ fi
- OSSL_ROOT=`cd ${OSSL_ROOT} && pwd`
-- MORELIBS="${MORELIBS} -L$OSSL_ROOT -lssl"
-- INCS="${INCS} -I$OSSL_ROOT"
-+ MORELIBS="${MORELIBS} -L$OSSL_ROOT/lib -lssl"
-+ INCS="${INCS} -I$OSSL_ROOT/include/openssl"
- AC_DEFINE(HAVE_OPENSSL)
- AC_MSG_RESULT([found in $OSSL_ROOT])
- else
-@@ -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) */
-
-+#ifdef HAVE_LIBWRAP
-+int allow_severity = LOG_INFO;
-+int deny_severity = LOG_WARNING;
-+#endif
-
- /*
- * You are welcome!
-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;
- #ifdef WIN32
- int optind=0;
-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:
-- @$(top_srcdir)/mkinstalldirs $(plugindir);
-+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir);
- @for file in $(noinst_PROGRAMS); do \
-- cp -p $$file $(plugindir)/$$file; \
-+ cp -p $$file $(DESTDIR)$(plugindir)/$$file; \
- done
- # remove installed libraries
- @for file in $(lib_LTLIBRARIES); do \
+++ /dev/null
---- Makefile.am.orig Thu Apr 4 12:50:44 2002
-+++ Makefile.am Thu Apr 4 12:54:05 2002
-@@ -44,7 +44,6 @@
- plugin_LTLIBRARIES = libpep.la
-
- libpep_la_SOURCES = pep.c
--libpep_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@
-
- #
- # LIBS must be cleared, or else libtool won't create a shared module.
-@@ -53,7 +52,6 @@
- #
- LIBS = # ${PEPLIBS}
-
--pep.so: pep.c
-+pep: pep.c
- # ${CC} -shared ${libpep_la_OBJECTS} ${PEPLIBS} -Wl,-soname -Wl,libpep.so.0 -o pep.so
- @${CC} -shared ${libpep_la_OBJECTS} ${PEPLIBS} -o pep.so
-- (cd .. && ln -fs pep/pep.so .)
+++ /dev/null
---- Makefile.am.orig Thu Apr 4 12:46:12 2002
-+++ Makefile.am Thu Apr 4 13:24:41 2002
-@@ -57,31 +57,31 @@
- # librmonPlugin.la libwapPlugin.la
-
- libicmpPlugin_la_SOURCES = icmpPlugin.c
--libicmpPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+libicmpPlugin_la_LDFLAGS = -shared
-
- #librrdPlugin_la_SOURCES = rrdPlugin.c
--#librrdPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+#librrdPlugin_la_LDFLAGS = -shared
-
- libpdaPlugin_la_SOURCES = pdaPlugin.c
--libpdaPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+libpdaPlugin_la_LDFLAGS = -shared
-
- libsflowPlugin_la_SOURCES = sflowPlugin.c
--libsflowPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+libsflowPlugin_la_LDFLAGS = -shared
-
- liblastSeenPlugin_la_SOURCES = lastSeenPlugin.c
--liblastSeenPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+liblastSeenPlugin_la_LDFLAGS = -shared
-
- libnetflowPlugin_la_SOURCES = netflowPlugin.c
--libnetflowPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+libnetflowPlugin_la_LDFLAGS = -shared
-
- libnfsPlugin_la_SOURCES = nfsPlugin.c
--libnfsPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+libnfsPlugin_la_LDFLAGS = -shared
-
- #librmonPlugin_la_SOURCES = rmonPlugin.c rmon.h
--#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared
-
- #libwapPlugin_la_SOURCES = wapPlugin.c
--#libwapPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+#libwapPlugin_la_LDFLAGS = -shared
-
-
- #
-@@ -90,58 +90,40 @@
- #
-
-
--.libs/libicmpPlugin.so@SO_VERSION_PATCH@:
-- cc -bundle -flat_namespace -undefined suppress -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ icmpPlugin.o
-+.libs/libicmpPlugin.so:
-+ cc -bundle -flat_namespace -undefined suppress -o .libs/libicmpPlugin.so icmpPlugin.o
-
--icmpPlugin.so: .libs/libicmpPlugin.so@SO_VERSION_PATCH@
-- @ln -s .libs/libicmpPlugin.so icmpPlugin.so
-+#.libs/librrdPlugin.so:
-+# cc -bundle -flat_namespace -undefined suppress -o .libs/librrdPlugin.so rrdPlugin.o
-
--#.libs/librrdPlugin.so@SO_VERSION_PATCH@:
--# cc -bundle -flat_namespace -undefined suppress -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ rrdPlugin.o
--
--#rrdPlugin.so: .libs/librrdPlugin.so@SO_VERSION_PATCH@
-+#rrdPlugin.so: .libs/librrdPlugin.so
- # @ln -s .libs/librrdPlugin.so rrdPlugin.so
-
--.libs/libpdaPlugin.so@SO_VERSION_PATCH@:
-- cc -bundle -flat_namespace -undefined suppress -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ pdaPlugin.o
--
--pdaPlugin.so: .libs/libpdaPlugin.so@SO_VERSION_PATCH@
-- @ln -s .libs/libpdaPlugin.so pdaPlugin.so
--
--.libs/libsflowPlugin.so@SO_VERSION_PATCH@:
-- cc -bundle -flat_namespace -undefined suppress -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o
--
--sflowPlugin.so: .libs/libsflowPlugin.so@SO_VERSION_PATCH@
-- @ln -s .libs/libsflowPlugin.so sflowPlugin.so
--
--.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@:
-- cc -bundle -flat_namespace -undefined suppress -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ lastSeenPlugin.o
--
--lastSeenPlugin.so: .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@
-- @ln -s .libs/liblastSeenPlugin.so lastSeenPlugin.so
-+.libs/libpdaPlugin.so:
-+ cc -bundle -flat_namespace -undefined suppress -o .libs/libpdaPlugin.so pdaPlugin.o
-
--.libs/libnfsPlugin.so@SO_VERSION_PATCH@:
-- cc -bundle -flat_namespace -undefined suppress -o .libs/libnfsPlugin.so@SO_VERSION_PATCH@ nfsPlugin.o
-+.libs/libsflowPlugin.so:
-+ cc -bundle -flat_namespace -undefined suppress -o .libs/libsflowPlugin.so sflowPlugin.o
-
--netflowPlugin.so: .libs/libnetflowPlugin.so@SO_VERSION_PATCH@
-- @ln -s .libs/libnetflowPlugin.so netflowPlugin.so
-+.libs/liblastSeenPlugin.so:
-+ cc -bundle -flat_namespace -undefined suppress -o .libs/liblastSeenPlugin.so lastSeenPlugin.o
-
--.libs/libnetflowPlugin.so@SO_VERSION_PATCH@:
-- cc -bundle -flat_namespace -undefined suppress -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o
-+.libs/libnfsPlugin.so:
-+ cc -bundle -flat_namespace -undefined suppress -o .libs/libnfsPlugin.so nfsPlugin.o
-
--nfsPlugin.so: .libs/libnfsPlugin.so@SO_VERSION_PATCH@
-- @ln -s .libs/libnfsPlugin.so nfsPlugin.so
-+.libs/libnetflowPlugin.so:
-+ cc -bundle -flat_namespace -undefined suppress -o .libs/libnetflowPlugin.so netflowPlugin.o
-
--#.libs/librmonPlugin.so@SO_VERSION_PATCH@:
--# cc -bundle -flat_namespace -undefined suppress -o .libs/librmonPlugin.so@SO_VERSION_PATCH@ rmonPlugin.o
-+#.libs/librmonPlugin.so:
-+# cc -bundle -flat_namespace -undefined suppress -o .libs/librmonPlugin.so rmonPlugin.o
-
--#rmonPlugin.so: .libs/librmonPlugin.so@SO_VERSION_PATCH@
-+#rmonPlugin.so: .libs/librmonPlugin.so
- # @ln -s .libs/librmonPlugin.so rmonPlugin.so
-
--#.libs/libwapPlugin.so@SO_VERSION_PATCH@:
--# cc -bundle -flat_namespace -undefined suppress -o .libs/libwapPlugin.so@SO_VERSION_PATCH@ wapPlugin.o
-+#.libs/libwapPlugin.so:
-+# cc -bundle -flat_namespace -undefined suppress -o .libs/libwapPlugin.so wapPlugin.o
-
--#wapPlugin.so: .libs/libwapPlugin.so@SO_VERSION_PATCH@
-+#wapPlugin.so: .libs/libwapPlugin.so
- # @ln -s .libs/libwapPlugin.so wapPlugin.so
-
- install-data-local:
projects / packages / ntop.git / commitdiff