]> git.99rst.org Git - openwrt-packages.git/commitdiff
ovpn-dco: fix build on 6.18.40
authorQingfang Deng <redacted>
Tue, 4 Aug 2026 10:56:32 +0000 (18:56 +0800)
committerFlorian Eckert <redacted>
Tue, 4 Aug 2026 13:05:08 +0000 (15:05 +0200)
6.18.40 commit 073d95725269 changed the prototype of proto::recvmsg.
Update the ifdef.

Signed-off-by: Qingfang Deng <redacted>
kernel/ovpn-dco/Makefile
kernel/ovpn-dco/patches/0002-fix-build-on-6.18.40.patch [new file with mode: 0644]

index 851cb6750cbd5e1de1b03c8f2b63b95d92aff5d0..f11ab23e0cdd03f6880b6805f3300eaa38c70406 100644 (file)
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ovpn-backports
 PKG_VERSION:=7.1.0.2026070800
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
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
new file mode 100644 (file)
index 0000000..3e84402
--- /dev/null
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Qingfang Deng <dqfext@gmail.com>
+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)
git clone https://git.99rst.org/PROJECT