diff --git a/elf-invalid-byte-order.patch b/elf-invalid-byte-order.patch new file mode 100644 index 0000000..736f136 --- /dev/null +++ b/elf-invalid-byte-order.patch @@ -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 diff --git a/file.changes b/file.changes index fa084b4..765eb5c 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/file.spec b/file.spec index cf5aa35..fb381d5 100644 --- a/file.spec +++ b/file.spec @@ -61,6 +61,7 @@ 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 @@ -126,6 +127,7 @@ to develop applications that require the magic "file" interface. %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