svn commit: r523739 - in head: . net net/tcptrace net/tcptrace/files
Stefan Esser
se at FreeBSD.org
Tue Jan 21 20:42:19 UTC 2020
Author: se
Date: Tue Jan 21 20:42:17 2020
New Revision: 523739
URL: https://svnweb.freebsd.org/changeset/ports/523739
Log:
Resurrect tcptrace
This port has been deleted on 2019-10-16 as un-fetchable, but there is a
repository on GitHub that provides a slightly later version than that of
the deleted port.
Approved by: antoine (mentor)
Added:
head/net/tcptrace/
- copied from r514600, head/net/tcptrace/
head/net/tcptrace/files/patch-mod_traffic.c (contents, props changed)
head/net/tcptrace/files/patch-tcpdump.c (contents, props changed)
head/net/tcptrace/files/patch-tcpdump.h (contents, props changed)
head/net/tcptrace/files/patch-tcptrace.h (contents, props changed)
Deleted:
head/net/tcptrace/files/patch-tcpdump.c.diff
head/net/tcptrace/files/patch-tcpdump.h.diff
head/net/tcptrace/files/patch-tcptrace.h.diff
Modified:
head/MOVED
head/net/Makefile
head/net/tcptrace/Makefile
head/net/tcptrace/distinfo
Modified: head/MOVED
==============================================================================
--- head/MOVED Tue Jan 21 20:36:14 2020 (r523738)
+++ head/MOVED Tue Jan 21 20:42:17 2020 (r523739)
@@ -13268,7 +13268,6 @@ net/py-netstring||2019-10-16|Has expired: Unfetchable,
net/radiusd-cistron||2019-10-16|Has expired: Unfetchable, unmaintained
net/rtptools||2019-10-16|Has expired: Unfetchable, unmaintained
net/smbldap-tools||2019-10-16|Has expired: Unfetchable, unmaintained
-net/tcptrace||2019-10-16|Has expired: Unfetchable, unmaintained
net/wackford-squeers||2019-10-16|Has expired: Unfetchable, unmaintained
net/wmnet2||2019-10-16|Has expired: Unfetchable, unmaintained
net-im/pidgin-birthday-reminder||2019-10-16|Has expired: Unfetchable, unmaintained
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Tue Jan 21 20:36:14 2020 (r523738)
+++ head/net/Makefile Tue Jan 21 20:42:17 2020 (r523739)
@@ -1446,6 +1446,7 @@
SUBDIR += tcpsplit
SUBDIR += tcpstat
SUBDIR += tcptestsuite
+ SUBDIR += tcptrace
SUBDIR += tcptraceroute
SUBDIR += tcpview
SUBDIR += tcpwatch
Modified: head/net/tcptrace/Makefile
==============================================================================
--- head/net/tcptrace/Makefile Wed Oct 16 15:29:20 2019 (r514600)
+++ head/net/tcptrace/Makefile Tue Jan 21 20:42:17 2020 (r523739)
@@ -2,24 +2,24 @@
# $FreeBSD$
PORTNAME= tcptrace
-PORTVERSION= 6.6.7
+PORTVERSION= 6.6.8
CATEGORIES= net
-MASTER_SITES= http://www.tcptrace.org/download/
+#MASTER_SITES= http://www.tcptrace.org/download/
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= se at FreeBSD.org
COMMENT= TCP dump file analysis tool
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN= unfetchable
-DEPRECATED= Unfetchable, unmaintained
-EXPIRATION_DATE= 2019-10-16
-
+USES= bison
GNU_CONFIGURE= yes
ALL_TARGET= tcptrace
+USE_GITHUB= yes
+GH_ACCOUNT= blitz
+GH_TAGNAME= 508f73a
-PLIST_FILES= bin/${PORTNAME} \
+PLIST_FILES= bin/tcptrace \
bin/xpl2gpl \
man/man1/tcptrace.1.gz
Modified: head/net/tcptrace/distinfo
==============================================================================
--- head/net/tcptrace/distinfo Wed Oct 16 15:29:20 2019 (r514600)
+++ head/net/tcptrace/distinfo Tue Jan 21 20:42:17 2020 (r523739)
@@ -1,2 +1,3 @@
-SHA256 (tcptrace-6.6.7.tar.gz) = 63380a4051933ca08979476a9dfc6f959308bc9f60d45255202e388eb56910bd
-SIZE (tcptrace-6.6.7.tar.gz) = 3773308
+TIMESTAMP = 1579553429
+SHA256 (blitz-tcptrace-6.6.8-508f73a_GH0.tar.gz) = 91b8f947ff7b238d0e757e94a30a3a5ed09d1555e312725f2903442cf5885954
+SIZE (blitz-tcptrace-6.6.8-508f73a_GH0.tar.gz) = 3755441
Added: head/net/tcptrace/files/patch-mod_traffic.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tcptrace/files/patch-mod_traffic.c Tue Jan 21 20:42:17 2020 (r523739)
@@ -0,0 +1,11 @@
+--- mod_traffic.c.orig 2013-07-01 18:43:14 UTC
++++ mod_traffic.c
+@@ -291,7 +291,7 @@ IncludePorts(
+
+
+
+-static int
++static void
+ traffic_init_files(void)
+ {
+ static int created = 0;
Added: head/net/tcptrace/files/patch-tcpdump.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tcptrace/files/patch-tcpdump.c Tue Jan 21 20:42:17 2020 (r523739)
@@ -0,0 +1,17 @@
+--- tcpdump.c.orig 2013-07-01 18:43:14 UTC
++++ tcpdump.c
+@@ -114,10 +114,13 @@ static int callback(
+ /* 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;
Added: head/net/tcptrace/files/patch-tcpdump.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tcptrace/files/patch-tcpdump.h Tue Jan 21 20:42:17 2020 (r523739)
@@ -0,0 +1,34 @@
+--- tcpdump.h.orig 2013-07-01 18:43:14 UTC
++++ tcpdump.h
+@@ -179,7 +179,7 @@ static int find_ip_fddi(char* buf, int iplen) {
+ }
+
+ /* 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 at nortelnetworks.com) on july 18th, 2003 */
+ static int find_ip_eth(char* buf)
+ {
+@@ -192,16 +192,19 @@ static int find_ip_eth(char* buf)
+ 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;
Added: head/net/tcptrace/files/patch-tcptrace.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/tcptrace/files/patch-tcptrace.h Tue Jan 21 20:42:17 2020 (r523739)
@@ -0,0 +1,13 @@
+--- tcptrace.h.orig 2013-07-01 18:43:14 UTC
++++ tcptrace.h
+@@ -1188,6 +1188,10 @@ struct ipaddr *IPV6ADDR2ADDR(struct in6_addr *addr6);
+ #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 at nortelnetworks.com)*/
+ #ifndef ETHERTYPE_PPPOE_SESSION
+ #define ETHERTYPE_PPPOE_SESSION 0x8864
More information about the svn-ports-all
mailing list