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

Accepting request 201588 from Base:System

Browse Source 
- Add changes of Andreas Stieger 

- Update to file version 5.15 (bug fix release, no new featuress)
  * Don't mix errors and regular output if there was an error
  * in magic_descriptor() don't close the file and try to restore
    its position
  * Don't treat magic as an error if offset was past EOF (Christoph Biedl)
  * Fix spacing issues in softmagic and elf (Jan Kaluza)
  * Fix segmentation fault with multiple magic_load commands.
  * The way "default" was implemented was not very useful because
    the "if something was printed at that level" was not easily
    controlled by the user, and the format was bound to a string
    which is too restrictive. Add a "clear" for that level keyword
    and make "default" void.
  * disallow strength setting in "name" entries
- Adjust for upstream changes:
  * file-5.14-tex.dif
  * file-5.07-elf.dif
  * file-5.12-ocloexec.patch
  * file-5.12-nitpick.dif
  * file-5.13.dif
- Drop patches, applied upstream:
  * file-5.13-whitespace.patch
  * elf-invalid-byte-order.patch

 
- add file-5.15-clear-invalid.patch to fix an invalid format

- Make if ready for file 5.15

OBS-URL: https://build.opensuse.org/request/show/201588
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=75
This commit is contained in:
Stephan Kulow 2013-10-02 06:48:16 +00:00 committed by Git OBS Bridge
commit ce1df4d668
31 changed files with 197 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,31 +0,0 @@
--- 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

6
file-4.20-ssd.dif
View File

@ -1,7 +1,5 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
@@ -14,3 +14,12 @@
>33 string >\0 (%s)
2 string \000\022 TeX font metric data

6
file-4.20-xen.dif
View File

@ -1,7 +1,5 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
@@ -23,3 +23,9 @@
# determined?
512 search/531 R\0o\0o\0t\0\ \0E\0n\0t\0r\0y Structured Storage

6
file-4.21-scribus.dif
View File

@ -1,7 +1,5 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
@@ -29,3 +29,7 @@
#>2 regex \(name\ [^)]*\) %s
>20 search/256 (name (name

6
file-4.21-xcursor.dif
View File

@ -1,7 +1,5 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
@@ -33,3 +33,6 @@
# File magic for Scribus, an Open Source Desktop Publishing system
0 string \<SCRIBUSUTF8\ Version Scribus Document

14
file-4.24-autoconf.dif
View File

@ -1,7 +1,5 @@
Index: doc/Makefile.am
===================================================================
--- doc/Makefile.am.orig
+++ doc/Makefile.am
--- doc/Makefile.am
+++ doc/Makefile.am 2013-09-30 00:00:00.000000000 +0000
@@ -5,7 +5,8 @@ else
man_MAGIC = magic.4
endif
@ -22,10 +20,8 @@ Index: doc/Makefile.am
@rm -f $@
sed -e s@__CSECTION__@1@g \
-e s@__FSECTION__@${fsect}@g \
Index: src/readelf.h
===================================================================
--- src/readelf.h.orig
+++ src/readelf.h
--- src/readelf.h
+++ src/readelf.h 2013-09-30 00:00:00.000000000 +0000
@@ -34,7 +34,10 @@
#ifndef __fake_elf_h__
#define __fake_elf_h__
@ -37,7 +33,7 @@ Index: src/readelf.h
#include <stdint.h>
#endif
@@ -322,4 +325,5 @@ typedef struct {
@@ -339,4 +342,5 @@ typedef struct {
#define AV_386_SSE4_1 0x00800000
#define AV_386_SSE4_2 0x01000000

6
file-4.24-cromfs.dif
View File

@ -1,7 +1,5 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
@@ -36,3 +36,16 @@
# File magic for X11 cursor data files

6
file-4.24-solv.dif
View File

@ -1,7 +1,5 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
@@ -49,3 +49,7 @@
>44 ulelong >0 \b block size = %ld,
>48 ulequad >0 \b bytes = %lld

6
file-5.07-biorad.dif
View File

@ -1,7 +1,5 @@
Index: magic/Magdir/images
===================================================================
--- magic/Magdir/images.orig
+++ magic/Magdir/images
--- magic/Magdir/images
+++ magic/Magdir/images 2013-09-30 00:00:00.000000000 +0000
@@ -640,6 +640,8 @@
# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
# Samples: http://www.loci.wisc.edu/software/sample-data

6
file-5.07-clicfs.dif
View File

@ -1,7 +1,5 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
@@ -53,3 +53,11 @@
0 string SOLV Sat-solver solv file,

12
file-5.07-elf.dif
View File

@ -1,17 +1,15 @@
Index: src/readelf.c
===================================================================
--- src/readelf.c.orig
+++ src/readelf.c
@@ -677,7 +677,7 @@ core:
--- src/readelf.c
+++ src/readelf.c 2013-09-30 13:41:16.000000000 +0000
@@ -708,7 +708,7 @@ core:
default:
if (xnh_type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) {
/*###709 [cc] warning: declaration of 'i' shadows previous non-variable%%%*/
- size_t i, j;
+ size_t i, j, m = 0;
unsigned char c;
/*
* Extract the program name. We assume
@@ -689,7 +689,9 @@ core:
@@ -720,7 +720,9 @@ core:
* If the characters aren't all printable,
* reject it.
*/

8
file-5.07-iso9660.dif
View File

@ -1,8 +1,6 @@
Index: magic/Magdir/filesystems
===================================================================
--- magic/Magdir/filesystems.orig
+++ magic/Magdir/filesystems
@@ -1619,6 +1619,7 @@
--- magic/Magdir/filesystems
+++ magic/Magdir/filesystems 2013-09-30 00:00:00.000000000 +0000
@@ -1946,6 +1946,7 @@
32769 string CD001 #
!:mime application/x-iso9660-image
>38913 string !NSR0 ISO 9660 CD-ROM filesystem data

6
file-5.07-option.dif
View File

@ -1,7 +1,5 @@
Index: src/file.c
===================================================================
--- src/file.c.orig
+++ src/file.c
--- src/file.c
+++ src/file.c 2013-09-30 00:00:00.000000000 +0000
@@ -195,6 +195,8 @@ main(int argc, char *argv[])
flags |= MAGIC_DEBUG|MAGIC_CHECK;
break;

16
file-5.12-endian.patch
View File

@ -1,7 +1,5 @@
Index: src/apprentice.c
===================================================================
--- src/apprentice.c.orig
+++ src/apprentice.c
--- src/apprentice.c
+++ src/apprentice.c 2013-09-30 00:00:00.000000000 +0000
@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
#include <sys/mman.h>
#endif
@ -10,7 +8,7 @@ Index: src/apprentice.c
#define EATAB {while (isascii((unsigned char) *l) && \
isspace((unsigned char) *l)) ++l;}
@@ -109,9 +110,11 @@ private struct mlist *mlist_alloc(void);
@@ -115,9 +116,11 @@ private struct mlist *mlist_alloc(void);
private void mlist_free(struct mlist *);
private void byteswap(struct magic *, uint32_t);
private void bs1(struct magic *);
@ -25,7 +23,7 @@ Index: src/apprentice.c
private char *mkdbname(struct magic_set *, const char *, int);
private struct magic_map *apprentice_map(struct magic_set *, const char *);
private void apprentice_unmap(struct magic_map *);
@@ -2794,67 +2797,6 @@ byteswap(struct magic *magic, uint32_t n
@@ -2809,67 +2812,6 @@ byteswap(struct magic *magic, uint32_t n
}
/*
@ -93,10 +91,8 @@ Index: src/apprentice.c
* byteswap a single magic entry
*/
private void
Index: src/cdf.c
===================================================================
--- src/cdf.c.orig
+++ src/cdf.c
--- src/cdf.c
+++ src/cdf.c 2013-09-30 00:00:00.000000000 +0000
@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.53 2013
#ifdef HAVE_LIMITS_H
#include <limits.h>

6
file-5.12-javacheck.dif
View File

@ -1,7 +1,5 @@
Index: magic/Magdir/cafebabe
===================================================================
--- magic/Magdir/cafebabe.orig
+++ magic/Magdir/cafebabe
--- magic/Magdir/cafebabe
+++ magic/Magdir/cafebabe 2013-09-30 00:00:00.000000000 +0000
@@ -15,7 +15,7 @@
# might add another one or two as time goes by...
#

18
file-5.12-nitpick.dif
View File

@ -1,7 +1,5 @@
Index: src/file.c
===================================================================
--- src/file.c.orig
+++ src/file.c
--- src/file.c
+++ src/file.c 2013-09-30 00:00:00.000000000 +0000
@@ -94,10 +94,12 @@ private const char *separator = ":"; /*
private const struct option long_options[] = {
#define OPT(shortname, longname, opt, doc) \
@ -15,7 +13,7 @@ Index: src/file.c
#undef OPT_LONGONLY
{0, 0, NULL, 0}
};
@@ -522,6 +524,7 @@ docprint(const char *opts)
@@ -525,6 +527,7 @@ docprint(const char *opts)
private void
help(void)
{
@ -23,7 +21,7 @@ Index: src/file.c
(void)fputs(
"Usage: file [OPTION...] [FILE...]\n"
"Determine type of FILEs.\n"
@@ -529,11 +532,16 @@ help(void)
@@ -532,11 +535,16 @@ help(void)
#define OPT(shortname, longname, opt, doc) \
fprintf(stdout, " -%c, --" longname, shortname), \
docprint(doc);
@ -40,14 +38,12 @@ Index: src/file.c
#undef OPT_LONGONLY
fprintf(stdout, "\nReport bugs to http://bugs.gw.com/\n");
exit(0);
Index: src/file_opts.h
===================================================================
--- src/file_opts.h.orig
+++ src/file_opts.h
--- src/file_opts.h
+++ src/file_opts.h 2013-09-30 13:44:17.000000000 +0000
@@ -34,8 +34,8 @@ OPT_LONGONLY("mime-encoding", 0, "
OPT('k', "keep-going", 0, " don't stop at the first match\n")
#ifdef S_IFLNK
OPT('l', "list", 0, " list magic strength\n")
#ifdef S_IFLNK
-OPT('L', "dereference", 0, " follow symlinks (default)\n")
-OPT('h', "no-dereference", 0, " don't follow symlinks\n")
+OPT_POSIX('L', "dereference", 0, " follow symlinks\n")

38
file-5.12-ocloexec.patch
View File

@ -1,8 +1,6 @@
Index: src/apprentice.c
===================================================================
--- src/apprentice.c.orig
+++ src/apprentice.c
@@ -930,7 +930,7 @@ load_1(struct magic_set *ms, int action,
--- src/apprentice.c
+++ src/apprentice.c 2013-09-30 00:00:00.000000000 +0000
@@ -938,7 +938,7 @@ load_1(struct magic_set *ms, int action,
ssize_t len;
struct magic_entry me;
@ -11,7 +9,7 @@ Index: src/apprentice.c
if (f == NULL) {
if (errno != ENOENT)
file_error(ms, errno, "cannot read magic file `%s'",
@@ -2584,7 +2584,7 @@ apprentice_map(struct magic_set *ms, con
@@ -2599,7 +2599,7 @@ apprentice_map(struct magic_set *ms, con
if (dbname == NULL)
goto error;
@ -20,7 +18,7 @@ Index: src/apprentice.c
goto error;
if (fstat(fd, &st) == -1) {
@@ -2696,7 +2696,7 @@ apprentice_compile(struct magic_set *ms,
@@ -2711,7 +2711,7 @@ apprentice_compile(struct magic_set *ms,
if (dbname == NULL)
goto out;
@ -29,11 +27,9 @@ Index: src/apprentice.c
{
file_error(ms, errno, "cannot open `%s'", dbname);
goto out;
Index: src/compress.c
===================================================================
--- src/compress.c.orig
+++ src/compress.c
@@ -252,7 +252,7 @@ file_pipe2file(struct magic_set *ms, int
--- src/compress.c
+++ src/compress.c 2013-09-30 00:00:00.000000000 +0000
@@ -250,7 +250,7 @@ file_pipe2file(struct magic_set *ms, int
#else
{
int te;
@ -42,10 +38,8 @@ Index: src/compress.c
te = errno;
(void)unlink(buf);
errno = te;
Index: src/file.c
===================================================================
--- src/file.c.orig
+++ src/file.c
--- src/file.c
+++ src/file.c 2013-09-30 00:00:00.000000000 +0000
@@ -390,7 +390,7 @@ unwrap(struct magic_set *ms, const char
f = stdin;
wid = 1;
@ -55,13 +49,11 @@ Index: src/file.c
(void)fprintf(stderr, "%s: Cannot open `%s' (%s).\n",
progname, fn, strerror(errno));
return 1;
Index: src/magic.c
===================================================================
--- src/magic.c.orig
+++ src/magic.c
@@ -369,7 +369,7 @@ file_or_fd(struct magic_set *ms, const c
if (fstat(fd, &sb) == 0 && S_ISFIFO(sb.st_mode))
ispipe = 1;
--- src/magic.c
+++ src/magic.c 2013-09-30 00:00:00.000000000 +0000
@@ -372,7 +372,7 @@ file_or_fd(struct magic_set *ms, const c
else
pos = lseek(fd, (off_t)0, SEEK_CUR);
} else {
- int flags = O_RDONLY|O_BINARY;
+ int flags = O_RDONLY|O_BINARY|O_CLOEXEC;

6
file-5.12-zip.dif
View File

@ -1,7 +1,5 @@
Index: magic/Magdir/archive
===================================================================
--- magic/Magdir/archive.orig
+++ magic/Magdir/archive
--- magic/Magdir/archive
+++ magic/Magdir/archive 2013-09-30 00:00:00.000000000 +0000
@@ -589,6 +589,19 @@
# Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
0 string PK\005\006 Zip archive data (empty)

6
file-5.12-zip2.0.dif
View File

@ -1,7 +1,5 @@
Index: magic/Magdir/archive
===================================================================
--- magic/Magdir/archive.orig
+++ magic/Magdir/archive
--- magic/Magdir/archive
+++ magic/Magdir/archive 2013-09-30 00:00:00.000000000 +0000
@@ -585,6 +585,10 @@
# PKZIP multi-volume archive
0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract

16
file-5.13-whitespace.patch
View File

@ -1,16 +0,0 @@
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.

30
file-5.14-misc.dif
View File

@ -1,7 +1,5 @@
Index: magic/Magdir/audio
===================================================================
--- magic/Magdir/audio.orig
+++ magic/Magdir/audio
--- magic/Magdir/audio
+++ magic/Magdir/audio 2013-09-30 00:00:00.000000000 +0000
@@ -129,7 +129,7 @@
# Oct 31, 1995
# fixed by <doj@cubic.org> 2003-06-24
@ -11,10 +9,8 @@ Index: magic/Magdir/audio
#0 string if Composer 669 Module sound data
#0 string JN Composer 669 Module sound data (extended format)
0 string MAS_U ULT(imate) Module sound data
Index: magic/Magdir/bsdi
===================================================================
--- magic/Magdir/bsdi.orig
+++ magic/Magdir/bsdi
--- magic/Magdir/bsdi
+++ magic/Magdir/bsdi 2013-09-30 00:00:00.000000000 +0000
@@ -11,7 +11,7 @@
>32 byte 0x6a (uses shared libs)
@ -40,10 +36,8 @@ Index: magic/Magdir/bsdi
>0 byte &0x80 dynamically linked executable
>0 byte ^0x80 executable
>16 belong >0 not stripped
Index: magic/Magdir/mach
===================================================================
--- magic/Magdir/mach.orig
+++ magic/Magdir/mach
--- magic/Magdir/mach
+++ magic/Magdir/mach 2013-09-30 00:00:00.000000000 +0000
@@ -121,7 +121,7 @@
>>>4 belong&0x00ffffff 1 mc88100
>>>4 belong&0x00ffffff 2 mc88110
@ -53,10 +47,8 @@ Index: magic/Magdir/mach
>>0 belong&0x00ffffff 15 i860g
>>0 belong&0x00ffffff 16 alpha
>>0 belong&0x00ffffff 17 rs6000
Index: magic/Magdir/netbsd
===================================================================
--- magic/Magdir/netbsd.orig
+++ magic/Magdir/netbsd
--- magic/Magdir/netbsd
+++ magic/Magdir/netbsd 2013-09-30 00:00:00.000000000 +0000
@@ -100,25 +100,25 @@
0 belong&0377777777 045200507 a.out NetBSD/powerpc core
>12 string >\0 from '%s'
@ -87,10 +79,8 @@ Index: magic/Magdir/netbsd
>12 string >\0 from '%s'
>32 belong !0 (signal %d)
Index: magic/Magdir/sun
===================================================================
--- magic/Magdir/sun.orig
+++ magic/Magdir/sun
--- magic/Magdir/sun
+++ magic/Magdir/sun 2013-09-30 00:00:00.000000000 +0000
@@ -9,7 +9,7 @@
# are in aout, as they're indistinguishable from other big-endian
# 32-bit a.out files.

10
file-5.14-printf.dif
View File

@ -1,8 +1,6 @@
Index: src/apprentice.c
===================================================================
--- src/apprentice.c.orig
+++ src/apprentice.c
@@ -2057,8 +2057,16 @@ check_format_type(const char *ptr, int t
--- src/apprentice.c
+++ src/apprentice.c 2013-09-30 00:00:00.000000000 +0000
@@ -2072,8 +2072,16 @@ check_format_type(const char *ptr, int t
quad = 1;
/*FALLTHROUGH*/
case FILE_FMT_NUM:
@ -19,7 +17,7 @@ Index: src/apprentice.c
if (*ptr == '.')
ptr++;
while (isdigit((unsigned char)*ptr)) ptr++;
@@ -2100,6 +2108,9 @@ check_format_type(const char *ptr, int t
@@ -2115,6 +2123,9 @@ check_format_type(const char *ptr, int t
default:
return -1;
}

8
file-5.14-tex.dif
View File

@ -1,9 +1,7 @@
Index: magic/Localstuff
===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
--- magic/Localstuff
+++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000
@@ -5,3 +5,12 @@
# $File: Localstuff,v 1.5 2007/01/12 17:38:27 christos Exp $
# $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $
# Add any locally observed files here. Remember:
# text if readable, executable if runnable binary, data if unreadable.
+

3
file-5.14.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:461ba01dd0900a3b7c2dcd901b04903192c07887a9c1928af0be507572c77fe4
size 648552

25
file-5.15-clear-invalid.patch Normal file
View File

@ -0,0 +1,25 @@
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Sun, 29 Sep 2013 01:47:57 +0100
Subject: [PATCH] remove clear instruction
Upstream: no
References: http://mx.gw.com/pipermail/file/2013/001227.html http://mx.gw.com/pipermail/file/2013/001225.html
fixed build warning:
[ 205s] /usr/share/misc/magic, 5352: Warning: type `clear x' invalid
---
magic/Magdir/elf | 1 -
1 file changed, 1 deletion(-)
Index: file-5.15/magic/Magdir/elf
===================================================================
--- file-5.15.orig/magic/Magdir/elf 2013-09-29 01:42:19.000000000 +0100
+++ file-5.15/magic/Magdir/elf 2013-09-29 01:43:25.000000000 +0100
@@ -30,7 +30,6 @@
#>>>(0x38+0xcc) string >\0 of '%s'
#>>>(0x38+0x10) lelong >0 (signal %d),
>16 leshort &0xff00 processor-specific,
->18 clear x
>18 leshort 0 no machine,
>18 leshort 1 AT&T WE32100
>18 leshort 2 SPARC

98
file-5.13.dif → file-5.15.dif
View File

@ -1,8 +1,6 @@
Index: magic/Magdir/elf
===================================================================
--- magic/Magdir/elf.orig
+++ magic/Magdir/elf
@@ -126,7 +126,7 @@
--- magic/Magdir/elf
+++ magic/Magdir/elf 2013-09-30 00:00:00.000000000 +0000
@@ -129,7 +129,7 @@
>18 leshort 47 Renesas H8/300H,
>18 leshort 48 Renesas H8S,
>18 leshort 49 Renesas H8/500,
@ -11,17 +9,15 @@ Index: magic/Magdir/elf
>18 leshort 51 Stanford MIPS-X,
>18 leshort 52 Motorola Coldfire,
>18 leshort 53 Motorola M68HC12,
Index: magic/Magdir/linux
===================================================================
--- magic/Magdir/linux.orig
+++ magic/Magdir/linux
--- magic/Magdir/linux
+++ magic/Magdir/linux 2013-09-30 00:00:00.000000000 +0000
@@ -97,22 +97,44 @@
# and Nicolas Lichtmaier <nick@debian.org>
# All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
# Linux kernel boot images (i386 arch) (Wolfram Kleff)
-514 string HdrS Linux kernel
+514 string HdrS Linux
!:strength + 5
!:strength + 55
->510 leshort 0xAA55 x86 boot executable
->>518 leshort >0x1ff
->>>529 byte 0 zImage,
@ -75,20 +71,16 @@ Index: magic/Magdir/linux
# This also matches new kernels, which were caught above by "HdrS".
0 belong 0xb8c0078e Linux kernel
>0x1e3 string Loading version 1.3.79 or older
Index: magic/Magdir/msad
===================================================================
--- /dev/null
+++ magic/Magdir/msad
--- magic/Magdir/msad
+++ magic/Magdir/msad 2013-09-30 00:00:00.000000000 +0000
@@ -0,0 +1,5 @@
+#------------------------------------------------------------------------------
+# msad: file(1) magic for msad
+# Microsoft visual C
+# This must precede the heuristic for raw G3 data
+4 string Standard\ Jet\ DB Microsoft Access Database
Index: magic/Magdir/msdos
===================================================================
--- magic/Magdir/msdos.orig
+++ magic/Magdir/msdos
--- magic/Magdir/msdos
+++ magic/Magdir/msdos 2013-09-30 00:00:00.000000000 +0000
@@ -99,9 +99,9 @@
>>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
>>>(0x3c.l+22) leshort&0x1000 >0 system file
@ -101,10 +93,8 @@ Index: magic/Magdir/msdos
# hooray, there's a DOS extender using the PE format, with a valid PE
# executable inside (which just prints a message and exits if run in win)
Index: magic/Makefile.am
===================================================================
--- magic/Makefile.am.orig
+++ magic/Makefile.am
--- magic/Makefile.am
+++ magic/Makefile.am 2013-09-30 00:00:00.000000000 +0000
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -122,7 +112,7 @@ Index: magic/Makefile.am
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/archive \
$(MAGIC_FRAGMENT_DIR)/assembler \
@@ -73,7 +72,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
@@ -74,7 +73,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \
@ -130,7 +120,7 @@ Index: magic/Makefile.am
$(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/fonts \
$(MAGIC_FRAGMENT_DIR)/fortran \
@@ -111,6 +109,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
@@ -112,6 +110,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \
@ -139,7 +129,7 @@ Index: magic/Makefile.am
$(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \
@@ -118,7 +118,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
@@ -119,7 +119,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \
@ -147,7 +137,7 @@ Index: magic/Makefile.am
$(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \
@@ -126,7 +125,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
@@ -127,7 +126,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \
@ -155,7 +145,7 @@ Index: magic/Makefile.am
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \
@@ -145,10 +143,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -146,10 +144,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@ -165,9 +155,9 @@ Index: magic/Makefile.am
$(MAGIC_FRAGMENT_DIR)/msdos \
+$(MAGIC_FRAGMENT_DIR)/modem \
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \
$(MAGIC_FRAGMENT_DIR)/mup \
@@ -190,6 +188,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
@@ -192,6 +190,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
@ -176,7 +166,7 @@ Index: magic/Makefile.am
$(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
@@ -258,8 +258,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
@@ -261,8 +261,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel
@ -198,7 +188,7 @@ Index: magic/Makefile.am
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
@@ -271,19 +283,22 @@ FILE_COMPILE = $(top_builddir)/src/file
@@ -274,19 +286,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
FILE_COMPILE_DEP = $(FILE_COMPILE)
endif
@ -237,11 +227,9 @@ Index: magic/Makefile.am
+# fi)
+# $(FILE_COMPILE) -C -m magic
+# @rm -fr magic
Index: magic/Makefile.in
===================================================================
--- magic/Makefile.in.orig
+++ magic/Makefile.in
@@ -236,7 +236,7 @@ top_srcdir = @top_srcdir@
--- magic/Makefile.in
+++ magic/Makefile.in 2013-09-30 14:05:30.000000000 +0000
@@ -203,7 +203,7 @@ top_srcdir = @top_srcdir@
MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -250,7 +238,7 @@ Index: magic/Makefile.in
EXTRA_DIST = \
$(MAGIC_DIR)/Header \
$(MAGIC_DIR)/Localstuff \
@@ -250,7 +250,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \
@@ -217,7 +217,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \
$(MAGIC_FRAGMENT_DIR)/animation \
$(MAGIC_FRAGMENT_DIR)/aout \
$(MAGIC_FRAGMENT_DIR)/apl \
@ -258,7 +246,7 @@ Index: magic/Makefile.in
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/archive \
$(MAGIC_FRAGMENT_DIR)/assembler \
@@ -303,7 +302,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
@@ -271,7 +270,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \
@ -266,7 +254,7 @@ Index: magic/Makefile.in
$(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/fonts \
$(MAGIC_FRAGMENT_DIR)/fortran \
@@ -341,6 +339,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
@@ -309,6 +307,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \
@ -275,7 +263,7 @@ Index: magic/Makefile.in
$(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \
@@ -348,7 +348,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
@@ -316,7 +316,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \
@ -283,7 +271,7 @@ Index: magic/Makefile.in
$(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \
@@ -356,7 +355,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
@@ -324,7 +323,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \
@ -291,7 +279,7 @@ Index: magic/Makefile.in
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \
@@ -375,10 +373,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -343,10 +341,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@ -301,9 +289,9 @@ Index: magic/Makefile.in
$(MAGIC_FRAGMENT_DIR)/msdos \
+$(MAGIC_FRAGMENT_DIR)/modem \
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \
$(MAGIC_FRAGMENT_DIR)/mup \
@@ -420,6 +418,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
@@ -389,6 +387,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
@ -312,15 +300,15 @@ Index: magic/Makefile.in
$(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
@@ -488,10 +488,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
@@ -458,10 +458,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel
+RAW = magic
MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
+CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW}
@IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file
+CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ${RAW}
@IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file${EXEEXT}
+${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST)
+ cat /dev/null > $@
@ -335,8 +323,8 @@ Index: magic/Makefile.in
+
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file
@@ -714,23 +726,25 @@ uninstall-am: uninstall-pkgdataDATA
@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
@@ -676,23 +688,25 @@ uninstall-am: uninstall-pkgdataDATA
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-pkgdataDATA
@ -378,20 +366,16 @@ Index: magic/Makefile.in
# 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.
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig
+++ src/Makefile.am
--- src/Makefile.am
+++ src/Makefile.am 2013-09-30 00:00:00.000000000 +0000
@@ -1,4 +1,4 @@
-MAGIC = $(pkgdatadir)/magic
+MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
lib_LTLIBRARIES = libmagic.la
include_HEADERS = magic.h
Index: src/dcore.c
===================================================================
--- /dev/null
+++ src/dcore.c
--- src/dcore.c
+++ src/dcore.c 2013-09-30 00:00:00.000000000 +0000
@@ -0,0 +1,207 @@
+/*
+ * Show goo about ELF core files

3
file-5.15.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4bd52cc614d6488127c0bddc208a2855481744d76ff0878d9c173d2a6ed564e4
size 655932

36
file.changes
View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Tue Oct 1 10:42:40 UTC 2013 - werner@suse.de
- Add changes of Andreas Stieger
-------------------------------------------------------------------
Mon Sep 30 14:27:34 UTC 2013 - werner@suse.de
- Update to file version 5.15 (bug fix release, no new featuress)
* Don't mix errors and regular output if there was an error
* in magic_descriptor() don't close the file and try to restore
its position
* Don't treat magic as an error if offset was past EOF (Christoph Biedl)
* Fix spacing issues in softmagic and elf (Jan Kaluza)
* Fix segmentation fault with multiple magic_load commands.
* The way "default" was implemented was not very useful because
the "if something was printed at that level" was not easily
controlled by the user, and the format was bound to a string
which is too restrictive. Add a "clear" for that level keyword
and make "default" void.
* disallow strength setting in "name" entries
- Adjust for upstream changes:
* file-5.14-tex.dif
* file-5.07-elf.dif
* file-5.12-ocloexec.patch
* file-5.12-nitpick.dif
* file-5.13.dif
- Drop patches, applied upstream:
* file-5.13-whitespace.patch
* elf-invalid-byte-order.patch
-------------------------------------------------------------------
Sun Sep 29 00:46:01 UTC 2013 - andreas.stieger@gmx.de
- add file-5.15-clear-invalid.patch to fix an invalid format
-------------------------------------------------------------------
Sun May 26 10:31:25 UTC 2013 - schwab@suse.de

10
file.spec
View File

@ -30,14 +30,14 @@ Obsoletes: file-64bit
%endif
#
# Set Version also in python-magic.spec
Version: 5.14
Version: 5.15
Release: 0
Summary: A Tool to Determine File Types
License: BSD-2-Clause
Group: Productivity/File utilities
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
Source2: baselibs.conf
Patch: file-5.13.dif
Patch: file-5.15.dif
Patch1: file-5.14-misc.dif
Patch4: file-4.24-autoconf.dif
Patch5: file-5.14-tex.dif
@ -60,8 +60,7 @@ 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
Patch36: file-5.15-clear-invalid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -126,8 +125,7 @@ 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
%patch36 -p1 -b .clear
%patch -b .0
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in

5
python-magic.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 1 10:43:20 UTC 2013 - werner@suse.de
- Make if ready for file 5.15
-------------------------------------------------------------------
Tue Mar 12 10:37:20 UTC 2013 - idonmez@suse.com

2
python-magic.spec
View File

@ -23,7 +23,7 @@ BuildRequires: libtool
BuildRequires: python-devel
BuildRequires: zlib-devel
Url: http://www.darwinsys.com/file/
Version: 5.14
Version: 5.15
Release: 0
Summary: Python module to use libmagic
License: BSD-3-Clause and BSD-4-Clause