Browse Source

Import Debian version 3.4.4-3

Noël Köthe 6 years ago
parent
commit
441983a62b

+ 1 - 1
debian/compat

@@ -1 +1 @@
-5
+9

+ 5 - 3
debian/control

@@ -2,8 +2,8 @@ Source: tcpreplay
 Section: net
 Priority: optional
 Maintainer: Noël Köthe <noel@debian.org>
-Build-Depends: debhelper (>= 5.0.0), libpcap0.8-dev, tcpdump, autogen, dh-autoreconf, dpkg-dev (>= 1.16.0)
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9.0.0), libpcap0.8-dev, tcpdump, autogen, dh-autoreconf, dpkg-dev (>= 1.16.0)
+Standards-Version: 3.9.8
 Homepage: http://tcpreplay.synfin.net/
 
 Package: tcpreplay
@@ -19,5 +19,7 @@ Description: Tool to replay saved tcpdump files at arbitrary speeds
  and doesn't reproduce the real-world anomalies that appear on
  production networks (asymmetric routes, traffic bursts/lulls,
  fragmentation, retransmissions, etc.), tcpreplay allows for exact
- replication of real traffic seen on real networks. 
+ replication of real traffic seen on real networks. It included the following
+ executables tcpprep, tcprewrite, tcpreplay-edit, tcpbridge and pcap
+ based captures are possible.
 

+ 5 - 0
debian/patches/configure-pcap.patch

@@ -1,3 +1,8 @@
+Author: gregor herrmann <gregoa@debian.org>
+Date: 2012-03-14 18:44:39 +0100
+
+	Fix configure to find libpcap
+
 --- tcpreplay-3.4.4/configure.ac.orig	2010-04-05 02:58:05.000000000 +0200
 +++ tcpreplay-3.4.4/configure.ac	2012-07-06 23:27:29.000000000 +0200
 @@ -39,6 +39,7 @@

+ 30 - 0
debian/patches/enforce-maxpacket.patch

@@ -0,0 +1,30 @@
+Subject: tcprewrite: Handle frames of 65535 octets size
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: Mon Jun 29 17:08:24 2015 +0200
+
+diff --git a/src/defines.h.in b/src/defines.h.in
+index 3a1bf1e..5468d14 100644
+--- a/src/defines.h.in
++++ b/src/defines.h.in
+@@ -104,7 +104,7 @@ typedef struct tcpr_speed_s tcpr_speed_t;
+ #define DEFAULT_MTU 1500        /* Max Transmission Unit of standard ethernet
+                                  * don't forget *frames* are MTU + L2 header! */
+ 
+-#define MAXPACKET 65535         /* was 16436 linux loopback, but maybe something is bigger then 
++#define MAXPACKET 65549         /* was 16436 linux loopback, but maybe something is bigger then 
+                                    linux loopback */
+ 
+ #define MAX_SNAPLEN 65535       /* tell libpcap to capture the entire packet */
+diff --git a/src/tcprewrite.c b/src/tcprewrite.c
+index 90a6f2e..9c32a5e 100644
+--- a/src/tcprewrite.c
++++ b/src/tcprewrite.c
+@@ -253,6 +253,8 @@ rewrite_packets(tcpedit_t *tcpedit, pcap_t *pin, pcap_dumper_t *pout)
+         packetnum++;
+         dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum, pkthdr.caplen);
+ 
++        if (pkthdr.caplen > MAXPACKET)
++            errx(-1, "Frame too big, caplen %d exceeds %d", pkthdr.caplen, MAXPACKET);
+         /* 
+          * copy over the packet so we can pad it out if necessary and
+          * because pcap_next() returns a const ptr

+ 1 - 0
debian/patches/series

@@ -1 +1,2 @@
 configure-pcap.patch
+enforce-maxpacket.patch

+ 5 - 5
debian/rules

@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -11,11 +12,10 @@ else
 confflags= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
-CFLAGS = `dpkg-buildflags --get CFLAGS`
+DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 CFLAGS += -g -Wall
-CXXFLAGS = `dpkg-buildflags --get CXXFLAGS` -g -Wall
-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
-CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
 configure-stamp:
 	dh_testdir
@@ -60,7 +60,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tcpreplay.