开源软件构建与测试

_service:tar_scm:nasm.spec Changed

@@ -7,21 +7,19 @@
 %endif
 
 Name:     nasm
-Version:  2.15.05
-Release:  3
+Version:  2.16.01
+Release:  1
 Summary:  The Netwide Assembler, a portable x86 assembler with Intel-like syntax
 License:  BSD-2-Clause
 URL:      http://www.nasm.us
-Source0:  http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.bz2
-Source1:  http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2
+Source0:  http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.xz
+Source1:  http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.xz
 
 Patch6000: enable-make-check.patch
+Patch6001: 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
+BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git automake
+Obsoletes: nasm-rdoff < 2.16.01-1
 
 %description
 NASM is the Netwide Assembler, a free portable assembler for the Intel
@@ -33,7 +31,7 @@
 Summary: Help files for NASM
 %if %{with documentation}
 BuildRequires: perl(Font::TTF::Font) perl(File::Spec)
-BuildRequires: perl(Sort::Versions)
+BuildRequires: perl(Sort::Versions) perl(sort)
 BuildRequires: adobe-source-sans-pro-fonts adobe-source-code-pro-fonts
 BuildRequires: ghostscript
 Provides:  %{name}-doc
@@ -47,6 +45,7 @@
 
 %prep
 %autosetup -n %{name}-%{version} -p1
+tar xJf %{SOURCE1} --strip-components 1
 
 %build
 %configure
@@ -58,7 +57,7 @@
 %endif
 
 %install
-%make_install install_rdf
+%make_install
 
 %check
 make golden
@@ -66,18 +65,9 @@
 
 %files
 %doc CHANGES README.md
-%license AUTHORS
+%license AUTHORS LICENSE
 %{_bindir}/nasm
 %{_bindir}/ndisasm
-%{_bindir}/ldrdf
-%{_bindir}/rdf2bin
-%{_bindir}/rdf2ihx
-%{_bindir}/rdf2com
-%{_bindir}/rdfdump
-%{_bindir}/rdflib
-%{_bindir}/rdx
-%{_bindir}/rdf2ith
-%{_bindir}/rdf2srec
 
 %files help
 %if %{with documentation}
@@ -85,10 +75,17 @@
 %endif
 %{_mandir}/man1/nasm*
 %{_mandir}/man1/ndisasm*
-%{_mandir}/man1/rd*
-%{_mandir}/man1/ld*
 
 %changelog
+* Thu May 18 2023 liyanan <thistleslyn@163.com> - 2.16.01-1
+- update to 2.16.01
+
+* Wed Apr 12 2023 yaoxin <yao_xin001@hoperun.com> - 2.15.05-5
+- Fix CVE-2022-44370
+
+* Thu Jan 19 2023 yangchenguang <yangchenguang@uniontech.com> - 2.15.05-4
+- Fix help info error
+
 * Wed May 11 2022 wulei <wulei80@h-partners.com> - 2.15.05-3
 - License compliance rectification

_service:tar_scm:enable-make-check.patch Changed

_service:tar_scm:fix-help-info-error.patch Added

@@ -0,0 +1,28 @@
+From e5987111a8fc89ed86e43ab81e0805d958c61b2c Mon Sep 17 00:00:00 2001
+From: yangchenguang <yangchenguang@uniontech.com>
+Date: Thu, 19 Jan 2023 13:27:29 +0800
+Subject: PATCH fix help info error
+
+Signed-off-by: yangchenguang <yangchenguang@uniontech.com>
+---
+ 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
+

_service Changed

_service:tar_scm:nasm-2.15.05.tar.bz2 Deleted

_service:tar_scm:nasm-2.16.01-xdoc.tar.xz Added

_service:tar_scm:nasm-2.15.05-xdoc.tar.bz2 -> _service:tar_scm:nasm-2.16.01.tar.xz Changed

Changes of Revision 2