Attachment 16045 Details for Bug 29588 – file.diff

[patch] file.diff

file.diff (text/plain), 4.04 KB, created by Pete Fritchman on 2001-08-10 05:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Fritchman

Created: 2001-08-10 05:50:00 UTC

Size: 4.04 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/ngrep/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- Makefile	2000/08/09 09:23:36	1.6
>+++ Makefile	2001/08/09 03:47:00
>@@ -7,21 +7,28 @@
> #
> 
> PORTNAME=	ngrep
>-PORTVERSION=	1.38
>+PORTVERSION=	1.40
> CATEGORIES=	net security
>-MASTER_SITES=	http://www.packetfactory.net/Projects/ngrep/
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	obrien@FreeBSD.org
> 
> WRKSRC=		${WRKDIR}/ngrep
>+
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS+=	--with-pcre --with-restart
>+
> ALL_TARGET=	ngrep
>+
> MAN8=		ngrep.8
> 
> post-install:
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${PREFIX}/share/doc/ngrep
>-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ngrep
>+	@${MKDIR} ${DOCSDIR}
>+.for file in BUGS CHANGES README README.pcre USAGE
>+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
>+.endfor
> .endif
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/net/ngrep/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	2000/08/09 09:23:37	1.2
>+++ distinfo	2001/08/09 03:28:56
>@@ -1 +1 @@
>-MD5 (ngrep-1.38.tar.gz) = adff63845df54eb40ef48f16664e4344
>+MD5 (ngrep-1.40.tar.gz) = 4837f3d3b30e12ee067cb3fd2b874798
>Index: pkg-descr
>===================================================================
>RCS file: /home/ncvs/ports/net/ngrep/pkg-descr,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 pkg-descr
>--- pkg-descr	2000/01/02 10:22:41	1.1.1.1
>+++ pkg-descr	2001/08/09 03:43:55
>@@ -3,6 +3,9 @@
> 
> ngrep a pcap-aware tool that will allow you to specify extended
> regular expressions to match against data payloads of packets. It
>-currently recognizes TCP and UDP across Ethernet, PPP and SLIP
>-interfaces, and understands BPF filter logic in the same fashion
>-as more common packet sniffing tools, like tcpdump and snoop.
>+currently recognizes TCP, UDP, and ICMP across Ethernet, PPP, SLIP,
>+FDDI, Token Ring and null interfaces, and understands BPF filter
>+logic in the same fashion as more common packet sniffing tools,
>+like tcpdump and snoop.
>+
>+WWW: http://ngrep.sourceforge.net/
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/net/ngrep/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- pkg-plist	2000/07/03 03:03:52	1.2
>+++ pkg-plist	2001/08/09 03:39:16
>@@ -1,4 +1,7 @@
>-@comment $FreeBSD: ports/net/ngrep/pkg/PLIST,v 1.1.1.1 2000/01/02 10:22:41 obrien Exp $
> bin/ngrep
>-share/doc/ngrep/README
>-@dirrm share/doc/ngrep
>+%%PORTDOCS%%share/doc/ngrep/BUGS
>+%%PORTDOCS%%share/doc/ngrep/CHANGES
>+%%PORTDOCS%%share/doc/ngrep/README
>+%%PORTDOCS%%share/doc/ngrep/README.pcre
>+%%PORTDOCS%%share/doc/ngrep/USAGE
>+%%PORTDOCS%%@dirrm share/doc/ngrep
>Index: files/patch-ngrep.c
>===================================================================
>RCS file: /home/ncvs/ports/net/ngrep/files/patch-ngrep.c,v
>retrieving revision 1.3
>diff -u -r1.3 patch-ngrep.c
>--- files/patch-ngrep.c	2000/08/27 00:35:58	1.3
>+++ files/patch-ngrep.c	2001/08/09 03:36:41
>@@ -1,28 +1,19 @@
>---- ngrep.c.orig	Mon Jun 26 12:52:50 2000
>-+++ ngrep.c	Sat Aug 26 17:34:40 2000
>-@@ -48,6 +48,7 @@
>- #include "regex.h"
>+--- ngrep.c.orig	Wed Aug  8 23:36:09 2001
>++++ ngrep.c	Wed Aug  8 23:36:31 2001
>+@@ -62,6 +62,7 @@
>+ 
>  #include "ngrep.h"
>  
> +extern FILE *yyin;
>  
>- static char rcsver[] = "$Revision: 1.3 $";
>+ static char rcsver[] = "$Revision: 1.18 $";
>  
>-@@ -196,7 +197,7 @@
>-       free(filter); 
>+@@ -232,7 +233,7 @@
>        filter = get_filter(&argv[optind-1]); 
>  
>+ #ifdef NEED_RESTART
> -      PCAP_RESTART();
> +      PCAP_RESTART(yyin);
>+ #endif
>        if (pcap_compile(pd, &pcapfilter, filter, 0, mask.s_addr)) {
>  	pcap_perror(pd, "pcap compile");
>- 	clean_exit(-1);
>-@@ -653,7 +654,7 @@
>-   struct tm *t = localtime(&h->ts.tv_sec);
>- 
>-   printf("%02d/%02d/%02d %02d:%02d:%02d.%06d ",
>--	 t->tm_year+1900, t->tm_mon, t->tm_mday, t->tm_hour,
>-+	 t->tm_year+1900, t->tm_mon+1, t->tm_mday, t->tm_hour,
>- 	 t->tm_min, t->tm_sec, h->ts.tv_usec);
>- }
>-

Actions: View | Diff

Attachments on bug 29588: 16045