Date: Wed, 5 Jan 2000 16:05:02 +0200 (EET) From: acid@stu.cn.ua To: FreeBSD-gnats-submit@freebsd.org Subject: ports/15907: trafshow port update 2.0->3.1 Message-ID: <200001051405.QAA30275@stalker.stu.cn.ua>
next in thread | raw e-mail | index | archive | help
>Number: 15907 >Category: ports >Synopsis: trafshow port is outdated >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: Wed Jan 5 06:10:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: Michael Vasilenko >Release: FreeBSD 3.4-STABLE i386 >Organization: Chernigiv State Technological University >Environment: >Description: trafshow port is outdated >How-To-Repeat: >Fix: diff -urN trafshow.orig/Makefile trafshow/Makefile --- trafshow.orig/Makefile Mon Aug 30 17:24:25 1999 +++ trafshow/Makefile Wed Jan 5 15:57:51 2000 @@ -1,18 +1,27 @@ # New ports collection makefile for: trafshow -# Version required: 2.0 -# Date created: 25 September 1996 +# Version required: 3.1 +# Date created: 05 January 2000 # Whom: igor@zynaps.ru # -# $FreeBSD: ports/net/trafshow/Makefile,v 1.11 1999/08/30 14:24:25 peter Exp $ +# $FreeBSD$ # -DISTNAME= trafshow-2.0 +DISTNAME= trafshow-3.1 CATEGORIES= net -MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/tcpip/netmaint/ +MASTER_SITES= ftp://ftp.nsk.su/pub/RinetSoftware/ EXTRACT_SUFX= .tgz MAINTAINER= jseger@FreeBSD.org +LIB_DEPENDS= ncurses.4:${PORTSDIR}/devel/ncurses + +GNU_CONFIGURE= yes +CONFIGURE_ENV= "LDFLAGS=-L/usr/local/lib" MAN1= trafshow.1 + +do-install: + @ ${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin + @ ${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/man/man1 + @ ${INSTALL_DATA} ${WRKSRC}/.trafshow ${PREFIX}/etc/trafshow .include <bsd.port.mk> diff -urN trafshow.orig/files/md5 trafshow/files/md5 --- trafshow.orig/files/md5 Wed May 1 10:52:09 1996 +++ trafshow/files/md5 Wed Jan 5 14:33:33 2000 @@ -1 +1 @@ -MD5 (trafshow-2.0.tgz) = d977e8605ed8bae90c06bd31f38eff3e +MD5 (trafshow-3.1.tgz) = 085b99f160002a269b358aab1c5004f0 diff -urN trafshow.orig/patches/patch-aa trafshow/patches/patch-aa --- trafshow.orig/patches/patch-aa Thu May 7 05:05:36 1998 +++ trafshow/patches/patch-aa Wed Jan 5 14:22:31 2000 @@ -1,59 +1,11 @@ ---- Makefile.orig Tue Jan 16 19:28:26 1996 -+++ Makefile Mon May 4 11:18:44 1998 -@@ -2,41 +2,36 @@ - # Main Makefile. Build everything in directories... - # - --# This options intended for BSD/OS V2 --CC = shlicc2 --FLAGS = -O2 --DEFINE = --LIB = ../lib/libbpft.a -lcurses -ltermcap -ll -- --BINDIR = /usr/local/bin --MANDIR = /usr/local/man/man1 --MODE = 750 -+# This options intended for FreeBSD 2.1.0 -+CC = cc -+#FLAGS = -O2 -+DEFINE = -DETHER_SERVICE -+LIB = ../lib/libbpft.a -lcurses -ll -+ -+BINDIR = ${PREFIX}/bin -+MANDIR = ${PREFIX}/man/man1 -+MODE = 550 -+OWNER = bin - GROUP = wheel - - INCLUDE = -I../include --CFLAGS = $(FLAGS) $(INCLUDE) $(DEFINE) -+CFLAGS += $(FLAGS) $(INCLUDE) $(DEFINE) - DEPFLAGS= $(INCLUDE) $(DEFINE) - ARFLAGS = rc - - - all: -- @(cd lib; echo "Build library in `pwd`"; \ -- $(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' ARFLAGS=$(ARFLAGS)) -- @(cd trafshow; echo "Build trafshow in `pwd`"; \ -- $(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)') -- @echo Done. -+ @(cd lib; $(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' ARFLAGS=$(ARFLAGS)) -+ @(cd trafshow; $(MAKE) CC=$(CC) CFLAGS='$(CFLAGS)' LIB='$(LIB)') - - install: all -- install -s -o root -g $(GROUP) -m $(MODE) trafshow/trafshow $(BINDIR) -- install -c -m 644 trafshow.1 $(MANDIR) -- @echo Done. -+ install -s -o $(OWNER) -g $(GROUP) -m $(MODE) trafshow/trafshow $(BINDIR) -+ install -c -o bin -g bin -m 444 trafshow.1 $(MANDIR) - - depend: - @(cd lib; $(MAKE) depend) - @(cd trafshow; $(MAKE) depend) -- @echo Done. - - clean: - @(cd lib; $(MAKE) DEPFLAGS='$(DEPFLAGS)' clean) - @(cd trafshow; $(MAKE) DEPFLAGS='$(DEPFLAGS)' clean) -- @echo Done. +--- color.c.orig Sat Nov 15 11:22:08 1997 ++++ color.c Wed Jan 5 14:22:13 2000 +@@ -336,7 +336,7 @@ + error(1, "init_color_mask: getpwuid"); + (void) sprintf(buf, "%s/.%s", pw->pw_dir, program_name); + if ((fp = fopen(buf, "r")) == NULL) { +- (void) strcpy(buf, "/etc/"); ++ (void) strcpy(buf, "/usr/local/etc/"); + (void) strcat(buf, program_name); + if ((fp = fopen(buf, "r")) == NULL) return 0; + } diff -urN trafshow.orig/patches/patch-ab trafshow/patches/patch-ab --- trafshow.orig/patches/patch-ab Sun Apr 26 15:05:33 1998 +++ trafshow/patches/patch-ab Wed Jan 5 15:12:37 2000 @@ -1,48 +1,19 @@ ---- lib/interfaces.c.orig Fri Jun 9 11:24:47 1995 -+++ lib/interfaces.c Sun Apr 26 08:02:40 1998 -@@ -21,8 +21,6 @@ - #include <sys/socket.h> - #include <net/if.h> - #include <net/slip.h> --#include <net/if_slvar.h> --#include <net/ppp_proto.h> - #include <netinet/in.h> - #include <netinet/if_ether.h> - #include <netinet/in_systm.h> -@@ -33,6 +31,17 @@ - #include <netinet/tcp.h> - #include <netinet/tcpip.h> - #include <net/bpf.h> -+#if __FreeBSD__ >= 3 -+#include <net/if_var.h> -+#include <sys/mbuf.h> -+#include <net/slcompress.h> -+#endif -+#include <net/if_slvar.h> -+#ifdef __FreeBSD__ -+#include <net/if_ppp.h> -+#else -+#include <net/ppp_proto.h> -+#endif +--- Makefile.in.orig Mon Aug 24 07:54:16 1998 ++++ Makefile.in Wed Jan 5 15:12:21 2000 +@@ -29,7 +29,7 @@ + PROG = trafshow + CC = @CC@ + CCOPT = @V_CCOPT@ +-INCLS = -I. @V_INCLS@ ++INCLS = -I. -I/usr/local/include @V_INCLS@ + DEFS = @DEFS@ - #include "interface.h" + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) +@@ -51,6 +51,7 @@ -@@ -129,13 +138,16 @@ - * Thanks to Gregory J. Miller <gmiller@gateway.mitre.org> for - * help of true PPP header parsing. - */ -+#ifdef PPP_HDRLEN /* ppp-2.2 or later */ -+ if (caplen < PPP_HDRLEN) -+#else - if (caplen < sizeof(struct ppp_header)) -+#endif - return; - packetp = (u_char *)p; - snapend = (u_char *)p + caplen; - hdrlength = 0; -- if (p[0] == PPP_ADDRESS && p[1] == PPP_CONTROL) -- p += 2, hdrlength = 2; -+ p += 2, hdrlength = 2; - /* Retrive the protocol type */ - if (*p & 01) { /* Compressed protocol field */ - type = *p++; + # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot + # hack the extra indirection ++all: trafshow + OBJ = $(CSRC:.c=.o) $(GENSRC:.c=.o) @LIBOBJS@ + + CLEANFILES = $(PROG) $(OBJ) $(GENSRC) diff -urN trafshow.orig/patches/patch-ad trafshow/patches/patch-ad --- trafshow.orig/patches/patch-ad Thu Jul 17 19:33:50 1997 +++ trafshow/patches/patch-ad Thu Jan 1 03:00:00 1970 @@ -1,45 +0,0 @@ ---- lib/addrtoname.c Fri Jan 12 17:42:37 1996 -+++ lib/addrtoname.c Thu Jul 25 07:37:56 1996 -@@ -294,8 +294,8 @@ - #ifdef ETHER_SERVICE - if (!nflag) { -- cp = ETHER_ntohost(ep); -- if (cp) { -- tp->e_name = cp; -- return cp; -+ char buf[128]; -+ if (ether_ntohost(buf, ep) == 0) { -+ tp->e_name =strdup(buf); -+ return tp->e_name; - } - } ---- lib/gencode.c Wed Jan 10 12:27:13 1996 -+++ lib/gencode.c Thu Jul 25 07:43:16 1996 -@@ -841,4 +841,5 @@ - struct block *b, *tmp; - int port, real_proto; -+ static char wrk[6]; - - switch (q.addr) { -@@ -854,6 +855,9 @@ - case Q_HOST: - if (proto == Q_LINK) { - /* XXX Should lookup hw addr based on link layer */ -- eaddr = ETHER_hostton(name); -+ if (ether_hostton(name, wrk) == 0) -+ eaddr = wrk; -+ else -+ eaddr = 0; - if (eaddr == 0) - error("unknown ether host '%s'", name); -@@ -896,5 +901,9 @@ - - case Q_GATEWAY: -- eaddr = ETHER_hostton(name); -+ /* XXX Should lookup hw addr based on link layer */ -+ if (ether_hostton(name, wrk) == 0) -+ eaddr = wrk; -+ else -+ eaddr = 0; - if (eaddr == 0) - error("unknown ether host: %s", name); diff -urN trafshow.orig/patches/patch-ae trafshow/patches/patch-ae --- trafshow.orig/patches/patch-ae Mon Sep 20 04:19:54 1999 +++ trafshow/patches/patch-ae Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- trafshow/show.c.orig Sun Sep 19 16:55:10 1999 -+++ trafshow/show.c Sun Sep 19 16:55:21 1999 -@@ -15,6 +15,7 @@ - - static char copyright[] = "* Copyright (c) 1993-1996 CAD lab, Institute of Telecommunication, Novosibirsk *"; - -+#include <sys/types.h> - #include <curses.h> - #include <stdlib.h> - #include <string.h> diff -urN trafshow.orig/pkg/PLIST trafshow/pkg/PLIST --- trafshow.orig/pkg/PLIST Tue Aug 18 22:48:44 1998 +++ trafshow/pkg/PLIST Wed Jan 5 15:13:19 2000 @@ -1 +1,2 @@ bin/trafshow +etc/trafshow >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001051405.QAA30275>