From 612a0d5ebbb163e7d615b725fdf3d08a6cc5ffef Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 21 Nov 2016 10:35:33 +0200 Subject: [PATCH] tcpreplay: upgrade to 4.1.2 Contains patch that fixes compat with musl: https://github.com/appneta/tcpreplay/commit/7c942b71d4ace7425a26e4670f8fbd5814b2339b Signed-off-by: Alexandru Ardelean --- net/tcpreplay/Makefile | 6 ++-- .../patches/010-musl_compatibility.patch | 31 ------------------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 net/tcpreplay/patches/010-musl_compatibility.patch diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile index 6ff222502..d7dce051c 100644 --- a/net/tcpreplay/Makefile +++ b/net/tcpreplay/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcpreplay -PKG_VERSION:=4.1.1 -PKG_RELEASE:=3 +PKG_VERSION:=4.1.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION) -PKG_MD5SUM:=80394c33fe697b53b69eac9bb0968ae9 +PKG_MD5SUM:=3105b10b07dbc0b07ce2da07a2368359 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=docs/LICENSE diff --git a/net/tcpreplay/patches/010-musl_compatibility.patch b/net/tcpreplay/patches/010-musl_compatibility.patch deleted file mode 100644 index 5b2735e07..000000000 --- a/net/tcpreplay/patches/010-musl_compatibility.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/common/fakepoll.h -+++ b/src/common/fakepoll.h -@@ -40,11 +40,11 @@ - #define POLL_NO_WARN - #define SYS_POLL_NO_WARN - --#ifdef HAVE_SYS_POLL_H --#include --#define __FAKEPOLL_H --#elif HAVE_POLL_H -+#ifdef HAVE_POLL_H - #include -+#define __FAKEPOLL_H -+#elif HAVE_SYS_POLL_H -+#include - #define __FAKEPOLL_H - #endif - ---- a/src/common/sendpacket.c -+++ b/src/common/sendpacket.c -@@ -148,10 +148,6 @@ - #include "txring.h" - #endif - --#ifndef __GLIBC__ --typedef int socklen_t; --#endif -- - static sendpacket_t *sendpacket_open_pf(const char *, char *); - static struct tcpr_ether_addr *sendpacket_get_hwaddr_pf(sendpacket_t *); - static int get_iface_index(int fd, const char *device, char *);