diff --git a/pkgs/by-name/vs/vsftpd/package.nix b/pkgs/by-name/vs/vsftpd/package.nix index aed7cb231734..ef58bf50b021 100644 --- a/pkgs/by-name/vs/vsftpd/package.nix +++ b/pkgs/by-name/vs/vsftpd/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, libcap, libseccomp, openssl, @@ -27,7 +28,16 @@ stdenv.mkDerivation rec { libxcrypt ]; - patches = [ ./CVE-2015-1419.patch ]; + patches = [ + ./CVE-2015-1419.patch + + # Fix build with gcc15 + (fetchpatch { + name = "vsftpd-correct-the-definition-of-setup_bio_callbacks-in-ssl.patch"; + url = "https://src.fedoraproject.org/rpms/vsftpd/raw/c31087744900967ff4d572706a296bf6c8c4a68e/f/0076-Correct-the-definition-of-setup_bio_callbacks-in-ssl.patch"; + hash = "sha256-eYiY2eKQ+qS3CiRZYGuRHcnAe32zLDdb/GwF6NyHch4="; + }) + ]; postPatch = '' sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h