From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 18 02:50:02 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A53EE16A404 for ; Wed, 18 Jul 2007 02:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 80DAF13C4DD for ; Wed, 18 Jul 2007 02:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l6I2o24C022656 for ; Wed, 18 Jul 2007 02:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l6I2o2mV022655; Wed, 18 Jul 2007 02:50:02 GMT (envelope-from gnats) Resent-Date: Wed, 18 Jul 2007 02:50:02 GMT Resent-Message-Id: <200707180250.l6I2o2mV022655@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Wesley Shields Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F82516A401 for ; Wed, 18 Jul 2007 02:46:43 +0000 (UTC) (envelope-from wxs@atarininja.org) Received: from syn.atarininja.org (syn.csh.rit.edu [129.21.60.158]) by mx1.freebsd.org (Postfix) with ESMTP id D157113C4BE for ; Wed, 18 Jul 2007 02:46:42 +0000 (UTC) (envelope-from wxs@atarininja.org) Received: by syn.atarininja.org (Postfix, from userid 1001) id 386AB5C5A; Tue, 17 Jul 2007 22:54:19 -0400 (EDT) Message-Id: <20070718025419.386AB5C5A@syn.atarininja.org> Date: Tue, 17 Jul 2007 22:54:19 -0400 (EDT) From: Wesley Shields To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/114681: [MAINTAINER PATCH]: Update net/ntop X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Wesley Shields List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2007 02:50:02 -0000 >Number: 114681 >Category: ports >Synopsis: [MAINTAINER PATCH]: Update net/ntop >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 18 02:50:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Wesley Shields >Release: FreeBSD 6.2-RELEASE-p5 amd64 >Organization: >Environment: System: FreeBSD syn.csh.rit.edu 6.2-RELEASE-p5 FreeBSD 6.2-RELEASE-p5 #7: Thu May 24 09:18:59 EDT 2007 root@syn.csh.rit.edu:/usr/obj/usr/src/sys/SMP amd64 >Description: - Update to version 3.3 - General cleanup of the port - XMLDUMP option now works The patch adds the following files: files/patch-Makefile.am files/patch-configure.in files/patch-libtool.m4.in The patch removes the following files: files/patch-Makefile.in files/patch-configure files/patch-ntop.h files/patch-util.c >How-To-Repeat: N/A >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/ntop/Makefile,v retrieving revision 1.61 diff -u -r1.61 Makefile --- Makefile 25 May 2007 22:11:39 -0000 1.61 +++ Makefile 18 Jul 2007 00:04:11 -0000 @@ -6,35 +6,31 @@ # PORTNAME= ntop -PORTVERSION= 3.2 -PORTREVISION= 5 +PORTVERSION= 3.3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/} -EXTRACT_SUFX= .tgz MAINTAINER= wxs@atarininja.org COMMENT= Network monitoring tool with command line and web interfaces +BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ gdbm.3:${PORTSDIR}/databases/gdbm \ png.5:${PORTSDIR}/graphics/png - RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz \ - ${X11BASE}/lib/X11/fonts/URW/a010013l.afm:${PORTSDIR}/x11-fonts/urwfonts + ${LOCALBASE}/lib/X11/fonts/URW/a010013l.afm:${PORTSDIR}/x11-fonts/urwfonts DBDIR?= /var/db -USE_AUTOTOOLS= libtool:15 -USE_GETOPT_LONG=yes +USE_AUTOTOOLS= libtool:15 automake:19 autoconf:259 USE_GNOME= libxml2 USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= DBDIR=${DBDIR} \ - SHLIB=${PORTVERSION:S/.p/pre/} + PORTVERSION=${PORTVERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DBDIR} \ --with-ossl-root=${OPENSSLBASE} \ @@ -86,7 +82,6 @@ .endif .if defined(WITH_XMLDUMP) -BROKEN= Does not build with XML dump support LIB_DEPENDS+= gdome.8:${PORTSDIR}/textproc/gdome2 CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libxml2 \ -I${LOCALBASE}/include/libxml2/libxml \ @@ -104,6 +99,9 @@ post-extract: @${RM} ${WRKSRC}/configureextra/FREEBSD +pre-configure: + @cd ${WRKSRC} && ${SH} autogen.sh --noconfig + post-install: @${MKDIR} ${DBDIR}/ntop @${CHOWN} -R nobody:nobody ${DBDIR}/ntop Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/ntop/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo 25 Nov 2005 16:48:15 -0000 1.13 +++ distinfo 18 Jul 2007 00:04:11 -0000 @@ -1,3 +1,3 @@ -MD5 (ntop-3.2.tgz) = cd29a876b34a7dd76555e9acd8f160bb -SHA256 (ntop-3.2.tgz) = 5b639dbcb3c8bf77824cf8aaed168864f69730b2ef41dc68d2db22b205c586d8 -SIZE (ntop-3.2.tgz) = 3910593 +MD5 (ntop-3.3.tar.gz) = a0e52a85587c8a5519d822d04862dab4 +SHA256 (ntop-3.3.tar.gz) = e849dabe0ac1ff006e487aef7b78fe06864b8d74a7b789fe6c7b8e258b7f361c +SIZE (ntop-3.3.tar.gz) = 3709605 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/ntop/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- pkg-plist 22 Mar 2006 19:25:52 -0000 1.10 +++ pkg-plist 18 Jul 2007 00:04:11 -0000 @@ -7,52 +7,58 @@ etc/ntop/p2c.opt.table.gz etc/ntop/specialMAC.txt.gz @dirrm etc/ntop -lib/libicmpPlugin-%%SHLIB%%.so +lib/libicmpPlugin-%%PORTVERSION%% +lib/libicmpPlugin lib/libicmpPlugin.a -lib/libicmpPlugin.so -lib/liblastSeenPlugin-%%SHLIB%%.so +lib/liblastSeenPlugin-%%PORTVERSION%% +lib/liblastSeenPlugin lib/liblastSeenPlugin.a -lib/liblastSeenPlugin.so -lib/libmyrrd.so -lib/libmyrrd-%%SHLIB%%.so -lib/libmyrrd.a -lib/libmyrrd.la -lib/libnetflowPlugin-%%SHLIB%%.so +lib/libnetflowPlugin-%%PORTVERSION%% +lib/libnetflowPlugin lib/libnetflowPlugin.a -lib/libnetflowPlugin.so -lib/libntop-%%SHLIB%%.so +lib/libntop-%%PORTVERSION%% +lib/libntop lib/libntop.a lib/libntop.la -lib/libntop.so -lib/libntopreport-%%SHLIB%%.so +lib/libntopreport-%%PORTVERSION%% +lib/libntopreport lib/libntopreport.a lib/libntopreport.la -lib/libntopreport.so -lib/libpdaPlugin-%%SHLIB%%.so +lib/libpdaPlugin-%%PORTVERSION%% +lib/libpdaPlugin lib/libpdaPlugin.a -lib/libpdaPlugin.so -lib/librrdPlugin-%%SHLIB%%.so +lib/libremotePlugin-%%PORTVERSION%% +lib/libremotePlugin +lib/libremotePlugin.a +lib/librrdPlugin-%%PORTVERSION%% +lib/librrdPlugin lib/librrdPlugin.a -lib/librrdPlugin.so -lib/libsflowPlugin-%%SHLIB%%.so +lib/libsflowPlugin-%%PORTVERSION%% +lib/libsflowPlugin lib/libsflowPlugin.a -lib/libsflowPlugin.so -lib/libsnmpPlugin.so -lib/libsnmpPlugin-%%SHLIB%%.so -lib/libsnmpPlugin.a -lib/libxmldumpPlugin-%%SHLIB%%.so -lib/libxmldumpPlugin.a -lib/libxmldumpPlugin.so lib/ntop/plugins/icmpPlugin.so lib/ntop/plugins/lastSeenPlugin.so lib/ntop/plugins/netflowPlugin.so lib/ntop/plugins/pdaPlugin.so +lib/ntop/plugins/remotePlugin.so lib/ntop/plugins/rrdPlugin.so lib/ntop/plugins/sflowPlugin.so -lib/ntop/plugins/snmpPlugin.so -lib/ntop/plugins/xmldumpPlugin.so @dirrm lib/ntop/plugins @dirrm lib/ntop +%%DATADIR%%/html/autosuggest.js +%%DATADIR%%/html/calendar-setup.js +%%DATADIR%%/html/calendar.js +%%DATADIR%%/html/domLib.js +%%DATADIR%%/html/domTT.js +%%DATADIR%%/html/zoom.js +%%DATADIR%%/html/calendar.gif +%%DATADIR%%/html/edit.gif +%%DATADIR%%/html/graph_zoom.gif +%%DATADIR%%/html/marker.gif +%%DATADIR%%/html/skype.gif +%%DATADIR%%/html/external.png +%%DATADIR%%/html/marker.png +%%DATADIR%%/html/autosuggest.css %%DATADIR%%/html/JSCookMenu.js %%DATADIR%%/html/theme.js %%DATADIR%%/html/arrow.gif @@ -69,7 +75,6 @@ %%DATADIR%%/html/arrow_down.gif %%DATADIR%%/html/arrow_up.gif %%DATADIR%%/html/back.gif -%%DATADIR%%/html/bar.gif %%DATADIR%%/html/bg_line.gif %%DATADIR%%/html/black.gif %%DATADIR%%/html/bottom_corner.gif @@ -82,7 +87,6 @@ %%DATADIR%%/html/clear.gif %%DATADIR%%/html/clock.gif %%DATADIR%%/html/collapsed.gif -%%DATADIR%%/html/copyright.png %%DATADIR%%/html/corner.gif %%DATADIR%%/html/deleteURL.gif %%DATADIR%%/html/deleteUser.gif @@ -113,11 +117,7 @@ %%DATADIR%%/html/mail.gif %%DATADIR%%/html/major.gif %%DATADIR%%/html/marchio_unipi_pant541_144.gif -%%DATADIR%%/html/menubar.png -%%DATADIR%%/html/menubar_j.png -%%DATADIR%%/html/menuline.png %%DATADIR%%/html/minor.gif -%%DATADIR%%/html/modifyUser.gif %%DATADIR%%/html/multihomed.gif %%DATADIR%%/html/multivlaned.gif %%DATADIR%%/html/nboxLogo.gif @@ -126,7 +126,6 @@ %%DATADIR%%/html/ntopdump.dtd %%DATADIR%%/html/ntophelp.html %%DATADIR%%/html/p2p.gif -%%DATADIR%%/html/pie-error.png %%DATADIR%%/html/phone.gif %%DATADIR%%/html/printer.gif %%DATADIR%%/html/privacyNotice.html @@ -380,6 +379,49 @@ %%DATADIR%%/html/web.gif %%DATADIR%%/html/wheel.gif %%DATADIR%%/html/white_bg.gif +%%DATADIR%%/html/PlotKit/Base.js +%%DATADIR%%/html/PlotKit/Canvas.js +%%DATADIR%%/html/PlotKit/EasyPlot.js +%%DATADIR%%/html/PlotKit/Layout.js +%%DATADIR%%/html/PlotKit/PlotKit.js +%%DATADIR%%/html/PlotKit/PlotKit_Packed.js +%%DATADIR%%/html/PlotKit/SVG.js +%%DATADIR%%/html/PlotKit/SweetCanvas.js +%%DATADIR%%/html/PlotKit/SweetSVG.js +%%DATADIR%%/html/PlotKit/excanvas.js +%%DATADIR%%/html/MochiKit/Async.js +%%DATADIR%%/html/MochiKit/Base.js +%%DATADIR%%/html/MochiKit/Color.js +%%DATADIR%%/html/MochiKit/DOM.js +%%DATADIR%%/html/MochiKit/DateTime.js +%%DATADIR%%/html/MochiKit/Format.js +%%DATADIR%%/html/MochiKit/Iter.js +%%DATADIR%%/html/MochiKit/Logging.js +%%DATADIR%%/html/MochiKit/LoggingPane.js +%%DATADIR%%/html/MochiKit/MochiKit.js +%%DATADIR%%/html/MochiKit/MockDOM.js +%%DATADIR%%/html/MochiKit/Signal.js +%%DATADIR%%/html/MochiKit/Test.js +%%DATADIR%%/html/MochiKit/Visual.js +%%DATADIR%%/html/MochiKit/__package__.js +%%DATADIR%%/html/img_inquisitor/as_pointer.gif +%%DATADIR%%/html/img_inquisitor/hl_corner_bl.gif +%%DATADIR%%/html/img_inquisitor/hl_corner_br.gif +%%DATADIR%%/html/img_inquisitor/hl_corner_tl.gif +%%DATADIR%%/html/img_inquisitor/hl_corner_tr.gif +%%DATADIR%%/html/img_inquisitor/ul_corner_bl.gif +%%DATADIR%%/html/img_inquisitor/ul_corner_br.gif +%%DATADIR%%/html/img_inquisitor/ul_corner_tl.gif +%%DATADIR%%/html/img_inquisitor/ul_corner_tr.gif +%%DATADIR%%/html/jscalendar/calendar-load.js +%%DATADIR%%/html/jscalendar/calendar-setup.js +%%DATADIR%%/html/jscalendar/calendar.js +%%DATADIR%%/html/jscalendar/lang/calendar-en.js +@dirrm %%DATADIR%%/html/jscalendar/lang +@dirrm %%DATADIR%%/html/jscalendar +@dirrm %%DATADIR%%/html/img_inquisitor +@dirrm %%DATADIR%%/html/MochiKit +@dirrm %%DATADIR%%/html/PlotKit @dirrm %%DATADIR%%/html/statsicons/flags @dirrm %%DATADIR%%/html/statsicons/os @dirrm %%DATADIR%%/html/statsicons Index: files/patch-Makefile.am =================================================================== RCS file: files/patch-Makefile.am diff -N files/patch-Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile.am 18 Jul 2007 00:04:11 -0000 @@ -0,0 +1,10 @@ +--- ./Makefile.am.orig Sat Jun 9 17:15:11 2007 ++++ ./Makefile.am Tue Jul 17 12:37:26 2007 +@@ -360,7 +360,6 @@ + done + + install-data-local: ntop.txt ntop.html faq.html +- @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins; + @if ! test -d $(DESTDIR)/$(datadir)/ntop; then \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \ + touch $(DESTDIR)/$(datadir)/ntop/warnuser; \ Index: files/patch-Makefile.in =================================================================== RCS file: files/patch-Makefile.in diff -N files/patch-Makefile.in --- files/patch-Makefile.in 25 May 2007 22:11:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- Makefile.in.orig Mon May 14 22:53:04 2007 -+++ Makefile.in Mon May 14 22:53:19 2007 -@@ -1359,7 +1359,6 @@ - done - - install-data-local: ntop.txt ntop.html faq.html -- @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins; - @if ! test -d $(DESTDIR)/$(datadir)/ntop; then \ - $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \ - touch $(DESTDIR)/$(datadir)/ntop/warnuser; \ Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- files/patch-configure 16 Jan 2005 11:13:37 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,70 +0,0 @@ ---- configure.orig Tue Dec 21 05:07:24 2004 -+++ configure Sun Jan 16 10:19:25 2005 -@@ -5173,7 +5173,7 @@ - exit 1 - ;; - *1\.3\.[45]\-freebsd\-ports*) -- echo "* FreeBSD ports 1.3.4 seems to work, so we will let it slide..." -+ echo "* FreeBSD ports 1.3.5 seems to work, so we will let it slide..." - echo "*" - echo "* Fasten your seat belt and good luck! If you are injured, the" - echo "* development team will disavow any knowledge of your intentions." -@@ -22928,13 +22928,13 @@ - - - --echo "$as_me:$LINENO: checking for g_date_julian in -lglib" >&5 --echo $ECHO_N "checking for g_date_julian in -lglib... $ECHO_C" >&6 --if test "${ac_cv_lib_glib_g_date_julian+set}" = set; then -+echo "$as_me:$LINENO: checking for g_date_new_julian in -lglib-2.0" >&5 -+echo $ECHO_N "checking for g_date_new_julian in -lglib-2.0... $ECHO_C" >&6 -+if test "${ac_cv_lib_glib_g_date_new_julian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lglib $LIBS" -+LIBS="-lglib-2.0 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22948,11 +22948,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char g_date_julian (); -+char g_date_new_julian (); - int - main () - { --g_date_julian (); -+g_date_new_julian (); - ; - return 0; - } -@@ -22997,7 +22997,7 @@ - #define HAVE_LIBGLIB 1 - _ACEOF - -- LIBS="-lglib $LIBS" -+ LIBS="-lglib-2.0 $LIBS" - - fi - -@@ -28604,7 +28604,7 @@ - test ".${ac_cv_header_glibconfig_h}" = ".yes" && - test ".${ac_cv_header_xmlversion_h}" = ".yes" && - test ".${ac_cv_header_gdome_h}" = ".yes" && -- test ".${ac_cv_lib_glib_g_date_julian}" = ".yes" && -+ test ".${ac_cv_lib_glib_g_date_new_julian}" = ".yes" && - test ".${ac_cv_lib_xml2_xmlCheckVersion}" = ".yes" && - test ".${ac_cv_lib_gdome_gdome_di_saveDocToFile}" = ".yes"; then - echo "$as_me:$LINENO: result: ok" >&5 -@@ -28623,7 +28623,7 @@ - echo "* gdome.h...${ac_cv_header_gdome_h}" - echo "* libgdome.so or libgdome.a...${ac_cv_lib_gdome_gdome_di_saveDocToFile}" - echo "* glib.h...${ac_cv_header_glib_h}" -- echo "* libglib.so or libglib.a...${ac_cv_lib_glib_g_date_julian}" -+ echo "* libglib.so or libglib.a...${ac_cv_lib_glib_g_date_new_julian}" - echo "* glibconfig.h...${ac_cv_header_glibconfig_h}" - echo "*" - echo "* (yes means it was found, no means it was not found)" Index: files/patch-configure.in =================================================================== RCS file: files/patch-configure.in diff -N files/patch-configure.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure.in 18 Jul 2007 00:04:11 -0000 @@ -0,0 +1,13 @@ +--- ./configure.in.orig Sat Jun 9 17:30:00 2007 ++++ ./configure.in Tue Jul 17 12:37:26 2007 +@@ -577,8 +577,8 @@ + dnl> + if test ".${PCAP_ROOT}" != .; then + if test -d $PCAP_ROOT && +- test -r $PCAP_ROOT/libpcap.a && +- test -r $PCAP_ROOT/pcap.h; then ++ test -r $PCAP_ROOT/lib/libpcap.a && ++ test -r $PCAP_ROOT/include/pcap.h; then + PCAP_ROOT=`cd ${PCAP_ROOT} && pwd` + CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap" + INCS="${INCS} -I$PCAP_ROOT" Index: files/patch-libtool.m4.in =================================================================== RCS file: files/patch-libtool.m4.in diff -N files/patch-libtool.m4.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libtool.m4.in 18 Jul 2007 00:04:11 -0000 @@ -0,0 +1,11 @@ +--- ./libtool.m4.in.orig Tue Jul 17 12:50:08 2007 ++++ ./libtool.m4.in Tue Jul 17 12:50:13 2007 +@@ -1288,7 +1288,7 @@ + ;; + + freebsd*) +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) Index: files/patch-ntop.h =================================================================== RCS file: files/patch-ntop.h diff -N files/patch-ntop.h --- files/patch-ntop.h 1 Aug 2005 10:14:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- ntop.h.orig Mon Aug 1 12:07:39 2005 -+++ ntop.h Mon Aug 1 12:08:13 2005 -@@ -447,7 +447,7 @@ - #endif - - #ifndef EMBEDDED --#include "rrd.h" -+#include "myrrd/rrd.h" - #endif - - #ifdef HAVE_GETOPT_H Index: files/patch-util.c =================================================================== RCS file: files/patch-util.c diff -N files/patch-util.c --- files/patch-util.c 16 Jan 2005 11:13:37 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- util.c.orig Thu Dec 16 20:13:26 2004 -+++ util.c Sun Jan 16 12:05:04 2005 -@@ -494,7 +494,8 @@ - if(!strcmp(ii->name,device)) - if(iface_if_getinfo(ii) & IFACE_INFO_UP) { - /* Allocate memory for IPv6 addresses*/ -- count = iface_if_addrcount(ii, AF_INET6); -+ if ((count = iface_if_addrcount(ii, AF_INET6)) == 0) -+ return NULL; - if(count == 0) break; - addrs = (NtopIfaceAddr *)calloc(count, sizeof(NtopIfaceAddr)); - addr_pos = 0; >Release-Note: >Audit-Trail: >Unformatted: