From 20caba898adda25e6f3ffcdf8618314be8d875d9 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Thu, 16 Apr 2015 16:35:33 +0000 Subject: [PATCH] Fix configure logic in disabling pcap_findalldevs() (bug #546762). Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- net-analyzer/tcpreplay/ChangeLog | 11 ++++++++- net-analyzer/tcpreplay/Manifest | 23 ++++++------------- ...replay-4.1.0-enable-pcap_findalldevs.patch | 19 +++++++++++++++ ...4.0.5.ebuild => tcpreplay-4.0.5-r1.ebuild} | 6 +++-- ...4.1.0.ebuild => tcpreplay-4.1.0-r1.ebuild} | 4 +++- 5 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch rename net-analyzer/tcpreplay/{tcpreplay-4.0.5.ebuild => tcpreplay-4.0.5-r1.ebuild} (92%) rename net-analyzer/tcpreplay/{tcpreplay-4.1.0.ebuild => tcpreplay-4.1.0-r1.ebuild} (94%) diff --git a/net-analyzer/tcpreplay/ChangeLog b/net-analyzer/tcpreplay/ChangeLog index c3bc79ecd308..805aa3a682f7 100644 --- a/net-analyzer/tcpreplay/ChangeLog +++ b/net-analyzer/tcpreplay/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-analyzer/tcpreplay # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.59 2015/04/08 13:36:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.60 2015/04/16 16:35:31 jer Exp $ + +*tcpreplay-4.1.0-r1 (16 Apr 2015) +*tcpreplay-4.0.5-r1 (16 Apr 2015) + + 16 Apr 2015; Jeroen Roovers -tcpreplay-4.0.5.ebuild, + +tcpreplay-4.0.5-r1.ebuild, -tcpreplay-4.1.0.ebuild, + +tcpreplay-4.1.0-r1.ebuild, + +files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch: + Fix configure logic in disabling pcap_findalldevs() (bug #546762). 08 Apr 2015; Agostino Sarubbo tcpreplay-4.0.5.ebuild: Stable for amd64, wrt bug #545118 diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 63f588da2a67..926296f95007 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1,28 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX tcpreplay-4.1.0-enable-pcap_findalldevs.patch 601 SHA256 b25a3bb306fc6a4375c5e340836de2a03802fa8f43aa0cc96bc69f74ae8d5394 SHA512 6aa44d082e068de90a431071d94e4351257e5074f1b36617c1d7226ed18c5a6e76f06a0e9f20f41772e1d33af72ea23cbaa29a4dcf3018a567412a0d0fac72de WHIRLPOOL 23158c734f69a4afc30ba5174923138de9e0d4e0dbea1220574d7f84f8f33dbe0bace9897bee691e38f586372bde4b080f3d1a2512fcca718c35839550ac4ba3 DIST tcpreplay-4.0.4.tar.gz 2070706 SHA256 a9e6493fe33e9d17185e5cdd49d46ad5560832fdd86eeea6dcc04ec63df10256 SHA512 a9e87817079a73d677dd9c51a7eb850ae833c627f08914e45b71736a4536c307d92fe1451bf10e8babe3a8f8283f4f99987c1f37f93be110b12fd326337a0ecf WHIRLPOOL 602989ac43c1bb7f91583b4a4edff16962cca6821ab84be3d96bab7700e123d475ae79b0e5c36c99cd5984db4f0a48d86d2a9bf3e63619d42ba24fb230945b23 DIST tcpreplay-4.0.5.tar.gz 2059744 SHA256 63798c8adc9e5be79467e23593838ce0e617b25938cfce3116feda2630344d80 SHA512 bf0e8e64d9431bbf8379d2578edf0a53e6803dfc06d973c388aa885bcc4f029499dad02aed0ee17b78b5eef178b450b6c0b851b9a52a1ac27dc0e1cb2b83a88d WHIRLPOOL dcb446268956fc5f89d211e0aafa1323a2984c614b0637c7cdefdeaa617e594893397476bb358d1dc58cebc7d185fd4914cb88db97b23286606a7ae133a1ec50 DIST tcpreplay-4.1.0.tar.gz 2118212 SHA256 ad285b08d7a61ed88799713c4c5d657a7a503eee832304d3a767f67efe5d1a20 SHA512 bfd7a0679dccd86aba7ca5d102665e6feba72bffb1596915985bc50261f9ac10ce56b870e1aa64a33efa79e3bee89b8c66e2c26328fb15d3722a5bc957ea77a2 WHIRLPOOL e6a07495cb07a09f707b3784d15a266c04a7b3d369b7d8eb9d7d5683838accdcc539255ff05f99c2fc8036d045e66f3a250a0c7f1896024c65065a6c6d282b7a EBUILD tcpreplay-4.0.4.ebuild 2028 SHA256 f7ed69d3bc655a6510a91f8784416584691b7621609e113a6c31d0583ec1f18a SHA512 d81e465926e8d5a2b29a669ed8a42c26e440f44fba72b8cbc8d4b9ce3e399680cdb0ee677789151e4971e2ecb49183b15fbffbc568033c779e17c93e31c8114f WHIRLPOOL 2eb22aa16d28805b846ce63d6389db673740bfb1a906aa432090bc9f0772c5fbcac5903defc32b312e30a84207c810d8b50becdb02ef1ff2831a824aec8a6ea4 -EBUILD tcpreplay-4.0.5.ebuild 2029 SHA256 79795376b755b34271cb2795fd1ed25ba3f3d7565fb5bfa81ba29c4e78cf8387 SHA512 e15d226224e67915b9a6115a886790a011a1a7e54a7357b9d542bd14af42af65e555286b18d2b963b0f35f09a3d4911fc22c2e5261e708fe40cb6ad10456cadb WHIRLPOOL b69f37fb40c1b005c791a3911a5a849c616e3dd53a656e453617a962b7570980cc810e7ec6f20c867904680f1f812c1f7ea88287434024231a1c7b37e1e6cb1f -EBUILD tcpreplay-4.1.0.ebuild 2031 SHA256 9a6a31845618c5f5fd3e6341f93ee2310faaa457011bad9f567876517e0352f3 SHA512 0fc0af669b7f07f3baa6c9d1d17cc0d644ed1cfeab276d68b308da4dd81998deda68c8709eee0a18133734d9eb800468abaa473795330860d979506f0c85f931 WHIRLPOOL fbc5c8c9bce3c8707f6062784564c881ea6e3bbb197bac421fd62b1adcb2667d85127e1f557938ef0c558d5a8a7b34dd9eaba27a8aec009523dfc6f9a0248076 -MISC ChangeLog 9607 SHA256 ffde01f1c754d4c694fa7477b71c3145aa4f6cc849d885ef02af0ee7a16e7432 SHA512 f9cfa98f359ebff7c071bc7389505032123e4ac5e09553a1198d9d906b0683b2f28e37ec61e4d7a7d602cd0c5854d7053289cb3c256230ed48a34b3af05acb29 WHIRLPOOL 56b5cabef91a5638f09bad4a2e7313db4cc12e1ef99b713cead9c64cf20d16c970c6568a0563960e2ba8cb98cfe8e213d26af72ce78b5444f8c37d94527694b0 +EBUILD tcpreplay-4.0.5-r1.ebuild 2098 SHA256 47775c2ef379f30aab81667aa2d2a2a833a4b7fc146ea4a934a5342febd184d8 SHA512 7f696ffe950c2d3765e7f515a6093c10292fd6a2fcd3d9357c5fa318e611b865f5ecf85381d0f360aa2a60dd5bf2ab8bed9234fbf287f332c5c326edfbea07da WHIRLPOOL bfa749eb269e4536a1a6bd362118c746ef708d765f088a264145d1ec8404ba2701ba9b1c540f78e7c1f5fb4d908451db0bb76ce56731f2ff035d9cd30eef5fe0 +EBUILD tcpreplay-4.1.0-r1.ebuild 2099 SHA256 1ca04743e3fd8a728adfa1df91aef4d3ebe472bf2eaa072ef6cd376da8dfc417 SHA512 845eddaab8fbf94f1e87a0f22b45fe915e3254d16503ff78144c8cd4a1104662f6cfa06858a2443e9667c9bc662609fa7cea8697d045cbecc6ddcf84853f8e4d WHIRLPOOL a17b30967a48b13b8fdfe6555780d8202266094c9b7641b2fcb72233ad7a978a7cbee56934c09936e4f01d63673e3371c41b00f9622acbb44186a2d2b8eb9028 +MISC ChangeLog 9959 SHA256 efe3df1d216bbaf8e31323e72da1fd31b10cb4a4dc4c545dc35da5703f24409e SHA512 e137967f65d6e9666a203ea97175b98d71c99daa1b194544489e4f5c311f412751f738d97cffcf20e27e56d5b485a022f2dc1018b9bf2ad8b08690a861b69d68 WHIRLPOOL 57529c559a4c13d48035b67789011d661c2a9d91b047763f26542130a2ac6629283977c6cb8341d66dfa119a5a4d0cb126a6bf7866176b4e0dbe2ae5f6135d1a MISC metadata.xml 835 SHA256 26bad01dbf458cd04f341e34abf64a5b635f5ed06a83e90f870381e917786e8a SHA512 ef0c8a22ac7d6ff7d3bb9c056ab8de2f46136f69e43839c68732e60d2ebd063b09a40f46cdd9165f9cfcfdab0476dbcc7284b6ed40b1c66afbf4d947e8ce848e WHIRLPOOL 991dcb884ad1ace09ab4c785744c2cfa3b2f4d9965f34a429b5ea62f03a9b15a8c8c3a7825cb7c36a73ab28198ab7959b24ad104534f238a40bd1f0b4f0e0d9b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVJS7sAAoJELp701BxlEWfAWIP/AkfZzAYS02ELQ4HicpbGTSc -vC0vqMXn6rrMNn97AgLjWe3a0BAjbgXBLMXqOxDbshKait2KGUDitj2lEk2sjNcs -cHEc0pViC+KhJzzFeRFLws++Z/iGWLpT225DFo+PeAHtNES9/H2JLMuuQRdnE+x6 -q9i4Ac4erRTNg2ztb0WEyIPl5/+RjL5Ioe8Fqb4bU12tjsrItIgoxNajTR9WAqQ5 -pDTuVrmOg3w5dVkPt2RBveaKgHc3J4Z6oSZXivRFCNnlbNZGtXZ+r9Rx2Zl2fzkb -Ix2ctQG4L2vgGX1Pq4rPX3jr1eSCLTpijncp/L3U4W3/sxEDRxa23kJrn7Bhr1bB -2ZBYsAvbtWB3mL2hm1HRybv+A4MipQMKFLVyivPlxrQottDPRabfPLZOEcBXk5uK -NAyrVWPtRgPqfmCv9YA8l9GD9PC+vK08XxpKP9eZmvD+MUDG8io3wb3u2/sRlfaD -cc6BCO6aWgOfCPx0kPOLGEQ83SBic51F0UnaWc/uGCOtdH9WgfSMj6WTqSFJXThf -npB34JfpBkxSPx+Jus4f6NMKUAg5Tsfvppw2P1w9PjnzcNqxtJnbPqREqx7hgLFh -PRUfSSETboVisKaT/M17+UFTk9z5kpYyi2W8tmVxS7O5OluTTns1JDDGiIVxRCKh -0ECJtXIvFNqNyJmoAJlB -=ovV9 +iEYEAREIAAYFAlUv5NUACgkQVWmRsqeSphOK/QCfWEi6mJ92FYoZOqHWRUtAwyJ2 +aJAAn0KDbvVO9CI5uoUWsn5s4eFkuNxA +=S9tO -----END PGP SIGNATURE----- diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch new file mode 100644 index 000000000000..f45d14cd1da1 --- /dev/null +++ b/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch @@ -0,0 +1,19 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1499,6 +1499,8 @@ + AC_MSG_WARN(Unable to do tests when cross-compiling) + fi + ++disable_pcap_findalldevs=no ++ + dnl Allows user to choose which nic to use for testing purposes + AC_ARG_WITH(testnic, + AC_HELP_STRING([--with-testnic=NIC], [Select which network card to use for testing]), +@@ -1509,7 +1511,6 @@ + + dnl There's a bug in OS X which causes pcap_findalldevs() to make the wifi NIC to disassociate + dnl so under OSX we disable the interface list feature +-disable_pcap_findalldevs=no + + osx_frameworks=no + dnl these need to be dynamic based on OS diff --git a/net-analyzer/tcpreplay/tcpreplay-4.0.5.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild similarity index 92% rename from net-analyzer/tcpreplay/tcpreplay-4.0.5.ebuild rename to net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild index 694d5ffa6ad0..97d24418a2ae 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.0.5.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-4.0.5.ebuild,v 1.2 2015/04/08 13:36:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-4.0.5-r1.ebuild,v 1.1 2015/04/16 16:35:31 jer Exp $ EAPI=5 inherit autotools eutils flag-o-matic @@ -11,7 +11,7 @@ LICENSE="BSD GPL-3" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" SLOT="0" -KEYWORDS="amd64 ~sparc ~x86" +KEYWORDS="~amd64 ~sparc ~x86" IUSE="debug pcapnav +tcpdump" DEPEND=" @@ -27,6 +27,8 @@ RDEPEND="${DEPEND}" DOCS=( README docs/{CHANGELOG,CREDIT,HACKING,TODO} ) src_prepare() { + epatch "${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch + sed -i \ -e '/CFLAGS=/s|-ggdb -std=gnu99|-std=gnu99|g' \ -e 's|-O3||g' \ diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.0.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild similarity index 94% rename from net-analyzer/tcpreplay/tcpreplay-4.1.0.ebuild rename to net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild index 2731c6364b02..901eac60bdeb 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.1.0.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-4.1.0.ebuild,v 1.1 2015/03/31 05:21:19 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-4.1.0-r1.ebuild,v 1.1 2015/04/16 16:35:31 jer Exp $ EAPI=5 inherit autotools eutils flag-o-matic @@ -27,6 +27,8 @@ RDEPEND="${DEPEND}" DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) src_prepare() { + epatch "${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch + sed -i \ -e 's|-O3||g' \ -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ -- 2.26.2