Date: Fri, 3 Aug 2012 10:36:22 +0800 (CST) From: Hung-Yi Chen <gaod@hychen.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/170344: [UPDATE] net/tcpflow: update to 1.2.8, take maintainership Message-ID: <201208030236.q732aMVU009333@cse.tw> Resent-Message-ID: <201208030240.q732e7o1059350@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170344 >Category: ports >Synopsis: [UPDATE] net/tcpflow: update to 1.2.8, take maintainership >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 03 02:40:07 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Hung-Yi Chen >Release: FreeBSD 9.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD cse.tw 9.0-RELEASE-p2 FreeBSD 9.0-RELEASE-p2 #1: Tue Jun 12 04:13:46 CST 2012 gaod@cse.tw:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update to 1.2.8 and take maintainership. >How-To-Repeat: >Fix: --- tcpflow.diff begins here --- ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS ../tcpflow.orig/Makefile ./Makefile --- ../tcpflow.orig/Makefile 2012-08-03 02:19:14.000000000 +0800 +++ ./Makefile 2012-08-03 02:22:54.000000000 +0800 @@ -6,16 +6,15 @@ # PORTNAME= tcpflow -PORTVERSION= 0.21 -PORTREVISION= 1 +PORTVERSION= 1.2.8 CATEGORIES= net -MASTER_SITES= http://www.circlemud.org/pub/jelson/tcpflow/ +MASTER_SITES= https://github.com/downloads/simsong/tcpflow/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gaod@hychen.org COMMENT= A tool for capturing data transmitted as part of TCP connections HAS_CONFIGURE= yes -USE_AUTOTOOLS= automake14 +USE_AUTOTOOLS= automake MAN1= tcpflow.1 PLIST_FILES= bin/tcpflow diff -ruN --exclude=CVS ../tcpflow.orig/distinfo ./distinfo --- ../tcpflow.orig/distinfo 2012-08-03 02:19:14.000000000 +0800 +++ ./distinfo 2012-08-03 02:21:48.000000000 +0800 @@ -1,2 +1,2 @@ -SHA256 (tcpflow-0.21.tar.gz) = 16928bd9721c0de685b66365d320bcd52a97a4edf0e1087654ad8db379d19469 -SIZE (tcpflow-0.21.tar.gz) = 79369 +SHA256 (tcpflow-1.2.8.tar.gz) = ef4da1594b25af9f1fd51052fe1ff18f4f91d0e25e0a1f5825eabccfea9a503a +SIZE (tcpflow-1.2.8.tar.gz) = 220911 diff -ruN --exclude=CVS ../tcpflow.orig/files/patch-configure ./files/patch-configure --- ../tcpflow.orig/files/patch-configure 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-configure 2012-08-03 02:48:40.000000000 +0800 @@ -0,0 +1,28 @@ +--- configure.orig 2012-07-24 01:16:31.000000000 +0800 ++++ configure 2012-08-03 02:48:26.000000000 +0800 +@@ -6226,7 +6226,7 @@ + fi + done + +-ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " ++ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default + #ifdef HAVE_ARPA_INET_H + #include <arpa/inet.h> + #endif +@@ -6239,7 +6239,6 @@ + #include <netinet/tcp.h> + #endif + +- + " + if test "x$ac_cv_type_socklen_t" = xyes; then : + +@@ -6251,7 +6250,7 @@ + fi + + +-ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" " ++ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default + #ifdef HAVE_ARPA_INET_H + #include <arpa/inet.h> + #endif diff -ruN --exclude=CVS ../tcpflow.orig/files/patch-configure.ac ./files/patch-configure.ac --- ../tcpflow.orig/files/patch-configure.ac 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-configure.ac 2012-08-03 02:49:09.000000000 +0800 @@ -0,0 +1,11 @@ +--- configure.ac.orig 2012-07-24 01:15:44.000000000 +0800 ++++ configure.ac 2012-08-03 02:48:56.000000000 +0800 +@@ -282,7 +282,7 @@ + + AC_CHECK_FUNCS([inet_ntop sigaction sigset strnstr setuid setgid mmap futimes bcopy bzero]) + AC_CHECK_TYPES([socklen_t], [], [], +-[[ ++[[$ac_includes_default + #ifdef HAVE_ARPA_INET_H + #include <arpa/inet.h> + #endif diff -ruN --exclude=CVS ../tcpflow.orig/files/patch-datalink.c ./files/patch-datalink.c --- ../tcpflow.orig/files/patch-datalink.c 2012-08-03 02:19:14.000000000 +0800 +++ ./files/patch-datalink.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,26 +0,0 @@ ---- src/datalink.c.orig Mon May 9 12:00:38 2005 -+++ src/datalink.c Mon May 9 12:23:47 2005 -@@ -42,6 +42,13 @@ - - #include "tcpflow.h" - -+/* -+ * Byte-swap a 32-bit number. -+ * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on -+ * big-endian platforms.) -+ */ -+#define SWAPLONG(y) \ -+((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff)) - - - /* The DLT_NULL packet header is 4 bytes long. It contains a network -@@ -71,7 +78,8 @@ - #ifndef DLT_NULL_BROKEN - /* make sure this is AF_INET */ - memcpy((char *)&family, (char *)p, sizeof(family)); -- family = ntohl(family); -+ // family = ntohl(family); -+ if ((family & 0xFFFF0000) != 0) family = SWAPLONG(family); - if (family != AF_INET) { - DEBUG(6) ("warning: received non-AF_INET null frame (type %d)", family); - return; diff -ruN --exclude=CVS ../tcpflow.orig/files/patch-src_tcpflow.h ./files/patch-src_tcpflow.h --- ../tcpflow.orig/files/patch-src_tcpflow.h 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-src_tcpflow.h 2012-08-03 02:49:48.000000000 +0800 @@ -0,0 +1,28 @@ +--- src/tcpflow.h.orig 2012-08-03 02:49:18.000000000 +0800 ++++ src/tcpflow.h 2012-08-03 02:49:27.000000000 +0800 +@@ -34,6 +34,25 @@ + * + */ + ++#include <sys/types.h> ++#include <net/ethernet.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <netinet/in.h> ++#include <netinet/in_systm.h> ++#include <netinet/ip.h> ++#include <netinet/ip_var.h> ++#include <netinet/tcp.h> ++#include <netinet/tcpip.h> ++#include <arpa/inet.h> ++#include <ctype.h> ++#include <pcap.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <syslog.h> ++#include <unistd.h> ++ + #ifndef __TCPFLOW_H__ + #define __TCPFLOW_H__ + diff -ruN --exclude=CVS ../tcpflow.orig/pkg-descr ./pkg-descr --- ../tcpflow.orig/pkg-descr 2012-08-03 02:19:14.000000000 +0800 +++ ./pkg-descr 2012-08-03 02:50:57.000000000 +0800 @@ -15,4 +15,5 @@ reading the packets from a tcpdump(1) capture file, using a new option (-r). +WWW: https://github.com/simsong/tcpflow WWW: http://www.circlemud.org/~jelson/software/tcpflow/ ===> Done --- tcpflow.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?201208030236.q732aMVU009333>