commit ntop for openSUSE:Factory

16 Dec 2009

Hello community,

here is the log from the commit of package ntop for openSUSE:Factory
checked in at Wed Dec 16 15:30:43 CET 2009.



--------

--- ntop/ntop.changes	2009-08-13 15:08:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntop/ntop.changes	2009-11-03 20:21:04.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov  3 19:09:34 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ntop.spec ++++++
--- /var/tmp/diff_new_pack.B1QT1o/_old	2009-12-16 15:28:49.000000000 +0100
+++ /var/tmp/diff_new_pack.B1QT1o/_new	2009-12-16 15:28:49.000000000 +0100
@@ -44,11 +44,11 @@
 %endif
 %endif
 %endif
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Networking/Diagnostic
 AutoReqProv:    on
 Version:        3.3.10
-Release:        1
+Release:        2
 #
 %define pkg_name ntop
 %define pkg_user ntop


++++++ ntop-3.3.10.diff ++++++
--- /var/tmp/diff_new_pack.B1QT1o/_old	2009-12-16 15:28:49.000000000 +0100
+++ /var/tmp/diff_new_pack.B1QT1o/_new	2009-12-16 15:28:49.000000000 +0100
@@ -1,16 +1,21 @@
---- fcUtils.c	2006/01/26 12:45:23	1.1
-+++ fcUtils.c	2006/01/26 12:46:25
-@@ -654,6 +654,6 @@
+Index: fcUtils.c
+===================================================================
+--- fcUtils.c.orig
++++ fcUtils.c
+@@ -657,6 +657,7 @@ void processFcNSCacheFile(char *filename
      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';
    }
++  fclose(fd);
  }
---- graph.c	2009/08/13 11:51:16	1.1
-+++ graph.c	2009/08/13 11:51:54
-@@ -1508,13 +1508,11 @@
+Index: graph.c
+===================================================================
+--- graph.c.orig
++++ graph.c
+@@ -1508,13 +1508,11 @@ void drawVsanSwilsProtoDistribution(u_sh
  void drawVsanDomainTrafficDistribution(u_short vsanId, u_char dataSent) {
    int i, idx=0, numEntries = 0;
    FcFabricElementHash *hash;
@@ -25,9 +30,11 @@
    hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId);
  
    if (hash == NULL) {
---- pbuf.c.orig	2009-05-06 14:55:22.000000000 +0000
-+++ pbuf.c	2009-08-05 09:06:35.000000000 +0000
-@@ -3447,14 +3447,14 @@
+Index: pbuf.c
+===================================================================
+--- pbuf.c.orig
++++ pbuf.c
+@@ -3447,14 +3447,14 @@ void processPacket(u_char *_deviceId,
  		 && (ipxBuffer[30] == 0x0)  /* SAP Response (byte 0) */
  		 && (ipxBuffer[31] == 0x02) /* SAP Response (byte 1) */) {
  		u_int16_t serverType;
@@ -45,7 +52,7 @@
  		  if(serverName[i] == '!') {
  		    serverName[i] = '\0';
  		    break;
-@@ -3622,7 +3622,7 @@
+@@ -3622,7 +3622,7 @@ void processPacket(u_char *_deviceId,
  		    memcpy(nodeName, &p1[7+p1[5+displ]+displ], p1[6+p1[5+displ]+displ]);
  		    nodeName[p1[6+p1[5+displ]]] = '\0';
  
@@ -54,9 +61,11 @@
  		      if((srcHost->nonIPTraffic->atNodeType[i] == NULL)
  			 || (strcmp(srcHost->nonIPTraffic->atNodeType[i], nodeName) == 0))
  			break;
---- fcReport.c	2006/03/20 13:55:38	1.1
-+++ fcReport.c	2006/03/20 13:59:50
-@@ -4066,7 +4066,7 @@
+Index: fcReport.c
+===================================================================
+--- fcReport.c.orig
++++ fcReport.c
+@@ -4072,7 +4072,7 @@ void printFCSessions (int actualDeviceId
    char buf[LEN_GENERAL_WORK_BUFFER], *sign;
    char *arrowGif, *arrow[48], *theAnchor[48];
    char htmlAnchor[64], htmlAnchor1[64];
@@ -65,21 +74,49 @@
    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         \
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
+@@ -73,12 +73,9 @@ ETTER_PASSIVE = $(ETTER_PASSIVE_FILE).gz
+ ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share"
+ ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD"
+ 
+-NTOPDATA = ntop-cert.pem \
+-           $(ETTER_PASSIVE) \
++NTOPDATA = $(ETTER_PASSIVE) \
+            oui.txt.gz \
+-           specialMAC.txt.gz \
+-	   GeoIPASNum.dat \
+-	   GeoLiteCity.dat
++           specialMAC.txt.gz
+ 
+ NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
+            html/*.css html/*.dtd \
+@@ -136,8 +133,7 @@ libntop_la_SOURCES = address.c    argv.c
+                      ntop.c       pbuf.c        database.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 @@
+ libntop_la_DEPENDENCIES =  config.h
+ libntop_la_LIBADD       = $(BASE_LIBS)
+@@ -270,8 +266,6 @@ libclean:
+ 
+ install: install-recursive
+ 
+-	cd @GEO_DIR@; make install
+-
+ 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
+ 
+ 	@echo ""
+Index: plugins/Makefile.am
+===================================================================
+--- plugins/Makefile.am.orig
++++ plugins/Makefile.am
+@@ -89,7 +89,7 @@ libsflowPlugin_la_CFLAGS = $(AM_CFLAGS)
  #
  
  
@@ -88,7 +125,7 @@
  	@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 @@
+@@ -101,7 +101,7 @@ icmpPlugin.so$(EXEEXT): .libs/libicmpPlu
  
  ###############
  
@@ -97,7 +134,7 @@
  	@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 @@
+@@ -113,7 +113,7 @@ lastSeenPlugin.so$(EXEEXT): .libs/liblas
  
  ###############
  
@@ -106,7 +143,7 @@
  	@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 \
-@@ -155,7 +155,7 @@
+@@ -137,7 +137,7 @@ cpacketPlugin.so$(EXEEXT): .libs/libcpac
  
  ###############
  
@@ -115,7 +152,7 @@
  	@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 @@
+@@ -149,7 +149,7 @@ rrdPlugin.so$(EXEEXT): .libs/librrdPlugi
  
  ###############
  
@@ -124,7 +161,7 @@
  	@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 @@
+@@ -161,7 +161,7 @@ sflowPlugin.so$(EXEEXT): .libs/libsflowP
  
  ###############
  
@@ -133,9 +170,11 @@
  	@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 \
---- plugins/rrdPlugin.c	2009/08/06 12:24:07	1.1
-+++ plugins/rrdPlugin.c	2009/08/06 12:24:15
-@@ -5035,7 +5035,7 @@
+Index: plugins/rrdPlugin.c
+===================================================================
+--- plugins/rrdPlugin.c.orig
++++ plugins/rrdPlugin.c
+@@ -5035,7 +5035,7 @@ static void* rrdTrafficThreadLoop(void*
    traceEvent(CONST_TRACE_INFO,
               "THREADMGMT[t%lu]: RRD: Throughput data collection: Thread terminated [p%d]",
               pthread_self(), getpid());
@@ -144,9 +183,11 @@
  }
  
  /* ****************************** */
---- globals-core.h.orig	2009-04-17 11:58:52.000000000 +0000
-+++ globals-core.h	2009-08-05 09:11:45.000000000 +0000
-@@ -254,10 +254,6 @@
+Index: globals-core.h
+===================================================================
+--- globals-core.h.orig
++++ globals-core.h
+@@ -254,10 +254,6 @@ extern void allocDeviceMemory(int device
  
  #ifdef MAKE_WITH_SAFER_ROUTINES
  
@@ -157,9 +198,11 @@
  #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__)
---- configure.in	2009-05-06 14:55:22.000000000 +0000
-+++ configure.in.new	2009-07-21 08:17:33.000000000 +0000
-@@ -1652,22 +1652,22 @@
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -1652,22 +1652,22 @@ fi
  dnl>
  dnl> Lua - http://www.lua.org
  dnl>
@@ -198,7 +241,7 @@
  AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
  
  dnl>
-@@ -1963,39 +1963,39 @@
+@@ -1963,39 +1963,39 @@ else
  fi
  
  dnl> GeoIP (http://www.maxmind.com/)
@@ -269,9 +312,11 @@
  
  dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
  
---- autogen.sh	2009/08/05 08:56:13	1.1
-+++ autogen.sh	2009/08/05 08:56:34
-@@ -247,15 +247,15 @@
+Index: autogen.sh
+===================================================================
+--- autogen.sh.orig
++++ autogen.sh
+@@ -244,15 +244,15 @@ AUTOCONF=`find_command 'autoconf*'`
    GNU_OR_DIE=0
  }
  
@@ -296,37 +341,3 @@
  
  if test "$GNU_OR_DIE" -eq 0; then
    exit 1
---- Makefile.am.orig	2009-04-17 20:27:57.000000000 +0000
-+++ Makefile.am	2009-08-05 14:07:49.000000000 +0000
-@@ -73,12 +73,9 @@
- ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share"
- ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD"
- 
--NTOPDATA = ntop-cert.pem \
--           $(ETTER_PASSIVE) \
-+NTOPDATA = $(ETTER_PASSIVE) \
-            oui.txt.gz \
--           specialMAC.txt.gz \
--	   GeoIPASNum.dat \
--	   GeoLiteCity.dat
-+           specialMAC.txt.gz
- 
- NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
-            html/*.css html/*.dtd \
-@@ -270,8 +266,6 @@
- 
- install: install-recursive
- 
--	cd @GEO_DIR@; make install
--
- 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
- 
- 	@echo ""
---- fcUtils.c	2009/08/06 13:13:40	1.1
-+++ fcUtils.c	2009/08/06 13:13:51
-@@ -659,4 +659,5 @@
-     strncpy (&entry->alias[0], alias, MAX_LEN_SYM_HOST_NAME);
-     entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0';
-   }
-+  fclose(fd);
- }

++++++ rrdPlugin.diff ++++++
--- /var/tmp/diff_new_pack.B1QT1o/_old	2009-12-16 15:28:49.000000000 +0100
+++ /var/tmp/diff_new_pack.B1QT1o/_new	2009-12-16 15:28:49.000000000 +0100
@@ -1,12 +1,13 @@
---- plugins/rrdPlugin.c	2005/12/06 13:39:48	1.1
-+++ plugins/rrdPlugin.c	2005/12/06 13:42:57
-@@ -3033,7 +3033,7 @@
+Index: plugins/rrdPlugin.c
+===================================================================
+--- plugins/rrdPlugin.c.orig
++++ plugins/rrdPlugin.c
+@@ -4982,7 +4982,7 @@ static void rrdUpdateFcHostStats (HostTr
  
  /* ****************************** */
  
 -static void* rrdTrafficThreadLoop(void* notUsed _UNUSED_) {
 +static void rrdTrafficThreadLoop(void* notUsed _UNUSED_) {
  
-   traceEvent(CONST_TRACE_INFO, 
+   traceEvent(CONST_TRACE_INFO,
               "THREADMGMT[t%lu]: RRD: Throughput data collection: Thread starting [p%d]",
-


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit ntop for openSUSE:Factory

root＠Hilbert.suse.de