openvpn-auth-ldap: Fix CVE-2024-28820 (#337962)

This commit is contained in:
Simon Hauser 2024-08-29 18:09:15 +02:00 committed by GitHub
parent 120df833b5
commit 1906fbbe6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 10 deletions

View File

@ -1,12 +1,14 @@
{ lib {
, stdenv lib,
, fetchFromGitHub stdenv,
, autoreconfHook fetchFromGitHub,
, gnustep fetchpatch2,
, re2c autoreconfHook,
, openldap gnustep,
, openssl re2c,
, openvpn openldap,
openssl,
openvpn,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,6 +24,11 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./auth-ldap-fix-conftest.patch ./auth-ldap-fix-conftest.patch
(fetchpatch2 {
name = "fix-cve-2024-28820";
url = "https://patch-diff.githubusercontent.com/raw/threerings/openvpn-auth-ldap/pull/92.patch";
hash = "sha256-SXuo1D/WywKO5hCsmoeDdTsR7EelxFxJAKmlAQJ6vuE=";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -11070,7 +11070,7 @@ with pkgs;
openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
openvpn-auth-ldap = callPackage ../tools/networking/openvpn/openvpn-auth-ldap.nix { openvpn-auth-ldap = callPackage ../tools/networking/openvpn/openvpn-auth-ldap.nix {
stdenv = clangStdenv; inherit (llvmPackages_17) stdenv;
}; };
namespaced-openvpn = python3Packages.callPackage ../tools/networking/namespaced-openvpn { }; namespaced-openvpn = python3Packages.callPackage ../tools/networking/namespaced-openvpn { };