commit 9bbe674927a307f02d32834c9a39f49c8be476e7 · pyrox.dev/nixpkgs

+6 -2

pkgs/tools/networking/strongswan/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, gmp, pkgconfig, python }:

     

       1
       1
       +
       { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "strongswan-5.2.1";

     
···

       10
       10
        
       

     

       11
       11
        
         dontPatchELF = true;

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ gmp pkgconfig python ];

     

       13
       13
       +
         buildInputs = [ gmp pkgconfig python autoreconfHook ];

     

       14
       14
       +
       

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           ./firewall_defaults.patch

     

       17
       17
       +
         ];

     

       14
       18
        
       

     

       15
       19
        
         configureFlags = [ "--enable-swanctl" "--enable-cmd" ];

     

       16
       20

+32

pkgs/tools/networking/strongswan/firewall_defaults.patch

···

       1
       1
       +
       Index: strongswan-5.2.1/src/starter/confread.c

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- strongswan-5.2.1.orig/src/starter/confread.c

     

       4
       4
       +
       +++ strongswan-5.2.1/src/starter/confread.c

     

       5
       5
       +
       @@ -43,7 +43,7 @@

     

       6
       6
       +
        static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536";

     

       7
       7
       +
        static const char esp_defaults[] = "aes128-sha1,3des-sha1";

     

       8
       8
       +
        

     

       9
       9
       +
       -static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables";

     

       10
       10
       +
       +static const char firewall_defaults[] = IPSEC_SBINDIR "/" IPSEC_SCRIPT " _updown iptables";

     

       11
       11
       +
        

     

       12
       12
       +
        /**

     

       13
       13
       +
         * Provided by GPERF

     

       14
       14
       +
       Index: strongswan-5.2.1/src/starter/Makefile.am

     

       15
       15
       +
       ===================================================================

     

       16
       16
       +
       --- strongswan-5.2.1.orig/src/starter/Makefile.am

     

       17
       17
       +
       +++ strongswan-5.2.1/src/starter/Makefile.am

     

       18
       18
       +
       @@ -18,10 +18,12 @@ AM_CPPFLAGS = \

     

       19
       19
       +
        	-I$(top_srcdir)/src/libhydra \

     

       20
       20
       +
        	-I$(top_srcdir)/src/starter \

     

       21
       21
       +
        	-I$(top_srcdir)/src/stroke \

     

       22
       22
       +
       -	-DIPSEC_DIR=\"${ipsecdir}\" \

     

       23
       23
       +
       +	-DIPSEC_BINDIR=\"${bindir}\" \

     

       24
       24
       +
        	-DIPSEC_CONFDIR=\"${sysconfdir}\" \

     

       25
       25
       +
       -	-DIPSEC_PIDDIR=\"${piddir}\" \

     

       26
       26
       +
       +	-DIPSEC_DIR=\"${ipsecdir}\" \

     

       27
       27
       +
        	-DIPSEC_EAPDIR=\"${eapdir}\" \

     

       28
       28
       +
       +	-DIPSEC_PIDDIR=\"${piddir}\" \

     

       29
       29
       +
       +	-DIPSEC_SBINDIR=\"${sbindir}\" \

     

       30
       30
       +
        	-DIPSEC_SCRIPT=\"${ipsec_script}\" \

     

       31
       31
       +
        	-DDEV_RANDOM=\"${random_device}\" \

     

       32
       32
       +
        	-DDEV_URANDOM=\"${urandom_device}\" \