net-vpn/libreswan: remove unused patches
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Sat, 19 Jan 2019 09:22:49 +0000 (10:22 +0100)
committerAaron Bauman <bman@gentoo.org>
Wed, 27 Feb 2019 05:35:29 +0000 (00:35 -0500)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Signed-off-by: Aaron Bauman <bman@gentoo.org>
net-vpn/libreswan/files/libreswan-3.23-modern-kernels.patch [deleted file]
net-vpn/libreswan/files/libreswan-3.26-nss-link.patch [deleted file]
net-vpn/libreswan/files/libreswan-3.26-nss.patch [deleted file]

diff --git a/net-vpn/libreswan/files/libreswan-3.23-modern-kernels.patch b/net-vpn/libreswan/files/libreswan-3.23-modern-kernels.patch
deleted file mode 100644 (file)
index 5dedfeb..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/programs/pluto/kernel_netlink.c
-b/programs/pluto/kernel_netlink.c
-index 8cec3a2..a2500f4 100644
---- a/programs/pluto/kernel_netlink.c
-+++ b/programs/pluto/kernel_netlink.c
-@@ -51,8 +51,8 @@
- #include <linux/if_addr.h>
- #include <linux/if_link.h>
-
--#include "libreswan.h" /* before xfrm.h otherwise break on F22 */
- #include "linux/xfrm.h" /* local (if configured) or system copy */
-+#include "libreswan.h" /* before xfrm.h otherwise break on F22 */
-
- #include "libreswan/pfkeyv2.h"
- #include "libreswan/pfkey.h"
diff --git a/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch b/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch
deleted file mode 100644 (file)
index 267aa21..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644 (file)
index 89a6436..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-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"