Fix compile error
This commit is contained in:
parent
71d58f77e7
commit
b77e60d56d
29
Drop-unused-seg_init.patch
Normal file
29
Drop-unused-seg_init.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From 5eb1838b4d3752fd863d19442943983a2a5ee87c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Cyrill Gorcunov <gorcunov@gmail.com>
|
||||||
|
Date: Sat, 10 Feb 2018 00:33:41 +0300
|
||||||
|
Subject: [PATCH] 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 <gorcunov@gmail.com>
|
||||||
|
---
|
||||||
|
include/nasmlib.h | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/nasmlib.h b/include/nasmlib.h
|
||||||
|
index 79e866b5..fee1b5ea 100644
|
||||||
|
--- a/include/nasmlib.h
|
||||||
|
+++ b/include/nasmlib.h
|
||||||
|
@@ -188,10 +188,8 @@ 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);
|
||||||
|
|
||||||
|
/*
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Name: nasm
|
Name: nasm
|
||||||
Version: 2.13.03
|
Version: 2.13.03
|
||||||
Release: 4
|
Release: 6
|
||||||
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
|
License: BSD
|
||||||
URL: http://www.nasm.us
|
URL: http://www.nasm.us
|
||||||
@ -16,6 +16,7 @@ Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version
|
|||||||
Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2
|
Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2
|
||||||
#https://bugzilla.nasm.us/attachment.cgi?id=411648
|
#https://bugzilla.nasm.us/attachment.cgi?id=411648
|
||||||
Patch0000:CVE-2018-10254.patch
|
Patch0000:CVE-2018-10254.patch
|
||||||
|
Patch0001:Drop-unused-seg_init.patch
|
||||||
BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git
|
BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git
|
||||||
|
|
||||||
Provides: %{name}-rdoff
|
Provides: %{name}-rdoff
|
||||||
@ -84,6 +85,9 @@ make INSTALLROOT=%{buildroot} install install_rdf
|
|||||||
%{_mandir}/man1/ld*
|
%{_mandir}/man1/ld*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Fri Mar 20 2020 shijian<shijian16@huawei.com> - 2.13.03-5
|
||||||
- fix CVE-2018-10254
|
- fix CVE-2018-10254
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user