From 7ff4c415bd5ef894d22a4984e9e462dfd8332794 Mon Sep 17 00:00:00 2001 From: jpzhang187 Date: Wed, 22 Dec 2021 17:19:48 +0800 Subject: [PATCH] add missing extern for swanctl_dir variable in header --- ...-extern-for-swanctl_dir-variable-in-header.patch | 13 +++++++++++++ strongswan.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 add-missing-extern-for-swanctl_dir-variable-in-header.patch diff --git a/add-missing-extern-for-swanctl_dir-variable-in-header.patch b/add-missing-extern-for-swanctl_dir-variable-in-header.patch new file mode 100644 index 0000000..ea1ef14 --- /dev/null +++ b/add-missing-extern-for-swanctl_dir-variable-in-header.patch @@ -0,0 +1,13 @@ +diff --git a/src/swanctl/swanctl.h b/src/swanctl/swanctl.h +index f0c334f..70f70d1 100644 +--- a/src/swanctl/swanctl.h ++++ b/src/swanctl/swanctl.h +@@ -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 e65cd83..4880d0a 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -1,6 +1,6 @@ Name: strongswan Version: 5.7.2 -Release: 7 +Release: 8 Summary: An OpenSource IPsec-based VPN and TNC solution License: GPLv2+ URL: http://www.strongswan.org/ @@ -8,6 +8,7 @@ Source0: http://download.strongswan.org/strongswan-%{version}.tar.bz2 Patch0: CVE-2021-41990.patch Patch1: CVE-2021-41991.patch +Patch2: add-missing-extern-for-swanctl_dir-variable-in-header.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 @@ -124,6 +125,9 @@ install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/{aacerts acerts %{_mandir}/man8/*8.gz %changelog +* Wed Dec 22 2021 zhangjiapeng - 5.7.2-8 +- add missing extern for swanctl_dir variable in header + * Mon Oct 25 2021 wangkai - 5.7.2-7 - fix CVE-2021-40990 CVE-2021-40991 -- Gitee