Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2019-06-12 13:02:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file" Wed Jun 12 13:02:13 2019 rev:112 rq:706185 version:5.37 Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2019-02-26 22:13:38.910248164 +0100 +++ /work/SRC/openSUSE:Factory/.file.new.4811/file.changes 2019-06-12 13:02:15.593285430 +0200 @@ -1,0 +2,30 @@ +Mon May 27 09:26:52 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Update to file version 5.37 + * Make sure that continuation separators are printed + with -k within softmagic + * Change SIGPIPE saving and restoring during compression to use + sigaction(2) instead of signal(3) and cache it. (Denys Vlasenko) + * Cache stat(2) calls more to reduce number of calls (Denys Vlasenko) + * PR/77: Handle --mime-type and -k correctly. + * Switch decompression code to use vfork() because + tools like rpmdiff and rpmbuild call libmagic + with large process footprints (Denys Vlasenko) + * PR/75: --enable-zlib, did not work. + * Improve regex efficiency (Michael Schroeder) by: + 1. Prefixing regex searches with regular search + for keywords where possible + 2. Using memmem(3) where available +- Modify the patches + * file-5.12-zip.dif + * file-5.16-ocloexec.patch + * file-5.17-option.dif + * file-5.19-biorad.dif + * file-5.19-zip2.0.dif + * file-5.22-elf.dif + * file-5.24-nitpick.dif + * file-5.28-btrfs-image.dif + * file-secure_getenv.patch +- Modify and rename patch file-5.36.dif which becomes file-5.37.dif + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/file/python-magic.changes 2019-02-26 22:13:38.954248148 +0100 +++ /work/SRC/openSUSE:Factory/.file.new.4811/python-magic.changes 2019-06-12 13:02:15.637285411 +0200 @@ -1,0 +2,5 @@ +Wed May 29 06:08:37 UTC 2019 - Dr. Werner Fink <[email protected]> + +- - Correct version of file which is now 5.37 + +------------------------------------------------------------------- Old: ---- file-5.36.dif file-5.36.tar.gz file-5.36.tar.gz.asc New: ---- file-5.37.dif file-5.37.tar.gz file-5.37.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.589285011 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.593285009 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -30,7 +30,7 @@ %endif # # Set Version also in python-magic.spec -Version: 5.36 +Version: 5.37 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -40,7 +40,7 @@ Source3: file-rpmlintrc Source4: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc Source5: file.keyring -Patch: file-5.36.dif +Patch: file-5.37.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.621284998 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.621284998 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -28,7 +28,7 @@ BuildRequires: python-rpm-macros BuildRequires: zlib-devel Url: http://www.darwinsys.com/file/ -Version: 5.36 +Version: 5.37 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause AND BSD-4-Clause ++++++ file-5.12-zip.dif ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.665284979 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.665284979 +0200 @@ -3,11 +3,11 @@ 1 file changed, 19 insertions(+) --- magic/Magdir/archive -+++ magic/Magdir/archive 2019-02-21 06:46:47.000750101 +0000 -@@ -1044,6 +1044,25 @@ - !:ext zip/cbz ++++ magic/Magdir/archive 2019-05-27 08:45:06.163107524 +0000 +@@ -1072,6 +1072,25 @@ !:strength +1 0 string PK\003\004 + !:strength +1 +>30 ubelong !0x6d696d65 +>>4 byte 0x00 Zip archive data +!:mime application/zip ++++++ file-5.16-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.681284972 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.685284970 +0200 @@ -6,7 +6,7 @@ 4 files changed, 6 insertions(+), 6 deletions(-) --- src/apprentice.c -+++ src/apprentice.c 2019-02-21 06:49:57.677147690 +0000 ++++ src/apprentice.c 2019-05-27 08:53:31.057488035 +0000 @@ -1154,7 +1154,7 @@ load_1(struct magic_set *ms, int action, ssize_t len; struct magic_entry me; @@ -35,8 +35,8 @@ file_error(ms, errno, "cannot open `%s'", dbname); goto out; --- src/compress.c -+++ src/compress.c 2019-02-21 06:51:15.447677279 +0000 -@@ -423,7 +423,7 @@ file_pipe2file(struct magic_set *ms, int ++++ src/compress.c 2019-05-27 08:53:31.057488035 +0000 +@@ -435,7 +435,7 @@ file_pipe2file(struct magic_set *ms, int { int te; mode_t ou = umask(0); @@ -46,8 +46,8 @@ te = errno; (void)unlink(buf); --- src/file.c -+++ src/file.c 2019-02-21 06:49:57.681147615 +0000 -@@ -500,7 +500,7 @@ unwrap(struct magic_set *ms, const char ++++ src/file.c 2019-05-27 08:53:31.057488035 +0000 +@@ -498,7 +498,7 @@ unwrap(struct magic_set *ms, const char f = stdin; wid = 1; } else { @@ -57,8 +57,8 @@ return 1; } --- src/magic.c -+++ src/magic.c 2019-02-21 06:49:57.681147615 +0000 -@@ -435,7 +435,7 @@ file_or_fd(struct magic_set *ms, const c ++++ src/magic.c 2019-05-27 09:00:04.010005617 +0000 +@@ -436,7 +436,7 @@ file_or_fd(struct magic_set *ms, const c _setmode(STDIN_FILENO, O_BINARY); #endif if (inname != NULL) { @@ -66,4 +66,4 @@ + int flags = O_RDONLY|O_BINARY|O_NONBLOCK|O_CLOEXEC; errno = 0; if ((fd = open(inname, flags)) < 0) { - int okstat = stat(inname, &sb) == 0; + okstat = stat(inname, &sb) == 0; ++++++ file-5.17-option.dif ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.693284967 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.693284967 +0200 @@ -3,17 +3,17 @@ 1 file changed, 7 insertions(+), 1 deletion(-) --- src/file.c -+++ src/file.c 2018-06-12 14:16:45.847489541 +0000 -@@ -244,6 +244,8 @@ main(int argc, char *argv[]) ++++ src/file.c 2019-05-27 08:48:39.047051545 +0000 +@@ -242,6 +242,8 @@ main(int argc, char *argv[]) flags |= MAGIC_ERROR; break; case 'e': + if (!optarg) + usage(); - for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++) + for (i = 0; i < __arraycount(nv); i++) if (strcmp(nv[i].name, optarg) == 0) break; -@@ -255,7 +257,7 @@ main(int argc, char *argv[]) +@@ -253,7 +255,7 @@ main(int argc, char *argv[]) break; case 'f': @@ -22,7 +22,7 @@ usage(); if (magic == NULL) if ((magic = load(magicfile, flags)) == NULL) -@@ -265,6 +267,8 @@ main(int argc, char *argv[]) +@@ -263,6 +265,8 @@ main(int argc, char *argv[]) ++didsomefiles; break; case 'F': @@ -31,7 +31,7 @@ separator = optarg; break; case 'i': -@@ -277,6 +281,8 @@ main(int argc, char *argv[]) +@@ -275,6 +279,8 @@ main(int argc, char *argv[]) action = FILE_LIST; break; case 'm': ++++++ file-5.19-biorad.dif ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.713284958 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.713284958 +0200 @@ -3,10 +3,10 @@ 1 file changed, 2 insertions(+) --- magic/Magdir/images -+++ magic/Magdir/images 2018-06-12 14:20:39.967297749 +0000 -@@ -1026,6 +1026,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 ++++ magic/Magdir/images 2019-05-27 08:52:51.674238380 +0000 +@@ -1028,6 +1028,8 @@ + # https://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt + # Samples: https://www.loci.wisc.edu/software/sample-data 14 leshort <2 +>4 leshort >0 +>49 byte 0 ++++++ file-5.19-zip2.0.dif ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.737284948 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.741284947 +0200 @@ -4,7 +4,7 @@ --- magic/Magdir/archive +++ magic/Magdir/archive 2019-02-21 06:49:05.298138025 +0000 -@@ -1037,6 +1037,11 @@ +@@ -1064,6 +1064,11 @@ 0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract !:mime application/zip !:ext zip/cbz ++++++ file-5.22-elf.dif ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.749284944 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.753284942 +0200 @@ -4,7 +4,7 @@ --- src/readelf.c +++ src/readelf.c 2019-02-21 06:41:38.598573505 +0000 -@@ -805,7 +805,7 @@ do_core_note(struct magic_set *ms, unsig +@@ -810,7 +810,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 -@@ -817,7 +817,9 @@ do_core_note(struct magic_set *ms, unsig +@@ -822,7 +822,9 @@ do_core_note(struct magic_set *ms, unsig * If the characters aren't all printable, * reject it. */ ++++++ file-5.24-nitpick.dif ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.765284937 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.773284934 +0200 @@ -18,7 +18,7 @@ #undef OPT_LONGONLY {0, 0, NULL, 0} }; -@@ -649,6 +651,7 @@ docprint(const char *opts, int def) +@@ -647,6 +649,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" -@@ -656,11 +659,16 @@ help(void) +@@ -654,11 +657,16 @@ help(void) #define OPT(shortname, longname, opt, def, doc) \ fprintf(stdout, " -%c, --" longname, shortname), \ docprint(doc, def); ++++++ file-5.28-btrfs-image.dif ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:16.789284926 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:16.789284926 +0200 @@ -16,7 +16,7 @@ diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems --- a/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems -@@ -2270,20 +2270,29 @@ +@@ -2291,20 +2291,29 @@ >>0x10060 string >\0 lockproto %s) # Russell Coker <[email protected]> ++++++ file-5.36.dif -> file-5.37.dif ++++++ --- /work/SRC/openSUSE:Factory/file/file-5.36.dif 2019-02-26 22:13:36.546248994 +0100 +++ /work/SRC/openSUSE:Factory/.file.new.4811/file-5.37.dif 2019-06-12 13:02:15.265285568 +0200 @@ -10,7 +10,7 @@ 8 files changed, 312 insertions(+), 67 deletions(-) --- magic/Magdir/elf -+++ magic/Magdir/elf 2019-02-21 07:07:41.093015260 +0000 ++++ magic/Magdir/elf 2019-05-27 09:12:24.240057311 +0000 @@ -135,7 +135,7 @@ >18 leshort 47 Renesas H8/300H, >18 leshort 48 Renesas H8S, @@ -21,14 +21,18 @@ >18 leshort 52 Motorola Coldfire, >18 leshort 53 Motorola M68HC12, --- magic/Magdir/linux -+++ magic/Magdir/linux 2019-02-21 07:07:41.093015260 +0000 -@@ -111,23 +111,27 @@ - # and Nicolas Lichtmaier <[email protected]> ++++ magic/Magdir/linux 2019-05-27 09:16:20.143608597 +0000 +@@ -112,27 +112,31 @@ # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 # Linux kernel boot images (i386 arch) (Wolfram Kleff) + # URL: https://www.kernel.org/doc/Documentation/x86/boot.txt -514 string HdrS Linux kernel +514 string HdrS Linux !:strength + 55 + # often no extension like in linux, vmlinuz, bzimage or memdisk but sometimes + # Acronis Recovery kernel64.dat and Plop Boot Manager plpbtrom.bin + # DamnSmallLinux 1.5 damnsmll.lnx + !:ext /dat/bin/lnx ->510 leshort 0xAA55 x86 boot executable ->>518 leshort >0x1ff ->>>529 byte 0 zImage, @@ -67,7 +71,7 @@ 0 belong 0xb8c0078e Linux kernel >0x1e3 string Loading version 1.3.79 or older --- magic/Magdir/msad -+++ magic/Magdir/msad 2019-02-21 07:07:41.093015260 +0000 ++++ magic/Magdir/msad 2019-05-27 09:12:24.240057311 +0000 @@ -0,0 +1,5 @@ +#------------------------------------------------------------------------------ +# msad: file(1) magic for msad @@ -75,7 +79,7 @@ +# This must precede the heuristic for raw G3 data +4 string Standard\ Jet\ DB Microsoft Access Database --- magic/Magdir/msdos -+++ magic/Magdir/msdos 2019-02-21 07:07:41.097015184 +0000 ++++ magic/Magdir/msdos 2019-05-27 09:12:24.240057311 +0000 @@ -135,9 +135,9 @@ >>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) >>>(0x3c.l+22) leshort&0x1000 >0 system file @@ -98,7 +102,7 @@ # updated by Joerg Jenderek at Oct 2008,2015 --- magic/Makefile.am -+++ magic/Makefile.am 2019-02-21 07:08:08.552495225 +0000 ++++ magic/Makefile.am 2019-05-27 09:18:21.205329508 +0000 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -116,7 +120,7 @@ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -93,7 +92,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ +@@ -94,7 +93,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -124,7 +128,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -137,6 +135,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -138,6 +136,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -133,7 +137,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -146,7 +146,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -147,14 +147,12 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -141,15 +145,14 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -154,7 +153,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ - $(MAGIC_FRAGMENT_DIR)/macos \ -$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ - $(MAGIC_FRAGMENT_DIR)/make \ -@@ -177,10 +175,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -178,10 +176,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -159,9 +162,9 @@ $(MAGIC_FRAGMENT_DIR)/msdos \ +$(MAGIC_FRAGMENT_DIR)/modem \ $(MAGIC_FRAGMENT_DIR)/msooxml \ - $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -232,6 +230,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/msx \ +@@ -234,6 +232,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -169,8 +172,8 @@ +$(MAGIC_FRAGMENT_DIR)/macintosh \ $(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpm \ - $(MAGIC_FRAGMENT_DIR)/rtf \ -@@ -308,8 +308,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/rpmsg \ +@@ -311,8 +311,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zip \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -192,7 +195,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 -@@ -321,19 +333,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ +@@ -324,19 +336,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -232,7 +235,7 @@ +# $(FILE_COMPILE) -C -m magic +# @rm -fr magic --- magic/Makefile.in -+++ magic/Makefile.in 2019-02-21 07:07:58.924677558 +0000 ++++ magic/Makefile.in 2019-05-27 09:19:14.804321308 +0000 @@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic @@ -250,7 +253,7 @@ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -365,7 +364,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ +@@ -366,7 +365,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -258,7 +261,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -409,6 +407,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -410,6 +408,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -267,7 +270,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -418,7 +418,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -419,14 +419,12 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -275,15 +278,14 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -426,7 +425,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ - $(MAGIC_FRAGMENT_DIR)/macos \ -$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ - $(MAGIC_FRAGMENT_DIR)/make \ -@@ -449,10 +447,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -450,10 +448,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -293,9 +295,9 @@ $(MAGIC_FRAGMENT_DIR)/msdos \ +$(MAGIC_FRAGMENT_DIR)/modem \ $(MAGIC_FRAGMENT_DIR)/msooxml \ - $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -504,6 +502,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/msx \ +@@ -506,6 +504,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -303,8 +305,8 @@ +$(MAGIC_FRAGMENT_DIR)/macintosh \ $(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpm \ - $(MAGIC_FRAGMENT_DIR)/rtf \ -@@ -580,10 +580,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/rpmsg \ +@@ -583,10 +583,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zip \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -328,7 +330,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} -@@ -805,23 +817,25 @@ uninstall-am: uninstall-pkgdataDATA +@@ -808,23 +820,25 @@ uninstall-am: uninstall-pkgdataDATA .PRECIOUS: Makefile @@ -371,7 +373,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 2019-02-21 07:07:41.129014579 +0000 ++++ src/Makefile.am 2019-05-27 09:12:24.272056708 +0000 @@ -1,4 +1,4 @@ -MAGIC = $(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic @@ -379,7 +381,7 @@ nodist_include_HEADERS = magic.h --- src/dcore.c -+++ src/dcore.c 2019-02-21 07:07:41.133014502 +0000 ++++ src/dcore.c 2019-05-27 09:12:24.272056708 +0000 @@ -0,0 +1,207 @@ +/* + * Show goo about ELF core files ++++++ file-5.36.tar.gz -> file-5.37.tar.gz ++++++ ++++ 7229 lines of diff (skipped) ++++++ file-secure_getenv.patch ++++++ --- /var/tmp/diff_new_pack.lKj6M4/_old 2019-06-12 13:02:17.045284819 +0200 +++ /var/tmp/diff_new_pack.lKj6M4/_new 2019-06-12 13:02:17.049284817 +0200 @@ -18,7 +18,7 @@ AC_TYPE_OFF_T --- file-5.35/src/file.c +++ file-5.35/src/file.c 2018-10-22 07:57:43.206223603 +0000 -@@ -651,7 +651,7 @@ docprint(const char *opts, int def) +@@ -649,7 +649,7 @@ docprint(const char *opts, int def) private void help(void) { @@ -29,7 +29,7 @@ "Determine type of FILEs.\n" --- file-5.35/src/file.h +++ file-5.35/src/file.h 2018-10-22 07:57:43.206223603 +0000 -@@ -658,4 +658,12 @@ static const char *rcsid(const char *p) +@@ -649,4 +649,12 @@ static const char *rcsid(const char *p) #define __RCSID(a) #endif
