[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/, net-analyzer/tcpreplay/files/
commit: f1654f0340d745825110a57eeddfdfa0afd7e33a Author: Sam James gentoo org> AuthorDate: Mon May 1 13:28:52 2023 + Commit: Sam James gentoo org> CommitDate: Mon May 1 13:28:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1654f03 net-analyzer/tcpreplay: drop 4.4.2-r1 Signed-off-by: Sam James gentoo.org> net-analyzer/tcpreplay/Manifest| 1 - .../files/tcpreplay-4.4.2-configure-clang16.patch | 60 --- net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild | 87 -- 3 files changed, 148 deletions(-) diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 8e0d9474b8ee..1aaec471 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1,2 +1 @@ -DIST tcpreplay-4.4.2.tar.xz 750592 BLAKE2B c1f0bad69eca7e086aeb7100c4a35e2984a81412f81eaf981d969d24510736788e4657b511308b38ffbf88021c23272c51b9265eb2fb08318352d3eb8bed0a2a SHA512 78e5482c0cd70a55aa80167c602b33811fa01203860fab4b2d504da71a95e218356ea0cc85254e12be7cb13b611487a150f13df94f9da274661f71e921bd6045 DIST tcpreplay-4.4.3.tar.xz 750072 BLAKE2B 218fe1c5faab0fdd75a031afce8f468c85886a4cf21a4d9bd34089bd106756ee0e65e0df605efecb3260ccff266553a44d8ee10249b35524a044c6c5db86fcc7 SHA512 d8186a5faf3fbe5505da34cfc466c0375c4f298c997fe85505ea898c8c1241c16f98269596b682983a3e5cbd8493882334c925ff750d95995f3b13c5b83357cf diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch deleted file mode 100644 index 81a5a0086958.. --- a/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://github.com/appneta/tcpreplay/pull/757 - -From 096197e584ebb7d646eef75e5a8654f7192a0af2 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Thu, 24 Nov 2022 07:30:28 +0100 -Subject: [PATCH] configure.ac: Avoid implicit int, implicit function - declarations - -Do not call exit without declaring it. Add #include -for fork. Add missing int type to the definition of main. - -Implicit ints and implicit function declarations were removed from -C in 1999 and will not be supported by future compilers. a/configure.ac -+++ b/configure.ac -@@ -1681,8 +1681,8 @@ int - main (int argc, char *argv[]) - { - if (strncmp(PCAPNAV_VERSION, PCAPNAV_TEST, 3) >= 0) --exit(0); --exit(1); -+return 0; -+return 1; - } ]])],[libpcapnav_ver=yes - AC_MSG_RESULT(>= 0.4)],[libpcapnav_ver=no - AC_MSG_RESULT(< 0.4)],[libpcapnav_ver=no -@@ -1726,26 +1726,27 @@ case "$host_os" in - #include - #include - #include -+#include - unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; --main() { -+int main() { - unsigned int i; - pid_t pid; - int status; - /* avoid "core dumped" message */ - pid = fork(); - if (pid < 0) --exit(2); -+return 2; - if (pid > 0) { - /* parent */ - pid = waitpid(pid, , 0); - if (pid < 0) --exit(3); --exit(!WIFEXITED(status)); -+return 3; -+return !WIFEXITED(status); - } - /* child */ - i = *(unsigned int *)[[1]]; - printf("%d\n", i); --exit(0); -+return 0; - } - EOF - ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ - diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild deleted file mode 100644 index 2cc1e8f862c3.. --- a/net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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; -if [[ ${PV} == ** ]] ; 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" -SLOT="0" -IUSE="debug pcapnav +tcpdump" - -# libpcapnav for pcapnav-config -BDEPEND=" - net-libs/libpcapnav - >=sys-devel/autogen-5.18.4[libopts] -" -DEPEND=" - dev-libs/libdnet - >=net-libs/libpcap-0.9 - elibc_musl? ( sys-libs/fts-standalone ) - pcapnav? ( net-libs/libpcapnav ) - tcpdump? ( net-analyzer/tcpdump ) -" -RDEPEND="${DEPEND}" - -DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) - -PATCHES=( -
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/, net-analyzer/tcpreplay/files/
commit: c3d3a026966dbb4245543951ab61f7db413bf8ed Author: Sam James gentoo org> AuthorDate: Thu Nov 24 08:40:25 2022 + Commit: Sam James gentoo org> CommitDate: Thu Nov 24 08:40:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d3a026 net-analyzer/tcpreplay: fix configure w/ clang 16 Signed-off-by: Sam James gentoo.org> .../files/tcpreplay-4.4.2-configure-clang16.patch | 60 ++ ...play-4.4.2.ebuild => tcpreplay-4.4.2-r1.ebuild} | 1 + 2 files changed, 61 insertions(+) diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch new file mode 100644 index ..81a5a0086958 --- /dev/null +++ b/net-analyzer/tcpreplay/files/tcpreplay-4.4.2-configure-clang16.patch @@ -0,0 +1,60 @@ +https://github.com/appneta/tcpreplay/pull/757 + +From 096197e584ebb7d646eef75e5a8654f7192a0af2 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Thu, 24 Nov 2022 07:30:28 +0100 +Subject: [PATCH] configure.ac: Avoid implicit int, implicit function + declarations + +Do not call exit without declaring it. Add #include +for fork. Add missing int type to the definition of main. + +Implicit ints and implicit function declarations were removed from +C in 1999 and will not be supported by future compilers. +--- a/configure.ac b/configure.ac +@@ -1681,8 +1681,8 @@ int + main (int argc, char *argv[]) + { + if (strncmp(PCAPNAV_VERSION, PCAPNAV_TEST, 3) >= 0) +-exit(0); +-exit(1); ++return 0; ++return 1; + } ]])],[libpcapnav_ver=yes + AC_MSG_RESULT(>= 0.4)],[libpcapnav_ver=no + AC_MSG_RESULT(< 0.4)],[libpcapnav_ver=no +@@ -1726,26 +1726,27 @@ case "$host_os" in + #include + #include + #include ++#include + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +-main() { ++int main() { + unsigned int i; + pid_t pid; + int status; + /* avoid "core dumped" message */ + pid = fork(); + if (pid < 0) +-exit(2); ++return 2; + if (pid > 0) { + /* parent */ + pid = waitpid(pid, , 0); + if (pid < 0) +-exit(3); +-exit(!WIFEXITED(status)); ++return 3; ++return !WIFEXITED(status); + } + /* child */ + i = *(unsigned int *)[[1]]; + printf("%d\n", i); +-exit(0); ++return 0; + } + EOF + ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ + diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild similarity index 97% rename from net-analyzer/tcpreplay/tcpreplay-4.4.2.ebuild rename to net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild index aebdcc9142d9..2cc1e8f862c3 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.4.2.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.4.2-r1.ebuild @@ -39,6 +39,7 @@ DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) PATCHES=( "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch + "${FILESDIR}"/${PN}-4.4.2-configure-clang16.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/, net-analyzer/tcpreplay/files/
commit: 176877f778d193e7af634c1d38db2841bc7108f6 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Dec 31 17:39:01 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Dec 31 17:40:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176877f7 net-analyzer/tcpreplay: Version 4.3.1 Package-Manager: Portage-2.3.53, Repoman-2.3.12 Bug: https://bugs.gentoo.org/674156 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/tcpreplay/Manifest | 2 +- .../files/tcpreplay-4.3.0-enable-pcap_findalldevs.patch | 11 +++ .../{tcpreplay-4.3.0_beta1.ebuild => tcpreplay-4.3.1.ebuild} | 8 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 34fe3f97958..c3783ba664c 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1,3 +1,3 @@ DIST tcpreplay-4.1.2.tar.gz 2162175 BLAKE2B a99542277084a419c1f1208392e3d5b47aaf0be61a8e8de33bee9ba8e4f636fa78ae8eabcc07031c9bb659a8ba58a0aad6e4cc102e56d3dbddb0c3cf11c9df51 SHA512 3a7d125f38fe15070d666eacb4a5ef026a73ff850adec7ef3592966f38d1d155002792c5d5ac2476aa034d71be5f31b9dacd5be34af01a336149af3a42cad360 DIST tcpreplay-4.2.6.tar.gz 3494827 BLAKE2B 57222d7347efd780d2e1297145a7d81c8cce58a8d43bdb9b1485ef2514751e61af317dc4f5ff2068c214b2a33115d8099204d4b3165671d87bd8549c2df08bbd SHA512 a46846b29e3cd7fbc635faee9c4be90db0d346c0d0f291ac8e007e1fbf614289094e14480c1c5b40feb5a175d3cbad018e2dd4d1a5762b7d31a4325af6102e7e -DIST tcpreplay-4.3.0_beta1.tar.xz 719884 BLAKE2B 872ea10a3986f122cbf48bf9217d8df96f8c8c08e37aee095fc92ab5d5cf2607b42327aab9de5453c8bd198e1a32a3ae8964b085ba3065a6b3adfd853dd0b43b SHA512 55a9c419d4604cb4912571a631035ad4bc70d06b44d0248629a47b76411c23cba63b824322c23e0f2eeac4131a5d6e4c1fb2b9a60c0f57a7397d46760ff818f9 +DIST tcpreplay-4.3.1.tar.xz 746804 BLAKE2B c1feb541b8243b00b2fa6ee9742ced4ef47c58a58d3a95be88faa0fa4301da0cb962a620df724cd4526ea31e74a0e7d7161eb44afea37467a19976a20855e0e0 SHA512 2dbad1a88ed19db897cc1222883c02eb7f0808f64cafb3c3ef8f21c0cfcb14d3ebb92a8a01ea203ca128ed675d2e7dcdb30d0bce30eb79e729d9d45d309f9220 diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.3.0-enable-pcap_findalldevs.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.3.0-enable-pcap_findalldevs.patch new file mode 100644 index 000..6c4d2c02dc0 --- /dev/null +++ b/net-analyzer/tcpreplay/files/tcpreplay-4.3.0-enable-pcap_findalldevs.patch @@ -0,0 +1,11 @@ +--- 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]), diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild similarity index 93% rename from net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild rename to net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild index d9206da3d29..1dfd57b11cd 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic DESCRIPTION="utilities for editing and replaying previously captured network traffic" @@ -26,7 +26,7 @@ DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) PATCHES=( - "${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch + "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch ) S=${WORKDIR}/${P/_/-} @@ -52,8 +52,8 @@ src_configure() { $(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-local-libopts \ --enable-shared \ --with-libdnet \ --with-testnic2=lo \
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/, net-analyzer/tcpreplay/files/
commit: b4d13b3c9625fbb1308177dfbd192f399ab26c9d Author: Jeroen Roovers gentoo org> AuthorDate: Sat Mar 18 11:28:00 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Mar 18 11:28:19 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d13b3c net-analyzer/tcpreplay: Add patch for CVE-2017-6429 (bug #612224). Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../files/tcpreplay-4.1.2-CVE-2017-6429.patch | 27 ++ ...play-4.1.2.ebuild => tcpreplay-4.1.2-r1.ebuild} | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch new file mode 100644 index 000..42c74d65071 --- /dev/null +++ b/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch @@ -0,0 +1,27 @@ +--- a/src/tcpcapinfo.c b/src/tcpcapinfo.c +@@ -281,6 +281,15 @@ main(int argc, char *argv[]) + caplen = pcap_ph.caplen; + } + ++if (caplentoobig) { ++printf("\n\nCapture file appears to be damaged or corrupt.\n" ++"Contains packet of size %u, bigger than snap length %u\n", ++caplen, pcap_fh.snaplen); ++ ++close(fd); ++break; ++} ++ + /* check to make sure timestamps don't go backwards */ + if (last_sec > 0 && last_usec > 0) { + if ((pcap_ph.ts.tv_sec == last_sec) ? +@@ -306,7 +315,7 @@ main(int argc, char *argv[]) + } + + close(fd); +-continue; ++break; + } + + /* print the frame checksum */ diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild similarity index 95% rename from net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild rename to net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild index a27f9136a0b..90d4ff01657 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,6 +27,7 @@ DOCS=( ) PATCHES=( "${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch + "${FILESDIR}"/${PN}-4.1.2-CVE-2017-6429.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/, net-analyzer/tcpreplay/files/
commit: 158d982b5393f96dbe7eaeff6bd200260d5f1aa1 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Nov 24 22:42:36 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Nov 24 22:42:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=158d982b net-analyzer/tcpreplay: Old. 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 deletions(-) diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.1-MAXPACKET.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.1-MAXPACKET.patch deleted file mode 100644 index ccb2dca.. --- a/net-analyzer/tcpreplay/files/tcpreplay-4.1.1-MAXPACKET.patch +++ /dev/null @@ -1,22 +0,0 @@ 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 deleted file mode 100644 index 93eb633.. --- a/net-analyzer/tcpreplay/tcpreplay-4.1.1-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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 |#include |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 -}