Browse Source

Import Debian version 3.4.4-1

Noël Köthe 9 years ago
parent
commit
fe9db5a50f
8 changed files with 72 additions and 3294 deletions
  1. 0 1561
      config.guess
  2. 0 1686
      config.sub
  3. 3 3
      debian/control
  4. 9 8
      debian/copyright
  5. 30 0
      debian/patches/configure-pcap.patch
  6. 1 0
      debian/patches/series
  7. 28 36
      debian/rules
  8. 1 0
      debian/source/format

File diff suppressed because it is too large
+ 0 - 1561
config.guess


File diff suppressed because it is too large
+ 0 - 1686
config.sub


+ 3 - 3
debian/control

@@ -1,9 +1,9 @@
 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, autotools-dev
-Standards-Version: 3.8.2
+Maintainer: Noël Köthe <noel@debian.org>
+Build-Depends: debhelper (>= 5.0.0), libpcap0.8-dev, tcpdump, autogen, dh-autoreconf, dpkg-dev
+Standards-Version: 3.9.3
 Homepage: http://tcpreplay.synfin.net/
 
 Package: tcpreplay

+ 9 - 8
debian/copyright

@@ -1,6 +1,6 @@
 This package was debianized by
 Raphael Bossek <bossekr@debian.org>  Tue, 29 Aug 2000 21:36:07 +0200
-Noel Koethe <noel@debian.org> on Tue, 31 Dec 2002 16:19:09 +0100.
+Noël Köthe <noel@debian.org> on Tue, 31 Dec 2002 16:19:09 +0100.
 
 It was downloaded from https://sf.net/projects/tcpreplay/
 
@@ -14,7 +14,8 @@ Capinfo was written and is now maintained by Matt Bing.
 
 Copyright:
 
-Copyright (c) 1999-2002 Matt Bing, Aaron Turner. All rights reserved.
+Copyright (c) 2001-2010 Aaron Turner.  aturner at synfin dot net
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -25,12 +26,9 @@ are met:
 2. Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-      This product includes software developed by Anzen Computing, Inc.
-4. Neither the name of Anzen Computing, Inc. nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
+3. Neither the names of the copyright owners nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -44,3 +42,6 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+This product includes software developed by the University of California,
+Berkeley, Lawrence Berkeley Laboratory and its contributors.
+

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

@@ -0,0 +1,30 @@
+--- 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 @@
+ AC_SUBST(host)
+ AC_SUBST(build)
+ AC_SUBST(target)
++MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ 
+ have_cygwin=no
+ AC_MSG_CHECKING([for cygwin development environment])
+@@ -355,6 +356,8 @@
+                 LPCAPLIB="-L${testdir}/lib64 -lpcap"
+             elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
+                 LPCAPLIB="-L${testdir}/lib -lpcap"
++            elif test -f "${testdir}/lib/$MULTIARCH/libpcap${shrext_cmds}" ; then
++                LPCAPLIB="-L${testdir}/lib/$MULTIARCH/lib -lpcap"
+             else
+                 AC_ERROR([Unable to find libpcap in ${testdir}])
+             fi
+@@ -364,6 +367,9 @@
+             LPCAPLIB="${testdir}/lib/libpcap.${libext}"
+         elif test -f "${testdir}/lib/libwpcap.${libext}" ; then
+             LPCAPLIB="${testdir}/lib/libwpcap.${libext}"
++        elif test -f "${testdir}/lib/$MULTIARCH/libpcap.${libext}" ; then
++            LPCAPLIB="${testdir}/lib/$MULTIARCH/libpcap.${libext}"
++
+             AC_DEFINE([HAVE_WINPCAP], [1], [Do we have WinPcap?])
+         else
+             AC_ERROR([Unable to find matching library for header file in ${testdir}])
+

+ 1 - 0
debian/patches/series

@@ -0,0 +1 @@
+configure-pcap.patch

+ 28 - 36
debian/rules

@@ -1,36 +1,43 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
+DEB_HOST_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+confflags= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+confflags= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
-config.status: configure
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -g -Wall
+CXXFLAGS = `dpkg-buildflags --get CXXFLAGS` -g -Wall
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
+configure-stamp:
 	dh_testdir
+	dh_autoreconf
 	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
+		--enable-debug \
+		--enable-dynamic-link \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info
 
+	touch configure-stamp
 
-build: build-stamp
+build: build-arch build-indep
 
-build-stamp:  config.status
+build-arch: build-stamp
+
+build-indep: build-stamp
+
+build-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -42,15 +49,11 @@ build-stamp:  config.status
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-	-test -r /usr/share/misc/config.sub && \
-	  cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-	  cp -f /usr/share/misc/config.guess config.guess
-
+	dh_autoreconf_clean
 
 	dh_clean
 
@@ -72,31 +75,20 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
 	dh_installdocs
-#	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
 	dh_installcron
 	dh_installman
-#	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs docs/CHANGELOG
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install configure
+

+ 1 - 0
debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)