Attachment #16045 for bug #29588

View | Details | Raw Unified | Return to bug 29588
Collapse All | Expand All

Lines 7-27 Link Here

(-)Makefile (-4 / +11 lines)
7	#	7	#
8		8
9	PORTNAME= ngrep	9	PORTNAME= ngrep
10	PORTVERSION= 1.38	10	PORTVERSION= 1.40
11	CATEGORIES= net security	11	CATEGORIES= net security
12	MASTER_SITES= http://www.packetfactory.net/Projects/ngrep/	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
		13	MASTER_SITE_SUBDIR= ${PORTNAME}
13		14
14	MAINTAINER= obrien@FreeBSD.org	15	MAINTAINER= obrien@FreeBSD.org
15		16
16	WRKSRC= ${WRKDIR}/ngrep	17	WRKSRC= ${WRKDIR}/ngrep
		18
17	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
		20	CONFIGURE_ARGS+= --with-pcre --with-restart
		21
18	ALL_TARGET= ngrep	22	ALL_TARGET= ngrep
		23
19	MAN8= ngrep.8	24	MAN8= ngrep.8
20		25
21	post-install:	26	post-install:
22	.if !defined(NOPORTDOCS)	27	.if !defined(NOPORTDOCS)
23	@${MKDIR} ${PREFIX}/share/doc/ngrep	28	@${MKDIR} ${DOCSDIR}
24	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ngrep	29	.for file in BUGS CHANGES README README.pcre USAGE
		30	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
		31	.endfor
25	.endif	32	.endif
26		33
27	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (ngrep-1.38.tar.gz) = adff63845df54eb40ef48f16664e4344	1	MD5 (ngrep-1.40.tar.gz) = 4837f3d3b30e12ee067cb3fd2b874798

Lines 3-8 Link Here

(-)pkg-descr (-3 / +6 lines)
3		3
4	ngrep a pcap-aware tool that will allow you to specify extended	4	ngrep a pcap-aware tool that will allow you to specify extended
5	regular expressions to match against data payloads of packets. It	5	regular expressions to match against data payloads of packets. It
6	currently recognizes TCP and UDP across Ethernet, PPP and SLIP	6	currently recognizes TCP, UDP, and ICMP across Ethernet, PPP, SLIP,
7	interfaces, and understands BPF filter logic in the same fashion	7	FDDI, Token Ring and null interfaces, and understands BPF filter
8	as more common packet sniffing tools, like tcpdump and snoop.	8	logic in the same fashion as more common packet sniffing tools,
		9	like tcpdump and snoop.
		10
		11	WWW: http://ngrep.sourceforge.net/

Lines 1-4 Link Here

(-)pkg-plist (-3 / +6 lines)
1	@comment $FreeBSD: ports/net/ngrep/pkg/PLIST,v 1.1.1.1 2000/01/02 10:22:41 obrien Exp $
2	bin/ngrep	1	bin/ngrep
3	share/doc/ngrep/README	2	%%PORTDOCS%%share/doc/ngrep/BUGS
4	@dirrm share/doc/ngrep	3	%%PORTDOCS%%share/doc/ngrep/CHANGES
		4	%%PORTDOCS%%share/doc/ngrep/README
		5	%%PORTDOCS%%share/doc/ngrep/README.pcre
		6	%%PORTDOCS%%share/doc/ngrep/USAGE
		7	%%PORTDOCS%%@dirrm share/doc/ngrep




--- 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.18 $";
 
@@ -232,7 +233,7 @@
       free(filter); 
       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);
 }


Return to bug 29588

Lines 1-28 Link Here

(-)files/patch-ngrep.c (-17 / +8 lines)
1	--- ngrep.c.orig Mon Jun 26 12:52:50 2000	1	--- ngrep.c.orig Wed Aug 8 23:36:09 2001
2	+++ ngrep.c Sat Aug 26 17:34:40 2000	2	+++ ngrep.c Wed Aug 8 23:36:31 2001
3	@@ -48,6 +48,7 @@	3	@@ -62,6 +62,7 @@
4	#include "regex.h"	4
5	#include "ngrep.h"	5	#include "ngrep.h"
6		6
7	+extern FILE *yyin;	7	+extern FILE *yyin;
8		8
9	static char rcsver[] = "$Revision: 1.3 $";	9	static char rcsver[] = "$Revision: 1.18 $";
10		10
11	@@ -196,7 +197,7 @@	11	@@ -232,7 +233,7 @@
12	free(filter);
13	filter = get_filter(&argv[optind-1]);	12	filter = get_filter(&argv[optind-1]);
14		13
		14	#ifdef NEED_RESTART
15	- PCAP_RESTART();	15	- PCAP_RESTART();
16	+ PCAP_RESTART(yyin);	16	+ PCAP_RESTART(yyin);
		17	#endif
17	if (pcap_compile(pd, &pcapfilter, filter, 0, mask.s_addr)) {	18	if (pcap_compile(pd, &pcapfilter, filter, 0, mask.s_addr)) {
18	pcap_perror(pd, "pcap compile");	19	pcap_perror(pd, "pcap compile");
19	clean_exit(-1);
20	@@ -653,7 +654,7 @@
21	struct tm *t = localtime(&h->ts.tv_sec);
22
23	printf("%02d/%02d/%02d %02d:%02d:%02d.%06d ",
24	- t->tm_year+1900, t->tm_mon, t->tm_mday, t->tm_hour,
25	+ t->tm_year+1900, t->tm_mon+1, t->tm_mday, t->tm_hour,
26	t->tm_min, t->tm_sec, h->ts.tv_usec);
27	}
28