diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-21 18:00:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-21 18:00:10 +0100 |
| commit | 265dbe5dbc14c199299496c6db8fce3f76647015 (patch) | |
| tree | ab18b5617d138f6684566b619405090989d55a2c /net-vpn/libreswan/files | |
| parent | 586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff) | |
gentoo resync : 21.09.2018
Diffstat (limited to 'net-vpn/libreswan/files')
| -rw-r--r-- | net-vpn/libreswan/files/libreswan-3.26-nss-link.patch | 22 | ||||
| -rw-r--r-- | net-vpn/libreswan/files/libreswan-3.26-nss.patch | 27 |
2 files changed, 49 insertions, 0 deletions
diff --git a/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch b/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch new file mode 100644 index 000000000000..267aa2120dbd --- /dev/null +++ b/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch @@ -0,0 +1,22 @@ +From b3199806cc66de4888917ddc85b511b433e43d63 Mon Sep 17 00:00:00 2001 +From: Paul Wouters <pwouters@redhat.com> +Date: Mon, 17 Sep 2018 11:23:11 -0400 +Subject: [PATCH] building: -lfreebl is no longer needed + +--- + mk/config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/config.mk b/mk/config.mk +index 3bd2527497..d8497c2104 100644 +--- a/mk/config.mk ++++ b/mk/config.mk +@@ -234,7 +234,7 @@ BISONOSFLAGS?= + NSSFLAGS?=$(shell pkg-config --cflags nss) + # We don't want to link against every library pkg-config --libs nss + # returns +-NSS_LDFLAGS ?= -lnss3 -lfreebl -lnssutil3 ++NSS_LDFLAGS ?= -lnss3 -lnssutil3 + NSS_SMIME_LDFLAGS ?= -lsmime3 + NSS_UTIL_LDFLAGS ?= -lnssutil3 + NSPR_LDFLAGS ?= -lnspr4 diff --git a/net-vpn/libreswan/files/libreswan-3.26-nss.patch b/net-vpn/libreswan/files/libreswan-3.26-nss.patch new file mode 100644 index 000000000000..89a6436a2a26 --- /dev/null +++ b/net-vpn/libreswan/files/libreswan-3.26-nss.patch @@ -0,0 +1,27 @@ +From 910f69119b491c6d7abcc85cf8911d2fa012a135 Mon Sep 17 00:00:00 2001 +From: Andrew Cagney <cagney@gnu.org> +Date: Mon, 17 Sep 2018 11:56:56 -0400 +Subject: [PATCH] ecdsa: don't include NSS's "blapi.h", no longer needed and + not on debian + +(not to be confused with "lbapit.h", which also looks suspect) + +Follow-up b3199806cc66de4888917ddc85b511b433e43d63 and +2d093c9fb83c8104604e4b40defa4e41129577ea. The latter +relaced the call to ECDSA_VerifyDigest() with PK11_Verify(). +--- + programs/pluto/keys.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/programs/pluto/keys.c b/programs/pluto/keys.c +index b3df5802cf..bd9d8d8c6c 100644 +--- a/programs/pluto/keys.c ++++ b/programs/pluto/keys.c +@@ -72,7 +72,6 @@ + #include <secerr.h> + #include <secport.h> + #include <time.h> +-#include <blapi.h> + #include "lswconf.h" + #include "lswnss.h" + #include "secrets.h" |