>Number: 8292
>Category: ports
>Synopsis: update port: net/ntop
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 12 14:00:01 PDT 1998
>Last-Modified:
>Originator: Bill Fumerola
>Organization:
Computer Horizons Corp
>Release: FreeBSD 2.2.7-STABLE i386
>Environment:
>Description:
ntop continues to provide more detail on the packets it does statistics
on, and now it has a little built in web server. how neat.
patches: patch-aa, patch-ab, and patch-ac should be retired to the attic
never to be seen again. patch-ad and patch-ae are drasticly different, and
I even considered just making them -af and -ag, this is up to the
committer (whoever that may be).
>How-To-Repeat:
>Fix:
--- md5 Mon Oct 12 16:23:01 1998
+++ files/md5 Mon Oct 12 16:23:00 1998
@@ -1 +1 @@
-MD5 (ntop-0.4-src.tar.gz) = 6867ac4fd7390de478ce0c401c11e23e
+MD5 (ntop-1.0.src.tar.gz) = 25ad6dc31771e96ceacb0cd824f20d1c
--- patches/OLDpatch-ad Mon Oct 12 16:28:46 1998
+++ patches/patch-ad Mon Oct 12 16:44:18 1998
@@ -1,23 +1,11 @@
---- Makefile.in.old Mon Aug 10 21:23:13 1998
-+++ Makefile.in Mon Aug 10 21:23:39 1998
-@@ -38,17 +38,17 @@
+--- Makefile.in.orig Tue Oct 6 11:27:31 1998
++++ Makefile.in Mon Oct 12 16:43:50 1998
+@@ -38,7 +38,7 @@
CC = @CC@
PROG = ntop
CCOPT = @V_CCOPT@
--INCLS = -I. -I/usr/5include @V_INCLS@
-+INCLS = -I. -I/usr/include -I/usr/local/include @V_INCLS@
+-INCLS = -I. @V_INCLS@
++INCLS = -I. -I/usr/local/include @V_INCLS@
DEFS = @DEFS@
# Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
-
- # Standard LDFLAGS
--LDFLAGS = @LDFLAGS@ -L/usr/5lib
-+LDFLAGS = @LDFLAGS@ -L/usr/lib
-
- # Standard LIBS
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lncurses
-
- INSTALL = @INSTALL@
-
--- patches/OLDpatch-ae Mon Oct 12 16:46:45 1998
+++ patches/patch-ae Mon Oct 12 16:48:46 1998
@@ -1,16 +1,22 @@
---- ntop.c.orig Mon Aug 10 22:44:18 1998
-+++ ntop.c Mon Aug 10 22:45:29 1998
-@@ -298,11 +298,11 @@
- usage()
- {
- extern char version[];
-- extern char pcap_version[];
-+/* extern char pcap_version[]; */
+--- ntop.c.old Mon Oct 12 16:47:22 1998
++++ ntop.c Mon Oct 12 16:47:52 1998
+@@ -64,7 +64,7 @@
+ extern void scanTimedoutTCPSessions(time_t theTime);
+ extern int optind, opterr;
+ extern time_t nextSessionTimeoutScan;
+-extern char *optarg, version[], pcap_version[];
++extern char *optarg, version[]; // , pcap_version[]
- (void)fprintf(stderr, "%s v.%s for %s\n", program_name,
- version, osName);
-- (void)fprintf(stderr, "[libpcap version %s]\n", pcap_version);
-+/* (void)fprintf(stderr, "[libpcap version %s]\n", pcap_version); */
- (void)fprintf(stderr, "Written by %s.\n", author);
- (void)fprintf(stderr, "\nUsage: %s [-r (refresh time [default 3 secs]]\n\t"
- " [-n (numeric IP addresses)]\n\t"
+ /* Globals */
+ char *program_name, *device;
+@@ -439,8 +439,8 @@
+ clrscr(); /* clear the screen */
+ }
+
+- sprintf(buf, "%s v.%s for %s [libpcap version %s]",
+- program_name, version, osName, pcap_version);
++ sprintf(buf, "%s v.%s for %s",
++ program_name, version, osName);
+ if(cursesMode) { mvprintw (row++, 0, buf); } else fprintf(stderr, "%s\n", buf);
+ sprintf(buf, "Written by %s.", author);
+ if(cursesMode) { mvprintw (row, 0, buf); row+=2; } else fprintf(stderr, "%s\n\n", buf);
--- Makefile.old Mon Oct 12 16:23:01 1998
+++ Makefile Mon Oct 12 16:50:40 1998
@@ -1,22 +1,22 @@
# New ports collection makefile for: ntop
-# Version required: 0.2.2
+# Version required: 1.0
# Date created: 10 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $Id: Makefile,v 1.3 1998/09/05 21:43:26 hoek Exp $
#
-DISTNAME= ntop-0.4-src
-PKGNAME= ntop-0.4
+DISTNAME= ntop-1.0.src
+PKGNAME= ntop-1.0
CATEGORIES= net
-MASTER_SITES= http://jake.unipi.it/~deri/ntop/
+MASTER_SITES= ftp://ftp.unipi.it/pub/local/ntop/source/
MAINTAINER= billf@chc-chimes.com
WRKSRC= ${WRKDIR}/${PKGNAME}
USE_AUTOCONF= yes
ALL_TARGET=
-INSTALL_TARGET= install install-man
+INSTALL_TARGET= install
CFLAGS+= -D__dead=
MAN8= ntop.8
----------
I am including the new patch-ad and patch-ae in case the committer just
wants to make patch-af and patch-ag
----------
patch-ad
--- Makefile.in.orig Tue Oct 6 11:27:31 1998
+++ Makefile.in Mon Oct 12 16:43:50 1998
@@ -38,7 +38,7 @@
CC = @CC@
PROG = ntop
CCOPT = @V_CCOPT@
-INCLS = -I. @V_INCLS@
+INCLS = -I. -I/usr/local/include @V_INCLS@
DEFS = @DEFS@
# Standard CFLAGS
------
patch-ae
--- ntop.c.old Mon Oct 12 16:47:22 1998
+++ ntop.c Mon Oct 12 16:47:52 1998
@@ -64,7 +64,7 @@
extern void scanTimedoutTCPSessions(time_t theTime);
extern int optind, opterr;
extern time_t nextSessionTimeoutScan;
-extern char *optarg, version[], pcap_version[];
+extern char *optarg, version[]; // , pcap_version[]
/* Globals */
char *program_name, *device;
@@ -439,8 +439,8 @@
clrscr(); /* clear the screen */
}
- sprintf(buf, "%s v.%s for %s [libpcap version %s]",
- program_name, version, osName, pcap_version);
+ sprintf(buf, "%s v.%s for %s",
+ program_name, version, osName);
if(cursesMode) { mvprintw (row++, 0, buf); } else fprintf(stderr, "%s\n", buf);
sprintf(buf, "Written by %s.", author);
if(cursesMode) { mvprintw (row, 0, buf); row+=2; } else fprintf(stderr, "%s\n\n", buf);
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message