From 6ebf4b20419c17208b8cb4ae22a488690bb18014 Mon Sep 17 00:00:00 2001 From: wangjiang Date: Mon, 12 Dec 2022 14:10:22 +0800 Subject: [PATCH] remove rpath and runpath of exec files and libraries (cherry picked from commit 885c5e0296267842f40eea17f7f36c39798ec31b) --- vim.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index bffe4f3..98d27a2 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ Name: vim Epoch: 2 Version: 9.0 -Release: 4 +Release: 5 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim and MIT URL: http://www.vim.org @@ -86,7 +86,7 @@ Patch9000: bugfix-rm-modify-info-version.patch BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators gcc BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) libacl-devel gpm-devel file -BuildRequires: desktop-file-utils >= 0.2.93 libtool make +BuildRequires: desktop-file-utils >= 0.2.93 libtool make chrpath %if %{_with_selinux__} BuildRequires: libselinux-devel %endif @@ -367,6 +367,12 @@ echo ".so man1/vimtutor.1" > %{buildroot}%{_mandir}/man1/gvimtutor.1 echo ".so man1/vi.1" > %{buildroot}%{_mandir}/man5/virc.5 touch %{buildroot}%{_datadir}/%{name}/vimfiles/doc/tags +chrpath -d %{buildroot}%{_bindir}/vim +chrpath -d %{buildroot}%{_bindir}/xxd + +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{_libdir}/perl5/CORE" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf + pushd runtime ln -sf ../../%{name}/%{vimdir}/doc docs popd @@ -453,6 +459,7 @@ LC_ALL=en_US.UTF-8 make -j1 test %{_mandir}/man1/{gex.*,gview.*,gvim*,rvim.*,vim.*,vimdiff.*} %{_mandir}/man1/{vimtutor.*,vimx.*,xxd.*} %{_mandir}/man5/vimrc.* +%config(noreplace) /etc/ld.so.conf.d/* %files minimal %config(noreplace) %{_sysconfdir}/virc @@ -463,6 +470,7 @@ LC_ALL=en_US.UTF-8 make -j1 test %files enhanced %{_bindir}/{vim,rvim,vimdiff,vimtutor} +%config(noreplace) /etc/ld.so.conf.d/* %files filesystem %dir %{_datadir}/%{name}/vimfiles/after/* @@ -480,6 +488,12 @@ LC_ALL=en_US.UTF-8 make -j1 test %{_mandir}/man1/evim.* %changelog +* Mon Dec 12 2022 wangjiang - 2:9.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove rpath and runpath of exec files and libraries + * Thu Dec 08 2022 wangjiang - 2:9.0-4 - Type:CVE - ID:CVE-2022-4292 CVE-2022-4293 -- Gitee