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

Accepting request 162084 from Base:System

Browse Source 
- Refresh patches and remove the visibility patch that I
 upstreamed few releases ago in a different form. (forwarded request 161841 from WernerFink)

OBS-URL: https://build.opensuse.org/request/show/162084
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=72
This commit is contained in:
Stephan Kulow 2013-04-03 10:50:03 +00:00 committed by Git OBS Bridge
commit bae4039cd4
25 changed files with 185 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
file-4.20-ssd.dif
View File

@ -1,5 +1,7 @@
--- magic/Localstuff Index: magic/Localstuff
+++ magic/Localstuff 2007-03-21 12:38:03.000000000 +0100 ===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -14,3 +14,12 @@ @@ -14,3 +14,12 @@
>33 string >\0 (%s) >33 string >\0 (%s)
2 string \000\022 TeX font metric data 2 string \000\022 TeX font metric data

6
file-4.20-xen.dif
View File

@ -1,5 +1,7 @@
--- magic/Localstuff Index: magic/Localstuff
+++ magic/Localstuff 2007-03-21 12:41:52.000000000 +0100 ===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -23,3 +23,9 @@ @@ -23,3 +23,9 @@
# determined? # determined?
512 search/531 R\0o\0o\0t\0\ \0E\0n\0t\0r\0y Structured Storage 512 search/531 R\0o\0o\0t\0\ \0E\0n\0t\0r\0y Structured Storage

6
file-4.21-scribus.dif
View File

@ -1,5 +1,7 @@
--- magic/Localstuff Index: magic/Localstuff
+++ magic/Localstuff 2007-08-29 18:58:37.090251353 +0200 ===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -29,3 +29,7 @@ @@ -29,3 +29,7 @@
#>2 regex \(name\ [^)]*\) %s #>2 regex \(name\ [^)]*\) %s
>20 search/256 (name (name >20 search/256 (name (name

6
file-4.21-xcursor.dif
View File

@ -1,5 +1,7 @@
--- magic/Localstuff Index: magic/Localstuff
+++ magic/Localstuff 2007-12-05 11:31:15.494119630 +0100 ===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -33,3 +33,6 @@ @@ -33,3 +33,6 @@
# File magic for Scribus, an Open Source Desktop Publishing system # File magic for Scribus, an Open Source Desktop Publishing system
0 string \<SCRIBUSUTF8\ Version Scribus Document 0 string \<SCRIBUSUTF8\ Version Scribus Document

14
file-4.24-autoconf.dif
View File

@ -1,5 +1,7 @@
--- doc/Makefile.am Index: doc/Makefile.am
+++ doc/Makefile.am 2003-12-15 12:04:19.000000000 +0000 ===================================================================
--- doc/Makefile.am.orig
+++ doc/Makefile.am
@@ -5,7 +5,8 @@ else @@ -5,7 +5,8 @@ else
man_MAGIC = magic.4 man_MAGIC = magic.4
endif endif
@ -20,8 +22,10 @@
@rm -f $@ @rm -f $@
sed -e s@__CSECTION__@1@g \ sed -e s@__CSECTION__@1@g \
-e s@__FSECTION__@${fsect}@g \ -e s@__FSECTION__@${fsect}@g \
--- src/readelf.h Index: src/readelf.h
+++ src/readelf.h 2003-07-01 14:53:55.000000000 +0000 ===================================================================
--- src/readelf.h.orig
+++ src/readelf.h
@@ -34,7 +34,10 @@ @@ -34,7 +34,10 @@
#ifndef __fake_elf_h__ #ifndef __fake_elf_h__
#define __fake_elf_h__ #define __fake_elf_h__
@ -33,7 +37,7 @@
#include <stdint.h> #include <stdint.h>
#endif #endif
@@ -330,4 +333,5 @@ typedef struct { @@ -322,4 +325,5 @@ typedef struct {
#define AV_386_SSE4_1 0x00800000 #define AV_386_SSE4_1 0x00800000
#define AV_386_SSE4_2 0x01000000 #define AV_386_SSE4_2 0x01000000

6
file-4.24-cromfs.dif
View File

@ -1,5 +1,7 @@
--- magic/Localstuff Index: magic/Localstuff
+++ magic/Localstuff 2008-04-14 16:59:45.741454927 +0200 ===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -36,3 +36,16 @@ @@ -36,3 +36,16 @@
# File magic for X11 cursor data files # File magic for X11 cursor data files

6
file-4.24-solv.dif
View File

@ -1,5 +1,7 @@
--- magic/Localstuff Index: magic/Localstuff
+++ magic/Localstuff 2008-11-27 13:16:49.734433208 +0100 ===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -49,3 +49,7 @@ @@ -49,3 +49,7 @@
>44 ulelong >0 \b block size = %ld, >44 ulelong >0 \b block size = %ld,
>48 ulequad >0 \b bytes = %lld >48 ulequad >0 \b bytes = %lld

8
file-5.07-biorad.dif
View File

@ -1,6 +1,8 @@
--- magic/Magdir/images Index: magic/Magdir/images
+++ magic/Magdir/images 2011-06-14 14:09:58.779926039 +0000 ===================================================================
@@ -583,6 +583,8 @@ --- magic/Magdir/images.orig
+++ magic/Magdir/images
@@ -640,6 +640,8 @@
# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt # http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
# Samples: http://www.loci.wisc.edu/software/sample-data # Samples: http://www.loci.wisc.edu/software/sample-data
14 leshort <2 14 leshort <2

6
file-5.07-clicfs.dif
View File

@ -1,5 +1,7 @@
--- magic/Localstuff Index: magic/Localstuff
+++ magic/Localstuff 2011-06-14 17:40:22.417764753 +0000 ===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -53,3 +53,11 @@ @@ -53,3 +53,11 @@
0 string SOLV Sat-solver solv file, 0 string SOLV Sat-solver solv file,

10
file-5.07-elf.dif
View File

@ -1,6 +1,8 @@
--- src/readelf.c Index: src/readelf.c
+++ src/readelf.c 2011-06-14 13:58:06.424425742 +0000 ===================================================================
@@ -678,7 +678,7 @@ core: --- src/readelf.c.orig
+++ src/readelf.c
@@ -677,7 +677,7 @@ core:
default: default:
if (xnh_type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { if (xnh_type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) {
@ -9,7 +11,7 @@
unsigned char c; unsigned char c;
/* /*
* Extract the program name. We assume * Extract the program name. We assume
@@ -690,7 +690,9 @@ core: @@ -689,7 +689,9 @@ core:
* If the characters aren't all printable, * If the characters aren't all printable,
* reject it. * reject it.
*/ */

8
file-5.07-iso9660.dif
View File

@ -1,6 +1,8 @@
--- magic/Magdir/filesystems Index: magic/Magdir/filesystems
+++ magic/Magdir/filesystems 2009-10-27 15:55:38.000000000 +0000 ===================================================================
@@ -1236,6 +1236,7 @@ --- magic/Magdir/filesystems.orig
+++ magic/Magdir/filesystems
@@ -1619,6 +1619,7 @@
32769 string CD001 # 32769 string CD001 #
!:mime application/x-iso9660-image !:mime application/x-iso9660-image
>38913 string !NSR0 ISO 9660 CD-ROM filesystem data >38913 string !NSR0 ISO 9660 CD-ROM filesystem data

6
file-5.07-option.dif
View File

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

16
file-5.12-endian.patch
View File

@ -1,5 +1,7 @@
--- src/apprentice.c Index: src/apprentice.c
+++ src/apprentice.c 2013-01-22 15:08:18.325452293 +0000 ===================================================================
--- src/apprentice.c.orig
+++ src/apprentice.c
@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1. @@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
@ -23,7 +25,7 @@
private char *mkdbname(struct magic_set *, const char *, int); private char *mkdbname(struct magic_set *, const char *, int);
private struct magic_map *apprentice_map(struct magic_set *, const char *); private struct magic_map *apprentice_map(struct magic_set *, const char *);
private void apprentice_unmap(struct magic_map *); private void apprentice_unmap(struct magic_map *);
@@ -2788,67 +2791,6 @@ byteswap(struct magic *magic, uint32_t n @@ -2794,67 +2797,6 @@ byteswap(struct magic *magic, uint32_t n
} }
/* /*
@ -91,9 +93,11 @@
* byteswap a single magic entry * byteswap a single magic entry
*/ */
private void private void
--- src/cdf.c Index: src/cdf.c
+++ src/cdf.c 2013-01-22 00:00:00.000000000 +0000 ===================================================================
@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.51 2012 --- src/cdf.c.orig
+++ src/cdf.c
@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.53 2013
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
#endif #endif

6
file-5.12-javacheck.dif
View File

@ -1,5 +1,7 @@
--- magic/Magdir/cafebabe Index: magic/Magdir/cafebabe
+++ magic/Magdir/cafebabe 2013-01-22 14:34:00.199417547 +0000 ===================================================================
--- magic/Magdir/cafebabe.orig
+++ magic/Magdir/cafebabe
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
# might add another one or two as time goes by... # might add another one or two as time goes by...
# #

12
file-5.12-nitpick.dif
View File

@ -1,5 +1,7 @@
--- src/file.c Index: src/file.c
+++ src/file.c 2013-01-22 14:49:49.305453781 +0000 ===================================================================
--- src/file.c.orig
+++ src/file.c
@@ -94,10 +94,12 @@ private const char *separator = ":"; /* @@ -94,10 +94,12 @@ private const char *separator = ":"; /*
private const struct option long_options[] = { private const struct option long_options[] = {
#define OPT(shortname, longname, opt, doc) \ #define OPT(shortname, longname, opt, doc) \
@ -38,8 +40,10 @@
#undef OPT_LONGONLY #undef OPT_LONGONLY
fprintf(stdout, "\nReport bugs to http://bugs.gw.com/\n"); fprintf(stdout, "\nReport bugs to http://bugs.gw.com/\n");
exit(0); exit(0);
--- src/file_opts.h Index: src/file_opts.h
+++ src/file_opts.h 2012-09-18 10:14:38.000000000 +0000 ===================================================================
--- src/file_opts.h.orig
+++ src/file_opts.h
@@ -34,8 +34,8 @@ OPT_LONGONLY("mime-encoding", 0, " @@ -34,8 +34,8 @@ OPT_LONGONLY("mime-encoding", 0, "
OPT('k', "keep-going", 0, " don't stop at the first match\n") OPT('k', "keep-going", 0, " don't stop at the first match\n")
#ifdef S_IFLNK #ifdef S_IFLNK

30
file-5.12-ocloexec.patch
View File

@ -1,6 +1,8 @@
--- src/apprentice.c Index: src/apprentice.c
+++ src/apprentice.c 2013-01-22 14:39:18.865452095 +0000 ===================================================================
@@ -927,7 +927,7 @@ load_1(struct magic_set *ms, int action, --- src/apprentice.c.orig
+++ src/apprentice.c
@@ -930,7 +930,7 @@ load_1(struct magic_set *ms, int action,
ssize_t len; ssize_t len;
struct magic_entry me; struct magic_entry me;
@ -9,7 +11,7 @@
if (f == NULL) { if (f == NULL) {
if (errno != ENOENT) if (errno != ENOENT)
file_error(ms, errno, "cannot read magic file `%s'", file_error(ms, errno, "cannot read magic file `%s'",
@@ -2579,7 +2579,7 @@ apprentice_map(struct magic_set *ms, con @@ -2584,7 +2584,7 @@ apprentice_map(struct magic_set *ms, con
if (dbname == NULL) if (dbname == NULL)
goto error; goto error;
@ -18,7 +20,7 @@
goto error; goto error;
if (fstat(fd, &st) == -1) { if (fstat(fd, &st) == -1) {
@@ -2691,7 +2691,7 @@ apprentice_compile(struct magic_set *ms, @@ -2696,7 +2696,7 @@ apprentice_compile(struct magic_set *ms,
if (dbname == NULL) if (dbname == NULL)
goto out; goto out;
@ -27,8 +29,10 @@
{ {
file_error(ms, errno, "cannot open `%s'", dbname); file_error(ms, errno, "cannot open `%s'", dbname);
goto out; goto out;
--- src/compress.c Index: src/compress.c
+++ src/compress.c 2013-01-22 14:37:22.969952110 +0000 ===================================================================
--- src/compress.c.orig
+++ src/compress.c
@@ -252,7 +252,7 @@ file_pipe2file(struct magic_set *ms, int @@ -252,7 +252,7 @@ file_pipe2file(struct magic_set *ms, int
#else #else
{ {
@ -38,8 +42,10 @@
te = errno; te = errno;
(void)unlink(buf); (void)unlink(buf);
errno = te; errno = te;
--- src/file.c Index: src/file.c
+++ src/file.c 2013-01-22 00:00:00.000000000 +0000 ===================================================================
--- src/file.c.orig
+++ src/file.c
@@ -390,7 +390,7 @@ unwrap(struct magic_set *ms, const char @@ -390,7 +390,7 @@ unwrap(struct magic_set *ms, const char
f = stdin; f = stdin;
wid = 1; wid = 1;
@ -49,8 +55,10 @@
(void)fprintf(stderr, "%s: Cannot open `%s' (%s).\n", (void)fprintf(stderr, "%s: Cannot open `%s' (%s).\n",
progname, fn, strerror(errno)); progname, fn, strerror(errno));
return 1; return 1;
--- src/magic.c Index: src/magic.c
+++ src/magic.c 2013-01-22 00:00:00.000000000 +0000 ===================================================================
--- src/magic.c.orig
+++ src/magic.c
@@ -369,7 +369,7 @@ file_or_fd(struct magic_set *ms, const c @@ -369,7 +369,7 @@ file_or_fd(struct magic_set *ms, const c
if (fstat(fd, &sb) == 0 && S_ISFIFO(sb.st_mode)) if (fstat(fd, &sb) == 0 && S_ISFIFO(sb.st_mode))
ispipe = 1; ispipe = 1;

11
file-5.12-visibility.patch
View File

@ -1,11 +0,0 @@
--- src/Makefile.am
+++ src/Makefile.am 2012-01-16 13:23:27.235645838 +0000
@@ -11,7 +11,7 @@ libmagic_la_SOURCES = magic.c apprentice
encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
funcs.c file.h readelf.h tar.h apptype.c \
file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h
-libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libmagic_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libmagic.map -no-undefined -version-info 1:0:0
if MINGW
MINGWLIBS = -lgnurx -lshlwapi
else

8
file-5.12-zip.dif
View File

@ -1,6 +1,8 @@
--- magic/Magdir/archive Index: magic/Magdir/archive
+++ magic/Magdir/archive 2013-01-22 14:56:24.865452717 +0000 ===================================================================
@@ -592,6 +592,19 @@ --- magic/Magdir/archive.orig
+++ magic/Magdir/archive
@@ -589,6 +589,19 @@
# Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu) # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
0 string PK\005\006 Zip archive data (empty) 0 string PK\005\006 Zip archive data (empty)
0 string PK\003\004 0 string PK\003\004

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

@ -1,6 +1,8 @@
--- magic/Magdir/archive Index: magic/Magdir/archive
+++ magic/Magdir/archive 2013-01-22 15:01:33.273452678 +0000 ===================================================================
@@ -588,6 +588,10 @@ --- magic/Magdir/archive.orig
+++ magic/Magdir/archive
@@ -585,6 +585,10 @@
# PKZIP multi-volume archive # PKZIP multi-volume archive
0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract 0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract
!:mime application/zip !:mime application/zip

70
file-5.13.dif
View File

@ -1,6 +1,8 @@
--- magic/Magdir/elf Index: magic/Magdir/elf
+++ magic/Magdir/elf 2013-01-22 15:12:11.000000000 +0000 ===================================================================
@@ -127,7 +127,7 @@ --- magic/Magdir/elf.orig
+++ magic/Magdir/elf
@@ -126,7 +126,7 @@
>18 leshort 47 Renesas H8/300H, >18 leshort 47 Renesas H8/300H,
>18 leshort 48 Renesas H8S, >18 leshort 48 Renesas H8S,
>18 leshort 49 Renesas H8/500, >18 leshort 49 Renesas H8/500,
@ -9,8 +11,10 @@
>18 leshort 51 Stanford MIPS-X, >18 leshort 51 Stanford MIPS-X,
>18 leshort 52 Motorola Coldfire, >18 leshort 52 Motorola Coldfire,
>18 leshort 53 Motorola M68HC12, >18 leshort 53 Motorola M68HC12,
--- magic/Magdir/linux Index: magic/Magdir/linux
+++ magic/Magdir/linux 2013-01-22 15:16:41.000000000 +0000 ===================================================================
--- magic/Magdir/linux.orig
+++ magic/Magdir/linux
@@ -97,22 +97,44 @@ @@ -97,22 +97,44 @@
# and Nicolas Lichtmaier <nick@debian.org> # 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 # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
@ -71,16 +75,20 @@
# This also matches new kernels, which were caught above by "HdrS". # This also matches new kernels, which were caught above by "HdrS".
0 belong 0xb8c0078e Linux kernel 0 belong 0xb8c0078e Linux kernel
>0x1e3 string Loading version 1.3.79 or older >0x1e3 string Loading version 1.3.79 or older
--- magic/Magdir/msad Index: magic/Magdir/msad
+++ magic/Magdir/msad 2006-03-27 11:29:19.000000000 +0000 ===================================================================
--- /dev/null
+++ magic/Magdir/msad
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------
+# msad: file(1) magic for msad +# msad: file(1) magic for msad
+# Microsoft visual C +# Microsoft visual C
+# This must precede the heuristic for raw G3 data +# This must precede the heuristic for raw G3 data
+4 string Standard\ Jet\ DB Microsoft Access Database +4 string Standard\ Jet\ DB Microsoft Access Database
--- magic/Magdir/msdos Index: magic/Magdir/msdos
+++ magic/Magdir/msdos 2011-06-14 14:36:26.000000000 +0000 ===================================================================
--- magic/Magdir/msdos.orig
+++ magic/Magdir/msdos
@@ -99,9 +99,9 @@ @@ -99,9 +99,9 @@
>>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) >>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
>>>(0x3c.l+22) leshort&0x1000 >0 system file >>>(0x3c.l+22) leshort&0x1000 >0 system file
@ -93,8 +101,10 @@
# hooray, there's a DOS extender using the PE format, with a valid PE # 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) # executable inside (which just prints a message and exits if run in win)
--- magic/Makefile.am Index: magic/Makefile.am
+++ magic/Makefile.am 2013-01-22 15:19:21.000000000 +0000 ===================================================================
--- magic/Makefile.am.orig
+++ magic/Makefile.am
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -227,9 +237,11 @@
+# fi) +# fi)
+# $(FILE_COMPILE) -C -m magic +# $(FILE_COMPILE) -C -m magic
+# @rm -fr magic +# @rm -fr magic
--- magic/Makefile.in Index: magic/Makefile.in
+++ magic/Makefile.in 2013-01-22 15:20:19.000000000 +0000 ===================================================================
@@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@ --- magic/Makefile.in.orig
+++ magic/Makefile.in
@@ -236,7 +236,7 @@ top_srcdir = @top_srcdir@
MAGIC_FRAGMENT_BASE = Magdir MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -238,7 +250,7 @@
EXTRA_DIST = \ EXTRA_DIST = \
$(MAGIC_DIR)/Header \ $(MAGIC_DIR)/Header \
$(MAGIC_DIR)/Localstuff \ $(MAGIC_DIR)/Localstuff \
@@ -218,7 +218,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \ @@ -250,7 +250,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \
$(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/animation \
$(MAGIC_FRAGMENT_DIR)/aout \ $(MAGIC_FRAGMENT_DIR)/aout \
$(MAGIC_FRAGMENT_DIR)/apl \ $(MAGIC_FRAGMENT_DIR)/apl \
@ -246,7 +258,7 @@
$(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/archive \ $(MAGIC_FRAGMENT_DIR)/archive \
$(MAGIC_FRAGMENT_DIR)/assembler \ $(MAGIC_FRAGMENT_DIR)/assembler \
@@ -271,7 +270,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ @@ -303,7 +302,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \ $(MAGIC_FRAGMENT_DIR)/fcs \
@ -254,7 +266,7 @@
$(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/fonts \ $(MAGIC_FRAGMENT_DIR)/fonts \
$(MAGIC_FRAGMENT_DIR)/fortran \ $(MAGIC_FRAGMENT_DIR)/fortran \
@@ -309,6 +307,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ @@ -341,6 +339,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \ $(MAGIC_FRAGMENT_DIR)/jpeg \
@ -263,7 +275,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \ $(MAGIC_FRAGMENT_DIR)/keepass \
@@ -316,7 +316,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ @@ -348,7 +348,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \ $(MAGIC_FRAGMENT_DIR)/lif \
@ -271,7 +283,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/lua \
@@ -324,7 +323,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ @@ -356,7 +355,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/macos \
@ -279,7 +291,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \ $(MAGIC_FRAGMENT_DIR)/make \
@@ -343,10 +341,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ @@ -375,10 +373,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \ $(MAGIC_FRAGMENT_DIR)/mmdf \
@ -291,7 +303,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msvc \
$(MAGIC_FRAGMENT_DIR)/mup \ $(MAGIC_FRAGMENT_DIR)/mup \
@@ -388,6 +386,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ @@ -420,6 +418,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \
$(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \ $(MAGIC_FRAGMENT_DIR)/riff \
@ -300,7 +312,7 @@
$(MAGIC_FRAGMENT_DIR)/rinex \ $(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/rtf \
@@ -456,10 +456,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ @@ -488,10 +488,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
$(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zyxel $(MAGIC_FRAGMENT_DIR)/zyxel
@ -324,7 +336,7 @@
# FIXME: Build file natively as well so that it can be used to compile # 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 # the target's magic file; for now we bail if the local version does not match
@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file
@@ -674,23 +686,25 @@ uninstall-am: uninstall-pkgdataDATA @@ -714,23 +726,25 @@ uninstall-am: uninstall-pkgdataDATA
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-pkgdataDATA uninstall uninstall-am uninstall-pkgdataDATA
@ -366,16 +378,20 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
--- src/Makefile.am Index: src/Makefile.am
+++ src/Makefile.am 2008-04-14 15:14:56.000000000 +0000 ===================================================================
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-MAGIC = $(pkgdatadir)/magic -MAGIC = $(pkgdatadir)/magic
+MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
lib_LTLIBRARIES = libmagic.la lib_LTLIBRARIES = libmagic.la
include_HEADERS = magic.h include_HEADERS = magic.h
--- src/dcore.c Index: src/dcore.c
+++ src/dcore.c 2006-03-27 11:29:19.000000000 +0000 ===================================================================
--- /dev/null
+++ src/dcore.c
@@ -0,0 +1,207 @@ @@ -0,0 +1,207 @@
+/* +/*
+ * Show goo about ELF core files + * Show goo about ELF core files

30
file-5.14-misc.dif
View File

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

6
file-5.14-printf.dif
View File

@ -1,5 +1,7 @@
--- src/apprentice.c Index: src/apprentice.c
+++ src/apprentice.c 2013-03-22 10:07:26.293440720 +0000 ===================================================================
--- src/apprentice.c.orig
+++ src/apprentice.c
@@ -2057,8 +2057,16 @@ check_format_type(const char *ptr, int t @@ -2057,8 +2057,16 @@ check_format_type(const char *ptr, int t
quad = 1; quad = 1;
/*FALLTHROUGH*/ /*FALLTHROUGH*/

6
file-5.14-tex.dif
View File

@ -1,5 +1,7 @@
--- magic/Localstuff Index: magic/Localstuff
+++ magic/Localstuff 2003-07-01 16:58:32.000000000 +0000 ===================================================================
--- magic/Localstuff.orig
+++ magic/Localstuff
@@ -5,3 +5,12 @@ @@ -5,3 +5,12 @@
# $File: Localstuff,v 1.5 2007/01/12 17:38:27 christos Exp $ # $File: Localstuff,v 1.5 2007/01/12 17:38:27 christos Exp $
# Add any locally observed files here. Remember: # Add any locally observed files here. Remember:

6
file.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 29 06:56:37 UTC 2013 - crrodriguez@opensuse.org
- Refresh patches and remove the visibility patch that I
upstreamed few releases ago in a different form.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 22 10:13:29 UTC 2013 - werner@suse.de Fri Mar 22 10:13:29 UTC 2013 - werner@suse.de

20
file.spec
View File

@ -55,7 +55,6 @@ Patch25: file-5.12-javacheck.dif
Patch26: file-4.24-solv.dif Patch26: file-4.24-solv.dif
Patch27: file-5.12-zip2.0.dif Patch27: file-5.12-zip2.0.dif
Patch28: file-5.07-iso9660.dif Patch28: file-5.07-iso9660.dif
Patch30: file-5.12-visibility.patch
Patch31: file-5.07-biorad.dif Patch31: file-5.07-biorad.dif
Patch32: file-5.07-clicfs.dif Patch32: file-5.07-clicfs.dif
Patch33: file-5.12-ocloexec.patch Patch33: file-5.12-ocloexec.patch
@ -120,7 +119,6 @@ to develop applications that require the magic "file" interface.
%patch26 -p0 -b .solv %patch26 -p0 -b .solv
%patch27 -p0 -b .zip2.0 %patch27 -p0 -b .zip2.0
%patch28 -p0 -b .iso9600 %patch28 -p0 -b .iso9600
%patch30 -p0 -b .vis
%patch31 -p0 -b .biorad %patch31 -p0 -b .biorad
%patch32 -p0 -b .clicfs %patch32 -p0 -b .clicfs
%patch33 -p0 -b .clexe %patch33 -p0 -b .clexe
@ -137,24 +135,6 @@ rm -f ltcf-c.sh ltconfig ltmain.sh
autoreconf -fiv autoreconf -fiv
CFLAGS="$RPM_OPT_FLAGS -DHOWMANY=69632" CFLAGS="$RPM_OPT_FLAGS -DHOWMANY=69632"
%configure --disable-silent-rules --datadir=%{_miscdir} --disable-static --with-pic --enable-fsect-man5 %configure --disable-silent-rules --datadir=%{_miscdir} --disable-static --with-pic --enable-fsect-man5
#
# Used by patch #30 the visibility patch which allows us to
# export only the public magic_<...>() functions of libmagic.so
#
pushd src/
%{__make} %{?_smp_mflags} pkgdatadir='$(datadir)' magic.h
cat > libmagic.map <<-'EOF'
{
global:
EOF
sed -rn '/[[:alnum:]]+_[[:alnum:]]+\(/{
s/.*([[:blank:]\*])([[:alnum:]]+_[[:alnum:]]+)\(.*\);/ \2\;/p
}' < magic.h >> libmagic.map
cat >> libmagic.map <<-'EOF'
local: *;
};
EOF
popd
%{__make} %{?_smp_mflags} pkgdatadir='$(datadir)' %{__make} %{?_smp_mflags} pkgdatadir='$(datadir)'
%if 0%{?build_python_bindings:1} %if 0%{?build_python_bindings:1}
pushd python pushd python