From d9e3ccee0129b78130d54faaa8e3b029c6377647 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 08:56:45 +0000 Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20nasm-0.?= =?UTF-8?q?98-8.src.rpm=20Tue=20Aug=2007=202001=20Trond=20Eivind=20Glomsr?= =?UTF-8?q?=F8d=20=20-=20Updated=20patch=20from=20H.J.=20L?= =?UTF-8?q?u=20for=20bogus=20elf=20generation=20(#45986,=20verified=20by?= =?UTF-8?q?=20=20=20=20=20reporter)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nasm-0.98-boguself2.patch | 36 ++++++++++++++++++++++++++++++++++++ nasm.spec | 20 ++++++++++++-------- 2 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 nasm-0.98-boguself2.patch diff --git a/nasm-0.98-boguself2.patch b/nasm-0.98-boguself2.patch new file mode 100644 index 0000000..4341bd8 --- /dev/null +++ b/nasm-0.98-boguself2.patch @@ -0,0 +1,36 @@ +--- nasm-0.98/outelf.c.boguself Sun May 20 01:25:35 2001 ++++ nasm-0.98/outelf.c Sun May 20 02:01:59 2001 +@@ -548,7 +548,7 @@ static void elf_add_reloc (struct Sectio + r->symbol = 0; + for (i=0; iindex) +- r->symbol = i+3; ++ r->symbol = i+2; + if (!r->symbol) + r->symbol = GLOBAL_TEMP_BASE + raa_read(bsym, segment); + } +@@ -922,13 +922,13 @@ static struct SAA *elf_build_symtab (lon + * Now some standard symbols defining the segments, for relocation + * purposes. + */ +- for (i = 1; i <= nsects+1; i++) { ++ for (i = 1; i <= nsects; i++) { + p = entry; + WRITELONG (p, 0); /* no symbol name */ + WRITELONG (p, 0); /* offset zero */ + WRITELONG (p, 0); /* size zero */ + WRITESHORT (p, 3); /* local section-type thing */ +- WRITESHORT (p, (i==1 ? SHN_ABS : i-1)); /* the section id */ ++ WRITESHORT (p, i); /* the section id */ + saa_wbytes (s, entry, 16L); + *len += 16; + (*local)++; +@@ -986,7 +986,7 @@ static struct SAA *elf_build_reltab (lon + long sym = r->symbol; + + if (sym >= GLOBAL_TEMP_BASE) +- sym += -GLOBAL_TEMP_BASE + (nsects+3) + nlocals; ++ sym += -GLOBAL_TEMP_BASE + (nsects+2) + nlocals; + + p = entry; + WRITELONG (p, r->address); diff --git a/nasm.spec b/nasm.spec index 63678f2..fd738bd 100644 --- a/nasm.spec +++ b/nasm.spec @@ -1,9 +1,9 @@ -Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax +Summary: A portable x86 assembler which uses Intel-like syntax. Name: nasm Version: 0.98 -Release: 7 -Patch0: nasm-0.98-boguself.patch -License: GPL +Release: 8 +Patch0: nasm-0.98-boguself2.patch +License: freely distributable Group: Development/Languages Source: ftp://ftp.us.kernel.org/pub/software/devel/nasm/source/nasm-%{version}.tar.gz URL: http://www.cryogen.com/Nasm/ @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/install-info %package doc -Summary: Extensive documentation for NASM +Summary: Documentation for NASM. Group: Development/Languages %package rdoff @@ -25,12 +25,12 @@ NASM is the Netwide Assembler, a free portable assembler for the Intel instruction mnemonics and syntax. %description doc -Extensive documentation for the Netwide Assembler, NASM, in HTML, -info, PostScript and text formats. +This package contains documentation for the Netwide Assembler (NASM), +in HTML, info, PostScript, and text formats. %description rdoff Tools for the operating-system independent RDOFF binary format, which -is sometimes used with the Netwide Assembler (NASM). These tools +is sometimes used with the Netwide Assembler (NASM). These tools include linker, library manager, loader, and information dump. %prep @@ -90,6 +90,10 @@ fi /usr/bin/rdx %changelog +* Tue Aug 7 2001 Trond Eivind Glomsrød +- Updated patch from H.J. Lu for bogus elf generation (#45986, + verified by reporter) + * Thu Apr 26 2001 Trond Eivind Glomsrød - Updated patch for bogus elf generation from hjl@gnu.org