[gentoo-commits] repo/gentoo:master commit in: net-vpn/libreswan/files/

[Aaron Bauman]

commit:     04a1f8c7b11f2ffbd7ed25367bc46b5e588f3d00
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jan 19 09:22:49 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 05:35:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a1f8c7

net-vpn/libreswan: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/libreswan-3.23-modern-kernels.patch      | 15 ------------
 .../libreswan/files/libreswan-3.26-nss-link.patch  | 22 ------------------
 net-vpn/libreswan/files/libreswan-3.26-nss.patch   | 27 ----------------------
 3 files changed, 64 deletions(-)

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
index 5dedfeb34c7..00000000000
--- a/net-vpn/libreswan/files/libreswan-3.23-modern-kernels.patch
+++ /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
index 267aa2120db..00000000000
--- a/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b3199806cc66de4888917ddc85b511b433e43d63 Mon Sep 17 00:00:00 2001
-From: Paul Wouters <pwouters@××××××.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
index 89a6436a2a2..00000000000
--- a/net-vpn/libreswan/files/libreswan-3.26-nss.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 910f69119b491c6d7abcc85cf8911d2fa012a135 Mon Sep 17 00:00:00 2001
-From: Andrew Cagney <cagney@×××.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"