From 07ac0dbe704bcbfef0510bd9d419c6e84fcc58f9 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Sep 2025 01:26:05 +0300
Subject: [PATCH] openvpn3: fix build on latest Linux

---
 pkgs/by-name/op/openvpn3/package.nix          |  5 ++++
 .../op/openvpn3/v25-latest-linux-fix.patch    | 27 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/op/openvpn3/v25-latest-linux-fix.patch

diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
index 0b4598642abc..6eb179c1612f 100644
--- a/pkgs/by-name/op/openvpn3/package.nix
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # Should be fixed in v26: https://codeberg.org/OpenVPN/openvpn3-linux/issues/70
+    ./v25-latest-linux-fix.patch
+  ];
+
   postPatch = ''
     echo '#define OPENVPN_VERSION "3.git:unknown:unknown"
     #define PACKAGE_GUIVERSION "v${builtins.replaceStrings [ "_" ] [ ":" ] version}"
diff --git a/pkgs/by-name/op/openvpn3/v25-latest-linux-fix.patch b/pkgs/by-name/op/openvpn3/v25-latest-linux-fix.patch
new file mode 100644
index 000000000000..65577548730f
--- /dev/null
+++ b/pkgs/by-name/op/openvpn3/v25-latest-linux-fix.patch
@@ -0,0 +1,27 @@
+diff --git a/openvpn3-core/openvpn/dco/ovpn_dco_linux.h b/openvpn3-core/openvpn/dco/ovpn_dco_linux.h
+index 238f71f7a..5b7fe8d8c 100644
+--- a/openvpn3-core/openvpn/dco/ovpn_dco_linux.h
++++ b/openvpn3-core/openvpn/dco/ovpn_dco_linux.h
+@@ -239,22 +239,6 @@ enum ovpn_netlink_packet_attrs {
+ 	OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1,
+ };
+ 
+-enum ovpn_ifla_attrs {
+-	IFLA_OVPN_UNSPEC = 0,
+-	IFLA_OVPN_MODE,
+-
+-	__IFLA_OVPN_AFTER_LAST,
+-	IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST - 1,
+-};
+-
+-enum ovpn_mode {
+-	__OVPN_MODE_FIRST = 0,
+-	OVPN_MODE_P2P = __OVPN_MODE_FIRST,
+-	OVPN_MODE_MP,
+-
+-	__OVPN_MODE_AFTER_LAST,
+-};
+-
+ /// \endcond
+ 
+ #endif /* _UAPI_LINUX_OVPN_DCO_H_ */