From nobody Tue Jul 16 16:14:53 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WNkg12QWJz5RY00; Tue, 16 Jul 2024 16:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WNkg11n14z4bhp; Tue, 16 Jul 2024 16:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721146493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WsZ36WvY4cRc759azTwb6Rp2iiE+3C0vrGJmlWEYYMs=; b=i3e0tQj/B0mygvU/aOn3ayPFtDPLnQjvGfIMip/1kL4c1lgnokpbS0gDTSIoD3wWrCBh1v Lj1TtIHXhs0zMrxMquXMUWJxE88LyotbCP2QXMnNcLvCpt1jvcisXDLEWjVYaHOupExMmn mQj3IAwzrz29Qyhu6+LzGPRI/z/FJBUIDgW4IxiZiP0qPbNviOQnlqrq/L3PgyTXWqClET 0Ray7MkgB9Xz9dyhS31ddNJf5yKulG18TQaeV6INJdw5S61yIqRG7ggLVtgWh1sl99bls8 S8y+eqzcDZHtCLfl11G7VZb2Z1w5APKKJLBlSp1EEMLwNHjQzHPyT3NWIcVM2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721146493; a=rsa-sha256; cv=none; b=pLPrdX8T0fBRYIfk7/RzB7LOowj1BvVTmgkFA6Qr1+p3sxyJBPntEJ4vixLIZJatzSCEIn ZweVu+ag8aiYJ7u/1M8XrCJWmqs5g9FMuyLFHf85JE2U1h3izu4MaHhdJJzgBxLvUoWoKQ IJKKLrT+PdKgGDbuhlKR1w1DNp1qM7lOcW0PHdmKrh0NNQ1sqMOq+7M5T0rCsul3d65fHJ bmnuahibGGuk3cvnDD+3fP3BJZ9C169pAl+f7q0liz31qUWvhdynrXJMktWSEPGnSpq2Sg Qd9lo3TMzxfTaHRMCHAU2WTEh1grqq4s4Ynel25JH0wCqt3DCbUy3F87Dz2HvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721146493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WsZ36WvY4cRc759azTwb6Rp2iiE+3C0vrGJmlWEYYMs=; b=pl9dIJwV/RsMFCLPTdCK0IW2djWoqMGOrswCfMM7XKo7pgkAuVBCCsD90AMZB0RqA1W+12 UY3o35Vp+YavS5dmvuhVMss7FJk95J5eYzDQjVrlR1JiwJQhwKv7x99BStSSVBuL6W8G4v hnQPk7eesQsmSlrVhN8Smg8DewQjdNBvG0XVYMZld5KGbxJ9U2e1MFAo8DA2SjK+0uiEQ7 BZvt0sOSoc3snyu3qXB50Tsny0/LqYwm/6yUnyiLOV1MoX3IfgZqxrV6x0C8RBn97xo+FA 8ZihyfVIzQDBTPU3DaG29PysT/fBqXNu4p2ZwuEHn40AoPXGQKrebFml38DCfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WNkg11N1Zzjwh; Tue, 16 Jul 2024 16:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46GGEruq075217; Tue, 16 Jul 2024 16:14:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46GGEro4075214; Tue, 16 Jul 2024 16:14:53 GMT (envelope-from git) Date: Tue, 16 Jul 2024 16:14:53 GMT Message-Id: <202407161614.46GGEro4075214@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: e2455c7452a3 - main - net-mgmt/tcpreplay: take maintainership, add LICENSE_FILE, OPTIONS modified List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2455c7452a3c677008ca89700ccfc60e30620b0 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2455c7452a3c677008ca89700ccfc60e30620b0 commit e2455c7452a3c677008ca89700ccfc60e30620b0 Author: mew14930xvi AuthorDate: 2024-07-16 16:04:33 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-16 16:12:17 +0000 net-mgmt/tcpreplay: take maintainership, add LICENSE_FILE, OPTIONS modified Also: - replace patch for fix build (upstream issue: https://github.com/appneta/tcpreplay/issues/809); - remake patches with makepatch; - remove GNU_CONFIGURE_MANPREFIX. Version 4.5.1 contains many bug fixes: https://github.com/appneta/tcpreplay/releases/tag/v4.5.1 PR: 280260 Approved by: ehaupt (maintainer) MFH: 2024Q3 --- net-mgmt/tcpreplay/Makefile | 15 +++++---------- net-mgmt/tcpreplay/files/patch-Makefile.in | 12 ++++++------ net-mgmt/tcpreplay/files/patch-lib_queue.h | 19 ------------------- net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c | 15 +++++++++++++++ net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h | 13 +++++++++++++ 5 files changed, 39 insertions(+), 35 deletions(-) diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile index 8c250d6a58d9..5794a4e8a15b 100644 --- a/net-mgmt/tcpreplay/Makefile +++ b/net-mgmt/tcpreplay/Makefile @@ -3,11 +3,12 @@ DISTVERSION= 4.5.1 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/appneta/${PORTNAME}/releases/download/v${DISTVERSION}/ -MAINTAINER= ehaupt@FreeBSD.org +MAINTAINER= mew14930xvi@inbox.lv COMMENT= Tool to replay saved packet capture files WWW= https://github.com/appneta/tcpreplay LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/docs/LICENSE BUILD_DEPENDS= pcapnav-config:net/libpcapnav LIB_DEPENDS= libdnet.so:net/libdnet \ @@ -17,7 +18,6 @@ USES= cpe gmake libtool pkgconfig tar:xz CPE_VENDOR= broadcom GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share # libopts options are required when using autogen CONFIGURE_ARGS= --disable-libopts-install \ --disable-local-libopts \ @@ -26,15 +26,10 @@ CONFIGURE_ARGS= --disable-libopts-install \ TEST_TARGET= test -OPTIONS_DEFAULT= LIBPCAP_BASE -OPTIONS_SINGLE= LIBPCAP -OPTIONS_SINGLE_LIBPCAP= LIBPCAP_BASE LIBPCAP_PORTS - -LIBPCAP_BASE_DESC= Build with libpcap from the base OS -LIBPCAP_PORTS_DESC= Build with net/libpcap - -LIBPCAP_BASE_CONFIGURE_ON= --with-libpcap=/usr/lib +OPTIONS_DEFINE= LIBPCAP_PORTS +LIBPCAP_PORTS_DESC= Build with net/libpcap instead of from the base OS # needs .so version (see: 262976) LIBPCAP_PORTS_LIB_DEPENDS= libpcap.so.1:net/libpcap +LIBPCAP_PORTS_CONFIGURE_OFF= --with-libpcap=/usr/lib .include diff --git a/net-mgmt/tcpreplay/files/patch-Makefile.in b/net-mgmt/tcpreplay/files/patch-Makefile.in index 39a566da5eae..9d6e23e9e94a 100644 --- a/net-mgmt/tcpreplay/files/patch-Makefile.in +++ b/net-mgmt/tcpreplay/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2022-02-05 21:30:36 UTC +--- Makefile.in.orig 2024-07-12 17:15:27 UTC +++ Makefile.in -@@ -892,7 +892,7 @@ autoopts: - +@@ -900,7 +900,7 @@ test: + test: - echo Making test in $(TEST_DIR) + echo Making test in $(TEST_DIR) - cd $(TEST_DIR) && make test + cd $(TEST_DIR) && gmake test - + dlt_names: - cat @SAVEFILE_C@ | $(top_builddir)/scripts/dlt2name.pl src/dlt_names.h + cat @SAVEFILE_C@ | $(top_builddir)/scripts/dlt2name.pl src/dlt_names.h diff --git a/net-mgmt/tcpreplay/files/patch-lib_queue.h b/net-mgmt/tcpreplay/files/patch-lib_queue.h deleted file mode 100644 index cc17718f57a1..000000000000 --- a/net-mgmt/tcpreplay/files/patch-lib_queue.h +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/queue.h.orig 2024-03-24 16:55:28 UTC -+++ lib/queue.h -@@ -36,8 +36,8 @@ - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - */ - --#ifndef _SYS_QUEUE_H_ --#define _SYS_QUEUE_H_ -+#ifndef _QUEUE_H_ -+#define _QUEUE_H_ - - /* - * This file defines five types of data structures: singly-linked lists, -@@ -508,4 +508,4 @@ struct { \ - (elm2)->field.cqe_prev->field.cqe_next = (elm2); \ - } while (0) - --#endif /* !_SYS_QUEUE_H_ */ -+#endif /* !_QUEUE_H_ */ diff --git a/net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c b/net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c new file mode 100644 index 000000000000..d4eb02fa98b1 --- /dev/null +++ b/net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c @@ -0,0 +1,15 @@ +--- src/fragroute/mod.c.orig 2023-12-31 18:39:02 UTC ++++ src/fragroute/mod.c +@@ -8,11 +8,11 @@ + */ + + #include "mod.h" ++#include "lib/queue.h" + #include "defines.h" + #include "config.h" + #include "common.h" + #include "argv.h" +-#include "lib/queue.h" + #include + #include + #include diff --git a/net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h b/net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h new file mode 100644 index 000000000000..ec36392985f8 --- /dev/null +++ b/net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h @@ -0,0 +1,13 @@ +--- src/fragroute/pkt.h.orig 2023-12-31 18:39:02 UTC ++++ src/fragroute/pkt.h +@@ -8,9 +8,9 @@ + + #pragma once + ++#include "lib/queue.h" + #include "defines.h" + #include "config.h" +-#include "lib/queue.h" + #include + + #ifdef HAVE_LIBDNET