Add cross-compile patch by Bertrand Jacquin (bug #375679). Use emake instead of make. Fix one quoting issue.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 167 insertions, 10 deletions

diff --git a/net-analyzer/tcpreplay/ChangeLog b/net-analyzer/tcpreplay/ChangeLog
index 0fe5f02ad611..69fd8110ec96 100644
--- a/net-analyzer/tcpreplay/ChangeLog
+++ b/net-analyzer/tcpreplay/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/tcpreplay
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.44 2012/01/22 17:53:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.45 2012/04/12 04:04:47 jer Exp $
+
+*tcpreplay-3.4.4-r2 (12 Apr 2012)
+
+  12 Apr 2012; Jeroen Roovers <jer@gentoo.org> tcpreplay-3.4.4-r1.ebuild,
+  +tcpreplay-3.4.4-r2.ebuild, +files/tcpreplay-3.4.4-cross-compile.patch,
+  tcpreplay-3.4.5_beta3.ebuild:
+  Add cross-compile patch by Bertrand Jacquin (bug #375679). Use emake instead
+  of make. Fix one quoting issue.
 
 *tcpreplay-3.4.5_beta3 (22 Jan 2012)
 
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index e7ff17cee288..7bffe170927c 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA1
 
 AUX tcpreplay-3.4.4-crash.patch 999 RMD160 ea9cc29a1479d600493e57ec79ae9ad3244b6be8 SHA1 310bb774108bab593435120ccf96dfc4080804e1 SHA256 1880eccd2616836df6e255757f0683d9c3a9d127848514741f3825f53e560af8
+AUX tcpreplay-3.4.4-cross-compile.patch 1678 RMD160 448f591a7686f07c8c62c9628bce2fdbf2129613 SHA1 960ff867c8451c11b8adb34c940bd3d50bf52aa4 SHA256 53ee3e726267d579c4c81d9ed4ae435ebbd62b05df71f229380e0ad43754e6ca
 DIST tcpreplay-3.4.4.tar.gz 947179 RMD160 672812755ff39b284044b08cba32c574ab2b7e70 SHA1 9e4cca81cfbfb919f8759e1a27ce1b3b963ff3b8 SHA256 7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f
 DIST tcpreplay-3.4.5beta2.tar.gz 1886620 RMD160 d1840f1d1c1e85a708af6b9b395c52cc96456652 SHA1 340f3593683e7b026aaef8f20e1a7fcc2ddb6046 SHA256 072a5ef9997e817a78b272d4a2af70386456998de66da1fd510283b2128900f6
 DIST tcpreplay-3.4.5beta3.tar.gz 1904204 RMD160 feaadacde4fb3b9b591304b4b69d74f1c43ff84a SHA1 df4faa73e1f9e1bb277370d5652f89755ecb285f SHA256 6d4bac54173de23667f97943337f42503387e1153dcebcf6e3b6ba83063a3a6a
-EBUILD tcpreplay-3.4.4-r1.ebuild 1614 RMD160 f04ca8b2e7fb5f762f12b8f649fecde54ca6b5c5 SHA1 63eaaf6040545c8cd87510ab5c26b9ce0705257e SHA256 331b8e20ac951536dab862da1d5035f1b301410a2e1a9b36c0ca787c69fad8b0
+EBUILD tcpreplay-3.4.4-r1.ebuild 1616 RMD160 1d7d340730a932003cd42d5de3ddd3e004fe5eb9 SHA1 47c45a93af5db1f3bfd00933887f79915267507a SHA256 fc73db32d49a570ea6c4a76012b9075d243eebaa483aa69bbfdbf2cc8561399b
+EBUILD tcpreplay-3.4.4-r2.ebuild 1635 RMD160 e7a71482222d6f91ae04d7f8c42c4b44469563fa SHA1 8b3a66278e88b537cf635147425aeaf528a7caa4 SHA256 4b0bf0cd7ae43c2b8ca4c47f103a7fda7184767c57307ad9dcad435df4b6b5ea
 EBUILD tcpreplay-3.4.5_beta2.ebuild 1611 RMD160 4f2e6c00b5fbda8c41c6719d935fceafc2b9e428 SHA1 3da35b568780e7c0893489994c9453b6e24bd255 SHA256 2f2a95ff971d31d7739bd3747a3d1cb1384b5190bfd3f4102d83bffaaa03a16e
-EBUILD tcpreplay-3.4.5_beta3.ebuild 1611 RMD160 15b39f9895b5920c1cc0c07acb2d51970dba8d16 SHA1 6ceb61d017d7650e9cd977efb1a7b4480c22ae66 SHA256 c9f39d6985b27f5021276d1cd3d37a1764e01c446daeaf7e2f786489174f6067
-MISC ChangeLog 7271 RMD160 9dc49832894f7d24419a9098d042e9b5cc36be61 SHA1 7fd1e83d417cd3b829eb71f834d7f678ab18ea48 SHA256 b36a1fe33532504443af3d2ec9fed6bb9365abf05cfed1a0e08d1d33c386eb24
+EBUILD tcpreplay-3.4.5_beta3.ebuild 1680 RMD160 a6926ec860cf915e1bbaf3a999772ada2660722e SHA1 c4f2c4aa85ecb071cdfeaa79db9e1fcb452d3992 SHA256 1f787e53ef11813d7ed07396b26793d83e61fbf5356ef4ec6759eeaf456658cf
+MISC ChangeLog 7600 RMD160 358bd7c6e19ee93bf78a0b98838abc816d67c930 SHA1 3a7261d0d66d04123830ceffd6989b205103e6e5 SHA256 4e7e8ac9d73797d3089694cfd6309e3fa159dd5bd32ab6c771b7c101e8104f91
 MISC metadata.xml 835 RMD160 f49a99ce7708fa2eae5909d38c6c195c8ff147ec SHA1 8dfb5042c39c0ebb163b15446afac2ef9a70754c SHA256 26bad01dbf458cd04f341e34abf64a5b635f5ed06a83e90f870381e917786e8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8cTQ4ACgkQVWmRsqeSphNIIgCeJbF6id0P362qI72vEM3f8FKV
-/cIAmgLgS+6ww90+abxi//tJ6ULUTZi3
-=0mHm
+iEYEARECAAYFAk+GVGQACgkQVWmRsqeSphN7TACeInvmpRIZYcyy52qObCWmTt8P
+p+YAnR9Is55aCB3BucbbUcfpFJitH+eL
+=FMjQ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch b/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch
new file mode 100644
index 000000000000..745a3497c828
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch
@@ -0,0 +1,88 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -402,7 +402,6 @@
+ 
+ dnl 0.9.6 (which is still thinks it is 0.9.5 due to a bug) introduces an important
+ dnl fix for OSX.  See: http://tcpreplay.synfin.net/trac/ticket/167
+-libpcap_version_096=no
+ AC_RUN_IFELSE(AC_LANG_PROGRAM([[
+ #include <string.h>
+ #include <stdlib.h>
+@@ -419,11 +418,12 @@
+             exit(0);
+ 
+     exit(1);
+-]]), [
+-    libpcap_version_096=yes
+-])
++]]),
++ [libpcap_version_096=yes],
++ [libpcap_version_096=no],
++ [libpcap_version_096=yes]
++)
+ 
+-libpcap_ver8=no
+ AC_RUN_IFELSE(AC_LANG_PROGRAM([[
+ #include <string.h>
+ #include <stdlib.h>
+@@ -444,13 +444,12 @@
+         exit(0);
+ 
+     exit(1);
+-]]), [
+-    libpcap_ver8=yes
+-], [
+-    libpcap_ver8=no
+-])
++]]),
++ [libpcap_ver8=yes],
++ [libpcap_ver8=no],
++ [libpcap_ver8=yes]
++)
+ 
+-libpcap_ver7=no
+ AC_RUN_IFELSE(AC_LANG_PROGRAM([[
+ #include <string.h>
+ #include <stdlib.h>
+@@ -469,11 +468,11 @@
+             exit(0);
+ 
+     exit(1);
+-]]), [
+-    libpcap_ver7=yes
+-], [
+-    libpcap_ver7=no
+-])
++]]),
++ [libpcap_ver7=yes],
++ [libpcap_ver7=no],
++ [libpcap_ver7=yes]
++)
+ 
+ if test x$libpcap_ver8 = xyes ; then
+     AC_MSG_RESULT(>= 0.8.0)
+@@ -761,8 +760,8 @@
+ 
+ have_bpf=no
+ dnl Check for BSD's BPF
+-AC_MSG_CHECKING(for BPF device sending support)
+-AC_TRY_RUN([
++AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf,
++[AC_TRY_RUN([
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
+@@ -796,8 +795,11 @@
+             [Do we have BPF device support?])
+     AC_MSG_RESULT(yes)
+     have_bpf=yes
+-],[
+-    AC_MSG_RESULT(no)
++],
++[AC_MSG_RESULT(no)],
++[AC_MSG_ERROR([cross-compiling,
++  presetting ac_cv_have_bpf=(yes|no) will help])]
++)
+ ])
+ 
+ 
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild
index 99804c1484d6..89b0d54c6e24 100644
--- a/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild,v 1.4 2012/01/22 17:53:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild,v 1.5 2012/04/12 04:04:47 jer Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	echo "We don't use bundled libopts" > libopts/options.h
-	epatch ${FILESDIR}/${P}-crash.patch
+	epatch "${FILESDIR}"/${P}-crash.patch
 }
 
 src_configure() {
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.4.4-r2.ebuild b/net-analyzer/tcpreplay/tcpreplay-3.4.4-r2.ebuild
new file mode 100644
index 000000000000..0f5db0486339
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-3.4.4-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.4.4-r2.ebuild,v 1.1 2012/04/12 04:04:47 jer Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
+HOMEPAGE="http://tcpreplay.synfin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+	>=sys-devel/autogen-5.9.8
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	tcpdump? ( net-analyzer/tcpdump )
+	pcapnav? ( net-libs/libpcapnav )
+"
+RDEPEND="${DEPEND}"
+DOCS=( README docs/{CHANGELOG,CREDIT,HACKING,TODO} )
+
+src_prepare() {
+	echo "We don't use bundled libopts" > libopts/options.h
+	epatch \
+		"${FILESDIR}"/${P}-crash.patch \
+		"${FILESDIR}"/${P}-cross-compile.patch
+	eautoreconf
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug 252940
+	econf \
+		--enable-shared \
+		--enable-dynamic-link \
+		--disable-local-libopts \
+		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+		$(use_enable debug)
+}
+
+src_test() {
+	if [[ ! ${EUID} -eq 0 ]]; then
+		ewarn "Some tests were disabled due to FEATURES=userpriv"
+		ewarn "To run all tests issue the following command as root:"
+		ewarn " # make -C ${S}/test"
+		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		emake -j1 test || {
+			ewarn "Note, that some tests require eth0 iface to be UP." ;
+			die "self test failed - see ${S}/test/test.log" ; }
+	fi
+}
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.4.5_beta3.ebuild b/net-analyzer/tcpreplay/tcpreplay-3.4.5_beta3.ebuild
index 2f4669f92b52..6db52be18b42 100644
--- a/net-analyzer/tcpreplay/tcpreplay-3.4.5_beta3.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-3.4.5_beta3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.4.5_beta3.ebuild,v 1.1 2012/01/22 17:53:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.4.5_beta3.ebuild,v 1.2 2012/04/12 04:04:47 jer Exp $
 
 EAPI=4
+inherit eutils
 
 MY_P="${P/_/}"
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
@@ -26,6 +27,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4.4-cross-compile.patch
 	echo "We don't use bundled libopts" > libopts/options.h
 	./autogen.sh
 }