Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions kernel/ovpn-dco/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,39 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=ovpn-dco
PKG_VERSION:=0.2.20250801
PKG_NAME:=ovpn-backports
PKG_VERSION:=6.17.0.2025112700
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:=542677e69266e99babb560408b61705ef38a7c469eb820a81f609171faa61b20
https://swupdate.openvpn.net/community/releases
PKG_HASH:=4f9e92ad9c62e2e768e4f6db16ae47a81d161f72fce7e1ea89ab4c9a9239c479
PKG_BUILD_PARALLEL:=1

PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
PKG_LICENSE:=GPL-2.0-only


include $(INCLUDE_DIR)/package.mk

define KernelPackage/ovpn-dco-v2
define KernelPackage/ovpn
SUBMENU:=Network Support
TITLE:=OpenVPN data channel offload
DEPENDS:= \
DEPENDS:= @LINUX_6_12 \
+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/description
This module enhances the performance of the OpenVPN userspace software
by offloading the data channel processing to kernelspace.
endef
Expand All @@ -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))
6 changes: 3 additions & 3 deletions net/openvpn/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=openvpn

PKG_VERSION:=2.6.14
PKG_RELEASE:=5
PKG_VERSION:=2.7.0
PKG_RELEASE:=1

PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
https://swupdate.openvpn.net/community/releases/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=9eb6a6618352f9e7b771a9d38ae1631b5edfeed6d40233e243e602ddf2195e7a
PKG_HASH:=2f0e10eb272be61e8fb25fe1cfa20875ff30ac857ef1418000c02290bd6dfa45

PKG_MAINTAINER:=

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
--- a/src/openvpn/ssl_mbedtls.c
+++ b/src/openvpn/ssl_mbedtls.c
@@ -1616,7 +1616,7 @@ const char *
@@ -1573,11 +1573,7 @@ show_available_curves(void)
const char *
get_ssl_library_version(void)
{
static char mbedtls_version[30];
- static char mbedtls_version[30];
- unsigned int pv = mbedtls_version_get_number();
+ unsigned int pv = MBEDTLS_VERSION_NUMBER;
snprintf(mbedtls_version, sizeof(mbedtls_version), "mbed TLS %d.%d.%d",
(pv>>24)&0xff, (pv>>16)&0xff, (pv>>8)&0xff );
return mbedtls_version;
- snprintf(mbedtls_version, sizeof(mbedtls_version), "mbed TLS %d.%d.%d", (pv >> 24) & 0xff,
- (pv >> 16) & 0xff, (pv >> 8) & 0xff);
- return mbedtls_version;
+ return "mbed TLS " MBEDTLS_VERSION_STRING;
}

void

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/src/openvpn/ssl_verify_openssl.c
+++ b/src/openvpn/ssl_verify_openssl.c
@@ -267,6 +267,9 @@ backend_x509_get_username(char *common_n
@@ -257,6 +257,9 @@ backend_x509_get_username(char *common_n
return FAILURE;
}
}
Expand Down