* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/files/, net-analyzer/tcpreplay/
@ 2016-11-19 9:20 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2016-11-19 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 7335969291b9d994b6dfc031b713c71b16c20e58
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 09:20:28 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 09:20:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73359692
net-analyzer/tcpreplay: Add MAXPACKET patch (bug #588302).
Package-Manager: portage-2.3.2
.../files/tcpreplay-4.1.1-MAXPACKET.patch | 22 ++++++
net-analyzer/tcpreplay/tcpreplay-4.1.1-r1.ebuild | 78 ++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.1-MAXPACKET.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.1-MAXPACKET.patch
new file mode 100644
index 00000000..ccb2dca
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-4.1.1-MAXPACKET.patch
@@ -0,0 +1,22 @@
+--- a/src/defines.h.in
++++ b/src/defines.h.in
+@@ -145,7 +145,7 @@
+ #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 */
+--- 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
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.1-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.1-r1.ebuild
new file mode 100644
index 00000000..93eb633
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.1.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+LICENSE="BSD GPL-3"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+ >=sys-devel/autogen-5.18.4[libopts]
+ dev-libs/libdnet
+ >=net-libs/libpcap-0.9
+ tcpdump? ( net-analyzer/tcpdump )
+ pcapnav? ( net-libs/libpcapnav )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+ docs/{CHANGELOG,CREDIT,HACKING,TODO}
+)
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch
+ "${FILESDIR}"/${PN}-4.1.1-MAXPACKET.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's|-O3||g' \
+ -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+ configure.ac || die
+ sed -i \
+ -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+ src/common/sendpacket.c || die
+ sed -i \
+ -e 's|@\([A-Z_]*\)@|$(\1)|g' \
+ -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+ -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+ src/Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # By default it uses static linking. Avoid that, bug 252940
+ econf \
+ $(use_enable debug) \
+ $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+ $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+ --disable-local-libopts \
+ --enable-dynamic-link \
+ --enable-shared \
+ --with-libdnet \
+ --with-testnic2=lo \
+ --with-testnic=lo
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/files/, net-analyzer/tcpreplay/
@ 2022-02-13 16:21 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-02-13 16:21 UTC (permalink / raw
To: gentoo-commits
commit: f59a2f395f9edd7db3c03ac4628300e417f827b3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 16:18:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 16:19:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59a2f39
net-analyzer/tcpreplay: add 4.4.1
Bug: https://bugs.gentoo.org/833139
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/tcpreplay/Manifest | 1 +
.../tcpreplay-4.4.1-fix-bashism-configure.patch | 34 ++++++++++++++++++++++
...replay-999999.ebuild => tcpreplay-4.4.1.ebuild} | 29 +++++++++++-------
...preplay-999999.ebuild => tcpreplay-9999.ebuild} | 2 +-
4 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index ddd047da0039..ad3c5de2681d 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1 +1,2 @@
DIST tcpreplay-4.3.4.tar.xz 739280 BLAKE2B 8b680363ee182fc7581f99cc4587d50e36285446d07a5be370e2439b31582ad88c786c11d662e28dadc5b69aee376889b1c0f6a86d61c106426ab6ab2c085012 SHA512 6d19cf492114c68a9fafcf7790c08f31607d2c0112e02fa41eed8747255bbbef85f281f74348e1d51f1d476b88f07d64715224618ec15268688baefaf7cc7124
+DIST tcpreplay-4.4.1.tar.xz 751036 BLAKE2B cf6a4e23f68fd0d6f23392c3ded14ea6486d275eeb8e278ce02d6b34e8b426e69841858cac49cc5ea952e0398f2960049789d16180b0896e38d665511237b352 SHA512 25a4a94b7c0c416b8ef57aba5640803dcd6e271fe8789f3f6e281529e336e326b35738d7673fd44ac4ded0faf577dc4c6255b926bd67b8ba5104a8bad81a98f1
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
new file mode 100644
index 000000000000..f1d424274333
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
@@ -0,0 +1,34 @@
+https://github.com/appneta/tcpreplay/pull/714
+
+From bd93776c50ec1d0574c72f253095afe22eb6bf73 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 13 Feb 2022 16:09:23 +0000
+Subject: [PATCH] build: fix bashism in configure
+
+configure scripts are run with /bin/sh which is supposed
+to be a POSIX-compliant shell, so if /bin/sh is provided
+by e.g. dash (like on Debian) rather than bash, we hit
+errors.
+
+This has no effect on functionality for bash &
+retains compatibility.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11a1e4ea..4c577c42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1808,7 +1808,7 @@ fi
+ dnl No 'make test' when cross compile
+
+ AC_MSG_CHECKING(for 'make test' profile)
+-if test "$host" == "$build" ; then
++if test "$host" = "$build" ; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_WARN(Unable to do tests when cross-compiling)
+
diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild
similarity index 69%
copy from net-analyzer/tcpreplay/tcpreplay-999999.ebuild
copy to net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild
index 52407c59ac72..35febc8f8703 100644
--- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild
@@ -1,13 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools git-r3
+inherit autotools
DESCRIPTION="Utilities for editing and replaying previously captured network traffic"
HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
-EGIT_REPO_URI="https://github.com/appneta/tcpreplay"
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/appneta/tcpreplay"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~sparc ~x86"
+fi
+
S="${WORKDIR}"/${P/_/-}
LICENSE="BSD GPL-3"
@@ -31,6 +38,7 @@ DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
PATCHES=(
"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
+ "${FILESDIR}"/${PN}-4.4.1-fix-bashism-configure.patch
)
src_prepare() {
@@ -49,13 +57,13 @@ src_prepare() {
}
src_configure() {
- # By default it uses static linking. Avoid that, bug 252940
+ # By default it uses static linking. Avoid that, bug #252940
econf \
$(use_enable debug) \
$(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \
$(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \
- --disable-local-libopts \
--enable-dynamic-link \
+ --enable-local-libopts \
--enable-shared \
--with-libdnet \
--with-testnic2=lo \
@@ -63,14 +71,15 @@ src_configure() {
}
src_test() {
- if [[ ! ${EUID} -eq 0 ]]; then
- ewarn "Some tests will be disabled due to FEATURES=userpriv"
+ 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
else
emake -j1 test || {
- ewarn "Note that some tests require eth0 iface to be up." ;
- die "self test failed - see ${S}/test/test.log" ; }
+ 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-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild
similarity index 98%
rename from net-analyzer/tcpreplay/tcpreplay-999999.ebuild
rename to net-analyzer/tcpreplay/tcpreplay-9999.ebuild
index 52407c59ac72..ab3477f795b6 100644
--- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-13 16:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-13 16:21 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/files/, net-analyzer/tcpreplay/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-11-19 9:20 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox