diff --git a/file-4.21-pybuild.patch b/file-4.21-pybuild.patch deleted file mode 100644 index ed835d7..0000000 --- a/file-4.21-pybuild.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up file-4.21/python/setup.py.pybuild file-4.21/python/setup.py ---- file-4.21/python/setup.py.pybuild 2007-12-11 09:40:29.000000000 +0100 -+++ file-4.21/python/setup.py 2007-12-11 09:40:59.000000000 +0100 -@@ -3,8 +3,8 @@ from distutils.core import setup, Extens - - magic_module = Extension('magic', - libraries = ['magic'], -- library_dirs = ['./','../','../src','/usr/lib/'], -- include_dirs = ['./','../','../src','/usr/include/'], -+ library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'], -+ include_dirs = ['./','../','../src','../src/.libs','/usr/include/'], - sources = ['py_magic.c']) - - setup (name = 'Magic file extensions', diff --git a/file-4.26-btrfs.patch b/file-4.26-btrfs.patch deleted file mode 100644 index a48fd8d..0000000 --- a/file-4.26-btrfs.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up file-4.26/magic/Magdir/filesystems.btrfs file-4.26/magic/Magdir/filesystems ---- file-4.26/magic/Magdir/filesystems.btrfs 2009-01-12 12:50:33.000000000 +0100 -+++ file-4.26/magic/Magdir/filesystems 2009-01-12 12:53:30.000000000 +0100 -@@ -1324,6 +1324,14 @@ - >0x10024 belong x (blocksize %d, - >0x10060 string >\0 lockproto %s) - -+# BTRFS -+0x10040 string _BHRfS_M BTRFS Filesystem -+>0x1012b string >\0 (label "%s", -+>0x10090 lelong x sectorsize %d, -+>0x10094 lelong x nodesize %d, -+>0x10098 lelong x leafsize %d) -+ -+ - # dvdisaster's .ecc - # From: "Nelson A. de Oliveira" - 0 string *dvdisaster* dvdisaster error correction file diff --git a/file-4.26-devdrv.patch b/file-4.26-devdrv.patch deleted file mode 100644 index 83bbdbd..0000000 --- a/file-4.26-devdrv.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up file-4.26/magic/Magdir/msdos.devdrv file-4.26/magic/Magdir/msdos ---- file-4.26/magic/Magdir/msdos.devdrv 2008-10-07 16:00:29.000000000 +0200 -+++ file-4.26/magic/Magdir/msdos 2008-10-07 16:02:01.000000000 +0200 -@@ -293,22 +293,37 @@ - >10 string >\x23 - >>10 string !\x2e - >>>17 string <\x5B -->>>>10 string x \b, name: %.8s --#UDMA.SYS KEYB.SYS CMD640X2.SYS -+>>>>10 string CMD640X2.SYS \b, name: %.8s -+#UDMA.SYS - >10 string <\x41 - >>12 string >\x40 - >>>10 string !$ -->>>>12 string x \b, name: %.8s --#BTCDROM.SYS ASPICD.SYS -+>>>>12 string UDMA.SYS \b, name: %.8s -+#CMD640X2.SYS -+>10 string <\x41 -+>>12 string >\x40 -+>>>10 string !$ -+>>>>12 string CMD640X2.SYS \b, name: %.8s -+#KEYB.SYS -+>10 string <\x41 -+>>12 string >\x40 -+>>>10 string !$ -+>>>>12 string KEYB.SYS \b, name: %.8s -+#BTCDROM.SYS -+>22 string >\x40 -+>>22 string <\x5B -+>>>23 string <\x5B -+>>>>22 string BTCDROM.SYS \b, name: %.8s -+#ASPICD.SYS - >22 string >\x40 - >>22 string <\x5B - >>>23 string <\x5B -->>>>22 string x \b, name: %.8s -+>>>>22 string ASPICD.SYS \b, name: %.8s - #ATAPICD.SYS - >76 string \0 - >>77 string >\x40 - >>>77 string <\x5B -->>>>77 string x \b, name: %.8s -+>>>>77 string ATAPICD.SYS \b, name: %.8s - #0 byte 0x8c DOS executable (COM) - # 0xeb conflicts with "sequent" magic - #0 byte 0xeb DOS executable (COM) diff --git a/file-4.26-graphviz-latex.patch b/file-4.26-graphviz-latex.patch deleted file mode 100644 index c49ddcb..0000000 --- a/file-4.26-graphviz-latex.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up file-4.26/magic/Magdir/graphviz.latex file-4.26/magic/Magdir/graphviz ---- file-4.26/magic/Magdir/graphviz.latex 2008-12-15 16:55:28.000000000 +0100 -+++ file-4.26/magic/Magdir/graphviz 2008-12-15 17:10:07.000000000 +0100 -@@ -1,7 +1,7 @@ - - #------------------------------------------------------------------------------ - # graphviz: file(1) magic for http://www.graphviz.org/ --0 regex/100 [\r\n\t\ ]*graph[\r\n\t\ ]*.*\\{ graphviz graph text -+0 regex/100 [\r\n\t\ ]*graph[\r\n\t\ ]+.*\\{ graphviz graph text - !:mime text/vnd.graphviz --0 regex/100 [\r\n\t\ ]*digraph[\r\n\t\ ]*.*\\{ graphviz digraph text -+0 regex/100 [\r\n\t\ ]*digraph[\r\n\t\ ]+.*\\{ graphviz digraph text - !:mime text/vnd.graphviz diff --git a/file-4.26-jpeg2000.patch b/file-4.26-jpeg2000.patch deleted file mode 100644 index 160fb2b..0000000 --- a/file-4.26-jpeg2000.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up file-4.26/magic/Magdir/images.jpeg2000 file-4.26/magic/Magdir/images ---- file-4.26/magic/Magdir/images.jpeg2000 2009-01-12 14:37:52.000000000 +0100 -+++ file-4.26/magic/Magdir/images 2009-01-12 14:43:50.000000000 +0100 -@@ -600,3 +600,8 @@ - # Wavelet Scalar Quantization format used in gray-scale fingerprint images - # From Tano M Fotang - 0 string \xff\xa0\xff\xa8\x00 Wavelet Scalar Quantization image data -+ -+# JPEG 2000 Code Stream Bitmap -+# From Petr Splichal -+0 string \xFF\x4F\xFF\x51\x00 JPEG-2000 Code Stream Bitmap data -+ diff --git a/file-4.26-mime-encoding.patch b/file-4.26-mime-encoding.patch deleted file mode 100644 index 7b3845f..0000000 --- a/file-4.26-mime-encoding.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up file-4.26/src/funcs.c.mime file-4.26/src/funcs.c ---- file-4.26/src/funcs.c.mime 2008-10-14 13:07:44.000000000 +0200 -+++ file-4.26/src/funcs.c 2008-10-16 11:47:01.000000000 +0200 -@@ -152,6 +152,20 @@ file_badread(struct magic_set *ms) - file_error(ms, errno, "error reading"); - } - -+private int mime_encoding(struct magic_set * ms, const unsigned char * buf, size_t size) -+{ -+size_t dummy; -+ -+if( file_looks_utf8(buf, size, NULL, &dummy) == 1 ) -+{ -+ if(file_printf(ms, "7bit") == -1) -+ return -1; -+} else if(file_printf(ms, "binary") == -1) -+ return -1; -+ -+return 1; -+} -+ - #ifndef COMPILE_ONLY - protected int - file_buffer(struct magic_set *ms, int fd, const char *inname, const void *buf, -@@ -187,6 +201,8 @@ file_buffer(struct magic_set *ms, int fd - } - } - #endif -+ if (ms->flags & MAGIC_MIME_ENCODING && !(ms->flags & MAGIC_MIME_TYPE)) -+ return mime_encoding(ms, ubuf, nb); - - /* try compression stuff */ - if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) != 0 || -@@ -206,9 +222,9 @@ file_buffer(struct magic_set *ms, int fd - "data") == -1) - return -1; - m = 1; -- } -- } -- } -+ } -+ } -+ } - } - #ifdef BUILTIN_ELF - if ((ms->flags & MAGIC_NO_CHECK_ELF) == 0 && m == 1 && diff --git a/file-4.26-perl5.patch b/file-4.26-perl5.patch deleted file mode 100644 index 29e00f6..0000000 --- a/file-4.26-perl5.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up file-4.26/magic/Magdir/perl.perl5 file-4.26/magic/Magdir/perl ---- file-4.26/magic/Magdir/perl.perl5 2008-12-04 09:44:05.000000000 +0100 -+++ file-4.26/magic/Magdir/perl 2008-12-04 09:45:02.000000000 +0100 -@@ -23,7 +23,6 @@ - # by Dmitry V. Levin and Alexey Tourbin - # check the first line - 0 search/1 package --0 regex \^package[\ \t]+[A-Za-z_] - >0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *; Perl5 module source text - # not 'p', check other lines - 0 search/1 !p diff --git a/file-5.00-devdrv.patch b/file-5.00-devdrv.patch deleted file mode 100644 index 188a301..0000000 --- a/file-5.00-devdrv.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up file-5.00/magic/Magdir/msdos.devdrv file-5.00/magic/Magdir/msdos ---- file-5.00/magic/Magdir/msdos.devdrv 2009-02-09 14:35:12.000000000 +0100 -+++ file-5.00/magic/Magdir/msdos 2009-02-09 14:37:32.000000000 +0100 -@@ -294,22 +294,37 @@ - >10 string >\x23 - >>10 string !\x2e - >>>17 string <\x5B -->>>>10 string x \b, name: %.8s --#UDMA.SYS KEYB.SYS CMD640X2.SYS -+>>>>10 string CMD640X2.SYS \b, name: %.8s -+#UDMA.SYS - >10 string <\x41 - >>12 string >\x40 - >>>10 string !$ -->>>>12 string x \b, name: %.8s --#BTCDROM.SYS ASPICD.SYS -+>>>>12 string UDMA.SYS \b, name: %.8s -+#CMD640X2.SYS -+>10 string <\x41 -+>>12 string >\x40 -+>>>10 string !$ -+>>>>12 string CMD640X2.SYS \b, name: %.8s -+#KEYB.SYS -+>10 string <\x41 -+>>12 string >\x40 -+>>>10 string !$ -+>>>>12 string KEYB.SYS \b, name: %.8s -+#BTCDROM.SYS -+>22 string >\x40 -+>>22 string <\x5B -+>>>23 string <\x5B -+>>>>22 string BTCDROM.SYS \b, name: %.8s -+#ASPICD.SYS - >22 string >\x40 - >>22 string <\x5B - >>>23 string <\x5B -->>>>22 string x \b, name: %.8s -+>>>>22 string ASPICD.SYS \b, name: %.8s - #ATAPICD.SYS - >76 string \0 - >>77 string >\x40 - >>>77 string <\x5B -->>>>77 string x \b, name: %.8s -+>>>>77 string ATAPICD.SYS \b, name: %.8s - # test too generic ? - 0 byte 0x8c DOS executable (COM) - # updated by Joerg Jenderek at Oct 2008 diff --git a/file-5.00-erlang.patch b/file-5.00-erlang.patch deleted file mode 100644 index 07a5c84..0000000 --- a/file-5.00-erlang.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up file-5.00/magic/Magdir/erlang.tue file-5.00/magic/Magdir/erlang ---- file-5.00/magic/Magdir/erlang.tue 2009-04-29 09:38:45.000000000 +0200 -+++ file-5.00/magic/Magdir/erlang 2009-04-29 09:40:58.000000000 +0200 -@@ -12,7 +12,7 @@ - >8 string BEAM Erlang BEAM file - - # 4.2 version may have a copyright notice! --4 string Tue Jan 22 14:32:44 MET 1991 Erlang JAM file - version 4.2 --79 string Tue Jan 22 14:32:44 MET 1991 Erlang JAM file - version 4.2 -+4 string Tue\ Jan\ 22\ 14:32:44\ MET\ 1991 Erlang JAM file - version 4.2 -+79 string Tue\ Jan\ 22\ 14:32:44\ MET\ 1991 Erlang JAM file - version 4.2 - --4 string 1.0 Fri Feb 3 09:55:56 MET 1995 Erlang JAM file - version 4.3 -+4 string 1.0\ Fri\ Feb\ 3\ 09:55:56\ MET\ 1995 Erlang JAM file - version 4.3 diff --git a/file-5.00-fdleak.patch b/file-5.00-fdleak.patch deleted file mode 100644 index 1cc9e10..0000000 --- a/file-5.00-fdleak.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up file-5.00/src/compress.c.fdleak file-5.00/src/compress.c ---- file-5.00/src/compress.c.fdleak 2009-03-23 13:42:38.000000000 +0200 -+++ file-5.00/src/compress.c 2009-03-23 13:43:42.000000000 +0200 -@@ -486,6 +486,7 @@ err: - #else - (void)wait(NULL); - #endif -+ (void) close(fdin[0]); - return n; - } - } diff --git a/file-5.00-fonts-ttc-pfa.patch b/file-5.00-fonts-ttc-pfa.patch deleted file mode 100644 index 1e5ecde..0000000 --- a/file-5.00-fonts-ttc-pfa.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up file-5.00/magic/Magdir/fonts.ttcpfa file-5.00/magic/Magdir/fonts ---- file-5.00/magic/Magdir/fonts.ttcpfa 2009-03-23 11:44:36.000000000 +0100 -+++ file-5.00/magic/Magdir/fonts 2009-03-23 11:52:48.000000000 +0100 -@@ -9,6 +9,7 @@ - 0 search/1 %!PS-AdobeFont-1. PostScript Type 1 font text - >20 search/1 >\0 (%s) - 6 string %!PS-AdobeFont-1. PostScript Type 1 font program data -+0 string %!PS-AdobeFont-1. PostScript Type 1 font text - - # X11 font files in SNF (Server Natural Format) format - 0 belong 00000004 X11 SNF font data, MSB first -@@ -55,6 +56,8 @@ - 0 string \007\001\001\000Copyright\ (c)\ 199 Adobe Multiple Master font - 0 string \012\001\001\000Copyright\ (c)\ 199 Adobe Multiple Master font - -+0 string ttcf TrueType font collection data -+ - # Opentype font data from Avi Bercovich - 0 string OTTO OpenType font data - diff --git a/file-5.00-mdmp.patch b/file-5.00-mdmp.patch deleted file mode 100644 index f8f318c..0000000 --- a/file-5.00-mdmp.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up file-5.00/magic/Magdir/misctools.mdmp file-5.00/magic/Magdir/misctools ---- file-5.00/magic/Magdir/misctools.mdmp 2009-04-16 15:29:06.000000000 +0200 -+++ file-5.00/magic/Magdir/misctools 2009-04-16 15:32:23.000000000 +0200 -@@ -19,3 +19,6 @@ - # Extension: .lo - # Submitted by: Abel Cheung - 0 search/80 .lo\ -\ a\ libtool\ object\ file libtool object file -+ -+# From: Daniel Novotny -+0 string MDMP\x93\xA7 MDMP crash report data diff --git a/file-5.00-non-english-word.patch b/file-5.00-non-english-word.patch deleted file mode 100644 index 17bb1b6..0000000 --- a/file-5.00-non-english-word.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- file-5.00/src/readcdf.c 3 Feb 2009 20:27:51 -0000 1.11 -+++ file-5.00/src/readcdf.c 13 Feb 2009 18:45:33 -0000 -@@ -75,9 +75,23 @@ - if (len > 1) { - s = info[i].pi_str.s_buf; - if (NOTMIME(ms)) { -- if (file_printf(ms, ", %s: %.*s", buf, -- len, s) == -1) -- return -1; -+ char vbuf[1024]; -+ size_t j; -+ for (j = 0; j < sizeof(vbuf) && len--; -+ j++, s++) { -+ if (*s == '\0') -+ break; -+ if (isprint((unsigned char)*s)) -+ vbuf[j] = *s; -+ } -+ if (j == sizeof(vbuf)) -+ --j; -+ vbuf[j] = '\0'; -+ if (vbuf[0]) { -+ if (file_printf(ms, ", %s: %s", -+ buf, vbuf) == -1) -+ return -1; -+ } - } else if (info[i].pi_id == - CDF_PROPERTY_NAME_OF_APPLICATION) { - if (strstr(s, "Word")) - diff --git a/file-5.00-thumbs-db.patch b/file-5.00-thumbs-db.patch deleted file mode 100644 index 5788efc..0000000 --- a/file-5.00-thumbs-db.patch +++ /dev/null @@ -1,127 +0,0 @@ -Index: cdf.c -=================================================================== -RCS file: /p/file/cvsroot/file/src/cdf.c,v -retrieving revision 1.17 -diff -u -u -r1.17 cdf.c ---- file-5.00/src/cdf.c 3 Feb 2009 20:27:51 -0000 1.17 -+++ file-5.00/src/cdf.c 20 Feb 2009 15:45:39 -0000 -@@ -239,7 +239,9 @@ - cdf_unpack_header(h, buf); - cdf_swap_header(h); - if (h->h_magic != CDF_MAGIC) { -- DPRINTF(("Bad magic 0x%x != 0x$x\n", h->h_magic, CDF_MAGIC)); -+ DPRINTF(("Bad magic 0x%llx != 0x%llx\n", -+ (unsigned long long)h->h_magic, -+ (unsigned long long)CDF_MAGIC)); - errno = EFTYPE; - return -1; - } -@@ -539,10 +541,11 @@ - if (dir->dir_tab[i].d_type == CDF_DIR_TYPE_ROOT_STORAGE) - break; - -+ /* If the it is not there, just fake it; some docs don't have it */ - if (i == dir->dir_len) { -- DPRINTF(("Cannot find root storage node\n")); -- errno = EFTYPE; -- return -1; -+ scn->sst_tab = NULL; -+ scn->sst_len = 0; -+ return 0; - } - d = &dir->dir_tab[i]; - -Index: readcdf.c -=================================================================== -RCS file: /p/file/cvsroot/file/src/readcdf.c,v -retrieving revision 1.12 -diff -u -u -r1.12 readcdf.c ---- file-5.00/src/readcdf.c 13 Feb 2009 18:46:48 -0000 1.12 -+++ file-5.00/src/readcdf.c 20 Feb 2009 15:45:39 -0000 -@@ -129,7 +129,7 @@ - case CDF_CLIPBOARD: - break; - default: -- file_error(ms, 0, "Internal parsing error"); -+ ; - return -1; - } - } -@@ -202,6 +202,7 @@ - cdf_stream_t sst, scn; - cdf_dir_t dir; - int i; -+ const char *expn = ""; - (void)&nbytes; - (void)&buf; - -@@ -214,7 +215,7 @@ - #endif - - if (cdf_read_sat(fd, &h, &sat) == -1) { -- file_error(ms, errno, "Can't read SAT"); -+ expn = "Can't read SAT"; - return -1; - } - #ifdef CDF_DEBUG -@@ -222,7 +223,7 @@ - #endif - - if ((i = cdf_read_ssat(fd, &h, &sat, &ssat)) == -1) { -- file_error(ms, errno, "Can't read SAT"); -+ expn = "Can't read SSAT"; - goto out1; - } - #ifdef CDF_DEBUG -@@ -230,12 +231,12 @@ - #endif - - if ((i = cdf_read_dir(fd, &h, &sat, &dir)) == -1) { -- file_error(ms, errno, "Can't read directory"); -+ expn = "Can't read directory"; - goto out2; - } - - if ((i = cdf_read_short_stream(fd, &h, &sat, &dir, &sst)) == -1) { -- file_error(ms, errno, "Cannot read short stream"); -+ expn = "Cannot read short stream"; - goto out3; - } - -@@ -244,19 +245,14 @@ - #endif - if ((i = cdf_read_summary_info(fd, &h, &sat, &ssat, &sst, &dir, &scn)) - == -1) { -- /* Some files don't have summary info! */ --#ifdef notyet -- file_error(ms, errno, "Can't read summary_info"); --#else -- i = 0; --#endif -+ expn = ""; - goto out4; - } - #ifdef CDF_DEBUG - cdf_dump_summary_info(&h, &scn); - #endif - if ((i = cdf_file_summary_info(ms, &scn)) == -1) -- file_error(ms, errno, "Can't expand summary_info"); -+ expn = "Can't expand summary_info"; - free(scn.sst_tab); - out4: - free(sst.sst_tab); -@@ -266,5 +262,13 @@ - free(ssat.sat_tab); - out1: - free(sat.sat_tab); -+ if (i != 1) { -+ if (file_printf(ms, "CDF V2 Document") == -1) -+ return -1; -+ if (*expn) -+ if (file_printf(ms, ", corrupt: %s", expn) == -1) -+ return -1; -+ i = 1; -+ } - return i; - } - diff --git a/file-5.03-add-python-3.patch b/file-5.03-add-python-3.patch deleted file mode 100644 index b49f427..0000000 --- a/file-5.03-add-python-3.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up file-5.03/magic/Magdir/python.add-python-3 file-5.03/magic/Magdir/python ---- file-5.03/magic/Magdir/python.add-python-3 2009-10-26 15:06:23.387518090 -0400 -+++ file-5.03/magic/Magdir/python 2009-10-26 15:06:37.122518374 -0400 -@@ -5,7 +5,8 @@ - # From: David Necas - # often the module starts with a multiline string - 0 string """ a python script text executable --# MAGIC as specified in Python/import.c (1.5 to 2.3.0a) -+# MAGIC as specified in Python/import.c (1.5 to 2.6a1 and 3.1a0, assuming -+# that Py_UnicodeFlag is off for Python 2) - # 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n" - 0 belong 0x994e0d0a python 1.5/1.6 byte-compiled - 0 belong 0x87c60d0a python 2.0 byte-compiled -@@ -15,6 +16,8 @@ - 0 belong 0x6df20d0a python 2.4 byte-compiled - 0 belong 0xb3f20d0a python 2.5 byte-compiled - 0 belong 0xd1f20d0a python 2.6 byte-compiled -+0 belong 0x3b0c0d0a python 3.0 byte-compiled -+0 belong 0x4f0c0d0a python 3.1 byte-compiled - - - 0 string/b #!\ /usr/bin/python python script text executable diff --git a/file-5.03-delta.patch b/file-5.03-delta.patch deleted file mode 100644 index c45fd87..0000000 --- a/file-5.03-delta.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up file-5.03/magic/Magdir/filesystems.delta file-5.03/magic/Magdir/filesystems ---- file-5.03/magic/Magdir/filesystems.delta 2009-11-05 16:09:43.000000000 +0100 -+++ file-5.03/magic/Magdir/filesystems 2009-11-05 16:11:52.000000000 +0100 -@@ -1399,3 +1399,7 @@ - 0 string XFSM - >0x200 string XFSB XFS filesystem metadump image - -+#delta ISO Daniel Novotny (dnovotny@redhat.com) -+0 string DISO Delta ISO data -+>4 belong x version %d -+ -diff -up file-5.03/magic/Magdir/rpm.delta file-5.03/magic/Magdir/rpm ---- file-5.03/magic/Magdir/rpm.delta 2009-11-05 14:59:54.000000000 +0100 -+++ file-5.03/magic/Magdir/rpm 2009-11-05 15:02:43.000000000 +0100 -@@ -21,3 +21,9 @@ - >>8 beshort 11 MIPSel - >>8 beshort 12 ARM - >>10 string x %s -+ -+#delta RPM Daniel Novotny (dnovotny@redhat.com) -+0 string drpm Delta RPM -+!:mime application/x-rpm -+>12 string x %s -+ diff --git a/file-5.03-djvu.patch b/file-5.03-djvu.patch deleted file mode 100644 index 926bc9c..0000000 --- a/file-5.03-djvu.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up file-5.03/magic/Magdir/images.djvu file-5.03/magic/Magdir/images ---- file-5.03/magic/Magdir/images.djvu 2009-10-27 13:06:11.000000000 +0100 -+++ file-5.03/magic/Magdir/images 2009-10-27 13:08:25.000000000 +0100 -@@ -545,12 +545,12 @@ - # Reference: http://djvu.org/docs/DjVu3Spec.djvu - # Submitted by: Stephane Loeuillet - # Modified by (1): Abel Cheung --0 string AT&TFORM -+0 string AT&TFORM DjVu - !:mime image/vnd.djvu -->12 string DJVM DjVu multiple page document -->12 string DJVU DjVu image or single page document -->12 string DJVI DjVu shared document -->12 string THUM DjVu page thumbnails -+>12 string DJVM multiple page document -+>12 string DJVU image or single page document -+>12 string DJVI shared document -+>12 string THUM page thumbnails - - - # From Marc Espie diff --git a/file-5.03-fonts-postscript.patch b/file-5.03-fonts-postscript.patch deleted file mode 100644 index 1b2f394..0000000 --- a/file-5.03-fonts-postscript.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up file-5.03/magic/Magdir/fonts.orig file-5.03/magic/Magdir/fonts ---- file-5.03/magic/Magdir/fonts.orig 2009-06-13 10:46:47.044774639 -0400 -+++ file-5.03/magic/Magdir/fonts 2009-06-13 10:42:45.052774592 -0400 -@@ -9,6 +9,9 @@ - 0 string %!PS-AdobeFont-1. PostScript Type 1 font text - >20 string >\0 (%s) - 6 string %!PS-AdobeFont-1. PostScript Type 1 font program data -+0 string %!FontType1 PostScript Type 1 font program data -+6 string %!FontType1 PostScript Type 1 font program data -+0 string %!PS-Adobe-3.0\ Resource-Font PostScript Type 1 font text - - # X11 font files in SNF (Server Natural Format) format - 0 belong 00000004 X11 SNF font data, MSB first -@@ -58,7 +61,7 @@ - 0 string ttcf TrueType font collection data - - # Opentype font data from Avi Bercovich --0 string OTTO OpenType font data -+0 string OTTO OpenType font data - - # Gürkan Sengün , www.linuks.mine.nu - 0 string SplineFontDB: Spline Font Database diff --git a/file-5.03-ifany.patch b/file-5.03-ifany.patch deleted file mode 100644 index 84dd35f..0000000 --- a/file-5.03-ifany.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up file-5.03/magic/Magdir/lisp.ifany file-5.03/magic/Magdir/lisp ---- file-5.03/magic/Magdir/lisp.ifany 2009-07-23 15:46:03.000000000 +0200 -+++ file-5.03/magic/Magdir/lisp 2009-07-23 15:46:17.000000000 +0200 -@@ -11,8 +11,6 @@ - #>2 search/4096 !\r Lisp/Scheme program text - #>2 search/4096 \r Windows INF file - --0 search/4096 (if\ Lisp/Scheme program text --!:mime text/x-lisp - 0 search/4096 (setq\ Lisp/Scheme program text - !:mime text/x-lisp - 0 search/4096 (defvar\ Lisp/Scheme program text diff --git a/file-5.03-multilib.patch b/file-5.03-multilib.patch deleted file mode 100644 index 3782dfe..0000000 --- a/file-5.03-multilib.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up file-5.03/magic/Makefile.am.multilib file-5.03/magic/Makefile.am ---- file-5.03/magic/Makefile.am.multilib 2009-11-30 11:38:18.000000000 +0100 -+++ file-5.03/magic/Makefile.am 2009-11-30 11:47:23.000000000 +0100 -@@ -234,5 +234,7 @@ FILE_COMPILE_DEP = $(FILE_COMPILE) - endif - - ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) -- $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR) -- @mv $(MAGIC_FRAGMENT_BASE).mgc $@ -+ cat $(MAGIC_FRAGMENT_DIR)/* > all-magic -+ $(FILE_COMPILE) -C -m all-magic -+ rm all-magic -+ @mv all-magic.mgc $@ -diff -up file-5.03/magic/Makefile.in.multilib file-5.03/magic/Makefile.in ---- file-5.03/magic/Makefile.in.multilib 2009-11-30 11:38:34.000000000 +0100 -+++ file-5.03/magic/Makefile.in 2009-11-30 11:48:28.000000000 +0100 -@@ -584,8 +584,10 @@ uninstall-am: uninstall-pkgdataDATA - - - ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) -- $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR) -- @mv $(MAGIC_FRAGMENT_BASE).mgc $@ -+ cat $(MAGIC_FRAGMENT_DIR)/* > all-magic -+ $(FILE_COMPILE) -C -m all-magic -+ rm all-magic -+ @mv all-magic.mgc $@ - # 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: diff --git a/file-5.03-ppcswap.patch b/file-5.03-ppcswap.patch deleted file mode 100644 index 08f1d41..0000000 --- a/file-5.03-ppcswap.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up file-5.03/magic/Magdir/linux.ppcswap file-5.03/magic/Magdir/linux ---- file-5.03/magic/Magdir/linux.ppcswap 2009-10-21 15:48:42.000000000 +0200 -+++ file-5.03/magic/Magdir/linux 2009-10-21 15:50:09.000000000 +0200 -@@ -61,6 +61,9 @@ - >0x404 long x size %d pages - >>4086 string SWAPSPACE2 - >>>1052 string >\0 Label %s -+# From Daniel Novotny -+# swap file for PowerPC -+65526 string SWAPSPACE2 Linux/ppc swap file - # ECOFF magic for OSF/1 and Linux (only tested under Linux though) - # - # from Erik Troan (ewt@redhat.com) examining od dumps, so this diff --git a/file-5.03-xfsdump.patch b/file-5.03-xfsdump.patch deleted file mode 100644 index 77bcce7..0000000 --- a/file-5.03-xfsdump.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up file-5.03/magic/Magdir/filesystems.xfsdump file-5.03/magic/Magdir/filesystems ---- file-5.03/magic/Magdir/filesystems.xfsdump 2009-07-22 15:36:01.000000000 +0200 -+++ file-5.03/magic/Magdir/filesystems 2009-07-22 15:36:25.000000000 +0200 -@@ -1392,3 +1392,10 @@ - # dvdisaster's .ecc - # From: "Nelson A. de Oliveira" - 0 string *dvdisaster* dvdisaster error correction file -+ -+# xfs metadump image -+# mb_magic XFSM at 0; superblock magic XFSB at 1 << mb_blocklog -+# but can we do the << ? For now it's always 512 (0x200) anyway. -+0 string XFSM -+>0x200 string XFSB XFS filesystem metadump image -+ diff --git a/file-5.04-com32r.patch b/file-5.04-com32r.patch deleted file mode 100644 index c1e92aa..0000000 --- a/file-5.04-com32r.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up file-5.04/magic/Magdir/msdos.com32r file-5.04/magic/Magdir/msdos ---- file-5.04/magic/Magdir/msdos.com32r 2011-01-09 22:31:07.000000000 +0100 -+++ file-5.04/magic/Magdir/msdos 2011-01-09 23:26:32.000000000 +0100 -@@ -349,6 +349,10 @@ - # start with assembler instructions mov eax,21cd4cffh - 0 uleshort&0xc0ff 0xc0b8 - >1 lelong 0x21cd4cff COM executable (32-bit COMBOOT) -+# syslinux:doc/comboot.txt -+# A COM32R program must start with the byte sequence B8 FE 4C CD 21 (mov -+# eax,21cd4cfeh) as a magic number. -+0 string \xb8\xfe\x4c\xcd\x21 COM executable (COM32R) - 0 string \x81\xfc - >4 string \x77\x02\xcd\x20\xb9 - >>36 string UPX! FREE-DOS executable (COM), UPX compressed diff --git a/file-5.04-core-prpsinfo.patch b/file-5.04-core-prpsinfo.patch deleted file mode 100644 index a68e935..0000000 --- a/file-5.04-core-prpsinfo.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/elfclass.h b/src/elfclass.h -index 27817d0..7f3da86 100644 ---- a/src/elfclass.h -+++ b/src/elfclass.h -@@ -35,6 +35,7 @@ - switch (type) { - #ifdef ELFCORE - case ET_CORE: -+ flags |= FLAGS_IS_CORE; - if (dophn_core(ms, clazz, swap, fd, - (off_t)elf_getu(swap, elfhdr.e_phoff), - elf_getu16(swap, elfhdr.e_phnum), -diff --git a/src/readelf.c b/src/readelf.c -index 5915569..24aa28c 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -286,6 +286,7 @@ private const char os_style_names[][8] = { - #define FLAGS_DID_CORE 1 - #define FLAGS_DID_NOTE 2 - #define FLAGS_DID_CORE_STYLE 4 -+#define FLAGS_IS_CORE 8 - - private int - dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off, -@@ -676,7 +677,7 @@ core: - break; - - default: -- if (xnh_type == NT_PRPSINFO) { -+ if (xnh_type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { - size_t i, j; - unsigned char c; - /* diff --git a/file-5.04-core-trim.patch b/file-5.04-core-trim.patch deleted file mode 100644 index 731cf9c..0000000 --- a/file-5.04-core-trim.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- file-4.26.OLD/src/readelf.c 2008-07-26 17:03:55.000000000 +0200 -+++ file-4.26/src/readelf.c 2008-12-03 17:16:57.000000000 +0100 -@@ -738,6 +738,25 @@ core: - /* - * Well, that worked. - */ -+ -+ /* -+ * Try next offsets, in case this match is -+ * in the middle of a string. -+ */ -+ size_t k; -+ for (k = i + 1 ; k < NOFFSETS ; k++) { -+ if (prpsoffsets(k) >= prpsoffsets(i)) -+ continue; -+ size_t no; -+ int adjust = 1; -+ for (no = doff + prpsoffsets(k); -+ no < doff + prpsoffsets(i); no++) -+ adjust = adjust -+ && isprint(nbuf[no]); -+ if (adjust) -+ i = k; -+ } -+ - cname = (unsigned char *) - &nbuf[doff + prpsoffsets(i)]; - for (cp = cname; *cp && isprint(*cp); cp++) diff --git a/file-5.04-filesystem.patch b/file-5.04-filesystem.patch deleted file mode 100644 index cced0ba..0000000 --- a/file-5.04-filesystem.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up file-5.04/magic/Magdir/filesystems.minix file-5.04/magic/Magdir/filesystems ---- file-5.04/magic/Magdir/filesystems.minix 2010-03-11 15:26:17.000000000 +0100 -+++ file-5.04/magic/Magdir/filesystems 2010-03-11 15:28:41.000000000 +0100 -@@ -884,15 +884,19 @@ - - # Minix filesystems - Juan Cespedes - 0x410 leshort 0x137f -+!:strength / 2 - >0x402 beshort < 100 Minix filesystem, V1, %d zones - >0x1e string minix \b, bootable - 0x410 beshort 0x137f -+!:strength / 2 - >0x402 beshort < 100 Minix filesystem, V1 (big endian), %d zones - >0x1e string minix \b, bootable - 0x410 leshort 0x138f -+!:strength / 2 - >0x402 beshort < 100 Minix filesystem, V1, 30 char names, %d zones - >0x1e string minix \b, bootable - 0x410 beshort 0x138f -+!:strength / 2 - >0x402 beshort < 100 Minix filesystem, V1, 30 char names (big endian), %d zones - >0x1e string minix \b, bootable - 0x410 leshort 0x2468 diff --git a/file-5.04-gfs.patch b/file-5.04-gfs.patch deleted file mode 100644 index 50c1180..0000000 --- a/file-5.04-gfs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems -index 8d60f69..50dae60 100644 ---- a/magic/Magdir/filesystems -+++ b/magic/Magdir/filesystems -@@ -1468,9 +1468,13 @@ - - # From Eric Sandeen - # GFS2 --0x10000 belong 0x01161970 GFS2 Filesystem -->0x10024 belong x (blocksize %d, -->0x10060 string >\0 lockproto %s) -+0x10000 belong 0x01161970 -+>0x10018 belong 0x0000051d GFS1 Filesystem -+>>0x10024 belong x (blocksize %d, -+>>0x10060 string >\0 lockproto %s) -+>0x10018 belong 0x00000709 GFS2 Filesystem -+>>0x10024 belong x (blocksize %d, -+>>0x10060 string >\0 lockproto %s) - - # BTRFS - 0x10040 string _BHRfS_M BTRFS Filesystem diff --git a/file-5.04-html-regression.patch b/file-5.04-html-regression.patch deleted file mode 100644 index 9be36c9..0000000 --- a/file-5.04-html-regression.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/magic/Magdir/sgml b/magic/Magdir/sgml -index 0a57375..1dceba5 100644 ---- a/magic/Magdir/sgml -+++ b/magic/Magdir/sgml -@@ -34,21 +34,13 @@ - # HyperText Markup Language (HTML) is an SGML document type, - # from Daniel Quinlan (quinlan@yggdrasil.com) - # adapted to string extenstions by Anthon van der Neut - # often the module starts with a multiline string - 0 string """ a python script text executable --# MAGIC as specified in Python/import.c (1.5 to 2.6a1 and 3.1a0, assuming -+# MAGIC as specified in Python/import.c (1.5 to 2.7a0 and 3.1a0, assuming - # that Py_UnicodeFlag is off for Python 2) - # 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n" - 0 belong 0x994e0d0a python 1.5/1.6 byte-compiled -@@ -17,6 +17,7 @@ - 0 belong 0x6df20d0a python 2.4 byte-compiled - 0 belong 0xb3f20d0a python 2.5 byte-compiled - 0 belong 0xd1f20d0a python 2.6 byte-compiled -+0 belong 0x03f30d0a python 2.7 byte-compiled - 0 belong 0x3b0c0d0a python 3.0 byte-compiled - 0 belong 0x4f0c0d0a python 3.1 byte-compiled - diff --git a/file-5.04-retval.patch b/file-5.04-retval.patch deleted file mode 100644 index c44d335..0000000 --- a/file-5.04-retval.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up file-5.04/src/fsmagic.c.retval file-5.04/src/fsmagic.c ---- file-5.04/src/fsmagic.c.retval 2010-04-14 12:37:12.000000000 +0200 -+++ file-5.04/src/fsmagic.c 2010-04-14 12:55:50.000000000 +0200 -@@ -127,14 +127,8 @@ file_fsmagic(struct magic_set *ms, const - ret = stat(fn, sb); /* don't merge into if; see "ret =" above */ - - if (ret) { -- if (ms->flags & MAGIC_ERROR) { -- file_error(ms, errno, "cannot stat `%s'", fn); -- return -1; -- } -- if (file_printf(ms, "cannot open `%s' (%s)", -- fn, strerror(errno)) == -1) -- return -1; -- return 1; -+ file_error(ms, errno, "cannot open `%s'", fn); -+ return -1; - } - - if (!mime) { diff --git a/file-5.04-ruby-modules.patch b/file-5.04-ruby-modules.patch deleted file mode 100644 index 0f11263..0000000 --- a/file-5.04-ruby-modules.patch +++ /dev/null @@ -1,40 +0,0 @@ -From eebad924e62b678a54d3af05a12da2a929f5d918 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 5 Feb 2010 13:19:48 +0100 -Subject: [PATCH] Add matches for ruby modules - -Similar to what's already done for Perl. Existing rules only match shebangs, -which is not useful in most cases. This was tested to yield no false -positives when run against every perl and python source file I could find -on my system (260 CPAN modules and 59 Python modules). Produces a couple -of false negatives for a couple of files from 30 Ruby gems I have -installed, but is still an improvement over existing rules. (Ruby is -used to construct DSLs quite often, it would be really tricky to match -those). ---- - magic/Magdir/ruby | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -diff --git a/magic/Magdir/ruby b/magic/Magdir/ruby -index 7030295..be1786c 100644 ---- a/magic/Magdir/ruby -+++ b/magic/Magdir/ruby -@@ -14,3 +14,15 @@ - !:mime text/x-ruby - 0 search/1 #!\ /usr/bin/env\ ruby Ruby script text executable - !:mime text/x-ruby -+ -+# What looks like ruby, but does not have a shebang -+# (modules and such) -+# From: Lubomir Rintel -+0 regex \^[\ \t]*require[\ \t]'[A-Za-z_\/]+' -+>0 regex include\ [A-Z]|def\ [a-z]|\ do$ -+>>0 regex \^[\ \t]*end([\ \t]*[;#].*)?$ Ruby script text -+!:mime text/x-ruby -+0 regex \^[\ \t]*(class|module)[\ \t][A-Z] -+>0 regex (modul|includ)e\ [A-Z]|def\ [a-z] -+>>0 regex \^[\ \t]*end([\ \t]*[;#].*)?$ Ruby module source text -+!:mime text/x-ruby --- -1.6.6 - diff --git a/file-5.04-separ.patch b/file-5.04-separ.patch deleted file mode 100644 index a9dc767..0000000 --- a/file-5.04-separ.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up file-5.04/src/file.c.separ file-5.04/src/file.c ---- file-5.04/src/file.c.separ 2010-03-24 10:24:19.000000000 +0100 -+++ file-5.04/src/file.c 2010-03-24 10:24:52.000000000 +0100 -@@ -406,9 +406,8 @@ process(struct magic_set *ms, const char - if (wid > 0 && !bflag) { - (void)printf("%s", std_in ? "/dev/stdin" : inname); - if (nulsep) -- (void)putc('\0', stdout); -- else -- (void)printf("%s", separator); -+ (void)putc('\0', stdout); -+ (void)printf("%s", separator); - (void)printf("%*s ", - (int) (nopad ? 0 : (wid - file_mbswidth(inname))), ""); - } diff --git a/file-5.04-squashfs.patch b/file-5.04-squashfs.patch deleted file mode 100644 index f98971c..0000000 --- a/file-5.04-squashfs.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up file-5.04/magic/Magdir/filesystems.squashfs file-5.04/magic/Magdir/filesystems ---- file-5.04/magic/Magdir/filesystems.squashfs 2010-03-24 12:51:05.000000000 +0100 -+++ file-5.04/magic/Magdir/filesystems 2010-03-24 13:15:20.000000000 +0100 -@@ -1363,28 +1363,46 @@ - >28 beshort <3 - >>8 belong x %d bytes, - >28 beshort >2 -->>63 bequad x %lld bytes, -+>>28 beshort <4 -+>>>63 bequad x %lld bytes, -+>>28 beshort >3 -+>>>40 bequad x %lld bytes, - #>>67 belong x %d bytes, - >4 belong x %d inodes, - >28 beshort <2 - >>32 beshort x blocksize: %d bytes, - >28 beshort >1 -->>51 belong x blocksize: %d bytes, -->39 bedate x created: %s -+>>28 beshort <4 -+>>>51 belong x blocksize: %d bytes, -+>>28 beshort >3 -+>>>12 belong x blocksize: %d bytes, -+>28 beshort <4 -+>>39 bedate x created: %s -+>28 beshort >3 -+>>8 bedate x created: %s - 0 string hsqs Squashfs filesystem, little endian, - >28 leshort x version %d. - >30 leshort x \b%d, - >28 leshort <3 - >>8 lelong x %d bytes, - >28 leshort >2 -->>63 lequad x %lld bytes, -+>>28 leshort <4 -+>>>63 lequad x %lld bytes, -+>>28 leshort >3 -+>>>40 lequad x %lld bytes, - #>>63 lelong x %d bytes, - >4 lelong x %d inodes, - >28 leshort <2 - >>32 leshort x blocksize: %d bytes, - >28 leshort >1 -->>51 lelong x blocksize: %d bytes, -->39 ledate x created: %s -+>>28 leshort <4 -+>>>51 lelong x blocksize: %d bytes, -+>>28 leshort >3 -+>>>12 lelong x blocksize: %d bytes, -+>28 leshort <4 -+>>39 ledate x created: %s -+>28 leshort >3 -+>>8 ledate x created: %s - - 0 string td\000 floppy image data (TeleDisk) - diff --git a/file-5.04-string-size.patch b/file-5.04-string-size.patch deleted file mode 100644 index 79fe2df..0000000 --- a/file-5.04-string-size.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/file.h b/src/file.h -index c07f2d4..7086092 100644 ---- a/src/file.h -+++ b/src/file.h -@@ -104,11 +104,11 @@ - #define MAXMAGIS 8192 /* max entries in any one magic file - or directory */ - #define MAXDESC 64 /* max leng of text description/MIME type */ --#define MAXstring 32 /* max leng of "string" types */ -+#define MAXstring 64 /* max leng of "string" types */ - - #define MAGICNO 0xF11E041C --#define VERSIONNO 7 --#define FILE_MAGICSIZE 200 -+#define VERSIONNO 8 -+#define FILE_MAGICSIZE 232 - - #define FILE_LOAD 0 - #define FILE_CHECK 1 diff --git a/file-5.04-ulaw-segfault.patch b/file-5.04-ulaw-segfault.patch deleted file mode 100644 index 0f2fba2..0000000 --- a/file-5.04-ulaw-segfault.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up file-5.04/src/softmagic.c.segfault file-5.04/src/softmagic.c ---- file-5.04/src/softmagic.c.segfault 2009-10-19 15:10:20.000000000 +0200 -+++ file-5.04/src/softmagic.c 2010-01-28 15:28:20.000000000 +0100 -@@ -946,6 +946,7 @@ mcopy(struct magic_set *ms, union VALUET - end = last = (const char *)s + nbytes; - /* mget() guarantees buf <= last */ - for (lines = linecnt, b = buf; lines && -+ b < end && c < end && - ((b = CAST(const char *, - memchr(c = b, '\n', CAST(size_t, (end - b))))) - || (b = CAST(const char *, diff --git a/file-5.04-webm.patch b/file-5.04-webm.patch deleted file mode 100644 index f8b77ac..0000000 --- a/file-5.04-webm.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/magic/Magdir/matroska b/magic/Magdir/matroska -index 0ede715..d3d7349 100644 ---- a/magic/Magdir/matroska -+++ b/magic/Magdir/matroska -@@ -13,3 +13,11 @@ - # DocType contents: - >>8 string matroska Matroska data - !:mime video/x-matroska -+ -+# EBML id: -+0 belong 0x1a45dfa3 -+# DocType id: -+>0 search/4096 \x42\x82 -+# DocType contents: -+>>&1 string webm WebM -+!:mime video/webm diff --git a/file-5.04-zmachine-magic-update.patch b/file-5.04-zmachine-magic-update.patch deleted file mode 100644 index e5d0a42..0000000 --- a/file-5.04-zmachine-magic-update.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/magic/Magdir/adventure b/magic/Magdir/adventure -index 5087ce6..a693213 100644 ---- a/magic/Magdir/adventure -+++ b/magic/Magdir/adventure -@@ -18,17 +18,14 @@ - #------------------------------------------------------------------------------ - # Z-machine: file(1) magic for Z-machine binaries. - # --# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which --# appears to be a version-0 Z-machine binary. --# --# The (false match) message is to correct that behavior. Perhaps it is --# not needed. --# --16 belong&0xfe00f0f0 0x3030 Infocom game data -->0 ubyte 0 (false match) -->0 ubyte >0 (Z-machine %d, -->>2 ubeshort x Release %d / -->>18 string >\0 Serial %.6s) -+# The first byte is the Z-machine version number, which is always between -+# 1 and 8. -+0 ubyte >0 -+>0 ubyte <9 -+>>16 belong&0xfe00f0f0 0x3030 Infocom game data -+>>>0 ubyte >0 (Z-machine %d, -+>>>>2 ubeshort x Release %d / -+>>>>18 string >\0 Serial %.6s) - - #------------------------------------------------------------------------------ - # Glulx: file(1) magic for Glulx binaries. diff --git a/file-5.05-latex-improve.patch b/file-5.05-latex-improve.patch deleted file mode 100644 index 031d968..0000000 --- a/file-5.05-latex-improve.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/magic/Magdir/python b/magic/Magdir/python -index 51edbad..a8c31c2 100644 ---- a/magic/Magdir/python -+++ b/magic/Magdir/python -@@ -32,7 +32,7 @@ - - - # from module.submodule import func1, func2 --0 regex/b \^from\\s+(\\w|\\.)+\\s+import.*$ Python script text executable -+0 regex \^from\\s+(\\w|\\.)+\\s+import.*$ Python script text executable - !:mime text/x-python - - # def __init__ (self, ...): -diff --git a/magic/Magdir/tex b/magic/Magdir/tex -index 161a24e..9991c45 100644 ---- a/magic/Magdir/tex -+++ b/magic/Magdir/tex -@@ -37,34 +37,42 @@ - !:mime text/x-info - - # TeX documents, from Daniel Quinlan (quinlan@yggdrasil.com) --0 search/400 \\input TeX document text -+0 search/4096 \\input TeX document text - !:mime text/x-tex --0 search/400 \\section LaTeX document text -+!:strength + 15 -+0 search/4096 \\section LaTeX document text - !:mime text/x-tex --0 search/400 \\setlength LaTeX document text -+!:strength + 18 -+0 search/4096 \\setlength LaTeX document text - !:mime text/x-tex --0 search/400 \\documentstyle LaTeX document text -+!:strength + 15 -+0 search/4096 \\documentstyle LaTeX document text - !:mime text/x-tex --0 search/400 \\chapter LaTeX document text -+!:strength + 18 -+0 search/4096 \\chapter LaTeX document text - !:mime text/x-tex --0 search/400 \\documentclass LaTeX 2e document text -+!:strength + 18 -+0 search/4096 \\documentclass LaTeX 2e document text - !:mime text/x-tex --0 search/400 \\relax LaTeX auxiliary file -+!:strength + 15 -+0 search/4096 \\relax LaTeX auxiliary file - !:mime text/x-tex --0 search/400 \\contentsline LaTeX table of contents -+!:strength + 15 -+0 search/4096 \\contentsline LaTeX table of contents - !:mime text/x-tex --0 search/400 %\ -*-latex-*- LaTeX document text -+!:strength + 15 -+0 search/4096 %\ -*-latex-*- LaTeX document text - !:mime text/x-tex - - # Tex document, from Hendrik Scholz - 0 search/1 \\ifx TeX document text - - # Index and glossary files --0 search/400 \\indexentry LaTeX raw index file --0 search/400 \\begin{theindex} LaTeX sorted index --0 search/400 \\glossaryentry LaTeX raw glossary --0 search/400 \\begin{theglossary} LaTeX sorted glossary --0 search/400 This\ is\ makeindex Makeindex log file -+0 search/4096 \\indexentry LaTeX raw index file -+0 search/4096 \\begin{theindex} LaTeX sorted index -+0 search/4096 \\glossaryentry LaTeX raw glossary -+0 search/4096 \\begin{theglossary} LaTeX sorted glossary -+0 search/4096 This\ is\ makeindex Makeindex log file - - # End of TeX - diff --git a/file-5.05-python-3.2.patch b/file-5.05-python-3.2.patch deleted file mode 100644 index f1cc147..0000000 --- a/file-5.05-python-3.2.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/magic/Magdir/python b/magic/Magdir/python -index 107b091..bee1b69 100644 ---- a/magic/Magdir/python -+++ b/magic/Magdir/python -@@ -1,6 +1,6 @@ - - #------------------------------------------------------------------------------ --# $File: python,v 1.16 2010/12/31 18:15:28 christos Exp $ -+# $File: python,v 1.17 2011/02/08 13:45:15 christos Exp $ - # python: file(1) magic for python - # - # From: David Necas -@@ -20,6 +20,7 @@ - 0 belong 0x03f30d0a python 2.7 byte-compiled - 0 belong 0x3b0c0d0a python 3.0 byte-compiled - 0 belong 0x4f0c0d0a python 3.1 byte-compiled -+0 belong 0x6c0c0d0a python 3.2 byte-compiled - - 0 search/1/w #!\ /usr/bin/python Python script text executable - !:mime text/x-python diff --git a/file-5.05-python-magic.patch b/file-5.05-python-magic.patch deleted file mode 100644 index 3ced837..0000000 --- a/file-5.05-python-magic.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/python/magic.py b/python/magic.py -index 35a7182..1cfc035 100644 ---- a/python/magic.py -+++ b/python/magic.py -@@ -19,17 +19,17 @@ _libraries = {} - _libraries['magic'] = _init() - - # Flag constants for open and setflags --NONE = 0 --DEBUG = 1 --SYMLINK = 2 --COMPRESS = 4 --DEVICES = 8 --MIME_TYPE = 16 --CONTINUE = 32 --CHECK = 64 --PRESERVE_ATIME = 128 -+NONE = MAGIC_NONE = 0 -+DEBUG = MAGIC_DEBUG = 1 -+SYMLINK = MAGIC_SYMLINK = 2 -+COMPRESS = MAGIC_COMPRESS = 4 -+DEVICES = MAGIC_DEVICES = 8 -+MIME_TYPE = MAGIC_MIME = 16 -+CONTINUE = MAGIC_CONTINUE = 32 -+CHECK = MAGIC_CHECK = 64 -+PRESERVE_ATIME = MAGIC_PRESERVE_ATIME = 128 - RAW = 256 --ERROR = 512 -+ERROR = MAGIC_ERROR = 512 - MIME_ENCODING = 1024 - MIME = 1040 - APPLE = 2048 diff --git a/file.spec b/file.spec index 570f8d6..0ade6e6 100644 --- a/file.spec +++ b/file.spec @@ -4,18 +4,14 @@ Summary: A utility for determining file types Name: file -Version: 5.05 -Release: 4%{?dist} +Version: 5.07 +Release: 1%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ -# all patches are accepted by upstream Patch1: file-5.04-zip64.patch -Patch2: file-5.05-python-magic.patch -Patch3: file-5.05-latex-improve.patch -Patch4: file-5.05-rpm-archs.patch -Patch5: file-5.05-python-3.2.patch +Patch2: file-5.05-rpm-archs.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,14 +67,8 @@ file(1) command. %setup -q #fixes #637785 %patch1 -p1 -#keeps compatibility with older python-magic versions -%patch2 -p1 -#fixes #676543 -%patch3 -p1 #fixes #676041 -%patch4 -p1 -#fixes #678458 -%patch5 -p1 +%patch2 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -158,6 +148,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed May 11 2011 Jan Kaluza - 5.07-1 +- update to new upstream version 5.07 +- remove unused patches + * Tue Mar 01 2011 Jan Kaluza - 5.05-4 - fix #678458 - support for Python 3.2 compiled files