Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
e8f11304d1
!43 update to 2.16.01
From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-05-19 02:09:45 +00:00
lyn1001
7729bd08da update to 0.2.16.01 2023-05-18 16:09:15 +08:00
openeuler-ci-bot
61f64e0558
!37 Fix CVE-2022-44370
From: @starlet-dx 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
2023-04-12 08:58:34 +00:00
starlet-dx
a5eae9aa51 Fix CVE-2022-44370 2023-04-12 16:46:02 +08:00
openeuler-ci-bot
fe6437915a
!30 Fix help info error
From: @yangchen_guang 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
2023-02-14 08:54:12 +00:00
yangchenguang
4a0f9f04d5 fix help info error
Signed-off-by: yangchenguang <yangchenguang@uniontech.com>
2023-01-19 13:31:00 +08:00
openeuler-ci-bot
4704aaf647
!21 License compliance rectification
From: @wu-leilei 
Reviewed-by: @ruebb 
Signed-off-by: @ruebb
2022-06-20 02:33:05 +00:00
wu-leilei
b166351f04 License compliance rectification 2022-05-11 15:29:54 +08:00
openeuler-ci-bot
b176c17d9e !14 enable make check
From: @extinctfire
Reviewed-by: @licihua
Signed-off-by: @licihua
2021-11-27 03:45:26 +00:00
ExtinctFire
64ab4976f1 enable make check
Signed-off-by: ExtinctFire <shenyining_00@126.com>
2021-11-27 10:18:14 +08:00
7 changed files with 89 additions and 23 deletions

30
enable-make-check.patch Normal file
View File

@ -0,0 +1,30 @@
From 4d663e5249f94b49d7af474c345f96a4b9ffd931 Mon Sep 17 00:00:00 2001
From: ExtinctFire <shenyining_00@126.com>
Date: Sat, 27 Nov 2021 09:44:16 +0800
Subject: [PATCH] add check summary
Signed-off-by: ExtinctFire <shenyining_00@126.com>
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 5725ed3..9282215 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -459,10 +459,10 @@
splint -weak *.c
test: $(PROGS)
- cd test && $(RUNPERL) performtest.pl --nasm=../nasm *.asm
+ cd test && $(RUNPERL) performtest.pl --nasm=../nasm *.asm --verbose
golden: $(PROGS)
- cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm
+ cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm --verbose
travis: $(PROGS)
$(PYTHON3) travis/nasm-t.py run
--
2.23.0

28
fix-help-info-error.patch Normal file
View File

@ -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

Binary file not shown.

Binary file not shown.

BIN
nasm-2.16.01-xdoc.tar.xz Normal file

Binary file not shown.

BIN
nasm-2.16.01.tar.xz Normal file

Binary file not shown.

View File

@ -7,20 +7,19 @@
%endif
Name: nasm
Version: 2.15.05
Version: 2.16.01
Release: 1
Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
License: BSD
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
@ -32,7 +31,7 @@ format, includes linker, library manager, loader, and information dump.
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
@ -46,6 +45,7 @@ and text formats.
%prep
%autosetup -n %{name}-%{version} -p1
tar xJf %{SOURCE1} --strip-components 1
%build
%configure
@ -57,22 +57,17 @@ make all %{?_smp_mflags}
%endif
%install
%make_install install_rdf
%make_install
%check
make golden
make test
%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}
@ -80,10 +75,23 @@ make all %{?_smp_mflags}
%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
* Sat Nov 27 2021 ExtinctFire <shenyining_00@126.com> - 2.15.05-2
- enable make check
* Thu Jan 28 2021 liudabo <liudabo1@huawei.com> - 2.15.05-1
- upgrade version to 2.15.05