summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2020-06-27 08:15:13 +0200
committerHans de Graaff <graaff@gentoo.org>2020-06-27 08:15:30 +0200
commitf089a9dbc70325b82be293afe46bf2c9a7c3e9e8 (patch)
tree915bb84ab67562bdec123774fcd703b7df059d0c /net-vpn/libreswan/files
parentdev-perl/Config-Auto: -r bump for EAPI7 (diff)
downloadgentoo-f089a9dbc70325b82be293afe46bf2c9a7c3e9e8.tar.gz
gentoo-f089a9dbc70325b82be293afe46bf2c9a7c3e9e8.tar.bz2
gentoo-f089a9dbc70325b82be293afe46bf2c9a7c3e9e8.zip
net-vpn/libreswan: backport NSS compat patch
Backport a patch for compatibility with newer NSS versions. Closes: https://bugs.gentoo.org/721686 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'net-vpn/libreswan/files')
-rw-r--r--net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch b/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch
new file mode 100644
index 000000000000..09f71a9f907c
--- /dev/null
+++ b/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch
@@ -0,0 +1,23 @@
+Add compatibility setting for NSS
+
+https://github.com/libreswan/libreswan/commit/65a497959a0e1ca615341109eaad5e75723839d6
+
+We patch a different file because a later commit moved the setting to this file.
+
+diff --git a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+index 93a027089a..571913cc1e 100644
+--- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
++++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+@@ -16,6 +16,12 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
++/*
++ * Special advise from Bob Relyea - needs to go before any nss include
++ *
++ */
++#define NSS_PKCS11_2_0_COMPAT 1
++
+ #include "lswlog.h"
+ #include "lswnss.h"
+ #include "prmem.h"