new package: tcptrace (#6993)

Also added missing deps for libpcap: bison and flex

3 files changed, 99 insertions, 0 deletions

diff --git a/var/spack/repos/builtin/packages/libpcap/package.py b/var/spack/repos/builtin/packages/libpcap/package.py
index 02221b371e..4236fdbc3e 100644
--- a/var/spack/repos/builtin/packages/libpcap/package.py
+++ b/var/spack/repos/builtin/packages/libpcap/package.py
@@ -32,3 +32,6 @@ class Libpcap(AutotoolsPackage):
     url      = "http://www.tcpdump.org/release/libpcap-1.8.1.tar.gz"
 
     version('1.8.1', '3d48f9cd171ff12b0efd9134b52f1447')
+
+    depends_on('flex', type='build')
+    depends_on('bison', type='build')
diff --git a/var/spack/repos/builtin/packages/tcptrace/package.py b/var/spack/repos/builtin/packages/tcptrace/package.py
new file mode 100644
index 0000000000..ff2726a6a6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/tcptrace/package.py
@@ -0,0 +1,59 @@
+##############################################################################
+# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/spack/spack
+# Please also see the NOTICE and LICENSE files for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+from os.path import join
+
+
+class Tcptrace(AutotoolsPackage):
+    """tcptrace is a tool written by Shawn Ostermann at Ohio University for
+       analysis of TCP dump files. It can take as input the files produced by
+       several popular packet-capture programs, including tcpdump, snoop,
+       etherpeek, HP Net Metrix, and WinDump."""
+
+    homepage = "http://www.tcptrace.org/"
+    url      = "http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz"
+
+    version('6.6.7', '68128dc1817b866475e2f048e158f5b9')
+
+    depends_on('bison', type='build')
+    depends_on('flex', type='build')
+    depends_on('libpcap')
+
+    # Fixes incorrect API access in libpcap.
+    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545595
+    patch('tcpdump.patch')
+
+    @run_after('configure')
+    def patch_makefile(self):
+        # see https://github.com/blitz/tcptrace/blob/master/README.linux
+        Makefile = FileFilter('Makefile')
+        Makefile.filter(
+            "PCAP_LDLIBS = -lpcap",
+            "DEFINES += -D_BSD_SOURCE\nPCAP_LDLIBS = -lpcap")
+
+    def install(self, spec, prefix):
+        # The build system has trouble creating directories
+        mkdirp(prefix.bin)
+        install('tcptrace', join(prefix.bin, 'tcptrace'))
diff --git a/var/spack/repos/builtin/packages/tcptrace/tcpdump.patch b/var/spack/repos/builtin/packages/tcptrace/tcpdump.patch
new file mode 100644
index 0000000000..107d3a8af6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/tcptrace/tcpdump.patch
@@ -0,0 +1,37 @@
+--- a/tcpdump.c
++++ b/tcpdump.c
+@@ -68,9 +68,6 @@
+ 
+ 
+ 
+-/* external ref, in case missing in older version */
+-extern int pcap_offline_read(void *, int, pcap_handler, u_char *);
+-
+ /* global pointer, the pcap info header */
+ static pcap_t *pcap;
+ 
+@@ -248,9 +245,12 @@
+     void		**pplast)
+ {
+     int ret;
++    struct pcap_pkthdr *pkt_header;
++    const u_char *pkt_data;
+ 
+     while (1) {
+-	if ((ret = pcap_offline_read(pcap,1,(pcap_handler)callback,0)) != 1) {
++       ret = pcap_next_ex(pcap, &pkt_header, &pkt_data);
++       if (ret != 1) {
+ 	    /* prob EOF */
+ 
+ 	    if (ret == -1) {
+@@ -265,6 +265,10 @@
+ 	    return(0);
+ 	}
+ 
++   if (callback(0, pkt_header, (char *)pkt_data)) {
++      continue;
++   }
++
+ 	/* at least one tcpdump implementation (AIX) seems to be */
+ 	/* storing NANOseconds in the usecs field of the timestamp. */
+ 	/* This confuses EVERYTHING.  Try to compensate. */