commit cf73a5c9dd29795c5ee96581a747f0ea419c0ab5 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

vsftpd: fix build with gcc15

- add patch from fedora, fixing `setup_bio_callbacks` definition

Fixes build failure with gcc15:
```
ssl.c: In function 'ssl_accept':
ssl.c:493:3: error: too many arguments to function 'setup_bio_callbacks';
expected 0, have 1
493 | setup_bio_callbacks(p_ssl);
| ^~~~~~~~~~~~~~~~~~~ ~~~~~
ssl.c:37:13: note: declared here
37 | static void setup_bio_callbacks();
| ^~~~~~~~~~~~~~~~~~~
ssl.c: In function 'ssl_session_init':
ssl.c:647:3: error: too many arguments to function 'setup_bio_callbacks';
expected 0, have 1
647 | setup_bio_callbacks(p_ssl);
| ^~~~~~~~~~~~~~~~~~~ ~~~~~
ssl.c:37:13: note: declared here
37 | static void setup_bio_callbacks();
| ^~~~~~~~~~~~~~~~~~~
ssl.c: At top level:
ssl.c:692:13: error: conflicting types for 'setup_bio_callbacks'; have
'void(SSL *)' {aka 'void(struct ssl_st *)'}
692 | static void setup_bio_callbacks(SSL* p_ssl)
| ^~~~~~~~~~~~~~~~~~~
ssl.c:37:13: note: previous declaration of 'setup_bio_callbacks' with
type 'void(void)'
37 | static void setup_bio_callbacks();
| ^~~~~~~~~~~~~~~~~~~
```

ghpzin 3 months ago cf73a5c9 ef6712a9

options

unified split

Changed files

+11 -1

pkgs

by-name

vsftpd

package.nix

+11 -1

pkgs/by-name/vs/vsftpd/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         libcap,

     

       6
       7
        
         libseccomp,

     

       7
       8
        
         openssl,

     
···

       27
       28
        
           libxcrypt

     

       28
       29
        
         ];

     

       29
       30
        
       

     

       30
       30
       -
         patches = [ ./CVE-2015-1419.patch ];

     

       31
       31
       +
         patches = [

     

       32
       32
       +
           ./CVE-2015-1419.patch

     

       33
       33
       +
       

     

       34
       34
       +
           # Fix build with gcc15

     

       35
       35
       +
           (fetchpatch {

     

       36
       36
       +
             name = "vsftpd-correct-the-definition-of-setup_bio_callbacks-in-ssl.patch";

     

       37
       37
       +
             url = "https://src.fedoraproject.org/rpms/vsftpd/raw/c31087744900967ff4d572706a296bf6c8c4a68e/f/0076-Correct-the-definition-of-setup_bio_callbacks-in-ssl.patch";

     

       38
       38
       +
             hash = "sha256-eYiY2eKQ+qS3CiRZYGuRHcnAe32zLDdb/GwF6NyHch4=";

     

       39
       39
       +
           })

     

       40
       40
       +
         ];

     

       31
       41
        
       

     

       32
       42
        
         postPatch = ''

     

       33
       43
        
           sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h