From cb914a5ef990f36709fa16f1d813b8bc56a136d6 Mon Sep 17 00:00:00 2001 From: Kai Liu Date: Mon, 16 Dec 2024 11:02:11 +0800 Subject: [PATCH] Correctly escape % in spec file Signed-off-by: Kai Liu (cherry picked from commit 6cfadccf169a49d7a223f1f999cef58e382b3aa9) --- gcc_secure.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gcc_secure.spec b/gcc_secure.spec index 0fe75c5..d13ba1d 100644 --- a/gcc_secure.spec +++ b/gcc_secure.spec @@ -3,7 +3,7 @@ Summary: Enforcing secure compile options for abuild License: GPL-2.0-only Group: System/Management Version: 1.0 -Release: 0.13 +Release: 0.14 BuildRoot: %{_tmppath}/%{name}-%{version} BuildRequires: util-linux coreutils @@ -30,7 +30,7 @@ old_gcc=/usr/bin/gcc mv $old_gcc $old_gcc"_old" cat < $old_gcc #!/bin/sh -gcc_secure_exclude=\`rpm --eval %{gcc_secure_exclude}\` +gcc_secure_exclude=\`rpm --eval %%{gcc_secure_exclude}\` if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fsigned-char' fs_opt='' @@ -75,7 +75,7 @@ if [ -f $old_gplus ]; then mv $old_gplus $old_gplus"_old" cat < $old_gplus #!/bin/sh -gcc_secure_exclude=\`rpm --eval %{gcc_secure_exclude}\` +gcc_secure_exclude=\`rpm --eval %%{gcc_secure_exclude}\` if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fsigned-char' fs_opt='' @@ -115,7 +115,7 @@ if [ -f $old_cpp ]; then mv $old_cpp $old_cpp"_old" cat < $old_cpp #!/bin/sh -gcc_secure_exclude=\`rpm --eval %{gcc_secure_exclude}\` +gcc_secure_exclude=\`rpm --eval %%{gcc_secure_exclude}\` if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fsigned-char' fs_opt='' @@ -160,6 +160,12 @@ rm -rf %{_tmppath}/%{name}-%{version} rm -rf $RPM_BUILD_DIR/%{name}-%{version} %changelog +* Mon Dec 16 2024 Kai Liu - 1.0-0.14 +- Type:bugfix +- ID:IBBGOY +- SUG:NA +- DESC: Fix escaping of % + * Fri Nov 25 2022 Ge Wang - 1.0-0.13 - Type:enhancement - ID:NA -- Gitee