From 33d4e72c596e723843c2bfc3f3e683b08f6cc78f Mon Sep 17 00:00:00 2001 From: Lyall Beveridge Date: Wed, 27 Nov 2024 05:51:05 +0000 Subject: [PATCH] patches: (APP-3765, PR #335) update iperf3 patch Approved-by: Sophronia Koilpillai Approved-by: Evan Benn --- patches/002-iperf3_3_15.patch | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/patches/002-iperf3_3_15.patch b/patches/002-iperf3_3_15.patch index 18aebc13ad..d9af569f7e 100644 --- a/patches/002-iperf3_3_15.patch +++ b/patches/002-iperf3_3_15.patch @@ -4,25 +4,30 @@ Temporarily downgrade iperf3 due to performance issues as udp server This takes us back to OpenWrt 23.05.2's Makefile. diff --git a/feeds/packages/net/iperf3/Makefile b/feeds/packages/net/iperf3/Makefile -index bd5c6ca94..dbe09c1e0 100644 +index 44065e6e1a..dbe09c1e03 100644 --- a/feeds/packages/net/iperf3/Makefile +++ b/feeds/packages/net/iperf3/Makefile -@@ -8,12 +8,12 @@ +@@ -8,16 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf --PKG_VERSION:=3.16 +-PKG_VERSION:=3.17.1 +-PKG_RELEASE:=2 +PKG_VERSION:=3.15 - PKG_RELEASE:=1 ++PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf --PKG_HASH:=cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e +-PKG_HASH:=84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa +PKG_HASH:=bdb77c11f72bce90214883159577fa24412013e62b2083cf5f54391d79b1d8ff PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause -@@ -44,8 +44,7 @@ define Package/iperf3-ssl +-PKG_CPE_ID:=cpe:/a:es:iperf3 + + PKG_BUILD_PARALLEL:=1 + PKG_INSTALL:=1 +@@ -45,8 +44,7 @@ define Package/iperf3-ssl $(call Package/iperf3/default) TITLE+= with iperf_auth support VARIANT:=ssl @@ -32,7 +37,7 @@ index bd5c6ca94..dbe09c1e0 100644 endef define Package/libiperf3 -@@ -53,11 +52,9 @@ define Package/libiperf3 +@@ -54,11 +52,9 @@ define Package/libiperf3 CATEGORY:=Libraries TITLE:=Internet Protocol bandwidth measuring library URL:=https://github.com/esnet/iperf