From 5f02f0135908a4a3673ed4d1a8adf4ffa525df9c Mon Sep 17 00:00:00 2001 From: Qingfang Deng Date: Thu, 2 Apr 2026 10:42:09 +0800 Subject: [PATCH] ovpn-dco: switch to the new source The ovpn kernel module is is part of the Linux kernel starting from version 6.16. Switch to the new officially maintained backports source: https://github.com/OpenVPN/ovpn-backports Signed-off-by: Qingfang Deng --- kernel/ovpn-dco/Makefile | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/kernel/ovpn-dco/Makefile b/kernel/ovpn-dco/Makefile index 14a8468ba6..d8a1b7706a 100644 --- a/kernel/ovpn-dco/Makefile +++ b/kernel/ovpn-dco/Makefile @@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_NAME:=ovpn-dco -PKG_VERSION:=0.2.20251017 +PKG_NAME:=ovpn-backports +PKG_VERSION:=7.0.0.2026032400 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL= \ https://build.openvpn.net/downloads/releases \ - https://codeload.github.com/OpenVPN/ovpn-dco/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=af88c9bc73b350e0cada9aa5b21c5d4b598f9a9868f0b78b2d06026183a67032 + https://swupdate.openvpn.net/community/releases +PKG_HASH:=509ca84cf2bb7b9300b282c11869fc1607b09339b562087e535d070d4c0d26a8 +PKG_BUILD_PARALLEL:=1 PKG_MAINTAINER:=Jianhui Zhao PKG_LICENSE:=GPL-2.0-only @@ -24,17 +25,22 @@ PKG_LICENSE:=GPL-2.0-only include $(INCLUDE_DIR)/package.mk -define KernelPackage/ovpn-dco-v2 +define KernelPackage/ovpn-backports SUBMENU:=Network Support TITLE:=OpenVPN data channel offload DEPENDS:= \ +kmod-udptunnel4 +IPV6:kmod-udptunnel6 \ +kmod-crypto-chacha20poly1305 +kmod-crypto-lib-chacha20 +kmod-crypto-lib-poly1305 - FILES:=$(PKG_BUILD_DIR)/drivers/net/ovpn-dco/ovpn-dco-v2.ko - AUTOLOAD:=$(call AutoLoad,30,ovpn-dco-v2) + # Note: TCP requires STREAM_PARSER but it can't be selected by out-of-tree + # modules, so pull in AF_KCM for now. This needs to be patched on kernel + # side. + #KCONFIG:=CONFIG_STREAM_PARSER=y + KCONFIG:=CONFIG_AF_KCM + FILES:=$(PKG_BUILD_DIR)/drivers/net/ovpn/ovpn.ko + AUTOLOAD:=$(call AutoLoad,30,ovpn) endef -define KernelPackage/ovpn-dco-v2/description +define KernelPackage/ovpn-backports/description This module enhances the performance of the OpenVPN userspace software by offloading the data channel processing to kernelspace. endef @@ -46,20 +52,19 @@ NOSTDINC_FLAGS += \ -include $(PKG_BUILD_DIR)/linux-compat.h EXTRA_KCONFIG:= \ - CONFIG_OVPN_DCO_V2=m + CONFIG_OVPN=m -PKG_EXTMOD_SUBDIRS = drivers/net/ovpn-dco +PKG_EXTMOD_SUBDIRS = drivers/net/ovpn MAKE_OPTS:= \ - $(KERNEL_MAKE_FLAGS) \ - M="$(PKG_BUILD_DIR)/drivers/net/ovpn-dco" \ + M="$(PKG_BUILD_DIR)/$(PKG_EXTMOD_SUBDIRS)" \ NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ $(EXTRA_KCONFIG) define Build/Compile - $(MAKE) -C "$(LINUX_DIR)" \ + +$(KERNEL_MAKE) $(PKG_JOBS) \ $(MAKE_OPTS) \ modules endef -$(eval $(call KernelPackage,ovpn-dco-v2)) +$(eval $(call KernelPackage,ovpn-backports))