rpm/file
SHA256
1
0
Fork 0
forked from pool/file
Code Pull Requests Activity

Accepting request 176637 from Base:System

Browse Source 
- elf-invalid-byte-order.patch: remove bogus "invalid byte order" from elf
  magic (forwarded request 176595 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/176637
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=73
This commit is contained in:
Stephan Kulow 2013-05-27 08:18:38 +00:00 committed by Git OBS Bridge
commit 1f243479f0
4 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
elf-invalid-byte-order.patch Normal file
View File

@ -0,0 +1,31 @@
--- file-5.14/magic/Magdir/elf.~1~ 2013-03-21 18:50:02.000000000 +0100
+++ file-5.14/magic/Magdir/elf 2013-05-26 12:17:31.439378748 +0200
@@ -36,10 +36,10 @@
>18 leshort 3 Intel 80386,
>18 leshort 4 Motorola
>>4 byte 1
->>>36 lelong &0x01000000 68000 - invalid byte order,
->>>36 lelong &0x00810000 CPU32 - invalid byte order,
->>>36 lelong 0 68020 - invalid byte order,
->18 leshort 5 Motorola 88000 - invalid byte order,
+>>>36 lelong &0x01000000 68000,
+>>>36 lelong &0x00810000 CPU32,
+>>>36 lelong 0 68020,
+>18 leshort 5 Motorola 88000,
>18 leshort 6 Intel 80486,
>18 leshort 7 Intel 80860,
# The official e_machine number for MIPS is now #8, regardless of endianness.
@@ -74,10 +74,10 @@
>>>48 lelong&0xf0000000 0x60000000 MIPS64
>>>48 lelong&0xf0000000 0x70000000 MIPS32 rel2
>>>48 lelong&0xf0000000 0x80000000 MIPS64 rel2
->18 leshort 9 Amdahl - invalid byte order,
+>18 leshort 9 Amdahl,
>18 leshort 10 MIPS (deprecated),
->18 leshort 11 RS6000 - invalid byte order,
->18 leshort 15 PA-RISC - invalid byte order,
+>18 leshort 11 RS6000,
+>18 leshort 15 PA-RISC,
# only for 32-bit
>>4 byte 1
>>>38 leshort 0x0214 2.0

16
file-5.13-whitespace.patch Normal file
View File

@ -0,0 +1,16 @@
Index: file-5.14/magic/Magdir/elf
===================================================================
--- file-5.14.orig/magic/Magdir/elf
+++ file-5.14/magic/Magdir/elf
@@ -189,9 +189,9 @@
>4 byte 1 32-bit
>4 byte 2 64-bit
>5 byte 0 invalid byte order
->5 byte 1 LSB
+>5 byte 1 LSB
>>0 use elf-le
->5 byte 2 MSB
+>5 byte 2 MSB
>>0 use \^elf-le
# Up to now only 0, 1 and 2 are defined; I've seen a file with 0x83, it seemed
# like proper ELF, but extracting the string had bad results.

12
file.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun May 26 10:31:25 UTC 2013 - schwab@suse.de
- elf-invalid-byte-order.patch: remove bogus "invalid byte order" from elf
magic
-------------------------------------------------------------------
Sun May 26 08:01:55 UTC 2013 - schwab@suse.de
- file-5.13-whitespace.patch: remove extra whitespace in ELF magic, breaks
libtool
-------------------------------------------------------------------
Fri Mar 29 06:56:37 UTC 2013 - crrodriguez@opensuse.org

4
file.spec
View File

@ -60,6 +60,8 @@ Patch32: file-5.07-clicfs.dif
Patch33: file-5.12-ocloexec.patch
Patch34: file-5.12-endian.patch
Patch35: file-5.12-nitpick.dif
Patch36: file-5.13-whitespace.patch
Patch37: elf-invalid-byte-order.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -124,6 +126,8 @@ to develop applications that require the magic "file" interface.
%patch33 -p0 -b .clexe
%patch34 -p0 -b .endian
%patch35 -p0 -b .nitpick
%patch36 -p1
%patch37 -p1
%patch -b .0
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in