tcpreplay: update to 4.6.0

Refresh PKG_HASH from the release tarball.

Define __UAPI_DEF_ETHHDR=0: 4.6.0 added XDP support, so txring.h now
pulls <linux/if_ether.h> while sendpacket.h pulls <netinet/if_ether.h>,
and on musl both define struct ethhdr. The macro makes the kernel header
defer the struct to libc, fixing the redefinition.

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index eba59d6e652295f8e37fd01fec665b7a65a7d711..1c8e855b9dbe98851a0faa201f033ecb656be08b 100644 (file)
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tcpreplay
-PKG_VERSION:=4.5.2
-PKG_RELEASE:=5
+PKG_VERSION:=4.6.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION)
-PKG_HASH:=2df15bc6d49f96a77617d137049f998193bbae95c1a31b04ca02856a24cbf384
+PKG_HASH:=1ec01a3fab92215be6d8a99984ab6c16047c1ec6d813f4c508b744dd94b48837
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=docs/LICENSE
@@ -139,7 +139,10 @@ CONFIGURE_ARGS += \
        --with-libdnet="$(STAGING_DIR)/usr" \
        --with-libpcap="$(STAGING_DIR)/usr"
 
-TARGET_CFLAGS += -std=gnu11
+# 4.6.0's txring.h (<linux/if_ether.h>) and sendpacket.h
+# (<netinet/if_ether.h>) both define struct ethhdr on musl; have the
+# kernel header defer it to libc to avoid the redefinition.
+TARGET_CFLAGS += -std=gnu11 -D__UAPI_DEF_ETHHDR=0
 TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
 
 define tcpreplayTemplate