Skip to content

Commit

Permalink
net-mgmt/tcpreplay: take maintainership, add LICENSE_FILE, OPTIONS mo…
Browse files Browse the repository at this point in the history
…dified

Also:
 - replace patch for fix build (upstream issue:
appneta/tcpreplay#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
  • Loading branch information
mew14930xvi authored and VVD committed Jul 16, 2024
1 parent 82cba74 commit e2455c7
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 35 deletions.
15 changes: 5 additions & 10 deletions net-mgmt/tcpreplay/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ DISTVERSION= 4.5.1
CATEGORIES= net-mgmt
MASTER_SITES= https://github.com/appneta/${PORTNAME}/releases/download/v${DISTVERSION}/

MAINTAINER= [email protected]
MAINTAINER= [email protected]
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 \
Expand All @@ -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 \
Expand All @@ -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 <bsd.port.mk>
12 changes: 6 additions & 6 deletions net-mgmt/tcpreplay/files/patch-Makefile.in
Original file line number Diff line number Diff line change
@@ -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
19 changes: 0 additions & 19 deletions net-mgmt/tcpreplay/files/patch-lib_queue.h

This file was deleted.

15 changes: 15 additions & 0 deletions net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c
Original file line number Diff line number Diff line change
@@ -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 <ctype.h>
#include <stdio.h>
#include <stdlib.h>
13 changes: 13 additions & 0 deletions net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h
Original file line number Diff line number Diff line change
@@ -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 <sys/time.h>

#ifdef HAVE_LIBDNET

0 comments on commit e2455c7

Please sign in to comment.