Date: Thu, 5 May 2005 19:00:48 +0300 From: Vasil Dimov <vd@datamax.bg> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80665: Update port: net/tcptrace from 6.6.0 to 6.6.7 Message-ID: <20050505160048.GA41467@sinanica.bg.datamax> Resent-Message-ID: <200505051610.j45GA2VP072858@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80665 >Category: ports >Synopsis: Update port: net/tcptrace from 6.6.0 to 6.6.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 05 16:10:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Vasil Dimov >Release: FreeBSD 5.4-STABLE i386 >Organization: DataMax >Environment: System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #5: Mon Apr 11 14:07:32 EEST 2005 root@sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP i386 >Description: Update net/tcptrace to the most recent version 6.6.7 * Always install man page, regardless of NOPORTDOCS * Install additional documentation in post-install target instead of do-install target * Install additional documentation with INSTALL_MAN instead of INSTALL_DATA * Prefix additional docs with %%PORTDOCS%% in pkg-plist. This way we do not get errors about nonexisting files while removing port if installed with NOPORTDOCS=yes * Sync patch with new source * Split patchfile into 3 patchfiles - one for each file being patched >How-To-Repeat: >Fix: --- tcptrace_update_6.6.0-6.6.7.diff begins here --- diff -urN tcptrace-6.6.0/Makefile tcptrace/Makefile --- tcptrace-6.6.0/Makefile Wed Jan 21 16:15:35 2004 +++ tcptrace/Makefile Thu May 5 18:19:52 2005 @@ -6,7 +6,7 @@ # PORTNAME= tcptrace -PORTVERSION= 6.6.0 +PORTVERSION= 6.6.7 CATEGORIES= net ipv6 MASTER_SITES= http://www.tcptrace.org/download/ @@ -26,11 +26,13 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/xpl2gpl ${PREFIX}/bin -.if !defined(NOPORTDOCS) ${INSTALL_MAN} ${WRKSRC}/tcptrace.man ${PREFIX}/man/man1/tcptrace.1 + +post-install: +.if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/tcptrace .for file in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/tcptrace + ${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/share/doc/tcptrace .endfor .endif diff -urN tcptrace-6.6.0/distinfo tcptrace/distinfo --- tcptrace-6.6.0/distinfo Mon Apr 26 16:08:43 2004 +++ tcptrace/distinfo Thu May 5 18:22:11 2005 @@ -1,2 +1,2 @@ -MD5 (tcptrace-6.6.0.tar.gz) = 9d71ee3c75e142cd46cf0d412b7d6e89 -SIZE (tcptrace-6.6.0.tar.gz) = 3762654 +MD5 (tcptrace-6.6.7.tar.gz) = 68128dc1817b866475e2f048e158f5b9 +SIZE (tcptrace-6.6.7.tar.gz) = 3773308 diff -urN tcptrace-6.6.0/files/patch-ad tcptrace/files/patch-ad --- tcptrace-6.6.0/files/patch-ad Thu Nov 18 08:50:35 2004 +++ tcptrace/files/patch-ad Thu Jan 1 02:00:00 1970 @@ -1,65 +0,0 @@ -Index: tcpdump.c -=========================================================================== ---- tcpdump.c 2004/11/17 22:48:46 #1 -+++ tcpdump.c 2004/11/17 22:48:46 -@@ -112,6 +112,9 @@ - { - case -1: /* Not an IP packet */ - return (-1); -+ case EH_SIZE + ETHER_VLAN_ENCAP_LEN: -+ memcpy(ð_header.ether_type, buf+EH_SIZE+2, 2); -+ /* FALLTHROUGH */ - case EH_SIZE: /* straight Ethernet encapsulation */ - memcpy((char *)ip_buf,buf+offset,iplen); - callback_plast = ip_buf+iplen-offset-1; -Index: tcpdump.h -=========================================================================== ---- tcpdump.h 2004/11/17 22:48:46 #1 -+++ tcpdump.h 2004/11/17 22:48:46 -@@ -178,7 +178,7 @@ - } - - /* This function determine the offset for the IP packet in an Ethernet frame */ --/* We handle two cases : straight Ethernet encapsulation or PPPoE encapsulation */ -+/* We handle three cases : straight Ethernet, PPPoE, or .1q VLAN encapsulation */ - /* Written by Yann Samama (ysamama@nortelnetworks.com) on july 18th, 2003 */ - static int find_ip_eth(char* buf) - { -@@ -191,10 +191,8 @@ - switch (eth_proto_type) - { - case ETHERTYPE_IPV6: /* it's pure IPv6 over ethernet */ -- offset = 14; -- break; - case ETHERTYPE_IP: /* it's pure IPv4 over ethernet */ -- offset = 14; -+ offset = sizeof(struct ether_header); - break; - case ETHERTYPE_PPPOE_SESSION: /* it's a PPPoE session */ - memcpy(&ppp_proto_type, buf+20, 2); -@@ -202,6 +200,10 @@ - if (ppp_proto_type == 0x0021) /* it's IP over PPPoE */ - offset = PPPOE_SIZE; - break; -+ case ETHERTYPE_VLAN: -+ offset = sizeof(struct ether_header) + -+ ETHER_VLAN_ENCAP_LEN; -+ break; - default: /* well, this is not an IP packet */ - offset = -1; - break; -Index: tcptrace.h -=========================================================================== ---- tcptrace.h 2004/11/17 22:48:46 #1 -+++ tcptrace.h 2004/11/17 22:48:46 -@@ -1172,6 +1172,10 @@ - #define ETHERTYPE_VLAN 0x8100 - #endif /* 802.1Q Virtual LAN */ - -+#ifndef ETHER_VLAN_ENCAP_LEN -+#define ETHER_VLAN_ENCAP_LEN 4 -+#endif /* 802.1Q tag header length */ -+ - /* support for PPPoE encapsulation added by Yann Samama (ysamama@nortelnetworks.com)*/ - #ifndef ETHERTYPE_PPPOE_SESSION - #define ETHERTYPE_PPPOE_SESSION 0x8864 diff -urN tcptrace-6.6.0/files/patch-tcpdump.c.diff tcptrace/files/patch-tcpdump.c.diff --- tcptrace-6.6.0/files/patch-tcpdump.c.diff Thu Jan 1 02:00:00 1970 +++ tcptrace/files/patch-tcpdump.c.diff Thu May 5 18:42:43 2005 @@ -0,0 +1,17 @@ +--- tcpdump.c.orig Thu May 5 18:41:30 2005 ++++ tcpdump.c Thu May 5 18:41:53 2005 +@@ -112,10 +112,13 @@ + /* for some reason, the windows version of tcpdump is using */ + /* this. It looks just like ethernet to me */ + case PCAP_DLT_EN10MB: +- offset = find_ip_eth(buf); /* Here we check if we are dealing with Straight Ethernet encapsulation or PPPoE */ ++ offset = find_ip_eth(buf); /* Here we check if we are dealing with Straight Ethernet encapsulation, PPPoE or .1q VLAN encapsulation */ + memcpy(ð_header, buf, EH_SIZE); /* save ether header */ + switch (offset) + { ++ case EH_SIZE + ETHER_VLAN_ENCAP_LEN: ++ memcpy(ð_header.ether_type, buf+EH_SIZE+2, 2); ++ /* FALLTHROUGH */ + case EH_SIZE: /* straight Ethernet encapsulation */ + memcpy((char *)ip_buf,buf+offset,iplen-offset); + callback_plast = ip_buf+iplen-offset-1; diff -urN tcptrace-6.6.0/files/patch-tcpdump.h.diff tcptrace/files/patch-tcpdump.h.diff --- tcptrace-6.6.0/files/patch-tcpdump.h.diff Thu Jan 1 02:00:00 1970 +++ tcptrace/files/patch-tcpdump.h.diff Thu May 5 18:45:37 2005 @@ -0,0 +1,34 @@ +--- tcpdump.h.orig Thu May 5 18:41:37 2005 ++++ tcpdump.h Thu May 5 18:41:53 2005 +@@ -179,7 +179,7 @@ + } + + /* This function determine the offset for the IP packet in an Ethernet frame */ +-/* We handle two cases : straight Ethernet encapsulation or PPPoE encapsulation */ ++/* We handle three cases : straight Ethernet, PPPoE, or .1q VLAN encapsulation */ + /* Written by Yann Samama (ysamama@nortelnetworks.com) on july 18th, 2003 */ + static int find_ip_eth(char* buf) + { +@@ -192,16 +192,19 @@ + switch (eth_proto_type) + { + case ETHERTYPE_IPV6: /* it's pure IPv6 over ethernet */ +- offset = 14; +- break; ++ /* FALLTHROUGH */ + case ETHERTYPE_IP: /* it's pure IPv4 over ethernet */ +- offset = 14; ++ offset = sizeof(struct ether_header); + break; + case ETHERTYPE_PPPOE_SESSION: /* it's a PPPoE session */ + memcpy(&ppp_proto_type, buf+20, 2); + ppp_proto_type = ntohs(ppp_proto_type); + if (ppp_proto_type == 0x0021) /* it's IP over PPPoE */ + offset = PPPOE_SIZE; ++ break; ++ case ETHERTYPE_VLAN: ++ offset = sizeof(struct ether_header) + ++ ETHER_VLAN_ENCAP_LEN; + break; + default: /* well, this is not an IP packet */ + offset = -1; diff -urN tcptrace-6.6.0/files/patch-tcptrace.h.diff tcptrace/files/patch-tcptrace.h.diff --- tcptrace-6.6.0/files/patch-tcptrace.h.diff Thu Jan 1 02:00:00 1970 +++ tcptrace/files/patch-tcptrace.h.diff Thu May 5 18:45:51 2005 @@ -0,0 +1,13 @@ +--- tcptrace.h.orig Thu May 5 18:41:47 2005 ++++ tcptrace.h Thu May 5 18:41:53 2005 +@@ -1182,6 +1182,10 @@ + #define ETHERTYPE_VLAN 0x8100 + #endif /* 802.1Q Virtual LAN */ + ++#ifndef ETHER_VLAN_ENCAP_LEN ++#define ETHER_VLAN_ENCAP_LEN 4 ++#endif /* 802.1Q tag header length */ ++ + /* support for PPPoE encapsulation added by Yann Samama (ysamama@nortelnetworks.com)*/ + #ifndef ETHERTYPE_PPPOE_SESSION + #define ETHERTYPE_PPPOE_SESSION 0x8864 diff -urN tcptrace-6.6.0/pkg-plist tcptrace/pkg-plist --- tcptrace-6.6.0/pkg-plist Thu Nov 21 20:23:04 2002 +++ tcptrace/pkg-plist Thu May 5 18:20:53 2005 @@ -1,18 +1,18 @@ bin/tcptrace bin/xpl2gpl -share/doc/tcptrace/ARGS -share/doc/tcptrace/CHANGES -share/doc/tcptrace/COPYING -share/doc/tcptrace/COPYRIGHT -share/doc/tcptrace/FAQ -share/doc/tcptrace/README -share/doc/tcptrace/README.mailing_list -share/doc/tcptrace/README.modules -share/doc/tcptrace/README.tline_graphs -share/doc/tcptrace/README.tput_graphs -share/doc/tcptrace/README.version -share/doc/tcptrace/README.xpl2gpl -share/doc/tcptrace/THANKS -share/doc/tcptrace/WWW -share/doc/tcptrace/dot_tcptracerc -@dirrm share/doc/tcptrace +%%PORTDOCS%%share/doc/tcptrace/ARGS +%%PORTDOCS%%share/doc/tcptrace/CHANGES +%%PORTDOCS%%share/doc/tcptrace/COPYING +%%PORTDOCS%%share/doc/tcptrace/COPYRIGHT +%%PORTDOCS%%share/doc/tcptrace/FAQ +%%PORTDOCS%%share/doc/tcptrace/README +%%PORTDOCS%%share/doc/tcptrace/README.mailing_list +%%PORTDOCS%%share/doc/tcptrace/README.modules +%%PORTDOCS%%share/doc/tcptrace/README.tline_graphs +%%PORTDOCS%%share/doc/tcptrace/README.tput_graphs +%%PORTDOCS%%share/doc/tcptrace/README.version +%%PORTDOCS%%share/doc/tcptrace/README.xpl2gpl +%%PORTDOCS%%share/doc/tcptrace/THANKS +%%PORTDOCS%%share/doc/tcptrace/WWW +%%PORTDOCS%%share/doc/tcptrace/dot_tcptracerc +%%PORTDOCS%%@dirrm share/doc/tcptrace --- tcptrace_update_6.6.0-6.6.7.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050505160048.GA41467>