Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/libreswan/files/
Date: Sun, 29 Aug 2021 22:42:20
Message-Id: 1630276866.dbddf84e82f627f7273f52e1f8a75fa85b85fd13.conikost@gentoo
1 commit: dbddf84e82f627f7273f52e1f8a75fa85b85fd13
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sat Aug 28 19:28:55 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 29 22:41:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbddf84e
7
8 net-vpn/libreswan: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/22147
11 Package-Manager: Portage-3.0.22, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../files/libreswan-3.32-nss-compat.patch | 23 ----------------------
16 1 file changed, 23 deletions(-)
17
18 diff --git a/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch b/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch
19 deleted file mode 100644
20 index 09f71a9f907..00000000000
21 --- a/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch
22 +++ /dev/null
23 @@ -1,23 +0,0 @@
24 -Add compatibility setting for NSS
25 -
26 -https://github.com/libreswan/libreswan/commit/65a497959a0e1ca615341109eaad5e75723839d6
27 -
28 -We patch a different file because a later commit moved the setting to this file.
29 -
30 -diff --git a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
31 -index 93a027089a..571913cc1e 100644
32 ---- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
33 -+++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
34 -@@ -16,6 +16,12 @@
35 - #include <stdio.h>
36 - #include <stdlib.h>
37 -
38 -+/*
39 -+ * Special advise from Bob Relyea - needs to go before any nss include
40 -+ *
41 -+ */
42 -+#define NSS_PKCS11_2_0_COMPAT 1
43 -+
44 - #include "lswlog.h"
45 - #include "lswnss.h"
46 - #include "prmem.h"