diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-09-25 13:23:05 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-25 13:23:05 +0000 |
commit | b2eb15856bac59755557268a517fae96c49e8eea (patch) | |
tree | aff0b7b8cb5a1f1ca2771c330ae5351eb77a575b /sys-apps/file/files | |
parent | arm/ia64/s390/sh stable (diff) | |
download | gentoo-2-b2eb15856bac59755557268a517fae96c49e8eea.tar.gz gentoo-2-b2eb15856bac59755557268a517fae96c49e8eea.tar.bz2 gentoo-2-b2eb15856bac59755557268a517fae96c49e8eea.zip |
old
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'sys-apps/file/files')
-rw-r--r-- | sys-apps/file/files/digest-file-4.12 | 3 | ||||
-rw-r--r-- | sys-apps/file/files/digest-file-4.13 | 3 | ||||
-rw-r--r-- | sys-apps/file/files/digest-file-4.15-r1 | 3 | ||||
-rw-r--r-- | sys-apps/file/files/digest-file-4.16 | 3 | ||||
-rw-r--r-- | sys-apps/file/files/file-4.13-cross-compile.patch | 30 | ||||
-rw-r--r-- | sys-apps/file/files/file-4.13-ia64.patch | 16 | ||||
-rw-r--r-- | sys-apps/file/files/file-4.14-gcc2.patch | 13 | ||||
-rw-r--r-- | sys-apps/file/files/file-4.15-cracklib-magic.patch | 10 | ||||
-rw-r--r-- | sys-apps/file/files/file-4.15-empty-mime-buffer.patch | 29 | ||||
-rw-r--r-- | sys-apps/file/files/file-4.16-fix-array-64bit.patch | 65 | ||||
-rw-r--r-- | sys-apps/file/files/file-4.xx-mips-gentoo.patch | 152 |
11 files changed, 0 insertions, 327 deletions
diff --git a/sys-apps/file/files/digest-file-4.12 b/sys-apps/file/files/digest-file-4.12 deleted file mode 100644 index 403bc8c05fe6..000000000000 --- a/sys-apps/file/files/digest-file-4.12 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 09488a9d62bc6627b48a8c93e12d72f8 file-4.12.tar.gz 414600 -RMD160 0f943edeb9311853161936e256dbd31f86eb49d5 file-4.12.tar.gz 414600 -SHA256 827307b428d0c19160bbf3429a8b60218aef515fc009a9f024ca7b7440928841 file-4.12.tar.gz 414600 diff --git a/sys-apps/file/files/digest-file-4.13 b/sys-apps/file/files/digest-file-4.13 deleted file mode 100644 index 5eda164fd53f..000000000000 --- a/sys-apps/file/files/digest-file-4.13 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 2bfc0f878ee22e50441b68df2ccbb984 file-4.13.tar.gz 420851 -RMD160 6ad85982bda00f6d1f037ab85698f4cbcb76970a file-4.13.tar.gz 420851 -SHA256 98dfd26c2780fba4dd62ce93bfafdc9345eb700115d0f717d5ec45582ef99861 file-4.13.tar.gz 420851 diff --git a/sys-apps/file/files/digest-file-4.15-r1 b/sys-apps/file/files/digest-file-4.15-r1 deleted file mode 100644 index feecfebd21ad..000000000000 --- a/sys-apps/file/files/digest-file-4.15-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 09a6603dadbe06e577e98a2547201fab file-4.15.tar.gz 546522 -RMD160 6b34dab996ad0cb245f9e9d56ba02b141c4e13c5 file-4.15.tar.gz 546522 -SHA256 11d3f5bb112bbc78b4f841f17b19a23bae32e7469474e01d520a1b233b6e6b6e file-4.15.tar.gz 546522 diff --git a/sys-apps/file/files/digest-file-4.16 b/sys-apps/file/files/digest-file-4.16 deleted file mode 100644 index 770ffd5c7885..000000000000 --- a/sys-apps/file/files/digest-file-4.16 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9bc5a7017ab7bd544f288fd931ec741a file-4.16.tar.gz 548877 -RMD160 cc7dfa009faf57e44f53e63a31df5dd092ff7159 file-4.16.tar.gz 548877 -SHA256 916cd515ad98de405154ff2de9790421f1869257e93a5e41c905fce85f1a283c file-4.16.tar.gz 548877 diff --git a/sys-apps/file/files/file-4.13-cross-compile.patch b/sys-apps/file/files/file-4.13-cross-compile.patch deleted file mode 100644 index b2b7d3c80707..000000000000 --- a/sys-apps/file/files/file-4.13-cross-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- file-4.10/magic/Makefile.in.orig 2004-07-24 14:38:55.000000000 -0600 -+++ file-4.10/magic/Makefile.in 2004-07-28 12:16:23.000000000 -0600 -@@ -490,10 +490,10 @@ - done >> $@ - - magic.mgc: magic -- $(top_builddir)/src/file -C -m magic -+ /usr/bin/file -C -m magic - - magic.mime.mgc: magic.mime -- $(top_builddir)/src/file -C -m $(srcdir)/magic.mime -+ /usr/bin/file -C -m $(srcdir)/magic.mime - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: ---- file-4.10/magic/Makefile.am.orig 2004-07-24 14:38:55.000000000 -0600 -+++ file-4.10/magic/Makefile.am 2004-07-28 12:18:15.000000000 -0600 -@@ -16,10 +16,10 @@ - done >> $@ - - magic.mgc: magic -- $(top_builddir)/src/file -C -m magic -+ /usr/bin/file -C -m magic - - magic.mime.mgc: magic.mime -- $(top_builddir)/src/file -C -m $(srcdir)/magic.mime -+ /usr/bin/file -C -m $(srcdir)/magic.mime - - magic_FRAGMENTS = \ - Magdir/acorn \ diff --git a/sys-apps/file/files/file-4.13-ia64.patch b/sys-apps/file/files/file-4.13-ia64.patch deleted file mode 100644 index afe6abaf7e86..000000000000 --- a/sys-apps/file/files/file-4.13-ia64.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- file-4.02/magic/Magdir/elf -+++ file-4.02/magic/Magdir/elf -@@ -91,5 +91,5 @@ - >>18 leshort 48 Hitachi H8S, - >>18 leshort 49 Hitachi H8/500, -->>18 leshort 50 IA-64 (Intel 64 bit architecture) -+>>18 leshort 50 IA-64, - >>18 leshort 51 Stanford MIPS-X, - >>18 leshort 52 Motorola Coldfire, -@@ -178,5 +178,5 @@ - >>18 beshort 48 Hitachi H8S, - >>18 beshort 49 Hitachi H8/500, -->>18 beshort 50 Intel Merced Processor, -+>>18 beshort 50 IA-64, - >>18 beshort 51 Stanford MIPS-X, - >>18 beshort 52 Motorola Coldfire, diff --git a/sys-apps/file/files/file-4.14-gcc2.patch b/sys-apps/file/files/file-4.14-gcc2.patch deleted file mode 100644 index f5d5774b9668..000000000000 --- a/sys-apps/file/files/file-4.14-gcc2.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- file-4.14/src/readelf.c 2005-07-24 14:11:30 +0200 -+++ file-4.14.az/src/readelf.c 2005-07-24 14:11:46 +0200 -@@ -490,9 +490,9 @@ - - if (namesz == 10 && strcmp((char *)&nbuf[noff], "DragonFly") == 0 && - nh_type == NT_DRAGONFLY_VERSION && descsz == 4) { -+ uint32_t desc; - if (file_printf(ms, ", for DragonFly") == -1) - return size; -- uint32_t desc; - (void)memcpy(&desc, &nbuf[doff], sizeof(desc)); - desc = getu32(swap, desc); - if (file_printf(ms, " %d.%d.%d", desc / 100000, diff --git a/sys-apps/file/files/file-4.15-cracklib-magic.patch b/sys-apps/file/files/file-4.15-cracklib-magic.patch deleted file mode 100644 index 38a74d441957..000000000000 --- a/sys-apps/file/files/file-4.15-cracklib-magic.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- magic/Magdir/cracklib -+++ magic/Magdir/cracklib -@@ -8,6 +8,5 @@ - >>8 long >-1 (%i words) - 0 belong 0x70775631 Cracklib password index, big endian - >4 belong >-1 (%i words) --0 long 0 -->4 belong 0x70775631 Cracklib password index, big endian ("64-bit") -+4 belong 0x70775631 Cracklib password index, big endian ("64-bit") - >12 belong >0 (%i words) diff --git a/sys-apps/file/files/file-4.15-empty-mime-buffer.patch b/sys-apps/file/files/file-4.15-empty-mime-buffer.patch deleted file mode 100644 index aff090c2dc3a..000000000000 --- a/sys-apps/file/files/file-4.15-empty-mime-buffer.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://bugs.gentoo.org/106152 - ---- src/magic.c -+++ src/magic.c -@@ -316,12 +316,18 @@ magic_buffer(struct magic_set *ms, const - { - if (file_reset(ms) == -1) - return NULL; -- /* -- * The main work is done here! -- * We have the file name and/or the data buffer to be identified. -- */ -- if (file_buffer(ms, -1, buf, nb) == -1) { -- return NULL; -+ if (nb == 0) { -+ if (file_printf(ms, (ms->flags & MAGIC_MIME) ? -+ "application/x-empty" : "empty") == -1) -+ return NULL; -+ } else { -+ /* -+ * The main work is done here! -+ * We have the file name and/or the data buffer to be identified. -+ */ -+ if (file_buffer(ms, -1, buf, nb) == -1) { -+ return NULL; -+ } - } - return file_getbuffer(ms); - } diff --git a/sys-apps/file/files/file-4.16-fix-array-64bit.patch b/sys-apps/file/files/file-4.16-fix-array-64bit.patch deleted file mode 100644 index ad14f25e35f0..000000000000 --- a/sys-apps/file/files/file-4.16-fix-array-64bit.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- src/readelf.h -+++ src/readelf.h -@@ -50,6 +50,7 @@ - typedef uint32_t Elf64_Off[2]; - typedef uint32_t Elf64_Xword[2]; - #else -+#undef USE_ARRAY_FOR_64BIT_TYPES - typedef uint64_t Elf64_Addr; - typedef uint64_t Elf64_Off; - typedef uint64_t Elf64_Xword; ---- src/readelf.c -+++ src/readelf.c -@@ -121,6 +121,14 @@ - return value; - } - -+#ifdef USE_ARRAY_FOR_64BIT_TYPES -+# define elf_getu64(swap, array) \ -+ ((swap ? ((uint64_t)getu32(swap, array[0])) << 32 : getu32(swap, array[0])) + \ -+ (swap ? getu32(swap, array[1]) : ((uint64_t)getu32(swap, array[1]) << 32))) -+#else -+# define elf_getu64(swap, value) getu64(swap, value) -+#endif -+ - #define xsh_addr (class == ELFCLASS32 \ - ? (void *) &sh32 \ - : (void *) &sh64) -@@ -913,11 +921,7 @@ - if (getu16(swap, elfhdr.e_type) == ET_CORE) { - #ifdef ELFCORE - if (dophn_core(ms, class, swap, fd, --#ifdef USE_ARRAY_FOR_64BIT_TYPES -- (off_t)getu32(swap, elfhdr.e_phoff[1]), --#else -- (off_t)getu64(swap, elfhdr.e_phoff), --#endif -+ (off_t)elf_getu64(swap, elfhdr.e_phoff), - getu16(swap, elfhdr.e_phnum), - (size_t)getu16(swap, elfhdr.e_phentsize)) == -1) - return -1; -@@ -927,22 +931,14 @@ - } else { - if (getu16(swap, elfhdr.e_type) == ET_EXEC) { - if (dophn_exec(ms, class, swap, fd, --#ifdef USE_ARRAY_FOR_64BIT_TYPES -- (off_t)getu32(swap, elfhdr.e_phoff[1]), --#else -- (off_t)getu64(swap, elfhdr.e_phoff), --#endif -+ (off_t)elf_getu64(swap, elfhdr.e_phoff), - getu16(swap, elfhdr.e_phnum), - (size_t)getu16(swap, elfhdr.e_phentsize)) - == -1) - return -1; - } - if (doshn(ms, class, swap, fd, --#ifdef USE_ARRAY_FOR_64BIT_TYPES -- (off_t)getu32(swap, elfhdr.e_shoff[1]), --#else -- (off_t)getu64(swap, elfhdr.e_shoff), --#endif -+ (off_t)elf_getu64(swap, elfhdr.e_shoff), - getu16(swap, elfhdr.e_shnum), - (size_t)getu16(swap, elfhdr.e_shentsize)) == -1) - return -1; diff --git a/sys-apps/file/files/file-4.xx-mips-gentoo.patch b/sys-apps/file/files/file-4.xx-mips-gentoo.patch deleted file mode 100644 index fbc18409c7bc..000000000000 --- a/sys-apps/file/files/file-4.xx-mips-gentoo.patch +++ /dev/null @@ -1,152 +0,0 @@ -This tweaks the output format for mips binaries so things like -libtool don't barf all over the place when trying to parse it. - -BEFORE: cat: ELF 32-bit N32 MSB MIPS-IV executable, MIPS, version 1 (SYSV), for GNU/Linux 2.4.0, dynamically linked (uses shared libs), stripped -AFTER: cat: ELF 32-bit MSB executable, MIPS, N32 MIPS-IV version 1 (SYSV), for GNU/Linux 2.4.0, dynamically linked (uses shared libs), stripped - -Reference: -http://lists.debian.org/debian-mips/2001/01/msg00065.html -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=83303 - ---- magic/Magdir/elf -+++ magic/Magdir/elf -@@ -11,22 +11,39 @@ - 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 -+>>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, - # 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 -+>>18 leshort 8 MIPS, -+>>>36 lelong &0x20 N32 -+>>18 leshort 10 MIPS, -+>>>36 lelong &0x20 N32 -+>>18 leshort 8 - # only for 32-bit - >>>4 byte 1 - >>>>36 lelong&0xf0000000 0x00000000 MIPS-I -@@ -49,29 +66,6 @@ - >>>>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, -@@ -111,8 +105,31 @@ - >>20 lelong 1 version 1 - >>36 lelong 1 MathCoPro/FPU/MAU Required - >5 byte 2 MSB -+>>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, - # only for MIPS - see comment in little-endian section above. -->>18 beshort 8 -+>>18 beshort 8 MIPS, -+>>>36 belong &0x20 N32 -+>>18 beshort 10 MIPS, -+>>>36 belong &0x20 N32 -+>>18 beshort 8 - # only for 32-bit - >>>4 byte 1 - >>>>36 belong&0xf0000000 0x00000000 MIPS-I -@@ -135,26 +152,6 @@ - >>>>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, |