Index: head/net/ngrep/Makefile =================================================================== --- head/net/ngrep/Makefile (revision 550839) +++ head/net/ngrep/Makefile (revision 550840) @@ -1,64 +1,64 @@ # Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ PORTNAME= ngrep PORTVERSION= 1.45 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net security MASTER_SITES= SF MAINTAINER= logan@elandsys.com COMMENT= Network grep LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= gmake tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-pcap-restart MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= CAPSICUM DOCS IPV6 PCRE PORTS_PCAP OPTIONS_DEFAULT= CAPSICUM PCRE PCRE_DESC= Use PCRE instead of GNU regex PORTS_PCAP_DESC= Use ports PCAP instead of system PCAP CAPSICUM_DESC= Build with capsicum if kernel supports it PLIST_FILES= bin/ngrep man/man8/ngrep.8.gz PORTDOCS= CHANGES.txt CREDITS.txt INSTALL.txt LICENSE.txt \ README.txt REGEX.txt CAPSICUM_CONFIGURE_ON= --enable-capsicum IPV6_CONFIGURE_ENABLE= ipv6 PCRE_CONFIGURE_ENABLE= pcre PORTS_PCAP_CONFIGURE_ON= --with-pcap-includes=${LOCALBASE}/include PORTS_PCAP_CONFIGURE_OFF= --with-pcap-includes=/usr/include PORTS_PCAP_BUILD_DEPENDS= ${LOCALBASE}/lib/libpcap.a:net/libpcap .include post-patch: .if ${PORT_OPTIONS:MPORTS_PCAP} @${REINPLACE_CMD} -e "s|-lpcap|${LOCALBASE}/lib/libpcap.a|g" \ ${WRKSRC}/Makefile.in ${WRKSRC}/configure .endif post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} @if [ -f ${WRKSRC}/${file} ]; then \ ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}; \ else \ ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}; \ fi .endfor .endif .include Index: head/net/ngrep/files/patch-fix-ipv6 =================================================================== --- head/net/ngrep/files/patch-fix-ipv6 (nonexistent) +++ head/net/ngrep/files/patch-fix-ipv6 (revision 550840) @@ -0,0 +1,39 @@ +--- ngrep.c 2010-04-21 12:16:52.000000000 +0200 ++++ ngrep.c 2010-04-21 12:11:49.581088102 +0200 +@@ -711,10 +711,12 @@ void process(u_char *d, struct pcap_pkth + data = (unsigned char *)(tcp_pkt) + tcphdr_offset; + len -= link_offset + ip_hl + tcphdr_offset; + ++/* + #if USE_IPv6 + if (ip_ver == 6) + len -= ntohs(ip6_pkt->ip6_plen); +-#endif ++#endif ++*/ + + if ((int32_t)len < 0) + len = 0; +@@ -731,11 +733,12 @@ void process(u_char *d, struct pcap_pkth + data = (unsigned char *)(udp_pkt) + udphdr_offset; + len -= link_offset + ip_hl + udphdr_offset; + ++/* + #if USE_IPv6 + if (ip_ver == 6) + len -= ntohs(ip6_pkt->ip6_plen); + #endif +- ++*/ + if ((int32_t)len < 0) + len = 0; + +@@ -769,7 +772,7 @@ void process(u_char *d, struct pcap_pkth + uint16_t icmp6hdr_offset = (frag_offset) ? 0 : 4; + + data = (unsigned char *)(icmp6_pkt) + icmp6hdr_offset; +- len -= link_offset + ip_hl + ntohs(ip6_pkt->ip6_plen) + icmp6hdr_offset; ++ len -= link_offset + ip_hl + icmp6hdr_offset; + + if ((int32_t)len < 0) + len = 0; Property changes on: head/net/ngrep/files/patch-fix-ipv6 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property