commit ntop

Hello community, here is the log from the commit of package ntop checked in at Fri Aug 3 01:58:57 CEST 2007. -------- --- ntop/ntop.changes 2007-07-26 16:56:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntop/ntop.changes 2007-08-01 12:20:11.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 1 12:19:04 CEST 2007 - bg@suse.de + +- update to version 3.3 (mainly bugfixes and automake changes) +- fix some rpmlint warnings + +------------------------------------------------------------------- Old: ---- myrrd.diff ntop-3.2.diff ntop-3.2.tar.bz2 sflow.diff New: ---- libtool.diff ntop-3.3.diff ntop-3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntop.spec ++++++ --- /var/tmp/diff_new_pack.V25535/_old 2007-08-03 01:55:34.000000000 +0200 +++ /var/tmp/diff_new_pack.V25535/_new 2007-08-03 01:55:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ntop (Version 3.2) +# spec file for package ntop (Version 3.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,24 +11,23 @@ # norootforbuild Name: ntop -BuildRequires: freetype2-devel gcc-c++ gd-devel gdbm-devel libjpeg-devel libpcap-devel libpng-devel lsof mysql-devel openssl-devel readline-devel rrdtool-devel xorg-x11-devel +BuildRequires: dos2unix fdupes freetype2-devel gcc-c++ gd-devel gdbm-devel libart_lgpl-devel libjpeg-devel libpcap-devel libpng-devel lsof mysql-devel net-snmp-devel openssl-devel readline-devel rrdtool-devel xorg-x11-devel License: GPL v2 or later Group: Productivity/Networking/Diagnostic -PreReq: %fillup_prereq %insserv_prereq /bin/cat +PreReq: %fillup_prereq %insserv_prereq /bin/cat sysconfig Autoreqprov: on -Version: 3.2 -Release: 95 +Version: 3.3 +Release: 1 Summary: Web-Based Network Traffic Monitor Source: %{name}-%{version}.tar.bz2 Source2: rcntop Source3: rc.config.ntop Source4: passcheck.c Source5: README.SuSE -Patch: ntop-3.2.diff -Patch1: sflow.diff +Patch: ntop-%{version}.diff Patch2: rrdPlugin.diff -Patch3: myrrd.diff Patch4: dotpath.diff +Patch5: libtool.diff URL: http://www.ntop.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,16 +44,16 @@ %prep %setup -q -n %{name}-%{version} %patch -%patch1 %patch2 -%patch3 %patch4 +%patch5 %build %{?suse_update_config:%{suse_update_config -f gdchart* ntop . }} -autoconf # ntop wants to setup the files for the newer autoconf itself: -NTOP_AUTOREBUILD=yes ./configure || echo "new autoconf prepared" +aclocal +./autogen.sh +# NTOP_AUTOREBUILD=yes ./configure || echo "new autoconf prepared" # now we are ready for the real configure... CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H" \ ./configure \ @@ -96,6 +95,11 @@ cp %SOURCE5 . find $RPM_BUILD_ROOT/usr/share/ntop/html -type f -print0 | xargs -0 chmod 644 +%fdupes $RPM_BUILD_ROOT/usr/share/ntop/html/ +find $RPM_BUILD_ROOT -name "*.la" | xargs rm +rm docs/ntop-autotools.vsd +dos2unix docs/RedHat-rpmbuild-HOWTO.txt + %post # Are we in update mode? if [ ${1:-0} -gt 1 ]; then @@ -105,6 +109,7 @@ fi fi chown wwwrun:www /usr/share/ntop /var/lib/ntop +etc/sysconfig/network/scripts/hwdesc2iface etc/sysconfig/ntop NTOPD_IFACE %run_ldconfig %{fillup_and_insserv -n ntop ntop } @@ -121,9 +126,6 @@ %doc SUPPORT_NTOP.txt THANKS README.SuSE %config /etc/init.d/ntop /usr/bin/ntop -%{_libdir}/libntopreport.la -%{_libdir}/libntop.la -%{_libdir}/libmyrrd.la %{_libdir}/lib*.so /usr/sbin/rcntop /usr/sbin/passcheck @@ -144,6 +146,9 @@ %changelog +* Wed Aug 01 2007 - bg@suse.de +- update to version 3.3 (mainly bugfixes and automake changes) +- fix some rpmlint warnings * Thu Jul 26 2007 - prusnak@suse.cz - changed libpcap to libpcap-devel in BuildRequires * Thu Jun 21 2007 - dmueller@suse.de ++++++ dotpath.diff ++++++ --- /var/tmp/diff_new_pack.V25535/_old 2007-08-03 01:55:35.000000000 +0200 +++ /var/tmp/diff_new_pack.V25535/_new 2007-08-03 01:55:35.000000000 +0200 @@ -1,11 +1,11 @@ --- report.c +++ report.c -@@ -2213,7 +2213,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 */ - } - +@@ -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 */ + } + ++++++ libtool.diff ++++++ --- 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" ++++++ ntop-3.2.diff -> ntop-3.3.diff ++++++ --- ntop/ntop-3.2.diff 2006-04-03 11:18:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntop/ntop-3.3.diff 2007-07-31 14:05:58.000000000 +0200 @@ -62,50 +62,17 @@ char tmpBuf[80], *str; int c; ---- report.c 2005/11/04 12:35:16 1.1 -+++ report.c 2005/11/04 12:36:49 -@@ -2166,7 +2166,7 @@ - - /* ****************************************************************** */ - --static makeHostName(HostTraffic *el, char *buf, int len) { -+static void makeHostName(HostTraffic *el, char *buf, int len) { - if(el->hostResolvedName[0] != '\0') strcpy(buf, el->hostResolvedName); - else if(el->hostNumIpAddress[0] != '\0') strcpy(buf, el->hostNumIpAddress); - else if(el->ethAddressString[0] != '\0') strcpy(buf, el->ethAddressString); ---- http.c 2005/11/04 12:37:06 1.1 -+++ http.c 2005/11/04 12:40:22 -@@ -1044,7 +1044,7 @@ - disconnected client is still sending */) { - traceEvent(CONST_TRACE_ERROR, "EBADF during sending of page to web client"); - } else { -- traceEvent(CONST_TRACE_ERROR, "errno %d during sending of page to web client"); -+ traceEvent(CONST_TRACE_ERROR, "errno %d during sending of page to web client",errno); - } - - traceEvent(CONST_TRACE_VERYNOISY, "Failed text was %d bytes, '%s'", strlen(theString), theString); ---- globals-core.h 2005/11/04 12:28:55 1.1 -+++ globals-core.h 2005/11/04 12:29:53 -@@ -260,8 +260,6 @@ - #ifdef MAKE_WITH_SAFER_ROUTINES - - /* Fix to the free prototype courtesy of Tanner Lovelace */ --#define free(a) ntop_safefree((void**)&(a), __FILE__, __LINE__) --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__) --- fcReport.c 2006/03/20 13:55:38 1.1 +++ fcReport.c 2006/03/20 13:59:50 -@@ -4057,7 +4057,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; +@@ -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 @@ @@ -118,32 +85,88 @@ libntop_la_DEPENDENCIES = myrrd/libmyrrd.la config.h libntop_la_LIBADD = ---- Makefile.in 2006/04/03 09:09:17 1.1 -+++ Makefile.in 2006/04/03 09:10:00 -@@ -97,7 +97,7 @@ - getopt.lo getopt1.lo globals-core.lo hash.lo iface.lo \ - initialize.lo leaks.lo ntop.lo pbuf.lo plugin.lo prefs.lo \ - protocols.lo sessions.lo term.lo util.lo utildl.lo traffic.lo \ -- vendor.lo version.lo ntop_darwin.lo -+ vendor.lo version.lo - libntop_la_OBJECTS = $(am_libntop_la_OBJECTS) - am_libntopreport_la_OBJECTS = emitter.lo globals-report.lo graph.lo \ - fcReport.lo http.lo report.lo reportUtils.lo ssl.lo \ -@@ -357,8 +357,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 = -@@ -556,7 +555,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntop-admin.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntop-main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntop.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntop_darwin.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pbuf.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdaPlugin.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@ +--- 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; ++++++ ntop-3.2.tar.bz2 -> ntop-3.3.tar.bz2 ++++++ ++++ 205050 lines of diff (skipped) ++++++ rcntop ++++++ --- ntop/rcntop 2006-01-15 18:00:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntop/rcntop 2007-07-31 14:47:33.000000000 +0200 @@ -11,6 +11,7 @@ # Required-Stop: $network # Default-Start: 3 5 # Default-Stop: 0 1 2 6 +# Short-Description: ntop Network Monitor # Description: Tool for monitoring the network usage. ### END INIT INFO PROGRAM=/usr/bin/ntop @@ -31,12 +32,6 @@ NTOP_OPTIONS="-P /var/lib/ntop" # define the NTOP_IFACE if [ -n "$NTOPD_IFACE" ]; then - # It might be necessary to convert the "configuration - # name" (as in /etc/sysconfig/network/ifcfg-*) into the - # "interface name" (like eth*) - if [ -x /sbin/getcfg-interface ]; then - NTOPD_IFACE=$(/sbin/getcfg-interface $NTOPD_IFACE) - fi NTOP_OPTIONS="$NTOP_OPTIONS -i $NTOPD_IFACE" else rc_failed 6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org