Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2016-11-28 15:02:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file" Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2016-11-02 12:27:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.file.new/file.changes 2016-11-28 15:02:48.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Nov 24 09:17:37 UTC 2016 - [email protected] + +- Update to file version 5.29 + * der getlength overflow (Jonas Wagner) + * multiple magic file load failure (Christoph Biedl) + * CDF parsing improvements (Guy Helmer) + * Add support for signed indirect offsets + * cat /dev/null | file - should print empty (Christoph Biedl) + * Bump string size from 64 to 96. + * PR/556: Fix separators on annotations. +- Remove patch file-5.28-compress.patch now upstream +- Rename patch file-5.28.dif which becomes now file-5.29.dif + +------------------------------------------------------------------- python3-magic.changes: same change Old: ---- file-5.28-compress.patch file-5.28.dif file-5.28.tar.gz New: ---- file-5.29.dif file-5.29.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -32,7 +32,7 @@ %endif # # Set Version also in python-magic.spec -Version: 5.28 +Version: 5.29 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -40,7 +40,7 @@ Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source2: baselibs.conf Source3: file-rpmlintrc -Patch: file-5.28.dif +Patch: file-5.29.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -63,7 +63,6 @@ Patch35: file-5.24-nitpick.dif Patch36: file-5.15-clear-invalid.patch Patch37: file-secure_getenv.patch -Patch38: file-5.28-compress.patch Patch39: file-5.28-btrfs-image.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -132,9 +131,7 @@ %patch35 -p0 -b .nitpick %patch36 -p1 -b .clear %patch37 -p1 -b .getenv -# PATCH-FIX-UPSTREAM -- fix crash as found in build system -%patch38 -p0 -b .rpmbuild -%patch39 -p1 -b .rpmbuild +%patch39 -p1 -b .btrfs %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -28,7 +28,7 @@ BuildRequires: python-setuptools BuildRequires: zlib-devel Url: http://www.darwinsys.com/file/ -Version: 5.28 +Version: 5.29 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause and BSD-4-Clause python3-magic.spec: same change ++++++ file-5.16-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -6,8 +6,8 @@ 4 files changed, 6 insertions(+), 6 deletions(-) --- src/apprentice.c -+++ src/apprentice.c 2016-08-16 11:47:57.766941986 +0000 -@@ -1106,7 +1106,7 @@ load_1(struct magic_set *ms, int action, ++++ src/apprentice.c 2016-11-24 09:09:50.912104836 +0000 +@@ -1102,7 +1102,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'", -@@ -2950,7 +2950,7 @@ apprentice_map(struct magic_set *ms, con +@@ -2949,7 +2949,7 @@ apprentice_map(struct magic_set *ms, con if (dbname == NULL) goto error; @@ -25,7 +25,7 @@ goto error; if (fstat(fd, &st) == -1) { -@@ -3085,7 +3085,7 @@ apprentice_compile(struct magic_set *ms, +@@ -3086,7 +3086,7 @@ apprentice_compile(struct magic_set *ms, if (dbname == NULL) goto out; @@ -35,8 +35,8 @@ file_error(ms, errno, "cannot open `%s'", dbname); goto out; --- src/compress.c -+++ src/compress.c 2016-08-16 11:47:57.766941986 +0000 -@@ -389,7 +389,7 @@ file_pipe2file(struct magic_set *ms, int ++++ src/compress.c 2016-11-24 09:09:50.912104836 +0000 +@@ -393,7 +393,7 @@ file_pipe2file(struct magic_set *ms, int #else { int te; @@ -46,8 +46,8 @@ (void)unlink(buf); errno = te; --- src/file.c -+++ src/file.c 2016-08-16 11:47:57.766941986 +0000 -@@ -467,7 +467,7 @@ unwrap(struct magic_set *ms, const char ++++ src/file.c 2016-11-24 09:09:50.912104836 +0000 +@@ -471,7 +471,7 @@ unwrap(struct magic_set *ms, const char f = stdin; wid = 1; } else { @@ -57,7 +57,7 @@ progname, fn, strerror(errno)); return 1; --- src/magic.c -+++ src/magic.c 2016-08-16 11:47:57.766941986 +0000 ++++ src/magic.c 2016-11-24 09:09:50.912104836 +0000 @@ -442,7 +442,7 @@ file_or_fd(struct magic_set *ms, const c else pos = lseek(fd, (off_t)0, SEEK_CUR); ++++++ file-5.19-biorad.dif ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -3,8 +3,8 @@ 1 file changed, 2 insertions(+) --- magic/Magdir/images -+++ magic/Magdir/images 2016-08-16 11:46:27.356644029 +0000 -@@ -996,6 +996,8 @@ ++++ magic/Magdir/images 2016-11-24 09:13:02.360240173 +0000 +@@ -1002,6 +1002,8 @@ # http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt # Samples: http://www.loci.wisc.edu/software/sample-data 14 leshort <2 ++++++ file-5.19-printf.dif ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -3,8 +3,8 @@ 1 file changed, 8 insertions(+) --- src/apprentice.c -+++ src/apprentice.c 2016-04-18 11:33:37.966264194 +0000 -@@ -2350,8 +2350,16 @@ check_format_type(const char *ptr, int t ++++ 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; ++++++ file-5.22-elf.dif ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -3,8 +3,8 @@ 1 file changed, 4 insertions(+), 2 deletions(-) --- src/readelf.c -+++ src/readelf.c 2016-04-18 11:25:34.395199288 +0000 -@@ -728,7 +728,7 @@ do_core_note(struct magic_set *ms, unsig ++++ src/readelf.c 2016-11-24 09:07:31.806925998 +0000 +@@ -742,7 +742,7 @@ do_core_note(struct magic_set *ms, unsig default: if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { @@ -13,7 +13,7 @@ unsigned char c; /* * Extract the program name. We assume -@@ -740,7 +740,9 @@ do_core_note(struct magic_set *ms, unsig +@@ -754,7 +754,9 @@ do_core_note(struct magic_set *ms, unsig * If the characters aren't all printable, * reject it. */ ++++++ file-5.23-endian.patch ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -4,7 +4,7 @@ 2 files changed, 10 insertions(+), 114 deletions(-) --- src/apprentice.c -+++ src/apprentice.c 2016-08-16 11:48:47.694001873 +0000 ++++ src/apprentice.c 2016-11-24 09:11:04.886611707 +0000 @@ -54,6 +54,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1. #if defined(HAVE_LIMITS_H) #include <limits.h> @@ -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); -@@ -3176,67 +3179,6 @@ byteswap(struct magic *magic, uint32_t n +@@ -3177,67 +3180,6 @@ byteswap(struct magic *magic, uint32_t n } /* @@ -97,8 +97,8 @@ */ private void --- src/cdf.c -+++ src/cdf.c 2016-08-16 11:48:47.694001873 +0000 -@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.82 2016 ++++ src/cdf.c 2016-11-24 09:11:04.886611707 +0000 +@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.85 2016 #ifdef HAVE_LIMITS_H #include <limits.h> #endif ++++++ file-5.24-nitpick.dif ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -4,7 +4,7 @@ 2 files changed, 10 insertions(+), 2 deletions(-) --- src/file.c -+++ src/file.c 2016-08-16 11:49:23.481327975 +0000 ++++ src/file.c 2016-11-24 09:11:40.741887920 +0000 @@ -96,10 +96,12 @@ private const struct option long_options #define OPT_MIME_ENCODING 5 #define OPT(shortname, longname, opt, def, doc) \ @@ -18,7 +18,7 @@ #undef OPT_LONGONLY {0, 0, NULL, 0} }; -@@ -617,6 +619,7 @@ docprint(const char *opts, int def) +@@ -621,6 +623,7 @@ docprint(const char *opts, int def) private void help(void) { @@ -26,7 +26,7 @@ (void)fputs( "Usage: file [OPTION...] [FILE...]\n" "Determine type of FILEs.\n" -@@ -624,11 +627,16 @@ help(void) +@@ -628,11 +631,16 @@ help(void) #define OPT(shortname, longname, opt, def, doc) \ fprintf(stdout, " -%c, --" longname, shortname), \ docprint(doc, def); @@ -44,7 +44,7 @@ fprintf(stdout, "\nReport bugs to http://bugs.gw.com/\n";); exit(0); --- src/file_opts.h -+++ src/file_opts.h 2016-08-16 11:49:23.481327975 +0000 ++++ src/file_opts.h 2016-11-24 09:11:40.741887920 +0000 @@ -36,8 +36,8 @@ OPT_LONGONLY("mime-encoding", 0, 0, " OPT('k', "keep-going", 0, 0, " don't stop at the first match\n") OPT('l', "list", 0, 0, " list magic strength\n") ++++++ file-5.28.dif -> file-5.29.dif ++++++ --- /work/SRC/openSUSE:Factory/file/file-5.28.dif 2016-08-22 10:50:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.file.new/file-5.29.dif 2016-11-28 15:02:48.000000000 +0100 @@ -10,7 +10,7 @@ 8 files changed, 311 insertions(+), 66 deletions(-) --- magic/Magdir/elf -+++ magic/Magdir/elf 2016-08-16 11:53:22.408828154 +0000 ++++ magic/Magdir/elf 2016-11-24 09:14:28.650497856 +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 2016-08-16 11:53:22.408828154 +0000 ++++ magic/Magdir/linux 2016-11-24 09:14:28.650497856 +0000 @@ -101,23 +101,27 @@ # and Nicolas Lichtmaier <[email protected]> # 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 2016-08-16 11:53:22.408828154 +0000 ++++ magic/Magdir/msad 2016-11-24 09:14:28.650497856 +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 2016-08-16 11:53:22.408828154 +0000 ++++ magic/Magdir/msdos 2016-11-24 09:14:28.650497856 +0000 @@ -104,9 +104,9 @@ >>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) >>>(0x3c.l+22) leshort&0x1000 >0 system file @@ -89,7 +89,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) --- magic/Makefile.am -+++ magic/Makefile.am 2016-08-16 11:53:22.408828154 +0000 ++++ magic/Makefile.am 2016-11-24 09:15:11.733627853 +0000 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -99,15 +99,15 @@ EXTRA_DIST = \ $(MAGIC_DIR)/Header \ -@@ -21,7 +21,6 @@ $(MAGIC_FRAGMENT_DIR)/android \ +@@ -22,7 +22,6 @@ $(MAGIC_FRAGMENT_DIR)/android \ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ $(MAGIC_FRAGMENT_DIR)/apl \ -$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ - $(MAGIC_FRAGMENT_DIR)/archive \ - $(MAGIC_FRAGMENT_DIR)/assembler \ -@@ -82,7 +81,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/apt \ +@@ -85,7 +84,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -115,7 +115,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -122,6 +120,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -125,6 +123,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -124,7 +124,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -130,7 +130,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -133,7 +133,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -132,7 +132,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -138,7 +137,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ +@@ -141,7 +140,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/macos \ @@ -140,7 +140,7 @@ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/make \ -@@ -160,10 +158,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -163,10 +161,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -152,7 +152,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -214,6 +212,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ +@@ -218,6 +216,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -161,7 +161,7 @@ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/ruby \ -@@ -285,8 +285,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ +@@ -289,8 +289,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -183,7 +183,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 -@@ -298,19 +310,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ +@@ -302,19 +314,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -223,7 +223,7 @@ +# $(FILE_COMPILE) -C -m magic +# @rm -fr magic --- magic/Makefile.in -+++ magic/Makefile.in 2016-08-16 11:53:22.408828154 +0000 ++++ magic/Makefile.in 2016-11-24 09:15:28.789283420 +0000 @@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic @@ -233,15 +233,15 @@ EXTRA_DIST = \ $(MAGIC_DIR)/Header \ $(MAGIC_DIR)/Localstuff \ -@@ -293,7 +293,6 @@ $(MAGIC_FRAGMENT_DIR)/android \ +@@ -294,7 +294,6 @@ $(MAGIC_FRAGMENT_DIR)/android \ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ $(MAGIC_FRAGMENT_DIR)/apl \ -$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ - $(MAGIC_FRAGMENT_DIR)/archive \ - $(MAGIC_FRAGMENT_DIR)/assembler \ -@@ -354,7 +353,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/apt \ +@@ -357,7 +356,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -249,7 +249,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -394,6 +392,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -397,6 +395,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -258,7 +258,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -402,7 +402,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -405,7 +405,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -266,7 +266,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -410,7 +409,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ +@@ -413,7 +412,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/macos \ @@ -274,7 +274,7 @@ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/make \ -@@ -432,10 +430,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -435,10 +433,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -286,7 +286,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -486,6 +484,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ +@@ -490,6 +488,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -295,7 +295,7 @@ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/ruby \ -@@ -557,10 +557,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ +@@ -561,10 +561,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -319,7 +319,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} -@@ -782,23 +794,25 @@ uninstall-am: uninstall-pkgdataDATA +@@ -786,23 +798,25 @@ uninstall-am: uninstall-pkgdataDATA .PRECIOUS: Makefile @@ -362,7 +362,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 2016-08-16 11:54:33.947480617 +0000 ++++ src/Makefile.am 2016-11-24 09:14:28.686497129 +0000 @@ -1,4 +1,4 @@ -MAGIC = $(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic @@ -370,7 +370,7 @@ nodist_include_HEADERS = magic.h --- src/dcore.c -+++ src/dcore.c 2016-08-16 11:53:22.424827851 +0000 ++++ src/dcore.c 2016-11-24 09:14:28.686497129 +0000 @@ -0,0 +1,207 @@ +/* + * Show goo about ELF core files ++++++ file-5.28.tar.gz -> file-5.29.tar.gz ++++++ ++++ 4162 lines of diff (skipped) ++++++ file-secure_getenv.patch ++++++ --- /var/tmp/diff_new_pack.ltRRW6/_old 2016-11-28 15:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ltRRW6/_new 2016-11-28 15:02:50.000000000 +0100 @@ -1,12 +1,12 @@ --- - file-5.28/configure.ac | 2 ++ - file-5.28/src/file.c | 2 +- - file-5.28/src/file.h | 8 ++++++++ - file-5.28/src/magic.c | 10 +++++----- + file-5.29/configure.ac | 2 ++ + file-5.29/src/file.c | 2 +- + file-5.29/src/file.h | 8 ++++++++ + file-5.29/src/magic.c | 10 +++++----- 4 files changed, 16 insertions(+), 6 deletions(-) ---- file-5.28/configure.ac -+++ file-5.28/configure.ac 2016-08-16 11:51:12.795269362 +0000 +--- file-5.29/configure.ac ++++ file-5.29/configure.ac 2016-11-24 09:13:33.451612426 +0000 @@ -97,6 +97,8 @@ AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_S #include <signal.h> #endif]) @@ -16,9 +16,9 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_OFF_T ---- file-5.28/src/file.c -+++ file-5.28/src/file.c 2016-08-16 11:51:12.795269362 +0000 -@@ -619,7 +619,7 @@ docprint(const char *opts, int def) +--- file-5.29/src/file.c ++++ file-5.29/src/file.c 2016-11-24 09:13:33.451612426 +0000 +@@ -623,7 +623,7 @@ docprint(const char *opts, int def) private void help(void) { @@ -27,8 +27,8 @@ (void)fputs( "Usage: file [OPTION...] [FILE...]\n" "Determine type of FILEs.\n" ---- file-5.28/src/file.h -+++ file-5.28/src/file.h 2016-08-16 11:51:12.795269362 +0000 +--- file-5.29/src/file.h ++++ file-5.29/src/file.h 2016-11-24 09:13:33.451612426 +0000 @@ -615,4 +615,12 @@ static const char *rcsid(const char *p) #define __RCSID(a) #endif @@ -42,8 +42,8 @@ +#endif + #endif /* __file_h__ */ ---- file-5.28/src/magic.c -+++ file-5.28/src/magic.c 2016-08-16 11:51:12.795269362 +0000 +--- file-5.29/src/magic.c ++++ file-5.29/src/magic.c 2016-11-24 09:13:33.451612426 +0000 @@ -185,7 +185,7 @@ get_default_magic(void) free(default_magic); default_magic = NULL;
