Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'

2 files changed, 2 insertions, 62 deletions

diff --git a/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/nixpkgs/pkgs/tools/networking/strongswan/default.nix
index 8cd76b9ca4e6..1f0271c22573 100644
--- a/nixpkgs/pkgs/tools/networking/strongswan/default.nix
+++ b/nixpkgs/pkgs/tools/networking/strongswan/default.nix
@@ -19,11 +19,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "strongswan-${version}";
-  version = "5.7.2";
+  version = "5.8.0"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
 
   src = fetchurl {
     url = "https://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "0w6cks42lvvyj5ivyhqyqxya48x93yzfpz281q3xmqicdskkp3ih";
+    sha256 = "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m";
   };
 
   dontPatchELF = true;
@@ -40,10 +40,6 @@ stdenv.mkDerivation rec {
     ./ext_auth-path.patch
     ./firewall_defaults.patch
     ./updown-path.patch
-    (optional stdenv.isLinux (substituteAll {
-      src = ./modprobe-path.patch;
-      inherit kmod;
-    }))
   ];
 
   postPatch = optionalString stdenv.isLinux ''
diff --git a/nixpkgs/pkgs/tools/networking/strongswan/modprobe-path.patch b/nixpkgs/pkgs/tools/networking/strongswan/modprobe-path.patch
deleted file mode 100644
index 4c0cb59c13a1..000000000000
--- a/nixpkgs/pkgs/tools/networking/strongswan/modprobe-path.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/src/starter/klips.c b/src/starter/klips.c
-index 2216546..d626677 100644
---- a/src/starter/klips.c
-+++ b/src/starter/klips.c
-@@ -30,7 +30,7 @@ bool starter_klips_init(void)
- 		/* ipsec module makes the pf_key proc interface visible */
- 		if (stat(PROC_MODULES, &stb) == 0)
- 		{
--			ignore_result(system("modprobe -qv ipsec"));
-+			ignore_result(system("@kmod@/bin/modprobe -qv ipsec"));
- 		}
- 
- 		/* now test again */
-@@ -42,9 +42,9 @@ bool starter_klips_init(void)
- 	}
- 
- 	/* load crypto algorithm modules */
--	ignore_result(system("modprobe -qv ipsec_aes"));
--	ignore_result(system("modprobe -qv ipsec_blowfish"));
--	ignore_result(system("modprobe -qv ipsec_sha2"));
-+	ignore_result(system("@kmod@/bin/modprobe -qv ipsec_aes"));
-+	ignore_result(system("@kmod@/bin/modprobe -qv ipsec_blowfish"));
-+	ignore_result(system("@kmod@/bin/modprobe -qv ipsec_sha2"));
- 
- 	DBG2(DBG_APP, "found KLIPS IPsec stack");
- 	return TRUE;
-diff --git a/src/starter/netkey.c b/src/starter/netkey.c
-index b150d3e..0a7c2ff 100644
---- a/src/starter/netkey.c
-+++ b/src/starter/netkey.c
-@@ -30,7 +30,7 @@ bool starter_netkey_init(void)
- 		/* af_key module makes the netkey proc interface visible */
- 		if (stat(PROC_MODULES, &stb) == 0)
- 		{
--			ignore_result(system("modprobe -qv af_key"));
-+			ignore_result(system("@kmod@/bin/modprobe -qv af_key"));
- 		}
- 
- 		/* now test again */
-@@ -44,11 +44,11 @@ bool starter_netkey_init(void)
- 	/* make sure that all required IPsec modules are loaded */
- 	if (stat(PROC_MODULES, &stb) == 0)
- 	{
--		ignore_result(system("modprobe -qv ah4"));
--		ignore_result(system("modprobe -qv esp4"));
--		ignore_result(system("modprobe -qv ipcomp"));
--		ignore_result(system("modprobe -qv xfrm4_tunnel"));
--		ignore_result(system("modprobe -qv xfrm_user"));
-+		ignore_result(system("@kmod@/bin/modprobe -qv ah4"));
-+		ignore_result(system("@kmod@/bin/modprobe -qv esp4"));
-+		ignore_result(system("@kmod@/bin/modprobe -qv ipcomp"));
-+		ignore_result(system("@kmod@/bin/modprobe -qv xfrm4_tunnel"));
-+		ignore_result(system("@kmod@/bin/modprobe -qv xfrm_user"));
- 	}
- 
- 	DBG2(DBG_APP, "found netkey IPsec stack");