From 4367ecaba2b4fe2f0f7a443ec86e0f8b3f1c56e0 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Tue, 14 Feb 2023 17:20:06 +0800 Subject: [PATCH] Sync release from 20.03-LTS-SP3 --- fix-help-info-error.patch | 28 ++++++++++++++++++++++++++++ nasm.spec | 16 ++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 fix-help-info-error.patch diff --git a/fix-help-info-error.patch b/fix-help-info-error.patch new file mode 100644 index 0000000..fd7d8d7 --- /dev/null +++ b/fix-help-info-error.patch @@ -0,0 +1,28 @@ +From e5987111a8fc89ed86e43ab81e0805d958c61b2c Mon Sep 17 00:00:00 2001 +From: yangchenguang +Date: Thu, 19 Jan 2023 13:27:29 +0800 +Subject: [PATCH] fix help info error + +Signed-off-by: yangchenguang +--- + asm/nasm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/asm/nasm.c b/asm/nasm.c +index e5ae89a..e00408b 100644 +--- a/asm/nasm.c ++++ b/asm/nasm.c +@@ -2293,8 +2293,8 @@ static void help(FILE *out) + "\n" + " --prefix str prepend the given string to the names of all extern,\n" + " common and global symbols (also --gprefix)\n" +- " --suffix str append the given string to the names of all extern,\n" +- " common and global symbols (also --gprefix)\n" ++ " --postfix str append the given string to the names of all extern,\n" ++ " common and global symbols (also --gpostfix)\n" + " --lprefix str prepend the given string to local symbols\n" + " --lpostfix str append the given string to local symbols\n" + "\n" +-- +2.20.1 + diff --git a/nasm.spec b/nasm.spec index 7f6448b..5e734fc 100644 --- a/nasm.spec +++ b/nasm.spec @@ -8,7 +8,7 @@ Name: nasm Version: 2.15.03 -Release: 3 +Release: 5 Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax License: BSD URL: http://www.nasm.us @@ -19,12 +19,13 @@ Patch6000: backport-CVE-2019-20352.patch Patch6001: backport-CVE-2020-24241-1.patch Patch6002: backport-CVE-2020-24241-2.patch Patch6003: enable-make-check.patch +Patch6004: fix-help-info-error.patch #https://bugzilla.nasm.us/attachment.cgi?id=411648 BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git Provides: %{name}-rdoff -Obsoletes: %{name}-rdoff +Obsoletes: %{name}-rdoff < %{version}-%{release} %description NASM is the Netwide Assembler, a free portable assembler for the Intel @@ -40,7 +41,7 @@ BuildRequires: perl(Sort::Versions) BuildRequires: adobe-source-sans-pro-fonts adobe-source-code-pro-fonts BuildRequires: ghostscript Provides: %{name}-doc -Obsoletes: %{name}-doc +Obsoletes: %{name}-doc < %{version}-%{release} %endif BuildArch: noarch @@ -92,10 +93,17 @@ make test %{_mandir}/man1/ld* %changelog +* Thu Jan 19 2023 yangchenguang - 2.15.03-5 +- Fix help info error + +* Sat Oct 22 2022 zhangruifang - 2.15.03-4 +- add version number for Obsoletes +- fix bogus date in changelog + * Sat Nov 27 2021 ExtinctFire - 2.15.03-3 - enable make check -* Thu Jan 07 2020 shixuantong - 2.15.03-2 +* Thu Jan 07 2021 shixuantong - 2.15.03-2 - fix CVE-2019-20352 CVE-2020-24241 * Thu Jul 23 2020 shixuantong - 2.15.03-1 -- Gitee