!16 Fix pluto abrt

From: @ultra_planet
Reviewed-by: @jackie_wu123,@small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2020-11-26 16:55:40 +08:00 committed by Gitee
commit d3644546d1
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From 4c08ae4152c6dbd9ecc7126c2e32468dcf1a6589 Mon Sep 17 00:00:00 2001
From: si-gui <245140120@qq.com>
Date: Tue, 15 Sep 2020 20:19:26 +0800
Subject: [PATCH] fix libselinux deprecated
Signed-off-by: si-gui <245140120@qq.com>
---
programs/pluto/ike_alg_encrypt_nss_gcm_ops.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/programs/pluto/ike_alg_encrypt_nss_gcm_ops.c b/programs/pluto/ike_alg_encrypt_nss_gcm_ops.c
index 4352645..4143186 100644
--- a/programs/pluto/ike_alg_encrypt_nss_gcm_ops.c
+++ b/programs/pluto/ike_alg_encrypt_nss_gcm_ops.c
@@ -17,6 +17,13 @@
#include <libreswan.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"
--
2.23.0

View File

@ -20,7 +20,7 @@
Name: libreswan
Version: 3.25
Release: 9
Release: 10
Summary: A free implementation of IPsec & IKE for Linux
License: GPLv2
Url: https://github.com/libreswan/libreswan
@ -32,6 +32,7 @@ Patch0001: libreswan-3.25-relax-delete.patch
Patch0002: libreswan-3.25-unbound-hook.patch
Patch0003: 0001-Replace-and-remove-deprecated-libselinux-functions.patch
Patch0004: 0002-fixup-last-two-occurances-of-security_context_t.patch
Patch0005: 0003-fix-pluto-abort.patch
BuildRequires: gcc pkgconfig hostname bison flex systemd-devel nss-devel >= 3.16.1
BuildRequires: nspr-devel pam-devel libevent-devel unbound-devel >= 1.6.0-6 ldns-devel
@ -133,6 +134,9 @@ export NSS_DISABLE_HW_GCM=1
%doc %{_mandir}/*/*
%changelog
* Thu Nov 26 2020 lingsheng <lingsheng@huawei.com> - 3.25-10
- Fix pluto abrt
* Thu Nov 05 2020 Ge Wang <wangge20@huawei.com> - 3.25-9
- Set help package as libreswan package's install require