diff --git a/9f45a77f4.patch b/9f45a77f4.patch new file mode 100644 index 0000000..6283a6e --- /dev/null +++ b/9f45a77f4.patch @@ -0,0 +1,41 @@ +commit 9f45a77f46829e666b35530939b9237cf978d4dc +Author: Cyrill Gorcunov +Date: Sat Feb 10 00:40:46 2018 +0300 + + nasmlib: Drop pure_func attrib from seg_alloc + + It not only reads static variable but writes it back as well. + + https://bugzilla.nasm.us/show_bug.cgi?id=3392461 + + Reported-by: Michael Šimáček + Signed-off-by: Cyrill Gorcunov + +commit 5eb1838b4d3752fd863d19442943983a2a5ee87c +Author: Cyrill Gorcunov +Date: Sat Feb 10 00:33:41 2018 +0300 + + nasmlib: Drop unused seg_init + + The helper has been eliminated in 2c4a4d5810d0a59b033a07876a2648ef5d4c2859 + + https://bugzilla.nasm.us/show_bug.cgi?id=3392461 + + Signed-off-by: Cyrill Gorcunov +Index: nasm-2.13.03/include/nasmlib.h +=================================================================== +--- nasm-2.13.03.orig/include/nasmlib.h ++++ nasm-2.13.03/include/nasmlib.h +@@ -188,11 +188,9 @@ int64_t readnum(char *str, bool *error); + int64_t readstrnum(char *str, int length, bool *warn); + + /* +- * seg_init: Initialise the segment-number allocator. + * seg_alloc: allocate a hitherto unused segment number. + */ +-void pure_func seg_init(void); +-int32_t pure_func seg_alloc(void); ++int32_t seg_alloc(void); + + /* + * many output formats will be able to make use of this: a standard diff --git a/nasm-2.13.02.tar.xz b/nasm-2.13.02.tar.xz deleted file mode 100644 index c944be4..0000000 --- a/nasm-2.13.02.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ac3235f49a6838ff7a8d7ef7c19a4430d0deecc0c2d3e3e237b5e9f53291757 -size 805744 diff --git a/nasm-2.13.03.tar.xz b/nasm-2.13.03.tar.xz new file mode 100644 index 0000000..c81d160 --- /dev/null +++ b/nasm-2.13.03.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:812ecfb0dcbc5bd409aaa8f61c7de94c5b8752a7b00c632883d15b2ed6452573 +size 806636 diff --git a/nasm.changes b/nasm.changes index 7e46ed7..d151247 100644 --- a/nasm.changes +++ b/nasm.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Mar 15 09:06:17 UTC 2018 - mpluskal@suse.com + +- Modernise spec file with spec-cleaner + +------------------------------------------------------------------- +Thu Mar 15 06:49:13 UTC 2018 - adam.majer@suse.de + +- New upstream version 2.13.03: + * Add flags: + AES, VAES, VPCLMULQDQ + * Add VPCLMULQDQ instruction + * elf: Add missing dwarf loc section + * documentation updates +- 9f45a77f4.patch: fixes compilation with gcc8 (bsc#1084631) + ------------------------------------------------------------------- Wed Jan 24 13:09:39 UTC 2018 - adam.majer@suse.de diff --git a/nasm.spec b/nasm.spec index 805e3c6..0ed76c3 100644 --- a/nasm.spec +++ b/nasm.spec @@ -17,13 +17,14 @@ Name: nasm -Version: 2.13.02 +Version: 2.13.03 Release: 0 Summary: Netwide Assembler (An x86 Assembler) License: BSD-2-Clause Group: Development/Languages/Other -Url: http://www.nasm.us/ +URL: http://www.nasm.us/ Source: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz +Patch1: 9f45a77f4.patch BuildRequires: fdupes %description @@ -31,13 +32,14 @@ NASM is a prototype general-purpose x86 assembler. It can currently output several binary formats, including ELF, a.out, Win32, and OS/2. %prep -%setup -q +%autosetup -p1 %build touch -r ./version.h ./version.h.stamp TS=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$TS\"/g" version.h touch -r ./version.h.stamp ./version.h + %configure make %{?_smp_mflags} all @@ -46,11 +48,11 @@ make INSTALLROOT=%{buildroot} install rdf_install %fdupes %{buildroot}%{_mandir} %check -make test +make %{?_smp_mflags} test %files -%defattr(-,root,root) -%doc AUTHORS CHANGES ChangeLog LICENSE README +%license LICENSE +%doc AUTHORS CHANGES ChangeLog README %{_bindir}/ldrdf %{_bindir}/nasm %{_bindir}/ndisasm @@ -62,16 +64,16 @@ make test %{_bindir}/rdfdump %{_bindir}/rdflib %{_bindir}/rdx -%{_mandir}/man1/ldrdf.1%{ext_man} -%{_mandir}/man1/nasm.1%{ext_man} -%{_mandir}/man1/ndisasm.1%{ext_man} -%{_mandir}/man1/rdf2bin.1%{ext_man} -%{_mandir}/man1/rdf2com.1%{ext_man} -%{_mandir}/man1/rdf2ihx.1%{ext_man} -%{_mandir}/man1/rdf2ith.1%{ext_man} -%{_mandir}/man1/rdf2srec.1%{ext_man} -%{_mandir}/man1/rdfdump.1%{ext_man} -%{_mandir}/man1/rdflib.1%{ext_man} -%{_mandir}/man1/rdx.1%{ext_man} +%{_mandir}/man1/ldrdf.1%{?ext_man} +%{_mandir}/man1/nasm.1%{?ext_man} +%{_mandir}/man1/ndisasm.1%{?ext_man} +%{_mandir}/man1/rdf2bin.1%{?ext_man} +%{_mandir}/man1/rdf2com.1%{?ext_man} +%{_mandir}/man1/rdf2ihx.1%{?ext_man} +%{_mandir}/man1/rdf2ith.1%{?ext_man} +%{_mandir}/man1/rdf2srec.1%{?ext_man} +%{_mandir}/man1/rdfdump.1%{?ext_man} +%{_mandir}/man1/rdflib.1%{?ext_man} +%{_mandir}/man1/rdx.1%{?ext_man} %changelog