Merge pull request #335697 from NixOS/backport-335465-to-release-24.05

This commit is contained in:
Franz Pletz 2024-08-20 09:43:44 +02:00 committed by GitHub
commit f07d0e4777
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages
{ lib, stdenv, fetchurl, fetchpatch, gettext, pkg-config, perlPackages
, libidn2, zlib, pcre, libuuid, libiconv, libintl
, python3, lzip
, withLibpsl ? false, libpsl
@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
patches = [
./remove-runtime-dep-on-openssl-headers.patch
(fetchpatch {
name = "CVE-2024-38428.patch";
url = "https://git.savannah.gnu.org/cgit/wget.git/patch/?id=ed0c7c7e0e8f7298352646b2fd6e06a11e242ace";
hash = "sha256-4ZVPufgG/h0UkxF9hQBAtF6QAG4GEz9hHeqEsD47q4U=";
})
];
preConfigure = ''