diff options
author | kim <kim> | 1998-10-11 20:27:03 +0000 |
---|---|---|
committer | kim <kim> | 1998-10-11 20:27:03 +0000 |
commit | 06093af811746b92acd35869f13658afe5f30655 (patch) | |
tree | 4d1438dc225f091e4127ed9f599360de3d26efce /net | |
parent | b0a5fb054b259a3375c059c6e83e1236169f7960 (diff) | |
download | pkgsrc-06093af811746b92acd35869f13658afe5f30655.tar.gz |
Updated ntop to 1.0
Diffstat (limited to 'net')
-rw-r--r-- | net/ntop/Makefile | 18 | ||||
-rw-r--r-- | net/ntop/files/md5 | 4 | ||||
-rw-r--r-- | net/ntop/patches/patch-aa | 39 | ||||
-rw-r--r-- | net/ntop/patches/patch-ab | 42 | ||||
-rw-r--r-- | net/ntop/patches/patch-ac | 12 | ||||
-rw-r--r-- | net/ntop/patches/patch-ad | 39 | ||||
-rw-r--r-- | net/ntop/patches/patch-ae | 12 | ||||
-rw-r--r-- | net/ntop/patches/patch-af | 102 |
8 files changed, 108 insertions, 160 deletions
diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 887bcec0ec8..c8cd25f0ce8 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -1,22 +1,24 @@ -# $NetBSD: Makefile,v 1.3 1998/09/22 06:11:39 garbled Exp $ +# $NetBSD: Makefile,v 1.4 1998/10/11 20:27:03 kim Exp $ -DISTNAME= ntop-0.4-src -PKGNAME= ntop-0.4 -WRKSRC= ${WRKDIR}/${PKGNAME} +DISTNAME= ntop-1.0 CATEGORIES= net -MASTER_SITES= http://jake.unipi.it/~deri/ntop/ - -NOT_FOR_ARCHS= alpha mips # elf problems WRT libcurses +MASTER_SITES= ${HOMEPAGE}/download/source/ +EXTRACT_SUFX= .src.tar.gz MAINTAINER= kim@tac.nyc.ny.us -HOMEPAGE= http://jake.unipi.it/~deri/ntop/ DEPENDS+= autoconf-2.12:../../devel/autoconf DEPENDS+= ncurses-1.9.9g:../../devel/ncurses +HOMEPAGE= http://www-serra.unipi.it/~ntop/ + +NOT_FOR_ARCHS= alpha mips # elf problems WRT libcurses + HAS_CONFIGURE= yes GNU_CONFIGURE= yes +LDFLAGS+= -L${PREFIX}/lib + CONFIGURE_ENV+= CPPFLAGS=-I${PREFIX}/include CONFIGURE_ENV+= CFLAGS=-I${PREFIX}/include CONFIGURE_ENV+= LDFLAGS=-L${PREFIX}/lib diff --git a/net/ntop/files/md5 b/net/ntop/files/md5 index 8757b88fd28..16763052fe9 100644 --- a/net/ntop/files/md5 +++ b/net/ntop/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1 1998/08/07 22:42:29 kim Exp $ +$NetBSD: md5,v 1.2 1998/10/11 20:27:04 kim Exp $ -MD5 (ntop-0.4-src.tar.gz) = 6867ac4fd7390de478ce0c401c11e23e +MD5 (ntop-1.0.src.tar.gz) = 25ad6dc31771e96ceacb0cd824f20d1c diff --git a/net/ntop/patches/patch-aa b/net/ntop/patches/patch-aa index ce57ef3a1ce..c118f3b2496 100644 --- a/net/ntop/patches/patch-aa +++ b/net/ntop/patches/patch-aa @@ -1,37 +1,12 @@ -$NetBSD: patch-aa,v 1.2 1998/10/11 10:25:24 hubertf Exp $ +$NetBSD: patch-aa,v 1.3 1998/10/11 20:27:04 kim Exp $ ---- Makefile.in.orig Mon Aug 3 12:43:38 1998 -+++ Makefile.in Sat Oct 10 22:06:42 1998 -@@ -48,7 +48,7 @@ - LDFLAGS = @LDFLAGS@ -L/usr/5lib +--- Makefile.in.orig Tue Oct 6 11:27:31 1998 ++++ Makefile.in Sun Oct 11 15:00:45 1998 +@@ -48,6 +48,7 @@ + LDFLAGS = @LDFLAGS@ # Standard LIBS --LIBS = @LIBS@ -+LIBS = @LIBS@ -L${PREFIX}/lib -lncurses ++#LIBS = @LIBS@ -L${prefix}/lib -lncurses + LIBS = @LIBS@ INSTALL = @INSTALL@ - -@@ -76,6 +76,8 @@ - - CLEANFILES = $(PROG) $(OBJ) $(GENSRC) - -+all: $(PROG) -+ - $(PROG): $(OBJ) @V_PCAPDEP@ - @rm -f $@ - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) -@@ -90,12 +92,8 @@ - rm -f OS.NAME - - install: force -- $(INSTALL) -m 6111 -o root -g sys $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) -- chmod gou+s $(DESTDIR)$(BINDEST)/$(PROG) -- --install-man: force -- $(INSTALL) -m 444 -o bin -g bin $(PROG).8 \ -- $(DESTDIR)$(MANDEST)/man8/$(PROG).8 -+ $(INSTALL) -m 6550 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) -+ $(INSTALL) -m 444 $(PROG).8 $(DESTDIR)$(MANDEST)/man8/$(PROG).8 - - lint: $(GENSRC) force - lint -hbxn $(SRC) | \ diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab index 2783089d3a8..a6e04b84103 100644 --- a/net/ntop/patches/patch-ab +++ b/net/ntop/patches/patch-ab @@ -1,30 +1,24 @@ -$NetBSD: patch-ab,v 1.2 1998/08/08 21:28:32 kim Exp $ +$NetBSD: patch-ab,v 1.3 1998/10/11 20:27:04 kim Exp $ ---- ntop.h.orig Fri Jul 31 12:31:45 1998 -+++ ntop.h Sat Aug 8 17:19:25 1998 -@@ -16,9 +16,16 @@ - #endif - - #include <errno.h> --#include "sn_curses.h" -+#ifdef HAVE_NCURSES_H -+#include <ncurses.h> -+#else -+#ifdef HAVE_CURSES_H -+#invlude <curses.h> -+#endif -+#endif - #include <ctype.h> - #include <sys/types.h> -+#include <sys/param.h> - #include <unistd.h> - #include <sys/socket.h> - #include <sys/select.h> -@@ -38,7 +45,6 @@ +--- ntop.h.orig Mon Oct 5 12:18:41 1998 ++++ ntop.h Sun Oct 11 15:56:17 1998 +@@ -87,8 +87,19 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> --#include <ethertype.h> ++#ifdef __NetBSD__ ++#include <net/ethertypes.h> ++#else /* __NetBSD__ */ + #include <ethertype.h> ++#endif /* __NetBSD__ */ #include <setjmp.h> - #include <pcap.h> ++ ++#ifndef ETHERTYPE_DN ++#define ETHERTYPE_DN 0x6003 ++#endif ++#ifndef ETHERTYPE_ATALK ++#define ETHERTYPE_ATALK 0x809b ++#endif + #include "interface.h" + #include "setsignal.h" diff --git a/net/ntop/patches/patch-ac b/net/ntop/patches/patch-ac index ce5f0eb5add..ffd6c15d2b0 100644 --- a/net/ntop/patches/patch-ac +++ b/net/ntop/patches/patch-ac @@ -1,12 +1,14 @@ -$NetBSD: patch-ac,v 1.1 1998/08/07 22:42:30 kim Exp $ +$NetBSD: patch-ac,v 1.2 1998/10/11 20:27:04 kim Exp $ ---- interface.h.ORIG Fri Jul 31 05:22:13 1998 -+++ interface.h Fri Aug 7 16:52:22 1998 -@@ -26,7 +26,6 @@ +--- interface.h.orig Sun Sep 13 05:00:58 1998 ++++ interface.h Sun Oct 11 15:16:33 1998 +@@ -42,7 +42,9 @@ */ --#include <gnuc.h> ++#ifdef HAVE_GNUC_H + #include <gnuc.h> ++#endif #ifdef HAVE_OS_PROTO_H #include "os-proto.h" #endif diff --git a/net/ntop/patches/patch-ad b/net/ntop/patches/patch-ad index ba7ed13ebc2..c804aafc800 100644 --- a/net/ntop/patches/patch-ad +++ b/net/ntop/patches/patch-ad @@ -1,26 +1,17 @@ -$NetBSD: patch-ad,v 1.1 1998/08/07 22:42:30 kim Exp $ +$NetBSD: patch-ad,v 1.2 1998/10/11 20:27:04 kim Exp $ ---- configure.in.orig Thu Jul 30 06:09:44 1998 -+++ configure.in Fri Aug 7 18:16:15 1998 +--- configure.in.orig Thu Sep 24 11:41:22 1998 ++++ configure.in Sun Oct 11 16:11:08 1998 @@ -18,7 +18,7 @@ AC_LBL_C_INIT(V_CCOPT, V_INCLS) --AC_CHECK_HEADERS(fcntl.h malloc.h memory.h) -+AC_CHECK_HEADERS(fcntl.h malloc.h memory.h ncurses.h curses.h) +-AC_CHECK_HEADERS(fcntl.h malloc.h memory.h ncurses.h curses.h sys/select.h netinet/if_ether.h netinet/in_systm.h stdarg.h) ++AC_CHECK_HEADERS(fcntl.h malloc.h memory.h ncurses.h curses.h sys/select.h netinet/if_ether.h netinet/in_systm.h stdarg.h gnuc.h) AC_HEADER_TIME AC_REPLACE_FUNCS(vfprintf) -@@ -27,6 +27,8 @@ - - AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) - -+AC_CHECK_LIB(ncurses, main) -+ - V_GROUP=0 - case "$target_os" in - -@@ -47,19 +49,19 @@ +@@ -60,9 +60,9 @@ ;; esac @@ -31,19 +22,5 @@ $NetBSD: patch-ad,v 1.1 1998/08/07 22:42:30 kim Exp $ +# V_GROUP=bpf +#fi - AC_LBL_CHECK_TYPE(int32_t, int) - AC_LBL_CHECK_TYPE(u_int32_t, u_int) - - AC_LBL_DEVEL(V_CCOPT) - --if test -r lbl/gnuc.h ; then -- rm -f gnuc.h -- ln -s lbl/gnuc.h gnuc.h --fi -+#if test -r lbl/gnuc.h ; then -+# rm -f gnuc.h -+# ln -s lbl/gnuc.h gnuc.h -+#fi - - AC_SUBST(V_CCOPT) - AC_SUBST(V_GROUP) + AC_MSG_CHECKING(if ether_header uses ether_addr structs) + AC_CACHE_VAL(ac_cv_ether_header_has_ea, diff --git a/net/ntop/patches/patch-ae b/net/ntop/patches/patch-ae index 88db24e8fe2..b3a082379a8 100644 --- a/net/ntop/patches/patch-ae +++ b/net/ntop/patches/patch-ae @@ -1,12 +1,14 @@ -$NetBSD: patch-ae,v 1.1 1998/08/07 22:42:30 kim Exp $ +$NetBSD: patch-ae,v 1.2 1998/10/11 20:27:04 kim Exp $ ---- setsignal.c.orig Fri Jul 31 05:21:22 1998 -+++ setsignal.c Fri Aug 7 18:12:53 1998 -@@ -40,7 +40,6 @@ +--- setsignal.c.orig Tue Sep 22 12:01:46 1998 ++++ setsignal.c Sun Oct 11 15:19:35 1998 +@@ -56,7 +56,9 @@ #include <string.h> #endif --#include <gnuc.h> ++#ifdef HAVE_GNUC_H + #include <gnuc.h> ++#endif #ifdef HAVE_OS_PROTO_H #include "os-proto.h" #endif diff --git a/net/ntop/patches/patch-af b/net/ntop/patches/patch-af index 42ac91e3cd8..04649de6541 100644 --- a/net/ntop/patches/patch-af +++ b/net/ntop/patches/patch-af @@ -1,53 +1,49 @@ -$NetBSD: patch-af,v 1.2 1998/08/08 21:30:25 kim Exp $ - ---- pbuf.c.orig Mon Aug 3 08:50:07 1998 -+++ pbuf.c Sat Aug 8 17:22:28 1998 -@@ -100,7 +100,7 @@ - /* Static */ - static clock_t lastTime; - static int lastNumLines, lastNumCols; --static char domainName[64]; -+static char domainName[MAXHOSTNAMELEN]; - static short sortSendMode=0; - static char hex[] = "0123456789ABCDEF"; - static short screenNumber=0; -@@ -289,6 +289,8 @@ - - void init_curses () - { -+ char *p; -+ - if(webMode) return; - - initscr (); -@@ -305,7 +307,12 @@ - - lastNumLines = LINES; - lastNumCols = COLS; -- domainName[0] = '\0'; -+ if ((gethostname(domainName, MAXHOSTNAMELEN) == 0) -+ && ((p = memchr(domainName, '.', MAXHOSTNAMELEN)) != NULL)) { -+ domainName[MAXHOSTNAMELEN - 1] = '\0'; -+ memmove(domainName, ++p, MAXHOSTNAMELEN + domainName - p); -+ } else -+ domainName[0] = '\0'; - printHeader(); - } - -@@ -418,16 +425,6 @@ - if (hp && (hp->h_name)) { - char *dotp = (char*)hp->h_name; - -- if((domainName[0] == '\0') -- && ((hostIpAddress.s_addr & netmask) == localnet)) { -- int i; -- -- for(i=0; dotp[i] != '\0' && dotp[i] != '.'; i++); -- -- if((dotp[i] == '.') && (isalpha(dotp[strlen(dotp)-1]))) -- strcpy(domainName, &dotp[i+1]); -- } -- - if(domainName[0] != '\0') { - int len = strlen(dotp)-strlen(domainName); - +*** pbuf.c.orig Tue Oct 6 03:49:59 1998 +--- pbuf.c Sun Oct 11 15:45:15 1998 +*************** +*** 265,270 **** +--- 265,271 ---- + void init_counters() { + char *p; + struct servent *svnt; ++ struct hostent *hent; + + (void)setsignal(SIGWINCH, windowSizeChanged); + +*************** +*** 272,287 **** + * The name of the local domain is now calculated properly + * Kimmo Suominen <kim@tac.nyc.ny.us> + */ +! if((getdomainname(domainName, MAXHOSTNAMELEN) != 0) +! || (domainName[0] == '\0')) +! { +! if ((gethostname(domainName, MAXHOSTNAMELEN) == 0) +! && ((p = memchr(domainName, '.', MAXHOSTNAMELEN)) != NULL)) { + domainName[MAXHOSTNAMELEN - 1] = '\0'; +! memmove(domainName, ++p, MAXHOSTNAMELEN + domainName - p); +! } else +! domainName[0] = '\0'; +! } + + init_curses(); + resetStats(); +--- 273,290 ---- + * The name of the local domain is now calculated properly + * Kimmo Suominen <kim@tac.nyc.ny.us> + */ +! if (gethostname(domainName, MAXHOSTNAMELEN) == 0) { +! if ((p = memchr(domainName, '.', MAXHOSTNAMELEN)) != NULL) { +! domainName[MAXHOSTNAMELEN - 1] = '\0'; +! memmove(domainName, ++p, MAXHOSTNAMELEN + domainName - p); +! } else +! if (((hent = gethostbyname(domainName)) != NULL) +! && ((p = strchr(hent->h_name, '.')) != NULL)) { +! strncpy(domainName, ++p, MAXHOSTNAMELEN); + domainName[MAXHOSTNAMELEN - 1] = '\0'; +! } +! } else +! domainName[0] = '\0'; + + init_curses(); + resetStats(); |