Changes - j0ke.net Open Build Service

Changes of Revision 56

[-] [+]	Changed	ntop.spec
@@ -1,5 +1,5 @@ # -# spec file for package ntop (Version 3.3.9) +# spec file for package ntop (Version 3.3.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,43 +14,52 @@ Name: ntop BuildRequires: dos2unix freetype2-devel gcc-c++ gd-devel gdbm-devel libart_lgpl-devel libjpeg-devel libpng-devel BuildRequires: lsof mysql-devel net-snmp-devel openssl-devel readline-devel wget -BuildRequires: libGeoIP-devel +BuildRequires: libGeoIP-devel lua-devel %if 0%{?suse_version} -BuildRequires: tcpd-devel xorg-x11-devel +BuildRequires: tcpd-devel xorg-x11-devel libevent PreReq: /bin/cat %fillup_prereq %insserv_prereq sysconfig + %if 0%{?suse_version} > 1020 BuildRequires: fdupes libpcap-devel rrdtool-devel %else BuildRequires: libpcap rrdtool-devel %endif + +%if 0%{?suse_version} >= 1110 +BuildRequires: libevent-devel +%endif + %else + %if 0%{?fedora_version} PreReq: /bin/cat /sbin/insserv /bin/fillup sysconfig -BuildRequires: libpcap-devel rrdtool-devel xorg-x11-devel +BuildRequires: libpcap-devel rrdtool-devel xorg-x11-devel libevent-devel %else + %if 0%{?mandriva_version} BuildRequires: libpcap-devel librrdtool-devel rrdtool PreReq: /bin/cat /sbin/insserv /bin/fillup sysconfig %endif + %endif + %endif License: GPL v2 or later Group: Productivity/Networking/Diagnostic AutoReqProv: on -Version: 3.3.9 +Version: 3.3.10 Release: 678 Summary: Web-Based Network Traffic Monitor -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.bz2 Source2: rcntop Source3: rc.config.ntop Source4: passcheck.c Source5: README.SuSE -Source20: GeoIP.tar.gz Source21: GeoLiteCity.dat.gz Source22: GeoIPASNum.dat.gz Patch: ntop-%{version}.diff -Patch1: ntop-3.3.9-geoip.patch +Patch1: ntop-%{version}-geoip.patch Patch2: rrdPlugin.diff Patch4: dotpath-%{version}.diff Url: http://www.ntop.org @@ -73,7 +82,6 @@ %patch2 %patch4 # copy geoip files to source directory - disables download when running configure -cp %{S:20} . zcat %{S:21} > GeoLiteCity.dat zcat %{S:22} > GeoIPASNum.dat @@ -140,11 +148,31 @@ find $RPM_BUILD_ROOT/usr/share/ntop/html -type f -print0 \| xargs -0 chmod 644 %if 0%{?suse_version} > 1020 %fdupes $RPM_BUILD_ROOT/usr/share/ntop/html/ +%fdupes $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/ %endif find $RPM_BUILD_ROOT -name ".la" \| xargs rm rm docs/ntop-autotools.vsd dos2unix docs/RedHat-rpmbuild-HOWTO.txt +# strip bins +strip %{buildroot}%{_bindir}/ntop +strip %{buildroot}%{_libdir}/libcpacketPlugin-%{version}.so +strip %{buildroot}%{_libdir}/libicmpPlugin-%{version}.so +strip %{buildroot}%{_libdir}/liblastSeenPlugin-%{version}.so +strip %{buildroot}%{_libdir}/libnetflowPlugin-%{version}.so +strip %{buildroot}%{_libdir}/libntop-%{version}.so +strip %{buildroot}%{_libdir}/libntopreport-%{version}.so +strip %{buildroot}%{_libdir}/librrdPlugin-%{version}.so +strip %{buildroot}%{_libdir}/libsflowPlugin-%{version}.so +strip %{buildroot}%{_libdir}/ntop/plugins/cpacketPlugin.so +strip %{buildroot}%{_libdir}/ntop/plugins/icmpPlugin.so +strip %{buildroot}%{_libdir}/ntop/plugins/lastSeenPlugin.so +strip %{buildroot}%{_libdir}/ntop/plugins/netflowPlugin.so +strip %{buildroot}%{_libdir}/ntop/plugins/rrdPlugin.so +strip %{buildroot}%{_libdir}/ntop/plugins/sflowPlugin.so +strip %{buildroot}%{_sbindir}/passcheck + + %post # Are we in update mode? if [ ${1:-0} -gt 1 ]; then @@ -164,6 +192,9 @@ /sbin/ldconfig %{insserv_cleanup} +%preun +%stop_on_removal + %clean rm -rf $RPM_BUILD_ROOT @@ -187,14 +218,24 @@ %dir /etc/ntop /etc/ntop/ntop-cert.pem #/etc/ntop/AS-list.txt.gz -/etc/ntop/etter.finger.os.gz -/etc/ntop/oui.txt.gz +#/etc/ntop/etter.finger.os.gz +%config /etc/ntop/oui.txt.gz #/etc/ntop/p2c.opt.table.gz -/etc/ntop/specialMAC.txt.gz -/etc/ntop/GeoIPASNum.dat -/etc/ntop/GeoLiteCity.dat +%config /etc/ntop/specialMAC.txt.gz +%config /etc/ntop/GeoIPASNum.dat +%config /etc/ntop/GeoLiteCity.dat %changelog + Sat May 23 2009 Carsten Schoene <cs@linux-administrator.com> +- new upstream release 3.3.10 + + MPLS support + + a per-interface BPF filter + + ability to export th HTTP GET parameters in QUERY_STRING_UNESCAPED in perl plugin + + support for extended sFlow samples + - fix for a visualization issue when using VLANs + - improved perl plugin + - reworked patches for RPM + * Thu Dec 18 2008 Carsten Schoene <cs@linux-administrator.com> - new upstream release 3.3.9 - Fixes were made for detecting buffer overflows
[-] [+]	Changed	dotpath-3.3.10.diff ^
@@ -9,12 +9,3 @@ storePrefsValue("dot.path", dotPath); /* Set the default */ } -@@ -6953,7 +6953,7 @@ - - if(el == myGlobals.broadcastEntry) continue; - -- if((key == NULL) \|\| (key == "")) do_add = 1; -+ if((key == NULL) \|\| (key[0] == 0)) do_add = 1; - else if(el->hostNumIpAddress && strcasestr(el->hostNumIpAddress, key)) do_add = 1; - else if(strcasestr(el->ethAddressString, key)) do_add = 2; - else if(strcasestr(el->hostResolvedName, key)) do_add = 1;
[-] [+]	Deleted	dotpath-3.3.7.diff ^
@@ -1,11 +0,0 @@ ---- report.c.orig 2008-06-12 09:31:27.000000000 +0200 -+++ report.c 2008-06-12 09:44:42.000000000 +0200 -@@ -2301,7 +2301,7 @@ - if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) { - snprintf(dotPath, sizeof(dotPath), "%s", buf); - } else { -- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot"); -+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot"); - storePrefsValue("dot.path", dotPath); /* Set the default */ - } -
[-] [+]	Deleted	dotpath-3.3.8.diff ^
@@ -1,11 +0,0 @@ ---- report.c.orig 2008-06-12 09:31:27.000000000 +0200 -+++ report.c 2008-06-12 09:44:42.000000000 +0200 -@@ -2301,7 +2301,7 @@ - if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) { - snprintf(dotPath, sizeof(dotPath), "%s", buf); - } else { -- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot"); -+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot"); - storePrefsValue("dot.path", dotPath); /* Set the default */ - } -
[-] [+]	Deleted	dotpath-3.3.diff ^
@@ -1,11 +0,0 @@ ---- report.c -+++ report.c -@@ -2302,7 +2302,7 @@ - if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) { - snprintf(dotPath, sizeof(dotPath), "%s", buf); - } else { -- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot"); -+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot"); - storePrefsValue("dot.path", dotPath); /* Set the default */ - } -
[-] [+]	Deleted	libtool.diff ^
@@ -1,12 +0,0 @@ ---- libtool.m4.in.orig 2007-07-31 11:25:17.000000000 +0000 -+++ libtool.m4.in 2007-07-31 11:25:29.000000000 +0000 -@@ -4057,7 +4057,7 @@ - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext' - - # Executable file suffix (normally ""). - exeext="$exeext" -
[-] [+]	Added	ntop-3.3.10-geoip.patch ^
@@ -0,0 +1,69 @@ +--- Makefile.am.orig 2009-01-11 21:25:20.000000000 +0100 ++++ Makefile.am 2009-01-11 21:25:30.000000000 +0100 +@@ -270,8 +270,6 @@ + + install: install-recursive + +- cd @GEO_DIR@; make install +- + @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) + + @echo "" +--- configure.in.orig 2009-05-06 16:55:22.000000000 +0200 ++++ configure.in 2009-05-23 11:06:17.000000000 +0200 +@@ -1652,20 +1652,7 @@ + dnl> + dnl> Lua - http://www.lua.org + dnl> +-LUA_VERSION=lua-5.1.4 +-if test -f "$LUA_VERSION.tar.gz"; then +- echo "Lua already present on this machine" +-else +- wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz +-fi +- +-tar xvfz $LUA_VERSION.tar.gz +-cat $LUA_VERSION/src/Makefile \| sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp +-cat /tmp/lua.temp > $LUA_VERSION/src/Makefile +-#rm -f /tmp/lua.temp +-cd $LUA_VERSION; make posix; cd .. +- +-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src" ++LUA_LIB_DIR="/usr/include" + LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} " + INCS="${INCS} -I${LUA_LIB_DIR}" + AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported]) +@@ -1963,20 +1950,6 @@ + fi + + dnl> GeoIP (http://www.maxmind.com/) +-if test -f "GeoIP.tar.gz"; then +- echo "GeoIP already present on this machine" +-else +- wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz +-fi +-tar xvfz GeoIP.tar.gz +-GEO_DIR=`find $PWD -type d -name "GeoIP-"` +-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd .. +-# OSX Fix +-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" +-if test -f $GEO_DYLIB; then +- ln -s $GEO_DYLIB . +-fi +- + if test -f "GeoLiteCity.dat"; then + echo "GeoLiteCity.dat already present" + else +@@ -1992,10 +1965,9 @@ + fi + + +-GEO_DIR=`find $PWD -type d -name "GeoIP-"` +-GEO_IP="$GEO_DIR/libGeoIP/" ++GEO_IP="/usr/include" + CFLAGS="$CFLAGS -I$GEO_IP" +-LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS" ++LDFLAGS="$LDFLAGS -L$LIBDIR -lGeoIP" + + dnl> NTOPCONFIGDEBUG_SETTINGS([precet]) +
[-] [+]	Changed	ntop-3.3.10.diff ^
@@ -82,24 +82,6 @@ @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ else \ -@@ -131,7 +131,7 @@ - - ############### - --.libs/libpdaPlugin.so@SO_VERSION_PATCH@: -+.libs/libpdaPlugin.so@SO_VERSION_PATCH@: pdaPlugin.o - @if test -f libpdaPlugin_la-pdaPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ libpdaPlugin_la-pdaPlugin.o; \ - else \ -@@ -143,7 +143,7 @@ - - ############### - --.libs/libremotePlugin.so@SO_VERSION_PATCH@: -+.libs/libremotePlugin.so@SO_VERSION_PATCH@: remotePlugin.o - @if test -f libremotePlugin_la-remotePlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremotePlugin.so@SO_VERSION_PATCH@ libremotePlugin_la-remotePlugin.o; \ - else \ @@ -155,7 +155,7 @@ ###############
[-] [+]	Deleted	ntop-3.3.7.diff ^
@@ -1,162 +0,0 @@ ---- ssl.c 2006/01/26 12:55:30 1.1 -+++ ssl.c 2006/01/26 12:55:59 -@@ -304,7 +304,7 @@ - int term_ssl_connection(int fd) { - int i, rc; - -- if(!myGlobals.sslInitialized) return; -+ if(!myGlobals.sslInitialized) return 0; - - for(i=0; i<MAX_SSL_CONNECTIONS; i++) { - if((myGlobals.ssl[i].ctx != NULL) ---- fcUtils.c 2006/01/26 12:45:23 1.1 -+++ fcUtils.c 2006/01/26 12:46:25 -@@ -654,6 +654,6 @@ - memcpy (&entry->pWWN.str[0], &pWWN.str[0], LEN_WWN_ADDRESS); - memcpy (&entry->nWWN.str[0], &nWWN.str[0], LEN_WWN_ADDRESS); - strncpy (&entry->alias[0], alias, MAX_LEN_SYM_HOST_NAME); -- entry->alias[MAX_LEN_SYM_HOST_NAME] = '\0'; -+ entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0'; - } - } ---- graph.c 2006/01/26 12:47:15 1.1 -+++ graph.c 2006/01/26 12:47:54 -@@ -2635,7 +2635,7 @@ - Counter total; - SortedFcDomainStatsEntry fcDomainStats; - -- p[MAX_FC_DOMAINS+1] = 0; -+ p[MAX_FC_DOMAINS] = 0; - - hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId); - ---- fcReport.c 2006/03/20 13:55:38 1.1 -+++ fcReport.c 2006/03/20 13:59:50 -@@ -4066,7 +4066,7 @@ - char buf[LEN_GENERAL_WORK_BUFFER], sign; - char arrowGif, arrow[48], theAnchor[48]; - char htmlAnchor[64], htmlAnchor1[64]; -- char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[7][32]; -+ char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[15][32]; - char hostLinkBuf[LEN_GENERAL_WORK_BUFFER], - hostLinkBuf1[LEN_GENERAL_WORK_BUFFER]; - FCSession tmpTable, session; ---- Makefile.am 2006/04/03 09:09:17 1.1 -+++ Makefile.am 2006/04/03 09:09:40 -@@ -134,8 +134,7 @@ - ntop.c pbuf.c \ - plugin.c prefs.c protocols.c \ - sessions.c term.c util.c utildl.c \ -- traffic.c vendor.c version.c \ -- ntop_darwin.c -+ traffic.c vendor.c version.c - - libntop_la_DEPENDENCIES = myrrd/libmyrrd.la config.h - libntop_la_LIBADD = ---- plugins/Makefile.am.orig 2007-07-31 09:05:01.000000000 +0000 -+++ plugins/Makefile.am 2007-07-31 09:07:36.000000000 +0000 -@@ -95,7 +95,7 @@ - # - - --.libs/libicmpPlugin.so@SO_VERSION_PATCH@: -+.libs/libicmpPlugin.so@SO_VERSION_PATCH@: icmpPlugin.o - @if test -f libicmpPlugin_la-icmpPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ libicmpPlugin_la-icmpPlugin.o; \ - else \ -@@ -107,7 +107,7 @@ - - ############### - --.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: -+.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: lastSeenPlugin.o - @if test -f liblastSeenPlugin_la-lastSeenPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ liblastSeenPlugin_la-lastSeenPlugin.o; \ - else \ -@@ -119,7 +119,7 @@ - - ############### - --.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: -+.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: netflowPlugin.o - @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ - else \ -@@ -131,7 +131,7 @@ - - ############### - --.libs/libpdaPlugin.so@SO_VERSION_PATCH@: -+.libs/libpdaPlugin.so@SO_VERSION_PATCH@: pdaPlugin.o - @if test -f libpdaPlugin_la-pdaPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ libpdaPlugin_la-pdaPlugin.o; \ - else \ -@@ -143,7 +143,7 @@ - - ############### - --.libs/libremotePlugin.so@SO_VERSION_PATCH@: -+.libs/libremotePlugin.so@SO_VERSION_PATCH@: remotePlugin.o - @if test -f libremotePlugin_la-remotePlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremotePlugin.so@SO_VERSION_PATCH@ libremotePlugin_la-remotePlugin.o; \ - else \ -@@ -155,7 +155,7 @@ - - ############### - --.libs/librrdPlugin.so@SO_VERSION_PATCH@: -+.libs/librrdPlugin.so@SO_VERSION_PATCH@: rrdPlugin.o - @if test -f librrdPlugin_la-rrdPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ - else \ -@@ -167,7 +167,7 @@ - - ############### - --.libs/libsflowPlugin.so@SO_VERSION_PATCH@: -+.libs/libsflowPlugin.so@SO_VERSION_PATCH@: sflowPlugin.o - @if test -f libsflowPlugin_la-sflowPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ - else \ -@@ -179,7 +179,7 @@ - - ############### - --.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: -+.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: xmldumpPlugin.o - @if test -f libxmldumpPlugin_la-xmldumpPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpPlugin.so@SO_VERSION_PATCH@ libxmldumpPlugin_la-xmldumpPlugin.o; \ - else \ ---- pbuf.c.orig 2008-05-31 11:52:12.000000000 +0200 -+++ pbuf.c 2008-06-12 09:38:33.000000000 +0200 -@@ -3431,14 +3431,14 @@ - && (ipxBuffer[30] == 0x0) /* SAP Response (byte 0) / - && (ipxBuffer[31] == 0x02) / SAP Response (byte 1) /) { - u_int16_t serverType; -- char serverName[57]; -+ char serverName[MAX_LEN_SYM_HOST_NAME]; - int i, found; - - memcpy(&serverType, &ipxBuffer[32], 2); - serverType = ntohs(serverType); - -- memcpy(serverName, &ipxBuffer[34], 56); serverName[56] = '\0'; -- for(i=0; i<56; i++) -+ memcpy(serverName, &ipxBuffer[34], MAX_LEN_SYM_HOST_NAME); serverName[MAX_LEN_SYM_HOST_NAME-1] = '\0'; -+ for(i=0; i<MAX_LEN_SYM_HOST_NAME; i++) - if(serverName[i] == '!') { - serverName[i] = '\0'; - break; ---- globals-core.h.orig 2008-01-04 00:32:46.000000000 +0100 -+++ globals-core.h 2008-06-12 09:40:14.000000000 +0200 -@@ -256,10 +256,6 @@ - - #ifdef MAKE_WITH_SAFER_ROUTINES - --/ Fix to the free prototype courtesy of Tanner Lovelace <lovelace@opennms.org> / --/ Fix free() courtesy of Benoit Dolez <bdolez@exosec.fr> / --#define free(a) { void __t = (a); ntop_safefree((void*)&(__t), (char)__FILE__, (int)__LINE__); a = __t; } --extern void ntop_safefree(void *ptr, char file, int line); - #define malloc(sz) ntop_safemalloc((unsigned int)sz, (char)__FILE__, (int)__LINE__) - extern void ntop_safemalloc(unsigned int sz, char* file, int line); - #define calloc(c,sz) ntop_safecalloc(c, sz, (char*)__FILE__, (int)__LINE__)
[-] [+]	Deleted	ntop-3.3.8.diff ^
@@ -1,162 +0,0 @@ ---- ssl.c 2006/01/26 12:55:30 1.1 -+++ ssl.c 2006/01/26 12:55:59 -@@ -304,7 +304,7 @@ - int term_ssl_connection(int fd) { - int i, rc; - -- if(!myGlobals.sslInitialized) return; -+ if(!myGlobals.sslInitialized) return 0; - - for(i=0; i<MAX_SSL_CONNECTIONS; i++) { - if((myGlobals.ssl[i].ctx != NULL) ---- fcUtils.c 2006/01/26 12:45:23 1.1 -+++ fcUtils.c 2006/01/26 12:46:25 -@@ -654,6 +654,6 @@ - memcpy (&entry->pWWN.str[0], &pWWN.str[0], LEN_WWN_ADDRESS); - memcpy (&entry->nWWN.str[0], &nWWN.str[0], LEN_WWN_ADDRESS); - strncpy (&entry->alias[0], alias, MAX_LEN_SYM_HOST_NAME); -- entry->alias[MAX_LEN_SYM_HOST_NAME] = '\0'; -+ entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0'; - } - } ---- graph.c 2006/01/26 12:47:15 1.1 -+++ graph.c 2006/01/26 12:47:54 -@@ -2635,7 +2635,7 @@ - Counter total; - SortedFcDomainStatsEntry fcDomainStats; - -- p[MAX_FC_DOMAINS+1] = 0; -+ p[MAX_FC_DOMAINS] = 0; - - hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId); - ---- fcReport.c 2006/03/20 13:55:38 1.1 -+++ fcReport.c 2006/03/20 13:59:50 -@@ -4066,7 +4066,7 @@ - char buf[LEN_GENERAL_WORK_BUFFER], sign; - char arrowGif, arrow[48], theAnchor[48]; - char htmlAnchor[64], htmlAnchor1[64]; -- char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[7][32]; -+ char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[15][32]; - char hostLinkBuf[LEN_GENERAL_WORK_BUFFER], - hostLinkBuf1[LEN_GENERAL_WORK_BUFFER]; - FCSession tmpTable, session; ---- Makefile.am 2006/04/03 09:09:17 1.1 -+++ Makefile.am 2006/04/03 09:09:40 -@@ -134,8 +134,7 @@ - ntop.c pbuf.c \ - plugin.c prefs.c protocols.c \ - sessions.c term.c util.c utildl.c \ -- traffic.c vendor.c version.c \ -- ntop_darwin.c -+ traffic.c vendor.c version.c - - libntop_la_DEPENDENCIES = myrrd/libmyrrd.la config.h - libntop_la_LIBADD = ---- plugins/Makefile.am.orig 2007-07-31 09:05:01.000000000 +0000 -+++ plugins/Makefile.am 2007-07-31 09:07:36.000000000 +0000 -@@ -95,7 +95,7 @@ - # - - --.libs/libicmpPlugin.so@SO_VERSION_PATCH@: -+.libs/libicmpPlugin.so@SO_VERSION_PATCH@: icmpPlugin.o - @if test -f libicmpPlugin_la-icmpPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ libicmpPlugin_la-icmpPlugin.o; \ - else \ -@@ -107,7 +107,7 @@ - - ############### - --.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: -+.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: lastSeenPlugin.o - @if test -f liblastSeenPlugin_la-lastSeenPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ liblastSeenPlugin_la-lastSeenPlugin.o; \ - else \ -@@ -119,7 +119,7 @@ - - ############### - --.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: -+.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: netflowPlugin.o - @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ - else \ -@@ -131,7 +131,7 @@ - - ############### - --.libs/libpdaPlugin.so@SO_VERSION_PATCH@: -+.libs/libpdaPlugin.so@SO_VERSION_PATCH@: pdaPlugin.o - @if test -f libpdaPlugin_la-pdaPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ libpdaPlugin_la-pdaPlugin.o; \ - else \ -@@ -143,7 +143,7 @@ - - ############### - --.libs/libremotePlugin.so@SO_VERSION_PATCH@: -+.libs/libremotePlugin.so@SO_VERSION_PATCH@: remotePlugin.o - @if test -f libremotePlugin_la-remotePlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremotePlugin.so@SO_VERSION_PATCH@ libremotePlugin_la-remotePlugin.o; \ - else \ -@@ -155,7 +155,7 @@ - - ############### - --.libs/librrdPlugin.so@SO_VERSION_PATCH@: -+.libs/librrdPlugin.so@SO_VERSION_PATCH@: rrdPlugin.o - @if test -f librrdPlugin_la-rrdPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ - else \ -@@ -167,7 +167,7 @@ - - ############### - --.libs/libsflowPlugin.so@SO_VERSION_PATCH@: -+.libs/libsflowPlugin.so@SO_VERSION_PATCH@: sflowPlugin.o - @if test -f libsflowPlugin_la-sflowPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ - else \ -@@ -179,7 +179,7 @@ - - ############### - --.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: -+.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: xmldumpPlugin.o - @if test -f libxmldumpPlugin_la-xmldumpPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpPlugin.so@SO_VERSION_PATCH@ libxmldumpPlugin_la-xmldumpPlugin.o; \ - else \ ---- pbuf.c.orig 2008-05-31 11:52:12.000000000 +0200 -+++ pbuf.c 2008-06-12 09:38:33.000000000 +0200 -@@ -3431,14 +3431,14 @@ - && (ipxBuffer[30] == 0x0) /* SAP Response (byte 0) / - && (ipxBuffer[31] == 0x02) / SAP Response (byte 1) /) { - u_int16_t serverType; -- char serverName[57]; -+ char serverName[MAX_LEN_SYM_HOST_NAME]; - int i, found; - - memcpy(&serverType, &ipxBuffer[32], 2); - serverType = ntohs(serverType); - -- memcpy(serverName, &ipxBuffer[34], 56); serverName[56] = '\0'; -- for(i=0; i<56; i++) -+ memcpy(serverName, &ipxBuffer[34], MAX_LEN_SYM_HOST_NAME); serverName[MAX_LEN_SYM_HOST_NAME-1] = '\0'; -+ for(i=0; i<MAX_LEN_SYM_HOST_NAME; i++) - if(serverName[i] == '!') { - serverName[i] = '\0'; - break; ---- globals-core.h.orig 2008-01-04 00:32:46.000000000 +0100 -+++ globals-core.h 2008-06-12 09:40:14.000000000 +0200 -@@ -256,10 +256,6 @@ - - #ifdef MAKE_WITH_SAFER_ROUTINES - --/ Fix to the free prototype courtesy of Tanner Lovelace <lovelace@opennms.org> / --/ Fix free() courtesy of Benoit Dolez <bdolez@exosec.fr> / --#define free(a) { void __t = (a); ntop_safefree((void*)&(__t), (char)__FILE__, (int)__LINE__); a = __t; } --extern void ntop_safefree(void *ptr, char file, int line); - #define malloc(sz) ntop_safemalloc((unsigned int)sz, (char)__FILE__, (int)__LINE__) - extern void ntop_safemalloc(unsigned int sz, char* file, int line); - #define calloc(c,sz) ntop_safecalloc(c, sz, (char*)__FILE__, (int)__LINE__)
[-] [+]	Deleted	ntop-3.3.diff ^
@@ -1,185 +0,0 @@ ---- ssl.c 2006/01/26 12:55:30 1.1 -+++ ssl.c 2006/01/26 12:55:59 -@@ -304,7 +304,7 @@ - int term_ssl_connection(int fd) { - int i, rc; - -- if(!myGlobals.sslInitialized) return; -+ if(!myGlobals.sslInitialized) return 0; - - for(i=0; i<MAX_SSL_CONNECTIONS; i++) { - if((myGlobals.ssl[i].ctx != NULL) ---- fcUtils.c 2006/01/26 12:45:23 1.1 -+++ fcUtils.c 2006/01/26 12:46:25 -@@ -654,6 +654,6 @@ - memcpy (&entry->pWWN.str[0], &pWWN.str[0], LEN_WWN_ADDRESS); - memcpy (&entry->nWWN.str[0], &nWWN.str[0], LEN_WWN_ADDRESS); - strncpy (&entry->alias[0], alias, MAX_LEN_SYM_HOST_NAME); -- entry->alias[MAX_LEN_SYM_HOST_NAME] = '\0'; -+ entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0'; - } - } ---- graph.c 2006/01/26 12:47:15 1.1 -+++ graph.c 2006/01/26 12:47:54 -@@ -2635,7 +2635,7 @@ - Counter total; - SortedFcDomainStatsEntry fcDomainStats; - -- p[MAX_FC_DOMAINS+1] = 0; -+ p[MAX_FC_DOMAINS] = 0; - - hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId); - ---- pbuf.c 2006/01/26 12:47:57 1.1 -+++ pbuf.c 2006/01/26 12:55:21 -@@ -3232,15 +3232,15 @@ - && (ipxBuffer[30] == 0x0) / SAP Response (byte 0) / - && (ipxBuffer[31] == 0x02) / SAP Response (byte 1) /) { - u_int16_t serverType; -- char serverName[57]; -+ char serverName[MAX_LEN_SYM_HOST_NAME]; - int i, found; - - memcpy(&serverType, &ipxBuffer[32], 2); - - serverType = ntohs(serverType); - -- memcpy(serverName, &ipxBuffer[34], 56); serverName[56] = '\0'; -- for(i=0; i<56; i++) -+ memcpy(serverName, &ipxBuffer[34], MAX_LEN_SYM_HOST_NAME); serverName[MAX_LEN_SYM_HOST_NAME-1] = '\0'; -+ for(i=0; i<MAX_LEN_SYM_HOST_NAME; i++) - if(serverName[i] == '!') { - serverName[i] = '\0'; - break; ---- traffic.c 2005/11/04 13:01:06 1.1 -+++ traffic.c 2005/11/04 13:05:28 -@@ -548,7 +548,7 @@ - / ******************************* / - - unsigned int matrixHostHash(HostTraffic host, int actualDeviceId, int rehash) { -- unsigned long hash; -+ unsigned long hash=0; - char tmpBuf[80], str; - int c; - ---- fcReport.c 2006/03/20 13:55:38 1.1 -+++ fcReport.c 2006/03/20 13:59:50 -@@ -4066,7 +4066,7 @@ - char buf[LEN_GENERAL_WORK_BUFFER], sign; - char arrowGif, arrow[48], theAnchor[48]; - char htmlAnchor[64], htmlAnchor1[64]; -- char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[7][32]; -+ char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[15][32]; - char hostLinkBuf[LEN_GENERAL_WORK_BUFFER], - hostLinkBuf1[LEN_GENERAL_WORK_BUFFER]; - FCSession tmpTable, session; ---- Makefile.am 2006/04/03 09:09:17 1.1 -+++ Makefile.am 2006/04/03 09:09:40 -@@ -134,8 +134,7 @@ - ntop.c pbuf.c \ - plugin.c prefs.c protocols.c \ - sessions.c term.c util.c utildl.c \ -- traffic.c vendor.c version.c \ -- ntop_darwin.c -+ traffic.c vendor.c version.c - - libntop_la_DEPENDENCIES = myrrd/libmyrrd.la config.h - libntop_la_LIBADD = ---- plugins/Makefile.am.orig 2007-07-31 09:05:01.000000000 +0000 -+++ plugins/Makefile.am 2007-07-31 09:07:36.000000000 +0000 -@@ -95,7 +95,7 @@ - # - - --.libs/libicmpPlugin.so@SO_VERSION_PATCH@: -+.libs/libicmpPlugin.so@SO_VERSION_PATCH@: icmpPlugin.o - @if test -f libicmpPlugin_la-icmpPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ libicmpPlugin_la-icmpPlugin.o; \ - else \ -@@ -107,7 +107,7 @@ - - ############### - --.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: -+.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: lastSeenPlugin.o - @if test -f liblastSeenPlugin_la-lastSeenPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ liblastSeenPlugin_la-lastSeenPlugin.o; \ - else \ -@@ -119,7 +119,7 @@ - - ############### - --.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: -+.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: netflowPlugin.o - @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ - else \ -@@ -131,7 +131,7 @@ - - ############### - --.libs/libpdaPlugin.so@SO_VERSION_PATCH@: -+.libs/libpdaPlugin.so@SO_VERSION_PATCH@: pdaPlugin.o - @if test -f libpdaPlugin_la-pdaPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ libpdaPlugin_la-pdaPlugin.o; \ - else \ -@@ -143,7 +143,7 @@ - - ############### - --.libs/libremotePlugin.so@SO_VERSION_PATCH@: -+.libs/libremotePlugin.so@SO_VERSION_PATCH@: remotePlugin.o - @if test -f libremotePlugin_la-remotePlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremotePlugin.so@SO_VERSION_PATCH@ libremotePlugin_la-remotePlugin.o; \ - else \ -@@ -155,7 +155,7 @@ - - ############### - --.libs/librrdPlugin.so@SO_VERSION_PATCH@: -+.libs/librrdPlugin.so@SO_VERSION_PATCH@: rrdPlugin.o - @if test -f librrdPlugin_la-rrdPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ - else \ -@@ -167,7 +167,7 @@ - - ############### - --.libs/libsflowPlugin.so@SO_VERSION_PATCH@: -+.libs/libsflowPlugin.so@SO_VERSION_PATCH@: sflowPlugin.o - @if test -f libsflowPlugin_la-sflowPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ - else \ -@@ -179,7 +179,7 @@ - - ############### - --.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: -+.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: xmldumpPlugin.o - @if test -f libxmldumpPlugin_la-xmldumpPlugin.o; then \ - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpPlugin.so@SO_VERSION_PATCH@ libxmldumpPlugin_la-xmldumpPlugin.o; \ - else \ ---- report.c.orig 2007-06-09 20:23:00.000000000 +0000 -+++ report.c 2007-07-31 11:50:30.000000000 +0000 -@@ -6712,7 +6712,7 @@ - - if((el == myGlobals.broadcastEntry) \|\| (el->hostNumIpAddress == NULL)) continue; - -- if((key == NULL) \|\| (key == "")) do_add = 1; -+ if((key == NULL) \|\| (key[0] == 0)) do_add = 1; - else if(strstr(el->hostNumIpAddress, key)) do_add = 1; - else if(strstr(el->ethAddressString, key)) do_add = 1; - else if(strstr(el->hostResolvedName, key)) do_add = 1; ---- globals-core.h 2007/08/07 07:35:21 1.1 -+++ globals-core.h 2007/08/07 07:35:44 -@@ -256,10 +256,6 @@ - - #ifdef MAKE_WITH_SAFER_ROUTINES - --/* Fix to the free prototype courtesy of Tanner Lovelace <lovelace@opennms.org> / --/ Fix free() courtesy of Benoit Dolez <bdolez@exosec.fr> / --#define free(a) { void __t = (a); ntop_safefree((void)&(__t), __FILE__, __LINE__); a = __t; } --extern void ntop_safefree(void ptr, char* file, int line); - #define malloc(sz) ntop_safemalloc(sz, __FILE__, __LINE__) - extern void* ntop_safemalloc(unsigned int sz, char* file, int line); - #define calloc(c,sz) ntop_safecalloc(c, sz, __FILE__, __LINE__)
[-] [+]	Deleted	ntop-338-339.diff ^
@@ -1,6947 +0,0 @@ -diff -uNr ntop-3.3.8/acinclude.m4 ntop-3.3.9/acinclude.m4 ---- ntop-3.3.8/acinclude.m4 2008-10-02 12:54:15.000000000 +0200 -+++ ntop-3.3.9/acinclude.m4 2008-12-03 23:00:22.000000000 +0100 -@@ -195,15 +195,15 @@ - ]) - - # libtool.m4 - Configure libtool for the host system. --Autoconf-- --## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, --## 2008 Free Software Foundation, Inc. -+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -+## Free Software Foundation, Inc. - ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 - ## - ## This file is free software; the Free Software Foundation gives - ## unlimited permission to copy and/or distribute it, with or without - ## modifications, as long as this notice is preserved. - --# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL -+# serial 48 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -291,6 +291,7 @@ - AC_REQUIRE([AC_OBJEXT])dnl - AC_REQUIRE([AC_EXEEXT])dnl - dnl -+ - AC_LIBTOOL_SYS_MAX_CMD_LEN - AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - AC_LIBTOOL_OBJDIR -@@ -365,7 +366,7 @@ - test -z "$ac_objext" && ac_objext=o - - # Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' - old_postinstall_cmds='chmod 644 $oldlib' - old_postuninstall_cmds= - -@@ -392,8 +393,6 @@ - ;; - esac - --_LT_REQUIRED_DARWIN_CHECKS -- - AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], - enable_win32_dll=yes, enable_win32_dll=no) -@@ -454,9 +453,8 @@ - # Check for compiler boilerplate output or warnings with - # the simple compiler test code. - AC_DEFUN([_LT_COMPILER_BOILERPLATE], --[AC_REQUIRE([LT_AC_PROG_SED])dnl --ac_outfile=conftest.$ac_objext --echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+[ac_outfile=conftest.$ac_objext -+printf "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null \| $SED '/^$/d; /^ +/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest -@@ -468,85 +466,13 @@ - # Check for linker boilerplate output or warnings with - # the simple link test code. - AC_DEFUN([_LT_LINKER_BOILERPLATE], --[AC_REQUIRE([LT_AC_PROG_SED])dnl --ac_outfile=conftest.$ac_objext --echo "$lt_simple_link_test_code" >conftest.$ac_ext -+[ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null \| $SED '/^$/d; /^ +/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm -r conftest -+$rm conftest* - ])# _LT_LINKER_BOILERPLATE - --# _LT_REQUIRED_DARWIN_CHECKS --# -------------------------- --# Check for some things on darwin --AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -- case $host_os in -- rhapsody* \| darwin) -- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -- AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -- -- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -- [lt_cv_apple_cc_single_mod=no -- if test -z "${LT_MULTI_MODULE}"; then -- # By default we will add the -single_module flag. You can override -- # by either setting the environment variable LT_MULTI_MODULE -- # non-empty at configure time, or by adding -multi_module to the -- # link flags. -- echo "int foo(void){return 1;}" > conftest.c -- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -- -dynamiclib ${wl}-single_module conftest.c -- if test -f libconftest.dylib; then -- lt_cv_apple_cc_single_mod=yes -- rm -rf libconftest.dylib -- fi -- rm conftest.c -- fi]) -- AC_CACHE_CHECK([for -exported_symbols_list linker flag], -- [lt_cv_ld_exported_symbols_list], -- [lt_cv_ld_exported_symbols_list=no -- save_LDFLAGS=$LDFLAGS -- echo "_main" > conftest.sym -- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -- [lt_cv_ld_exported_symbols_list=yes], -- [lt_cv_ld_exported_symbols_list=no]) -- LDFLAGS="$save_LDFLAGS" -- ]) -- case $host_os in -- rhapsody* \| darwin1.[[0123]]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -- darwin1.) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin) -- # if running on 10.5 or later, the deployment target defaults -- # to the OS version, if on x86, and 10.4, the deployment -- # target defaults to 10.4. Don't you love it? -- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,86-darwin8\|10.0,-darwin[[91]]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[[012]]) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- esac -- ;; -- esac -- if test "$lt_cv_apple_cc_single_mod" = "yes"; then -- _lt_dar_single_mod='$single_module' -- fi -- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -- else -- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -- fi -- if test "$DSYMUTIL" != ":"; then -- _lt_dsymutil="~$DSYMUTIL \$lib \|\| :" -- else -- _lt_dsymutil= -- fi -- ;; -- esac --]) - - # _LT_AC_SYS_LIBPATH_AIX - # ---------------------- -@@ -557,20 +483,12 @@ - # If we don't find anything, use the default library path according - # to the aix ld manual. - AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], --[AC_REQUIRE([LT_AC_PROG_SED])dnl --AC_LINK_IFELSE(AC_LANG_PROGRAM,[ --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 $.$$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null \| $SED -n -e "$lt_aix_libpath_sed"` -+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null \| $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 $.$$/\1/; p; } -+}'` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null \| $SED -n -e "$lt_aix_libpath_sed"` --fi],[]) -+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null \| $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 $.$$/\1/; p; } -+}'`; fi],[]) - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ])# _LT_AC_SYS_LIBPATH_AIX - -@@ -801,17 +719,13 @@ - rm -rf conftest - ;; - --x86_64-kfreebsd-gnu\|x86_64-linux\|ppc-linux\|powerpc-linux\| \ --s390-linux\|sparc-linux) -+x86_64-linux\|ppc-linux\|powerpc-linux\|s390-linux\|sparc-linux) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - 32-bit) - case $host in -- x86_64-kfreebsd-gnu) -- LD="${LD-ld} -m elf_i386_fbsd" -- ;; - x86_64-linux) - LD="${LD-ld} -m elf_i386" - ;; -@@ -828,9 +742,6 @@ - ;; - 64-bit) - case $host in -- x86_64-kfreebsd-gnu)
	Renamed	GeoIP.tar.bz2 ^
	Changed	GeoIPASNum.dat.gz ^
	Changed	GeoLiteCity.dat.gz ^
	Changed	ntop-3.3.10.tar.bz2 ^
	Deleted	ntop-3.3.7.tar.gz ^
	Deleted	ntop-3.3.8.tar.gz ^
	Deleted	ntop-3.3.tar.bz2 ^