automatic import of nasmopeneuler24.03_LTSopeneuler22.03_LTS_SP4

5 files changed, 179 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index e69de29..8329747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/nasm-2.16.03-xdoc.tar.xz
+/nasm-2.16.03.tar.xz
diff --git a/enable-make-check.patch b/enable-make-check.patch
new file mode 100644
index 0000000..224d299
--- /dev/null
+++ b/enable-make-check.patch
@@ -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
+
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 <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
+
diff --git a/nasm.spec b/nasm.spec
new file mode 100644
index 0000000..0f19a52
--- /dev/null
+++ b/nasm.spec
@@ -0,0 +1,117 @@
+%global _module_build 1
+
+%if 0%{?_module_build}
+%bcond_with documentation
+%else
+%bcond_without documentation
+%endif
+
+Name:     nasm
+Version:  2.16.03
+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.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 
+
+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
+80x86 microprocessor series, using primarily the traditional Intel
+instruction mnemonics and syntax. It also provides tools in RDOFF binary
+format, includes linker, library manager, loader, and information dump.
+
+%package help
+Summary: Help files for NASM
+%if %{with documentation}
+BuildRequires: perl(Font::TTF::Font) perl(File::Spec)
+BuildRequires: perl(Sort::Versions) perl(sort)
+BuildRequires: adobe-source-sans-pro-fonts adobe-source-code-pro-fonts
+BuildRequires: ghostscript
+Provides:  %{name}-doc
+Obsoletes: %{name}-doc
+%endif
+BuildArch: noarch
+
+%description help
+Help files for %{name}, includes documentation in HTML, PDF, PostScript,
+and text formats.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+tar xJf %{SOURCE1} --strip-components 1
+
+%build
+%configure
+%if %{with documentation}
+%make everything
+gzip -9f doc/nasmdoc.{ps,txt}
+%else
+make all %{?_smp_mflags}
+%endif
+
+%install
+%make_install
+
+%check
+make golden
+make test
+
+%files
+%doc CHANGES README.md
+%license AUTHORS LICENSE
+%{_bindir}/nasm
+%{_bindir}/ndisasm
+
+%files help
+%if %{with documentation}
+%doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz doc/nasmdoc.pdf
+%endif
+%{_mandir}/man1/nasm*
+%{_mandir}/man1/ndisasm*
+
+%changelog
+* Thu Aug 08 2024 yuanlipeng <yuanlipeng2@huawei.com> - 2.16.03-1
+- Update package to version 2.16.03
+
+* 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
+
+* Thu Jan 07 2020 shixuantong <shixuantong@huawei.com> - 2.15.03-2
+- fix CVE-2019-20352 CVE-2020-24241 
+
+* Thu Jul 23 2020 shixuantong <shixuantong@huawei.com> - 2.15.03-1
+- update to 2.15.03-1
+
+* Tue Jun 9 2020 lizhenhua <lizhenhua21@huawei.com> - 2.13.03-6
+- fix compile error
+
+* Fri Mar 20 2020 shijian<shijian16@huawei.com> - 2.13.03-5
+- fix CVE-2018-10254
+
+* Mon Jan 13 2020 openEuler BuildTeam<buildteam@openeuler.org> - 2.13.03-4
+- build without documentation
+
+* Mon Dec 09 2019 openEuler BuildTeam<buildteam@openeuler.org> - 2.13.03-3
+- Package Init
diff --git a/sources b/sources
new file mode 100644
index 0000000..06255da
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+dd15a5c7602bf07d731ae3c823d1390c  nasm-2.16.03-xdoc.tar.xz
+2b8c72c52eee4f20085065e68ac83b55  nasm-2.16.03.tar.xz