From 96f7e7955f78c18a2c6597a02684b260304f3366 Mon Sep 17 00:00:00 2001 From: shdluan Date: Wed, 4 Aug 2021 09:27:04 +0800 Subject: [PATCH] fix multiple definition Signed-off-by: shdluan --- strongswan-multiple-definition.patch | 11 +++++++++++ strongswan.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 strongswan-multiple-definition.patch diff --git a/strongswan-multiple-definition.patch b/strongswan-multiple-definition.patch new file mode 100644 index 0000000..1a11719 --- /dev/null +++ b/strongswan-multiple-definition.patch @@ -0,0 +1,11 @@ +--- ./src/swanctl/swanctl.h.xiugai 2021-08-03 19:08:13.634660548 +0800 ++++ ./src/swanctl/swanctl.h 2021-08-03 19:08:30.770825041 +0800 +@@ -30,7 +30,7 @@ + /** + * Base directory for credentials and config + */ +-char *swanctl_dir; ++extern char *swanctl_dir; + + /** + * Configuration file for connections, etc. diff --git a/strongswan.spec b/strongswan.spec index 5817401..902e711 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -1,10 +1,13 @@ Name: strongswan Version: 5.7.2 -Release: 6 +Release: 7 Summary: An OpenSource IPsec-based VPN and TNC solution License: GPLv2+ URL: http://www.strongswan.org/ Source0: http://download.strongswan.org/strongswan-%{version}.tar.bz2 + +Patch0: strongswan-multiple-definition.patch + BuildRequires: gcc systemd-devel gmp-devel libcurl-devel NetworkManager-libnm-devel openldap-devel BuildRequires: openssl-devel sqlite-devel gettext-devel trousers-devel libxml2-devel pam-devel BuildRequires: json-c-devel libgcrypt-devel systemd-devel iptables-devel @@ -170,6 +173,9 @@ install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/{aacerts acerts %{_libexecdir}/strongswan/charon-nm %changelog +* Mon Aug 4 2021 shdluan - 5.7.2-7 +- fix multiple defination of variable + * Sat Jul 18 2020 yaokai13 - 5.7.2-6 - Unpack the merged package to fix the issue #l1N2UN -- Gitee