From d6f152ebe32c0c120176df920cc382259376180e Mon Sep 17 00:00:00 2001 From: Sander van Deijck Date: Mon, 10 Aug 2026 14:33:13 +0200 Subject: [PATCH] ovpn-dco: update to version 7.1.0.2026080300 Update to the latest version. Signed-off-by: Sander van Deijck --- kernel/ovpn-dco/Makefile | 6 ++--- .../patches/0002-fix-build-on-6.18.40.patch | 23 ------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 kernel/ovpn-dco/patches/0002-fix-build-on-6.18.40.patch diff --git a/kernel/ovpn-dco/Makefile b/kernel/ovpn-dco/Makefile index f11ab23e0c..0a7b1120cd 100644 --- a/kernel/ovpn-dco/Makefile +++ b/kernel/ovpn-dco/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ovpn-backports -PKG_VERSION:=7.1.0.2026070800 -PKG_RELEASE:=2 +PKG_VERSION:=7.1.0.2026080300 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ https://build.openvpn.net/downloads/releases \ https://swupdate.openvpn.net/community/releases -PKG_HASH:=2be764534b9a1c2e7827bc7fb832cf89827c5b2e73db6805cb749458e0c72e3b +PKG_HASH:=b612261015b75fcb52a364d7bedc1e5fd70656e26ba388f1d88f58fc5fbb9560 PKG_BUILD_PARALLEL:=1 PKG_MAINTAINER:=Jianhui Zhao diff --git a/kernel/ovpn-dco/patches/0002-fix-build-on-6.18.40.patch b/kernel/ovpn-dco/patches/0002-fix-build-on-6.18.40.patch deleted file mode 100644 index 3e844026c2..0000000000 --- a/kernel/ovpn-dco/patches/0002-fix-build-on-6.18.40.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Qingfang Deng -Date: Sun, 2 Aug 2026 19:17:55 +0800 -Subject: [PATCH] fix build on 6.18.40 - -6.18.40 commit 073d95725269 changed the prototype of proto::recvmsg. -Update the ifdef. ---- - drivers/net/ovpn/tcp.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/net/ovpn/tcp.c -+++ b/drivers/net/ovpn/tcp.c -@@ -167,6 +167,9 @@ err_nopeer: - #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0) - static int ovpn_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, - int noblock, int flags, int *addr_len) -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 18, 40) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 19, 0) -+static int ovpn_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, -+ int flags) - #elif LINUX_VERSION_CODE < KERNEL_VERSION(7, 1, 0) - static int ovpn_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, - int flags, int *addr_len)