diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/file/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/file/file-4.12.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/file/files/file-4.xx-mips-gentoo.diff | 224 |
3 files changed, 8 insertions, 227 deletions
diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog index b98e2e51674e..1032eefbf460 100644 --- a/sys-apps/file/ChangeLog +++ b/sys-apps/file/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/file # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.73 2004/12/08 10:29:12 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.74 2004/12/08 21:11:46 hardave Exp $ + + 08 Dec 2004; Hardave Riar <hardave@gentoo.org> + files/file-4.xx-mips-gentoo.diff, file-4.12.ebuild: + Fixed up mips patch so it applies cleanly. Keyworded stable on mips, bug + #72521. 08 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> file-4.12.ebuild: Stable on alpha, bug 72521. diff --git a/sys-apps/file/file-4.12.ebuild b/sys-apps/file/file-4.12.ebuild index ef4599809411..e778df238a91 100644 --- a/sys-apps/file/file-4.12.ebuild +++ b/sys-apps/file/file-4.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.12.ebuild,v 1.6 2004/12/08 10:29:12 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.12.ebuild,v 1.7 2004/12/08 21:11:46 hardave Exp $ inherit flag-o-matic gnuconfig eutils distutils libtool @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz LICENSE="as-is" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86" +KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 mips ppc ~ppc64 ~s390 ~sh sparc x86" IUSE="python build" DEPEND="virtual/libc diff --git a/sys-apps/file/files/file-4.xx-mips-gentoo.diff b/sys-apps/file/files/file-4.xx-mips-gentoo.diff index 585d15061366..2ff6ae9a093a 100644 --- a/sys-apps/file/files/file-4.xx-mips-gentoo.diff +++ b/sys-apps/file/files/file-4.xx-mips-gentoo.diff @@ -121,227 +121,3 @@ diff -Naurp file-4.05.orig/magic/Magdir/elf file-4.05/magic/Magdir/elf >>18 beshort 9 Amdahl, >>18 beshort 10 MIPS (deprecated), >>18 beshort 11 RS6000, -diff -Naurp file-4.05.orig/magic/Magdir/elf.orig file-4.05/magic/Magdir/elf.orig ---- file-4.05.orig/magic/Magdir/elf.orig 1969-12-31 19:00:00.000000000 -0500 -+++ file-4.05/magic/Magdir/elf.orig 2003-05-23 17:37:35.000000000 -0400 -@@ -0,0 +1,220 @@ -+ -+#------------------------------------------------------------------------------ -+# elf: file(1) magic for ELF executables -+# -+# We have to check the byte order flag to see what byte order all the -+# other stuff in the header is in. -+# -+# What're the correct byte orders for the nCUBE and the Fujitsu VPP500? -+# -+# updated by Daniel Quinlan (quinlan@yggdrasil.com) -+0 string \177ELF ELF -+>4 byte 0 invalid class -+>4 byte 1 32-bit -+# only for MIPS - in the future, the ABI field of e_flags should be used. -+>>18 leshort 8 -+>>>36 lelong &0x20 N32 -+>>18 leshort 10 -+>>>36 lelong &0x20 N32 -+>>18 beshort 8 -+>>>36 belong &0x20 N32 -+>>18 beshort 10 -+>>>36 belong &0x20 N32 -+>4 byte 2 64-bit -+>5 byte 0 invalid byte order -+>5 byte 1 LSB -+# The official e_machine number for MIPS is now #8, regardless of endianness. -+# The second number (#10) will be deprecated later. For now, we still -+# say something if #10 is encountered, but only gory details for #8. -+>>18 leshort 8 -+# only for 32-bit -+>>>4 byte 1 -+>>>>36 lelong&0xf0000000 0x00000000 MIPS-I -+>>>>36 lelong&0xf0000000 0x10000000 MIPS-II -+>>>>36 lelong&0xf0000000 0x20000000 MIPS-III -+>>>>36 lelong&0xf0000000 0x30000000 MIPS-IV -+>>>>36 lelong&0xf0000000 0x40000000 MIPS-V -+>>>>36 lelong&0xf0000000 0x60000000 MIPS32 -+>>>>36 lelong&0xf0000000 0x70000000 MIPS64 -+>>>>36 lelong&0xf0000000 0x80000000 MIPS32 rel2 -+>>>>36 lelong&0xf0000000 0x90000000 MIPS64 rel2 -+# only for 64-bit -+>>>4 byte 2 -+>>>>48 lelong&0xf0000000 0x00000000 MIPS-I -+>>>>48 lelong&0xf0000000 0x10000000 MIPS-II -+>>>>48 lelong&0xf0000000 0x20000000 MIPS-III -+>>>>48 lelong&0xf0000000 0x30000000 MIPS-IV -+>>>>48 lelong&0xf0000000 0x40000000 MIPS-V -+>>>>48 lelong&0xf0000000 0x60000000 MIPS32 -+>>>>48 lelong&0xf0000000 0x70000000 MIPS64 -+>>>>48 lelong&0xf0000000 0x80000000 MIPS32 rel2 -+>>>>48 lelong&0xf0000000 0x90000000 MIPS64 rel2 -+>>16 leshort 0 no file type, -+>>16 leshort 1 relocatable, -+>>16 leshort 2 executable, -+>>16 leshort 3 shared object, -+# Core handling from Peter Tobias <tobias@server.et-inf.fho-emden.de> -+# corrections by Christian 'Dr. Disk' Hechelmann <drdisk@ds9.au.s.shuttle.de> -+>>16 leshort 4 core file -+# Core file detection is not reliable. -+#>>>(0x38+0xcc) string >\0 of '%s' -+#>>>(0x38+0x10) lelong >0 (signal %d), -+>>16 leshort &0xff00 processor-specific, -+>>18 leshort 0 no machine, -+>>18 leshort 1 AT&T WE32100 - invalid byte order, -+>>18 leshort 2 SPARC - invalid byte order, -+>>18 leshort 3 Intel 80386, -+>>18 leshort 4 Motorola -+>>>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, -+>>18 leshort 6 Intel 80486, -+>>18 leshort 7 Intel 80860, -+>>18 leshort 8 MIPS, -+>>18 leshort 9 Amdahl - invalid byte order, -+>>18 leshort 10 MIPS (deprecated), -+>>18 leshort 11 RS6000 - invalid byte order, -+>>18 leshort 15 PA-RISC - invalid byte order, -+>>>50 leshort 0x0214 2.0 -+>>>48 leshort &0x0008 (LP64), -+>>18 leshort 16 nCUBE, -+>>18 leshort 17 Fujitsu VPP500, -+>>18 leshort 18 SPARC32PLUS, -+>>18 leshort 20 PowerPC, -+>>18 leshort 22 IBM S/390, -+>>18 leshort 36 NEC V800, -+>>18 leshort 37 Fujitsu FR20, -+>>18 leshort 38 TRW RH-32, -+>>18 leshort 39 Motorola RCE, -+>>18 leshort 40 ARM, -+>>18 leshort 41 Alpha, -+>>18 leshort 0xa390 IBM S/390 (obsolete), -+>>18 leshort 42 Hitachi SH, -+>>18 leshort 43 SPARC V9 - invalid byte order, -+>>18 leshort 44 Siemens Tricore Embedded Processor, -+>>18 leshort 45 Argonaut RISC Core, Argonaut Technologies Inc., -+>>18 leshort 46 Hitachi H8/300, -+>>18 leshort 47 Hitachi H8/300H, -+>>18 leshort 48 Hitachi H8S, -+>>18 leshort 49 Hitachi H8/500, -+>>18 leshort 50 IA-64 (Intel 64 bit architecture) -+>>18 leshort 51 Stanford MIPS-X, -+>>18 leshort 52 Motorola Coldfire, -+>>18 leshort 53 Motorola M68HC12, -+>>18 leshort 62 AMD x86-64, -+>>18 leshort 75 Digital VAX, -+>>18 leshort 97 NatSemi 32k, -+>>18 leshort 0x9026 Alpha (unofficial), -+>>20 lelong 0 invalid version -+>>20 lelong 1 version 1 -+>>36 lelong 1 MathCoPro/FPU/MAU Required -+>5 byte 2 MSB -+# only for MIPS - see comment in little-endian section above. -+>>18 beshort 8 -+# only for 32-bit -+>>>4 byte 1 -+>>>>36 belong&0xf0000000 0x00000000 MIPS-I -+>>>>36 belong&0xf0000000 0x10000000 MIPS-II -+>>>>36 belong&0xf0000000 0x20000000 MIPS-III -+>>>>36 belong&0xf0000000 0x30000000 MIPS-IV -+>>>>36 belong&0xf0000000 0x40000000 MIPS-V -+>>>>36 belong&0xf0000000 0x60000000 MIPS32 -+>>>>36 belong&0xf0000000 0x70000000 MIPS64 -+>>>>36 belong&0xf0000000 0x80000000 MIPS32 rel2 -+>>>>36 belong&0xf0000000 0x90000000 MIPS64 rel2 -+# only for 64-bit -+>>>4 byte 2 -+>>>>48 belong&0xf0000000 0x00000000 MIPS-I -+>>>>48 belong&0xf0000000 0x10000000 MIPS-II -+>>>>48 belong&0xf0000000 0x20000000 MIPS-III -+>>>>48 belong&0xf0000000 0x30000000 MIPS-IV -+>>>>48 belong&0xf0000000 0x40000000 MIPS-V -+>>>>48 belong&0xf0000000 0x60000000 MIPS32 -+>>>>48 belong&0xf0000000 0x70000000 MIPS64 -+>>>>48 belong&0xf0000000 0x80000000 MIPS32 rel2 -+>>>>48 belong&0xf0000000 0x90000000 MIPS64 rel2 -+>>16 beshort 0 no file type, -+>>16 beshort 1 relocatable, -+>>16 beshort 2 executable, -+>>16 beshort 3 shared object, -+>>16 beshort 4 core file, -+#>>>(0x38+0xcc) string >\0 of '%s' -+#>>>(0x38+0x10) belong >0 (signal %d), -+>>16 beshort &0xff00 processor-specific, -+>>18 beshort 0 no machine, -+>>18 beshort 1 AT&T WE32100, -+>>18 beshort 2 SPARC, -+>>18 beshort 3 Intel 80386 - invalid byte order, -+>>18 beshort 4 Motorola -+>>>36 belong &0x01000000 68000, -+>>>36 belong &0x00810000 CPU32, -+>>>36 belong 0 68020, -+>>18 beshort 5 Motorola 88000, -+>>18 beshort 6 Intel 80486 - invalid byte order, -+>>18 beshort 7 Intel 80860, -+>>18 beshort 8 MIPS, -+>>18 beshort 9 Amdahl, -+>>18 beshort 10 MIPS (deprecated), -+>>18 beshort 11 RS6000, -+>>18 beshort 15 PA-RISC -+>>>50 beshort 0x0214 2.0 -+>>>48 beshort &0x0008 (LP64) -+>>18 beshort 16 nCUBE, -+>>18 beshort 17 Fujitsu VPP500, -+>>18 beshort 18 SPARC32PLUS, -+>>>36 belong&0xffff00 &0x000100 V8+ Required, -+>>>36 belong&0xffff00 &0x000200 Sun UltraSPARC1 Extensions Required, -+>>>36 belong&0xffff00 &0x000400 HaL R1 Extensions Required, -+>>>36 belong&0xffff00 &0x000800 Sun UltraSPARC3 Extensions Required, -+>>18 beshort 20 PowerPC or cisco 4500, -+>>18 beshort 21 cisco 7500, -+>>18 beshort 22 IBM S/390, -+>>18 beshort 24 cisco SVIP, -+>>18 beshort 25 cisco 7200, -+>>18 beshort 36 NEC V800 or cisco 12000, -+>>18 beshort 37 Fujitsu FR20, -+>>18 beshort 38 TRW RH-32, -+>>18 beshort 39 Motorola RCE, -+>>18 beshort 40 ARM, -+>>18 beshort 41 Alpha, -+>>18 beshort 42 Hitachi SH, -+>>18 beshort 43 SPARC V9, -+>>18 beshort 44 Siemens Tricore Embedded Processor, -+>>18 beshort 45 Argonaut RISC Core, Argonaut Technologies Inc., -+>>18 beshort 46 Hitachi H8/300, -+>>18 beshort 47 Hitachi H8/300H, -+>>18 beshort 48 Hitachi H8S, -+>>18 beshort 49 Hitachi H8/500, -+>>18 beshort 50 Intel Merced Processor, -+>>18 beshort 51 Stanford MIPS-X, -+>>18 beshort 52 Motorola Coldfire, -+>>18 beshort 53 Motorola M68HC12, -+>>18 beshort 73 Cray NV1, -+>>18 beshort 75 Digital VAX, -+>>18 beshort 97 NatSemi 32k, -+>>18 beshort 0x9026 Alpha (unofficial), -+>>18 beshort 0xa390 IBM S/390 (obsolete), -+>>20 belong 0 invalid version -+>>20 belong 1 version 1 -+>>36 belong 1 MathCoPro/FPU/MAU Required -+# 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. -+>4 byte <0x80 -+>>8 string >\0 (%s) -+>8 string \0 -+>>7 byte 0 (SYSV) -+>>7 byte 1 (HP-UX) -+>>7 byte 2 (NetBSD) -+>>7 byte 3 (GNU/Linux) -+>>7 byte 4 (GNU/Hurd) -+>>7 byte 5 (86Open) -+>>7 byte 6 (Solaris) -+>>7 byte 7 (Monterey) -+>>7 byte 8 (IRIX) -+>>7 byte 9 (FreeBSD) -+>>7 byte 10 (Tru64) -+>>7 byte 11 (Novell Modesto) -+>>7 byte 12 (OpenBSD) -+>>7 byte 97 (ARM) -+>>7 byte 255 (embedded) |