diff options
Diffstat (limited to 'net/packetdrill')
| -rw-r--r-- | net/packetdrill/Makefile | 12 | ||||
| -rw-r--r-- | net/packetdrill/distinfo | 6 | ||||
| -rw-r--r-- | net/packetdrill/files/patch-Makefile.common | 31 | ||||
| -rw-r--r-- | net/packetdrill/files/patch-symbols__freebsd.c | 12 | ||||
| -rw-r--r-- | net/packetdrill/files/patch-tcp__options.h | 11 | ||||
| -rw-r--r-- | net/packetdrill/pkg-descr | 2 |
6 files changed, 63 insertions, 11 deletions
diff --git a/net/packetdrill/Makefile b/net/packetdrill/Makefile index 60b543a119b4..ba92406cbfd1 100644 --- a/net/packetdrill/Makefile +++ b/net/packetdrill/Makefile @@ -1,5 +1,5 @@ PORTNAME= packetdrill -PORTVERSION= 0.0.2023062500 +PORTVERSION= 0.0.2025042400 CATEGORIES= net MAINTAINER= olivier@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= GPLv2 USES= bison python:run uidfix USE_GITHUB= yes GH_ACCOUNT= freebsd-net -GH_TAGNAME= aebdc35 +GH_TAGNAME= f197eb3 WRKSRC_SUBDIR= gtests/net/packetdrill PLIST_FILES= bin/${PORTNAME} PORTDATA= packetdrill.el packetdrill.vim @@ -22,15 +22,13 @@ OPTIONS_DEFINE= DOCS EXAMPLES # XXX Static libraries with PIE are currently unsupported. MAKE_ARGS+= WITHOUT_PIE=true - -# 'MD5_Init' is deprecated on OpenSSL 3 -CFLAGS+= -Wno-deprecated +TEST_TARGET= tests pre-build: - cd ${WRKSRC} && ${LN} Makefile.FreeBSD Makefile + cd ${WRKSRC} && ${LN} -f Makefile.FreeBSD Makefile do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} post-install: @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/net/packetdrill/distinfo b/net/packetdrill/distinfo index 715bafa0d238..55b3eceece13 100644 --- a/net/packetdrill/distinfo +++ b/net/packetdrill/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688051642 -SHA256 (freebsd-net-packetdrill-0.0.2023062500-aebdc35_GH0.tar.gz) = c1f0fa965d345aa6aa3ab81bdd224dddea90ac0bc1fa6458e12af23e48e62d2c -SIZE (freebsd-net-packetdrill-0.0.2023062500-aebdc35_GH0.tar.gz) = 364128 +TIMESTAMP = 1745493026 +SHA256 (freebsd-net-packetdrill-0.0.2025042400-f197eb3_GH0.tar.gz) = a8dca77ff89e3545b723ffdf80a6df3b0bcab795743a77883a341cdd5eaa3562 +SIZE (freebsd-net-packetdrill-0.0.2025042400-f197eb3_GH0.tar.gz) = 366137 diff --git a/net/packetdrill/files/patch-Makefile.common b/net/packetdrill/files/patch-Makefile.common new file mode 100644 index 000000000000..87bbe4813039 --- /dev/null +++ b/net/packetdrill/files/patch-Makefile.common @@ -0,0 +1,31 @@ +--- Makefile.common.orig 2025-04-23 21:59:38 UTC ++++ Makefile.common +@@ -37,7 +37,7 @@ packetdrill: $(packetdrill-objs) + packetdrill-objs := packetdrill.o $(packetdrill-lib) + + packetdrill: $(packetdrill-objs) +- $(CC) -o packetdrill -g $(packetdrill-objs) $(packetdrill-ext-libs) ++ $(CC) $(LDFLAGS) -o packetdrill -g $(packetdrill-objs) $(packetdrill-ext-libs) + + test-bins := checksum_test packet_parser_test packet_to_string_test + tests: $(test-bins) +@@ -49,16 +49,16 @@ checksum_test: $(checksum_test-objs) + + checksum_test-objs := $(packetdrill-lib) checksum_test.o + checksum_test: $(checksum_test-objs) +- $(CC) -o checksum_test $(checksum_test-objs) $(packetdrill-ext-libs) ++ $(CC) $(LDFLAGS) -o checksum_test $(checksum_test-objs) $(packetdrill-ext-libs) + + packet_parser_test-objs := $(packetdrill-lib) packet_parser_test.o + packet_parser_test: $(packet_parser_test-objs) +- $(CC) -o packet_parser_test $(packet_parser_test-objs) \ ++ $(CC) $(LDFLAGS) -o packet_parser_test $(packet_parser_test-objs) \ + $(packetdrill-ext-libs) + + packet_to_string_test-objs := $(packetdrill-lib) packet_to_string_test.o + packet_to_string_test: $(packet_to_string_test-objs) +- $(CC) -o packet_to_string_test $(packet_to_string_test-objs) \ ++ $(CC) $(LDFLAGS) -o packet_to_string_test $(packet_to_string_test-objs) \ + $(packetdrill-ext-libs) + + clean: diff --git a/net/packetdrill/files/patch-symbols__freebsd.c b/net/packetdrill/files/patch-symbols__freebsd.c new file mode 100644 index 000000000000..25950fcd0277 --- /dev/null +++ b/net/packetdrill/files/patch-symbols__freebsd.c @@ -0,0 +1,12 @@ +--- symbols_freebsd.c.orig 2023-10-07 04:37:59 UTC ++++ symbols_freebsd.c +@@ -406,7 +406,9 @@ struct int_symbol platform_symbols_table[] = { + { TCP_NOOPT, "TCP_NOOPT" }, + { TCP_MD5SIG, "TCP_MD5SIG" }, + { TCP_INFO, "TCP_INFO" }, ++#if defined(TCP_STATS) + { TCP_STATS, "TCP_STATS" }, ++#endif + #if defined(TCP_LOG) + { TCP_LOG, "TCP_LOG" }, + #endif diff --git a/net/packetdrill/files/patch-tcp__options.h b/net/packetdrill/files/patch-tcp__options.h new file mode 100644 index 000000000000..a151a453fc98 --- /dev/null +++ b/net/packetdrill/files/patch-tcp__options.h @@ -0,0 +1,11 @@ +--- tcp_options.h.orig 2023-10-07 04:31:15 UTC ++++ tcp_options.h +@@ -166,7 +166,7 @@ struct tcp_option { + struct { + u8 data[MAX_TCP_OPTION_DATA_BYTES]; + } generic; +- }; ++ } __packed; + u32 flags; /* meta information, not going on the wire */ + } __packed; + diff --git a/net/packetdrill/pkg-descr b/net/packetdrill/pkg-descr index ac97f93a2e95..77dea864c71c 100644 --- a/net/packetdrill/pkg-descr +++ b/net/packetdrill/pkg-descr @@ -5,4 +5,4 @@ OpenBSD, and NetBSD. It can test network stack behavior over physical NICs on a LAN, or on a single machine using a tun virtual network device. -See also: https://github.com/google/packetdrill +See also WWW: https://github.com/google/packetdrill |