diff --git a/file-4.24-autoconf.dif b/file-4.24-autoconf.dif index 73d1f92..28161b6 100644 --- a/file-4.24-autoconf.dif +++ b/file-4.24-autoconf.dif @@ -4,7 +4,7 @@ 2 files changed, 8 insertions(+), 2 deletions(-) --- doc/Makefile.am -+++ doc/Makefile.am 2016-08-16 11:45:43.001478793 +0000 ++++ doc/Makefile.am 2017-05-24 10:58:47.226494450 +0000 @@ -5,7 +5,8 @@ else man_MAGIC = magic.4 endif @@ -26,7 +26,7 @@ sed -e s@__CSECTION__@1@g \ -e s@__FSECTION__@${fsect}@g \ --- src/readelf.h -+++ src/readelf.h 2016-08-16 11:45:43.001478793 +0000 ++++ src/readelf.h 2017-05-24 10:58:47.226494450 +0000 @@ -34,7 +34,10 @@ #ifndef __fake_elf_h__ #define __fake_elf_h__ @@ -38,7 +38,7 @@ #include #endif -@@ -398,4 +401,5 @@ typedef struct { +@@ -430,4 +433,5 @@ typedef struct { #define AV_386_SSE4_1 0x00800000 #define AV_386_SSE4_2 0x01000000 diff --git a/file-5.14-tex.dif b/file-5.14-tex.dif index ea28be6..663b0ed 100644 --- a/file-5.14-tex.dif +++ b/file-5.14-tex.dif @@ -1,7 +1,7 @@ --- magic/Localstuff +++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000 @@ -5,3 +5,12 @@ - # $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ + # $File: Localstuff,v 1.5 2007/01/12 17:38:27 christos Exp $ # Add any locally observed files here. Remember: # text if readable, executable if runnable binary, data if unreadable. + diff --git a/file-5.16-ocloexec.patch b/file-5.16-ocloexec.patch index 2786448..2648aad 100644 --- a/file-5.16-ocloexec.patch +++ b/file-5.16-ocloexec.patch @@ -6,8 +6,8 @@ 4 files changed, 6 insertions(+), 6 deletions(-) --- src/apprentice.c -+++ src/apprentice.c 2017-03-02 13:18:27.595290990 +0000 -@@ -1102,7 +1102,7 @@ load_1(struct magic_set *ms, int action, ++++ src/apprentice.c 2017-05-24 11:06:21.590079956 +0000 +@@ -1104,7 +1104,7 @@ load_1(struct magic_set *ms, int action, ssize_t len; struct magic_entry me; @@ -16,7 +16,7 @@ if (f == NULL) { if (errno != ENOENT) file_error(ms, errno, "cannot read magic file `%s'", -@@ -2949,7 +2949,7 @@ apprentice_map(struct magic_set *ms, con +@@ -2953,7 +2953,7 @@ apprentice_map(struct magic_set *ms, con if (dbname == NULL) goto error; @@ -25,7 +25,7 @@ goto error; if (fstat(fd, &st) == -1) { -@@ -3086,7 +3086,7 @@ apprentice_compile(struct magic_set *ms, +@@ -3090,7 +3090,7 @@ apprentice_compile(struct magic_set *ms, if (dbname == NULL) goto out; @@ -35,7 +35,7 @@ file_error(ms, errno, "cannot open `%s'", dbname); goto out; --- src/compress.c -+++ src/compress.c 2017-03-02 13:18:27.595290990 +0000 ++++ src/compress.c 2017-05-24 11:06:21.590079956 +0000 @@ -394,7 +394,7 @@ file_pipe2file(struct magic_set *ms, int #else { @@ -46,7 +46,7 @@ (void)unlink(buf); errno = te; --- src/file.c -+++ src/file.c 2017-03-02 13:18:27.595290990 +0000 ++++ src/file.c 2017-05-24 11:06:21.590079956 +0000 @@ -471,7 +471,7 @@ unwrap(struct magic_set *ms, const char f = stdin; wid = 1; @@ -57,7 +57,7 @@ progname, fn, strerror(errno)); return 1; --- src/magic.c -+++ src/magic.c 2017-03-02 13:18:27.595290990 +0000 ++++ src/magic.c 2017-05-24 11:06:21.590079956 +0000 @@ -442,7 +442,7 @@ file_or_fd(struct magic_set *ms, const c else pos = lseek(fd, (off_t)0, SEEK_CUR); diff --git a/file-5.19-printf.dif b/file-5.19-printf.dif index 3ea28fc..f394e31 100644 --- a/file-5.19-printf.dif +++ b/file-5.19-printf.dif @@ -1,23 +1,19 @@ --- - src/apprentice.c | 8 ++++++++ - 1 file changed, 8 insertions(+) + src/apprentice.c | 6 ++++++ + 1 file changed, 6 insertions(+) --- src/apprentice.c -+++ src/apprentice.c 2016-11-24 09:08:42.209492732 +0000 -@@ -2348,8 +2348,16 @@ check_format_type(const char *ptr, int t - } - } else - h = 0; -+ if (*ptr == '#') -+ ptr++; ++++ src/apprentice.c 2017-05-24 11:04:53.931691878 +0000 +@@ -2358,6 +2358,12 @@ check_format_type(const char *ptr, int t + ptr++; + if (*ptr == '#') + ptr++; + if (*ptr == ' ') + ptr++; - if (*ptr == '-') - ptr++; + if (*ptr == '+') + ptr++; + if (*ptr == '\'') + ptr++; - if (*ptr == '.') - ptr++; #define CHECKLEN() do { \ + for (len = cnt = 0; isdigit((unsigned char)*ptr); ptr++, cnt++) \ + len = len * 10 + (*ptr - '0'); \ diff --git a/file-5.23-endian.patch b/file-5.23-endian.patch index 3e54648..0619daf 100644 --- a/file-5.23-endian.patch +++ b/file-5.23-endian.patch @@ -1,10 +1,10 @@ --- src/apprentice.c | 70 ++++--------------------------------------------------- - src/cdf.c | 54 +++--------------------------------------- - 2 files changed, 10 insertions(+), 114 deletions(-) + src/cdf.c | 53 +++-------------------------------------- + 2 files changed, 10 insertions(+), 113 deletions(-) --- src/apprentice.c -+++ src/apprentice.c 2016-11-24 09:11:04.886611707 +0000 ++++ src/apprentice.c 2017-05-24 11:06:41.689710213 +0000 @@ -54,6 +54,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1. #if defined(HAVE_LIMITS_H) #include @@ -28,7 +28,7 @@ private char *mkdbname(struct magic_set *, const char *, int); private struct magic_map *apprentice_buf(struct magic_set *, struct magic *, size_t); -@@ -3177,67 +3180,6 @@ byteswap(struct magic *magic, uint32_t n +@@ -3181,67 +3184,6 @@ byteswap(struct magic *magic, uint32_t n } /* @@ -97,8 +97,8 @@ */ private void --- src/cdf.c -+++ src/cdf.c 2016-11-24 09:11:04.886611707 +0000 -@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.85 2016 ++++ src/cdf.c 2017-05-24 11:08:39.095549469 +0000 +@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.106 201 #ifdef HAVE_LIMITS_H #include #endif @@ -106,11 +106,10 @@ #ifndef EFTYPE #define EFTYPE EINVAL -@@ -80,56 +81,9 @@ static union { - CDF_TOLE8(CAST(uint64_t, x)))) - #define CDF_GETUINT32(x, y) cdf_getuint32(x, y) +@@ -109,55 +110,9 @@ cdf_calloc(const char *file __attribute_ + return calloc(n, u); + } -- -/* - * swap a short - */ @@ -160,9 +159,9 @@ - d[7] = s[0]; - return rv; -} -+#define _cdf_tole2(x) bswap_16(x) -+#define _cdf_tole4(x) bswap_32(x) -+#define _cdf_tole8(x) bswap_64(x) ++#define _cdf_tole2(x) bswap_16(x) ++#define _cdf_tole4(x) bswap_32(x) ++#define _cdf_tole8(x) bswap_64(x) /* * grab a uint32_t from a possibly unaligned address, and return it in diff --git a/file-5.30-150735.patch b/file-5.30-150735.patch deleted file mode 100644 index 5141752..0000000 --- a/file-5.30-150735.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1507352bc5cbdebaa9f64f1c73876ec9d8a638bc Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 14 Feb 2017 12:56:48 +0000 -Subject: [PATCH] keep "[not] stripped" last since some scripts expect it to be - there. - ---- - src/readelf.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/readelf.c b/src/readelf.c -index d1b71cf..3695c89 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -1373,12 +1373,12 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, - } - } - -- if (file_printf(ms, ", %sstripped", stripped ? "" : "not ") == -1) -- return -1; - if (has_debug_info) { - if (file_printf(ms, ", with debug_info") == -1) - return -1; - } -+ if (file_printf(ms, ", %sstripped", stripped ? "" : "not ") == -1) -+ return -1; - if (cap_hw1) { - const cap_desc_t *cdp; - switch (mach) { diff --git a/file-5.30-3c60e5.patch b/file-5.30-3c60e5.patch deleted file mode 100644 index 417534a..0000000 --- a/file-5.30-3c60e5.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3c60e59aee7425ba599d208678b62efa9a4a1d3f Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 21 Feb 2017 18:34:55 +0000 -Subject: [PATCH] bump perl to exceed 'c' - ---- - magic/Magdir/perl | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/magic/Magdir/perl b/magic/Magdir/perl -index bbe10ba..3423b5c 100644 ---- a/magic/Magdir/perl -+++ b/magic/Magdir/perl -@@ -33,14 +33,14 @@ - - # by Dmitry V. Levin and Alexey Tourbin - # check the first line --0 search/1024 package -+0 search/8192 package - >0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *; Perl5 module source text --!:strength + 10 -+!:strength + 40 - # not 'p', check other lines --0 search/1024 !p -+0 search/8192 !p - >0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *; - >>0 regex \^1\ *;|\^(use|sub|my)\ .*[(;{=] Perl5 module source text --!:strength + 10 -+!:strength + 75 - - # Perl POD documents - # From: Tom Hukins diff --git a/file-5.30.tar.gz b/file-5.30.tar.gz deleted file mode 100644 index 6f6f32d..0000000 --- a/file-5.30.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 -size 789345 diff --git a/file-5.30.dif b/file-5.31.dif similarity index 91% rename from file-5.30.dif rename to file-5.31.dif index 3ea14b5..1e44faa 100644 --- a/file-5.30.dif +++ b/file-5.31.dif @@ -10,7 +10,7 @@ 8 files changed, 312 insertions(+), 67 deletions(-) --- magic/Magdir/elf -+++ magic/Magdir/elf 2017-03-02 13:21:26.971933119 +0000 ++++ magic/Magdir/elf 2017-05-24 11:09:26.622674297 +0000 @@ -128,7 +128,7 @@ >18 leshort 47 Renesas H8/300H, >18 leshort 48 Renesas H8S, @@ -21,7 +21,7 @@ >18 leshort 52 Motorola Coldfire, >18 leshort 53 Motorola M68HC12, --- magic/Magdir/linux -+++ magic/Magdir/linux 2017-03-02 13:21:26.971933119 +0000 ++++ magic/Magdir/linux 2017-05-24 11:09:26.622674297 +0000 @@ -101,23 +101,27 @@ # and Nicolas Lichtmaier # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 @@ -67,7 +67,7 @@ 0 belong 0xb8c0078e Linux kernel >0x1e3 string Loading version 1.3.79 or older --- magic/Magdir/msad -+++ magic/Magdir/msad 2017-03-02 13:21:26.971933119 +0000 ++++ magic/Magdir/msad 2017-05-24 11:09:26.626674222 +0000 @@ -0,0 +1,5 @@ +#------------------------------------------------------------------------------ +# msad: file(1) magic for msad @@ -75,7 +75,7 @@ +# This must precede the heuristic for raw G3 data +4 string Standard\ Jet\ DB Microsoft Access Database --- magic/Magdir/msdos -+++ magic/Magdir/msdos 2017-03-02 13:21:26.971933119 +0000 ++++ magic/Magdir/msdos 2017-05-24 11:09:26.626674222 +0000 @@ -104,9 +104,9 @@ >>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) >>>(0x3c.l+22) leshort&0x1000 >0 system file @@ -88,7 +88,7 @@ # 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) -@@ -458,7 +458,7 @@ +@@ -473,7 +473,7 @@ # negative offset, must not lead into PSP >1 short <-259 # that offset must be accessible @@ -98,7 +98,7 @@ # updated by Joerg Jenderek at Oct 2008,2015 --- magic/Makefile.am -+++ magic/Makefile.am 2017-03-02 13:21:26.971933119 +0000 ++++ magic/Makefile.am 2017-05-24 11:10:19.821694359 +0000 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -108,15 +108,15 @@ EXTRA_DIST = \ $(MAGIC_DIR)/Header \ -@@ -22,7 +22,6 @@ $(MAGIC_FRAGMENT_DIR)/android \ - $(MAGIC_FRAGMENT_DIR)/animation \ +@@ -23,7 +23,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ + $(MAGIC_FRAGMENT_DIR)/apache \ $(MAGIC_FRAGMENT_DIR)/apl \ -$(MAGIC_FRAGMENT_DIR)/apple \ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -85,7 +84,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ +@@ -86,7 +85,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -124,7 +124,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -126,6 +124,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -127,6 +125,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -133,7 +133,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -134,7 +134,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -135,7 +135,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -141,7 +141,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -142,7 +141,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ +@@ -143,7 +142,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/macos \ @@ -149,7 +149,7 @@ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/make \ -@@ -164,10 +162,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -165,10 +163,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -161,7 +161,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -219,6 +217,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ +@@ -220,6 +218,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -170,7 +170,7 @@ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/ruby \ -@@ -291,8 +291,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ +@@ -293,8 +293,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -192,7 +192,7 @@ # 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 -@@ -304,19 +316,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ +@@ -306,19 +318,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -232,7 +232,7 @@ +# $(FILE_COMPILE) -C -m magic +# @rm -fr magic --- magic/Makefile.in -+++ magic/Makefile.in 2017-03-02 13:21:26.971933119 +0000 ++++ magic/Makefile.in 2017-05-24 11:10:33.469442910 +0000 @@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic @@ -242,15 +242,15 @@ EXTRA_DIST = \ $(MAGIC_DIR)/Header \ $(MAGIC_DIR)/Localstuff \ -@@ -294,7 +294,6 @@ $(MAGIC_FRAGMENT_DIR)/android \ - $(MAGIC_FRAGMENT_DIR)/animation \ +@@ -295,7 +295,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ + $(MAGIC_FRAGMENT_DIR)/apache \ $(MAGIC_FRAGMENT_DIR)/apl \ -$(MAGIC_FRAGMENT_DIR)/apple \ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -357,7 +356,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ +@@ -358,7 +357,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -258,7 +258,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -398,6 +396,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -399,6 +397,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -267,7 +267,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -406,7 +406,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -407,7 +407,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -275,7 +275,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -414,7 +413,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ +@@ -415,7 +414,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/macos \ @@ -283,7 +283,7 @@ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/make \ -@@ -436,10 +434,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -437,10 +435,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -295,7 +295,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -491,6 +489,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ +@@ -492,6 +490,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -304,7 +304,7 @@ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/ruby \ -@@ -563,10 +563,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ +@@ -565,10 +565,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -328,7 +328,7 @@ # 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${EXEEXT} -@@ -788,23 +800,25 @@ uninstall-am: uninstall-pkgdataDATA +@@ -790,23 +802,25 @@ uninstall-am: uninstall-pkgdataDATA .PRECIOUS: Makefile @@ -371,7 +371,7 @@ # 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. --- src/Makefile.am -+++ src/Makefile.am 2017-03-02 13:21:26.991932745 +0000 ++++ src/Makefile.am 2017-05-24 11:09:26.662673560 +0000 @@ -1,4 +1,4 @@ -MAGIC = $(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic @@ -379,7 +379,7 @@ nodist_include_HEADERS = magic.h --- src/dcore.c -+++ src/dcore.c 2017-03-02 13:21:26.991932745 +0000 ++++ src/dcore.c 2017-05-24 11:09:26.662673560 +0000 @@ -0,0 +1,207 @@ +/* + * Show goo about ELF core files diff --git a/file-5.31.tar.gz b/file-5.31.tar.gz new file mode 100644 index 0000000..c838c82 --- /dev/null +++ b/file-5.31.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09c588dac9cff4baa054f51a36141793bcf64926edc909594111ceae60fce4ee +size 791572 diff --git a/file.changes b/file.changes index 74c7b04..b29bb40 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed May 24 10:54:28 UTC 2017 - werner@suse.de + +- Update to file version 5.31 + * remove trailing spaces from magic files + * refactor is_tar + * better bounds checks for cdf +- Remove patches now upstream + * file-5.30-150735.patch + * file-5.30-3c60e5.patch +- Rename patch file-5.30.dif which becomes file-5.31.dif +- Modify the patches + * file-4.24-autoconf.dif + * file-5.14-tex.dif + * file-5.16-ocloexec.patch + * file-5.19-printf.dif + * file-5.23-endian.patch + ------------------------------------------------------------------- Thu Mar 2 13:22:39 UTC 2017 - werner@suse.de diff --git a/file.spec b/file.spec index 13ba6ec..89d6c27 100644 --- a/file.spec +++ b/file.spec @@ -32,7 +32,7 @@ Obsoletes: file-64bit %endif # # Set Version also in python-magic.spec -Version: 5.30 +Version: 5.31 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -40,7 +40,7 @@ Group: Productivity/File utilities Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source2: baselibs.conf Source3: file-rpmlintrc -Patch: file-5.30.dif +Patch: file-5.31.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -64,9 +64,6 @@ Patch35: file-5.24-nitpick.dif Patch36: file-5.15-clear-invalid.patch Patch37: file-secure_getenv.patch Patch39: file-5.28-btrfs-image.dif -# upstream fixes -Patch40: file-5.30-150735.patch -Patch41: file-5.30-3c60e5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -112,8 +109,6 @@ to develop applications that require the magic "file" interface. %prep %setup -q -n file-%{version} -%patch40 -p1 -b .p40 -%patch41 -p1 -b .p41 %patch1 -p0 -b .misc %patch4 -p0 -b .conf %patch5 -p0 -b .tex diff --git a/python-magic.spec b/python-magic.spec index 4179511..a715edf 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -28,7 +28,7 @@ BuildRequires: python-devel BuildRequires: python-setuptools BuildRequires: zlib-devel Url: http://www.darwinsys.com/file/ -Version: 5.30 +Version: 5.31 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause and BSD-4-Clause diff --git a/python3-magic.spec b/python3-magic.spec index ddd6e1f..0099201 100644 --- a/python3-magic.spec +++ b/python3-magic.spec @@ -28,7 +28,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: zlib-devel Url: http://www.darwinsys.com/file/ -Version: 5.30 +Version: 5.31 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause and BSD-4-Clause