fix multiple definition

Signed-off-by: shdluan <shdluan@163.com>
This commit is contained in:
shdluan 2021-08-04 09:27:04 +08:00
parent f91861ec20
commit 96f7e7955f
2 changed files with 18 additions and 1 deletions

View File

@ -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.

View File

@ -1,10 +1,13 @@
Name: strongswan Name: strongswan
Version: 5.7.2 Version: 5.7.2
Release: 6 Release: 7
Summary: An OpenSource IPsec-based VPN and TNC solution Summary: An OpenSource IPsec-based VPN and TNC solution
License: GPLv2+ License: GPLv2+
URL: http://www.strongswan.org/ URL: http://www.strongswan.org/
Source0: http://download.strongswan.org/strongswan-%{version}.tar.bz2 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: 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: openssl-devel sqlite-devel gettext-devel trousers-devel libxml2-devel pam-devel
BuildRequires: json-c-devel libgcrypt-devel systemd-devel iptables-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 %{_libexecdir}/strongswan/charon-nm
%changelog %changelog
* Mon Aug 4 2021 shdluan <shdluan@163.com> - 5.7.2-7
- fix multiple defination of variable
* Sat Jul 18 2020 yaokai13 <yaokai13@huawei.com> - 5.7.2-6 * Sat Jul 18 2020 yaokai13 <yaokai13@huawei.com> - 5.7.2-6
- Unpack the merged package to fix the issue #l1N2UN - Unpack the merged package to fix the issue #l1N2UN