Date: Tue, 25 Aug 2020 16:41:52 +0000 (UTC) From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546193 - in head/net/file2pcap: . files Message-ID: <202008251641.07PGfqQb077805@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Tue Aug 25 16:41:52 2020 New Revision: 546193 URL: https://svnweb.freebsd.org/changeset/ports/546193 Log: - Update to 1.27 snapshot on 2019-11-22. - Add patches to avoid build error with -fno-common (default of Clang 11 and GCC 10). Added: head/net/file2pcap/files/patch-file2pcap.c (contents, props changed) head/net/file2pcap/files/patch-file2pcap.h (contents, props changed) Modified: head/net/file2pcap/Makefile head/net/file2pcap/distinfo (contents, props changed) Modified: head/net/file2pcap/Makefile ============================================================================== --- head/net/file2pcap/Makefile Tue Aug 25 16:34:02 2020 (r546192) +++ head/net/file2pcap/Makefile Tue Aug 25 16:41:52 2020 (r546193) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= file2pcap -PORTVERSION= 1.25 +PORTVERSION= 1.27.b.${SNAPDATE} CATEGORIES= net MAINTAINER= nobutaka@FreeBSD.org @@ -11,10 +11,12 @@ COMMENT= Tool to make packet captures containing the c LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +USE_GITHUB= yes + GH_ACCOUNT= Cisco-Talos GH_PROJECT= file2pcap - -USE_GITHUB= yes +GH_TAGNAME= 0f694c0 +SNAPDATE= 20191122 ALL_TARGET= file2pcap Modified: head/net/file2pcap/distinfo ============================================================================== --- head/net/file2pcap/distinfo Tue Aug 25 16:34:02 2020 (r546192) +++ head/net/file2pcap/distinfo Tue Aug 25 16:41:52 2020 (r546193) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508678999 -SHA256 (Cisco-Talos-file2pcap-1.25_GH0.tar.gz) = 77a9cc8e2bf70fb88c140785a3f3f964aba16ed34844d12987a19cabf7b43d48 -SIZE (Cisco-Talos-file2pcap-1.25_GH0.tar.gz) = 27561 +TIMESTAMP = 1598371850 +SHA256 (Cisco-Talos-file2pcap-1.27.b.20191122-0f694c0_GH0.tar.gz) = cb377219eaf2606c8424b67499bc7b242d77c77a1ce95d96decf95d01a6e52b6 +SIZE (Cisco-Talos-file2pcap-1.27.b.20191122-0f694c0_GH0.tar.gz) = 34383 Added: head/net/file2pcap/files/patch-file2pcap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/file2pcap/files/patch-file2pcap.c Tue Aug 25 16:41:52 2020 (r546193) @@ -0,0 +1,11 @@ +--- file2pcap.c.orig 2019-11-21 15:44:46 UTC ++++ file2pcap.c +@@ -61,6 +61,8 @@ const int packetLen4 = (sizeof(SRC_ETHER)-1 + sizeof(D + const int packetLen6 = (sizeof(SRC_ETHER)-1 + sizeof(DST_ETHER)-1 + sizeof(PROTO_ETHER6)-1 + sizeof(struct ip6_hdr) + sizeof(struct tcphdr)); + + ++struct pcap_packet_header ph; ++unsigned short srcport, dstport; + struct handover hoFtp; + + Added: head/net/file2pcap/files/patch-file2pcap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/file2pcap/files/patch-file2pcap.h Tue Aug 25 16:41:52 2020 (r546193) @@ -0,0 +1,24 @@ +--- file2pcap.h.orig 2019-11-21 15:44:46 UTC ++++ file2pcap.h +@@ -81,7 +81,7 @@ struct pcap_packet_header + int usec; + int length1; + int length2; +- } ph; ++ }; + + struct v6_pseudo_header + { +@@ -90,10 +90,10 @@ struct v6_pseudo_header + int length; + char zeroes[3]; + char next_header; +- } v6ph; ++ }; + + +-unsigned short srcport, dstport; ++extern unsigned short srcport, dstport; + + + int craftTcp(char *payload, int payloadSize, char direction, unsigned char flags, struct handover *ho);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008251641.07PGfqQb077805>