From 3a6da6668f4e3e19583322ae971a9c1408762f2f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 16 Mar 2021 14:31:55 +0100
Subject: [PATCH 1/2] Remove iperf

---
 root/package/network/utils/iperf3/Makefile | 84 ----------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 root/package/network/utils/iperf3/Makefile

diff --git a/root/package/network/utils/iperf3/Makefile b/root/package/network/utils/iperf3/Makefile
deleted file mode 100644
index 1a7f3c83..00000000
--- a/root/package/network/utils/iperf3/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2007-2010 OpenWrt.org
-# Copyright (C) 2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=iperf
-PKG_SOURCE_VERSION:=40e7c05440583f229edd6b6ca05c5d97b66fcf15
-PKG_VERSION:=3.6-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/esnet/iperf.git
-
-PKG_MAINTAINER:=Yannick Chabanois <ycarus@zugaina.org>
-PKG_LICENSE:=BSD-3-Clause
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-DISABLE_NLS:=
-
-define Package/iperf3/default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Internet Protocol bandwidth measuring tool
-  URL:=https://github.com/esnet/iperf
-endef
-
-define Package/iperf3
-$(call Package/iperf3/default)
-  VARIANT:=nossl
-endef
-
-define Package/iperf3-ssl
-$(call Package/iperf3/default)
-  TITLE+= with iperf_auth support
-  VARIANT:=ssl
-  DEPENDS:= +libopenssl
-endef
-
-TARGET_CFLAGS += -D_GNU_SOURCE
-CONFIGURE_ARGS += --disable-shared
-
-ifeq ($(BUILD_VARIANT),ssl)
-	CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr"
-else
-	CONFIGURE_ARGS += --without-openssl
-endif
-
-MAKE_FLAGS += noinst_PROGRAMS=
-
-define Package/iperf3/description
- Iperf is a modern alternative for measuring TCP and UDP bandwidth
- performance, allowing the tuning of various parameters and
- characteristics.
-endef
-
-# autoreconf fails if the README file isn't present
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	touch $(PKG_BUILD_DIR)/README
-endef
-
-define Package/iperf3/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iperf3 $(1)/usr/bin/
-endef
-
-define Package/iperf3-ssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iperf3 $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,iperf3))
-$(eval $(call BuildPackage,iperf3-ssl))

From 877c8d07b9b1d8f6b46edf1ac24572476882a3a7 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 18 Mar 2021 15:40:14 +0100
Subject: [PATCH 2/2] Update OpenWrt

---
 build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 5e00d404..d77efc2b 100755
--- a/build.sh
+++ b/build.sh
@@ -82,9 +82,9 @@ fi
 
 #_get_repo source https://github.com/ysurac/openmptcprouter-source "master"
 if [ "$OMR_OPENWRT" = "default" ]; then
-	_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "ffeb37047e85a5efd96890db12710e9d60b4b76a"
-	_get_repo feeds/packages https://github.com/openwrt/packages "7bc897eb94c09c8fe2472091709fab7446b37976"
-	_get_repo feeds/luci https://github.com/openwrt/luci "5af5f4a1ee5cbcd4a3099e6e210aca0099973410"
+	_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "81edc842f6277bc9c12a86f295caab70ad519d27"
+	_get_repo feeds/packages https://github.com/openwrt/packages "1677e5fcd7a701e881612729400c03084328a69f"
+	_get_repo feeds/luci https://github.com/openwrt/luci "1dc16d9d3ffeee30d072c569e9a3c693d303e9fc"
 elif [ "$OMR_OPENWRT" = "master" ]; then
 	_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master"
 	_get_repo feeds/packages https://github.com/openwrt/packages "master"