packages/libreswan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!5 Remove Werror option that causes compilation failure

Browse Source 
Merge pull request !5 from jpzhang187/master
This commit is contained in:
openeuler-ci-bot 2020-08-04 16:47:49 +08:00 committed by Gitee
commit d406f0a1e8
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libreswan-3.25-workaround-deprecation-warnings-introduced-in-libselinux-update.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/programs/pluto/security_selinux.c b/programs/pluto/security_selinux.c
index ac5028e..2073a4a 100644
--- a/programs/pluto/security_selinux.c
+++ b/programs/pluto/security_selinux.c
@@ -18,6 +18,8 @@
static int selinux_ready = 0;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
void init_avc(void)
{
if (!is_selinux_enabled()) {
@@ -82,3 +84,4 @@ int within_range(security_context_t sl, security_context_t range)
range);
return 1;
}
+#pragma GCC diagnostic pop
diff --git a/programs/pluto/security_selinux.h b/programs/pluto/security_selinux.h
index cccd60f..61279eb 100644
--- a/programs/pluto/security_selinux.h
+++ b/programs/pluto/security_selinux.h
@@ -20,6 +20,9 @@
#include <selinux/context.h>
void init_avc(void);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
int within_range(security_context_t sl, security_context_t range);
+#pragma GCC diagnostic pop
#endif /* _SECURITY_SELINUX_H */

6
libreswan.spec
View File

@ -20,7 +20,7 @@
Name: libreswan
Version: 3.25
Release: 6
Release: 7
Summary: A free implementation of IPsec & IKE for Linux
License: GPLv2
Url: https://libreswan.org/
@ -30,6 +30,7 @@ Source2: openeuler-libreswan-tmpfiles.conf
Patch0001: libreswan-3.25-relax-delete.patch
Patch0002: libreswan-3.25-unbound-hook.patch
Patch0003: libreswan-3.25-workaround-deprecation-warnings-introduced-in-libselinux-update.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
@ -130,6 +131,9 @@ export NSS_DISABLE_HW_GCM=1
%doc %{_mandir}/*/*
%changelog
* Tue Aug 04 2020 zhangjiapeng <zhangjiapeng9@huawei.com> - 3.25-7
- Workaround deprecation warnings introduced in update libselinux >= 3.1
* Fri Apr 03 2020 Jiangping Hu <hujp1985@foxmail.com> - 3.25-6
- Add config files