From 322513ab10bee9d25bcc727be06f0f134a077ecc Mon Sep 17 00:00:00 2001
From: bloominstrong <github@mail.bloominstrong.net>
Date: Tue, 10 Feb 2026 12:30:30 +1000
Subject: [PATCH] openvpn: 2.6.14 -> 2.6.19

---
 pkgs/tools/networking/openvpn/dco.patch   | 25 -----------------------
 pkgs/tools/networking/openvpn/default.nix | 11 ++--------
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/tools/networking/openvpn/dco.patch

diff --git a/pkgs/tools/networking/openvpn/dco.patch b/pkgs/tools/networking/openvpn/dco.patch
deleted file mode 100644
index 22572e6bc48b..000000000000
--- a/pkgs/tools/networking/openvpn/dco.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/openvpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h
-index 73e19b5..46c2786 100644
---- a/src/openvpn/ovpn_dco_linux.h
-+++ b/src/openvpn/ovpn_dco_linux.h
-@@ -237,20 +237,4 @@ 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,
--};
--
- #endif /* _UAPI_LINUX_OVPN_DCO_H_ */
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index ef02532cd73f..bee9e1744aba 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -23,20 +23,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openvpn";
-  version = "2.6.14";
+  version = "2.6.19";
 
   src = fetchurl {
     url = "https://swupdate.openvpn.net/community/releases/openvpn-${finalAttrs.version}.tar.gz";
-    hash = "sha256-nramYYNS+ee3canTiuFjG17f7tbUAjPiQ+YC3fIZXno=";
+    hash = "sha256-E3AlJvaHwYslQMGj8uGJGHuqplIR7c9/9ncvpp8FNs8=";
   };
 
-  # Effectively a backport of https://github.com/OpenVPN/openvpn/commit/1d3c2b67a73a0aa011c13e62f876d24e49d41df0
-  # to fix build on linux-headers 6.16.
-  # FIXME: remove in next update
-  patches = [
-    ./dco.patch
-  ];
-
   nativeBuildInputs = [
     pkg-config
   ]