JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #57072 from knl/upgrade-strongswan-5.7.2

Browse Source 
strongswan: 5.7.1 -> 5.7.2
This commit is contained in:
Bas van Dijk 2019-03-08 16:29:49 +01:00 committed by GitHub
commit 6b9d8a21fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/networking/strongswan-swanctl/module.nix
View File

@ -65,9 +65,12 @@ in {
after = [ "network-online.target" "keys.target" ];
wants = [ "keys.target" ];
path = with pkgs; [ kmod iproute iptables utillinux ];
environment.STRONGSWAN_CONF = pkgs.writeTextFile {
name = "strongswan.conf";
text = cfg.strongswan.extraConfig;
environment = {
STRONGSWAN_CONF = pkgs.writeTextFile {
name = "strongswan.conf";
text = cfg.strongswan.extraConfig;
};
SWANCTL_DIR = "/etc/swanctl";
};
restartTriggers = [ config.environment.etc."swanctl/swanctl.conf".source ];
serviceConfig = {

13
pkgs/tools/networking/strongswan/default.nix
View File

@ -19,11 +19,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "strongswan-${version}";
version = "5.7.1";
version = "5.7.2";
src = fetchurl {
url = "https://download.strongswan.org/${name}.tar.bz2";
sha256 = "1v2b8lnqrkbc9hx3p2rw36xvphdy5ayy3dblm3kz98p24s8rqvq0";
sha256 = "0w6cks42lvvyj5ivyhqyqxya48x93yzfpz281q3xmqicdskkp3ih";
};
dontPatchELF = true;
@ -49,14 +49,7 @@ stdenv.mkDerivation rec {
}))
];
postPatch = ''
# swanctl can be configured by files in SWANCTLDIR which defaults to
# $out/etc/swanctl. Since that directory is in the nix store users can't
# modify it. Ideally swanctl accepts a command line option for specifying
# the configuration files. In the absence of that we patch swanctl to look
# for configuration files in /etc/swanctl.
substituteInPlace src/swanctl/swanctl.h --replace "SWANCTLDIR" "\"/etc/swanctl\""
'' + optionalString stdenv.isLinux ''
postPatch = optionalString stdenv.isLinux ''
# glibc-2.26 reorganized internal includes
sed '1i#include <stdint.h>' -i src/libstrongswan/utils/utils/memory.h