From 1098fc92217ac27746ec8004a87ca742b1408795 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Thu, 17 Mar 2022 14:28:52 +0100
Subject: [PATCH 1/2] openvpn: 2.5.5 -> 2.5.6 (security, CVE-2022-0547)

Release Notes:
https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst

Fixes: CVE-2022-0547
---
 pkgs/tools/networking/openvpn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index e2805f0ccf05..0f8218ab4935 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -32,7 +32,7 @@ let
         inherit version;
 
         src = fetchurl {
-          url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
+          url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.gz";
           inherit sha256;
         };
 
@@ -83,7 +83,7 @@ in
   };
 
   openvpn = generic {
-    version = "2.5.5";
-    sha256 = "sha256-EZvWn6AhCDj2zaonNpbcc476IA9FTb4R6237dd+2ADs=";
+    version = "2.5.6";
+    sha256 = "0gdd88rcan9vfiwkzsqn6fxxdim7kb1bsxrcra59c5xksprpwfik";
   };
 }

From 448d02ec22fb1abe298bc2a36a44ac96465ea23c Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Thu, 17 Mar 2022 22:47:40 +0100
Subject: [PATCH 2/2] openvpn: 2.4.11 -> 2.4.12 (security, CVE-2022-0547)

Release Notes:
https://github.com/OpenVPN/openvpn/blob/release/2.4/Changes.rst#version-2412https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst

Fixes: CVE-2022-0547
---
 pkgs/tools/networking/openvpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 0f8218ab4935..9200bc3f30e8 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -78,8 +78,8 @@ let
 in
 {
   openvpn_24 = generic {
-    version = "2.4.11";
-    sha256 = "06s4m0xvixjhd3azrzbsf4j86kah4xwr2jp6cmcpc7db33rfyyg5";
+    version = "2.4.12";
+    sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6";
   };
 
   openvpn = generic {