From a0b83b72c14f752e4b564616a284cbb9fe97a90d Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Tue, 15 Sep 2020 20:26:27 +0800 Subject: [PATCH] Fix pluto abort --- 0002-fix-pluto-abort.patch | 31 +++++++++++++++++++++++++++++++ libreswan.spec | 6 +++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0002-fix-pluto-abort.patch diff --git a/0002-fix-pluto-abort.patch b/0002-fix-pluto-abort.patch new file mode 100644 index 0000000..053b19b --- /dev/null +++ b/0002-fix-pluto-abort.patch @@ -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 + ++/* ++ *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 + diff --git a/libreswan.spec b/libreswan.spec index d1285c0..64a8f6d 100644 --- a/libreswan.spec +++ b/libreswan.spec @@ -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 @@ -31,6 +31,7 @@ Source2: openeuler-libreswan-tmpfiles.conf Patch0001: libreswan-3.25-relax-delete.patch Patch0002: libreswan-3.25-unbound-hook.patch Patch0003: 0001-fix-libselinux-deprecated.patch +Patch0004: 0002-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 @@ -131,6 +132,9 @@ export NSS_DISABLE_HW_GCM=1 %doc %{_mandir}/*/* %changelog +* Tue Sep 15 2020 Guoshuai Sun - 3.25-10 +- Fix pluto abort + * Tue Sep 15 2020 Guoshuai Sun - 3.25-9 - Fix libselinux deprecated instead of ignore the Werror