Compare commits
No commits in common. "e8f11304d13859972ca586f66e1fc8e132c15a7b" and "8f1a6a125b84956666723d6579f76427758ef1bd" have entirely different histories.
e8f11304d1
...
8f1a6a125b
@ -1,30 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
BIN
nasm-2.15.05-xdoc.tar.bz2
Normal file
BIN
nasm-2.15.05-xdoc.tar.bz2
Normal file
Binary file not shown.
BIN
nasm-2.15.05.tar.bz2
Normal file
BIN
nasm-2.15.05.tar.bz2
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
54
nasm.spec
54
nasm.spec
@ -7,19 +7,20 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: nasm
|
Name: nasm
|
||||||
Version: 2.16.01
|
Version: 2.15.05
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
|
Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
|
||||||
License: BSD-2-Clause
|
License: BSD
|
||||||
URL: http://www.nasm.us
|
URL: http://www.nasm.us
|
||||||
Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.xz
|
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.xz
|
Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2
|
||||||
|
|
||||||
Patch6000: enable-make-check.patch
|
|
||||||
Patch6001: fix-help-info-error.patch
|
|
||||||
|
|
||||||
BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git automake
|
#https://bugzilla.nasm.us/attachment.cgi?id=411648
|
||||||
Obsoletes: nasm-rdoff < 2.16.01-1
|
BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git
|
||||||
|
|
||||||
|
Provides: %{name}-rdoff
|
||||||
|
Obsoletes: %{name}-rdoff
|
||||||
|
|
||||||
%description
|
%description
|
||||||
NASM is the Netwide Assembler, a free portable assembler for the Intel
|
NASM is the Netwide Assembler, a free portable assembler for the Intel
|
||||||
@ -31,7 +32,7 @@ format, includes linker, library manager, loader, and information dump.
|
|||||||
Summary: Help files for NASM
|
Summary: Help files for NASM
|
||||||
%if %{with documentation}
|
%if %{with documentation}
|
||||||
BuildRequires: perl(Font::TTF::Font) perl(File::Spec)
|
BuildRequires: perl(Font::TTF::Font) perl(File::Spec)
|
||||||
BuildRequires: perl(Sort::Versions) perl(sort)
|
BuildRequires: perl(Sort::Versions)
|
||||||
BuildRequires: adobe-source-sans-pro-fonts adobe-source-code-pro-fonts
|
BuildRequires: adobe-source-sans-pro-fonts adobe-source-code-pro-fonts
|
||||||
BuildRequires: ghostscript
|
BuildRequires: ghostscript
|
||||||
Provides: %{name}-doc
|
Provides: %{name}-doc
|
||||||
@ -45,7 +46,6 @@ and text formats.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version} -p1
|
||||||
tar xJf %{SOURCE1} --strip-components 1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
@ -57,17 +57,22 @@ make all %{?_smp_mflags}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install install_rdf
|
||||||
|
|
||||||
%check
|
|
||||||
make golden
|
|
||||||
make test
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc CHANGES README.md
|
%doc CHANGES README.md
|
||||||
%license AUTHORS LICENSE
|
%license AUTHORS
|
||||||
%{_bindir}/nasm
|
%{_bindir}/nasm
|
||||||
%{_bindir}/ndisasm
|
%{_bindir}/ndisasm
|
||||||
|
%{_bindir}/ldrdf
|
||||||
|
%{_bindir}/rdf2bin
|
||||||
|
%{_bindir}/rdf2ihx
|
||||||
|
%{_bindir}/rdf2com
|
||||||
|
%{_bindir}/rdfdump
|
||||||
|
%{_bindir}/rdflib
|
||||||
|
%{_bindir}/rdx
|
||||||
|
%{_bindir}/rdf2ith
|
||||||
|
%{_bindir}/rdf2srec
|
||||||
|
|
||||||
%files help
|
%files help
|
||||||
%if %{with documentation}
|
%if %{with documentation}
|
||||||
@ -75,23 +80,10 @@ make test
|
|||||||
%endif
|
%endif
|
||||||
%{_mandir}/man1/nasm*
|
%{_mandir}/man1/nasm*
|
||||||
%{_mandir}/man1/ndisasm*
|
%{_mandir}/man1/ndisasm*
|
||||||
|
%{_mandir}/man1/rd*
|
||||||
|
%{_mandir}/man1/ld*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Jan 28 2021 liudabo <liudabo1@huawei.com> - 2.15.05-1
|
||||||
- upgrade version to 2.15.05
|
- upgrade version to 2.15.05
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user