From b89a83986ab078d7f9b1ceb3ed8fff548180528b Mon Sep 17 00:00:00 2001 From: wang_yue111 <648774160@qq.com> Date: Thu, 9 Sep 2021 18:08:10 +0800 Subject: [PATCH] fix rpath error (cherry picked from commit 57a50d1a8562bcc4a1c0d24a2e15cc209c1208cb) --- strongswan.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/strongswan.spec b/strongswan.spec index e3d2199..22fe40a 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -1,6 +1,6 @@ Name: strongswan Version: 5.7.2 -Release: 8 +Release: 9 Summary: An OpenSource IPsec-based VPN and TNC solution License: GPLv2+ URL: http://www.strongswan.org/ @@ -11,7 +11,7 @@ Patch1: fix-use-of-uninitialized-value.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 +BuildRequires: json-c-devel libgcrypt-devel systemd-devel iptables-devel chrpath Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -107,13 +107,24 @@ install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/{aacerts acerts %delete_la +cd $RPM_BUILD_ROOT/usr +file `find -type f` | grep -w ELF | awk -F":" '{print $1}' | for i in `xargs` +do +chrpath -d $i +done +cd - +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{_libdir}/strongswan" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf + %preun %systemd_preun strongswan.service %post +/sbin/ldconfig %systemd_post strongswan.service %postun +/sbin/ldconfig %systemd_postun_with_restart strongswan.service %files @@ -147,6 +158,7 @@ install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/{aacerts acerts %{_mandir}/man?/*.gz %{_datadir}/strongswan/templates/config/ %{_datadir}/strongswan/templates/database/ +%config(noreplace) /etc/ld.so.conf.d/* %files sqlite %{_libdir}/strongswan/plugins/libstrongswan-sqlite.so @@ -174,6 +186,9 @@ install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/{aacerts acerts %{_libexecdir}/strongswan/charon-nm %changelog +* Thu Sep 09 2021 caodongxia - 5.7.2-9 +- fix rpath error + * Wed Sep 1 2021 caodongxia - 5.7.2-8 - fix fuzz: use of uninitialized value -- Gitee