From 352f1684125d995ad1f82877b971b08f58582d6cd4f8b093ec9a8688c78d4626 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 2 Dec 2013 11:33:34 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=86 --- file-5.15.tar.gz | 3 - ...ocloexec.patch => file-5.16-ocloexec.patch | 12 ++-- file-5.15.dif => file-5.16.dif | 68 +++++++------------ file-5.16.tar.gz | 3 + file.changes | 11 +++ file.spec | 6 +- python-magic.changes | 7 +- python-magic.spec | 2 +- 8 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 file-5.15.tar.gz rename file-5.12-ocloexec.patch => file-5.16-ocloexec.patch (83%) rename file-5.15.dif => file-5.16.dif (89%) create mode 100644 file-5.16.tar.gz diff --git a/file-5.15.tar.gz b/file-5.15.tar.gz deleted file mode 100644 index 6ee7417..0000000 --- a/file-5.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bd52cc614d6488127c0bddc208a2855481744d76ff0878d9c173d2a6ed564e4 -size 655932 diff --git a/file-5.12-ocloexec.patch b/file-5.16-ocloexec.patch similarity index 83% rename from file-5.12-ocloexec.patch rename to file-5.16-ocloexec.patch index 7c44d7f..68363e2 100644 --- a/file-5.12-ocloexec.patch +++ b/file-5.16-ocloexec.patch @@ -1,6 +1,6 @@ --- src/apprentice.c +++ src/apprentice.c 2013-09-30 00:00:00.000000000 +0000 -@@ -938,7 +938,7 @@ load_1(struct magic_set *ms, int action, +@@ -944,7 +944,7 @@ load_1(struct magic_set *ms, int action, ssize_t len; struct magic_entry me; @@ -9,7 +9,7 @@ if (f == NULL) { if (errno != ENOENT) file_error(ms, errno, "cannot read magic file `%s'", -@@ -2599,7 +2599,7 @@ apprentice_map(struct magic_set *ms, con +@@ -2605,7 +2605,7 @@ apprentice_map(struct magic_set *ms, con if (dbname == NULL) goto error; @@ -18,7 +18,7 @@ goto error; if (fstat(fd, &st) == -1) { -@@ -2711,7 +2711,7 @@ apprentice_compile(struct magic_set *ms, +@@ -2717,7 +2717,7 @@ apprentice_compile(struct magic_set *ms, if (dbname == NULL) goto out; @@ -50,13 +50,13 @@ progname, fn, strerror(errno)); return 1; --- src/magic.c -+++ src/magic.c 2013-09-30 00:00:00.000000000 +0000 ++++ src/magic.c 2013-12-02 10:36:33.334786103 +0000 @@ -372,7 +372,7 @@ file_or_fd(struct magic_set *ms, const c else pos = lseek(fd, (off_t)0, SEEK_CUR); } else { - int flags = O_RDONLY|O_BINARY; + int flags = O_RDONLY|O_BINARY|O_CLOEXEC; + int okstat = stat(inname, &sb) == 0; - if (stat(inname, &sb) == 0 && S_ISFIFO(sb.st_mode)) { - #ifdef O_NONBLOCK + if (okstat && S_ISFIFO(sb.st_mode)) { diff --git a/file-5.15.dif b/file-5.16.dif similarity index 89% rename from file-5.15.dif rename to file-5.16.dif index 4474772..f261c29 100644 --- a/file-5.15.dif +++ b/file-5.16.dif @@ -1,6 +1,6 @@ --- magic/Magdir/elf +++ magic/Magdir/elf 2013-09-30 00:00:00.000000000 +0000 -@@ -129,7 +129,7 @@ +@@ -128,7 +128,7 @@ >18 leshort 47 Renesas H8/300H, >18 leshort 48 Renesas H8S, >18 leshort 49 Renesas H8/500, @@ -10,8 +10,8 @@ >18 leshort 52 Motorola Coldfire, >18 leshort 53 Motorola M68HC12, --- magic/Magdir/linux -+++ magic/Magdir/linux 2013-09-30 00:00:00.000000000 +0000 -@@ -97,22 +97,44 @@ ++++ magic/Magdir/linux 2013-12-02 11:09:39.454735400 +0000 +@@ -97,23 +97,27 @@ # and Nicolas Lichtmaier # 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) @@ -22,7 +22,8 @@ ->>518 leshort >0x1ff ->>>529 byte 0 zImage, ->>>529 byte 1 bzImage, -->>>(526.s+0x200) string >\0 version %s, +->>>526 lelong >0 +->>>>(526.s+0x200) string >\0 version %s, ->>498 leshort 1 RO-rootFS, ->>498 leshort 0 RW-rootFS, ->>508 leshort >0 root_dev 0x%X, @@ -37,28 +38,11 @@ +>510 leshort >0xAA55 Kernel +>518 leshort 0x0105 \b, Setup Version 0x105, zImage +>518 leshort >0x0105 \b, Setup Version %#hx ++>518 leshort >0x1ff +>>529 byte 0 \b, zImage +>>529 byte 1 \b, bzImage -+>>>(526.s+0x205) byte 32 -+>>>>(526.s+0x200) string >\0 \b, Version %5.5s -+>>>(526.s+0x206) byte 32 -+>>>>(526.s+0x200) string >\0 \b, Version %6.6s -+>>>(526.s+0x207) byte 32 -+>>>>(526.s+0x200) string >\0 \b, Version %7.7s -+>>>(526.s+0x205) byte 45 -+>>>>(526.s+0x200) string >\0 \b, Version %5.5s -+>>>(526.s+0x206) byte 45 -+>>>>(526.s+0x200) string >\0 \b, Version %6.6s -+>>>(526.s+0x207) byte 45 -+>>>>(526.s+0x200) string >\0 \b, Version %7.7s -+>>>(526.s+0x208) byte 45 -+>>>>(526.s+0x200) string >\0 \b, Version %8.8s -+>>>(526.s+0x209) byte 45 -+>>>>(526.s+0x200) string >\0 \b, Version %9.9s -+>>>(526.s+0x20a) byte 45 -+>>>>(526.s+0x200) string >\0 \b, Version %10.10s -+>>>(526.s+0x20b) byte 45 -+>>>>(526.s+0x200) string >\0 \b, Version %11.11s ++>>526 lelong >0 ++>>>(526.s+0x200) string >\0 \b, Version %s +>>498 leshort 1 \b, RO-rootFS +>>498 leshort 0 \b, RW-rootFS +>>508 leshort >0 \b, root_dev 0x%X @@ -104,7 +88,7 @@ EXTRA_DIST = \ $(MAGIC_DIR)/Header \ -@@ -20,7 +20,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \ +@@ -21,7 +21,6 @@ $(MAGIC_FRAGMENT_DIR)/android \ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ $(MAGIC_FRAGMENT_DIR)/apl \ @@ -112,7 +96,7 @@ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/archive \ $(MAGIC_FRAGMENT_DIR)/assembler \ -@@ -74,7 +73,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ +@@ -75,7 +74,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -120,7 +104,7 @@ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/fonts \ $(MAGIC_FRAGMENT_DIR)/fortran \ -@@ -112,6 +110,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -113,6 +111,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -129,7 +113,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -119,7 +119,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -120,7 +120,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -137,7 +121,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -127,7 +126,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ +@@ -128,7 +127,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/macos \ @@ -145,7 +129,7 @@ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/make \ -@@ -146,10 +144,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -147,10 +145,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -157,7 +141,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -192,6 +190,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ +@@ -193,6 +191,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -166,7 +150,7 @@ $(MAGIC_FRAGMENT_DIR)/rinex \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ -@@ -261,8 +261,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ +@@ -262,8 +262,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -188,7 +172,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 -@@ -274,19 +286,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ +@@ -275,19 +287,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -238,7 +222,7 @@ EXTRA_DIST = \ $(MAGIC_DIR)/Header \ $(MAGIC_DIR)/Localstuff \ -@@ -217,7 +217,6 @@ $(MAGIC_FRAGMENT_DIR)/amigaos \ +@@ -218,7 +218,6 @@ $(MAGIC_FRAGMENT_DIR)/android \ $(MAGIC_FRAGMENT_DIR)/animation \ $(MAGIC_FRAGMENT_DIR)/aout \ $(MAGIC_FRAGMENT_DIR)/apl \ @@ -246,7 +230,7 @@ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/archive \ $(MAGIC_FRAGMENT_DIR)/assembler \ -@@ -271,7 +270,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ +@@ -272,7 +271,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -254,7 +238,7 @@ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/fonts \ $(MAGIC_FRAGMENT_DIR)/fortran \ -@@ -309,6 +307,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -310,6 +308,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -263,7 +247,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -316,7 +316,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -317,7 +317,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -271,7 +255,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -324,7 +323,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ +@@ -325,7 +324,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/macos \ @@ -279,7 +263,7 @@ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/make \ -@@ -343,10 +341,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -344,10 +342,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -291,7 +275,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -389,6 +387,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ +@@ -390,6 +388,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -300,7 +284,7 @@ $(MAGIC_FRAGMENT_DIR)/rinex \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ -@@ -458,10 +458,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ +@@ -459,10 +459,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -324,7 +308,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} -@@ -676,23 +688,25 @@ uninstall-am: uninstall-pkgdataDATA +@@ -677,23 +689,25 @@ uninstall-am: uninstall-pkgdataDATA mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ uninstall uninstall-am uninstall-pkgdataDATA diff --git a/file-5.16.tar.gz b/file-5.16.tar.gz new file mode 100644 index 0000000..cbcd5d4 --- /dev/null +++ b/file-5.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48bcac7726c37a8a0bc7ffa16b58993575657dd7b382039380fb3b74ab389261 +size 658789 diff --git a/file.changes b/file.changes index cb8a6f8..6d5ec2a 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 2 11:29:44 UTC 2013 - werner@suse.de + +- Update to file version 5.16 (bug fix release) + * always leave magic file loaded, don't unload for magic_check, etc. + * fix default encoding to binary instead of unknown which broke recently + * handle empty and one byte files, less specially so that + --mime-encoding does not break completely. + * fix erroneous non-zero exit code from non-existant file and message + * add CDF MSI file detection (Guy Helmer) + ------------------------------------------------------------------- Mon Nov 4 00:30:41 UTC 2013 - jengelh@inai.de diff --git a/file.spec b/file.spec index 97fedb9..e7bdc4b 100644 --- a/file.spec +++ b/file.spec @@ -30,14 +30,14 @@ Obsoletes: file-64bit %endif # # Set Version also in python-magic.spec -Version: 5.15 +Version: 5.16 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause Group: Productivity/File utilities Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source2: baselibs.conf -Patch: file-5.15.dif +Patch: file-5.16.dif Patch1: file-5.14-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -57,7 +57,7 @@ Patch27: file-5.12-zip2.0.dif Patch28: file-5.07-iso9660.dif Patch31: file-5.07-biorad.dif Patch32: file-5.07-clicfs.dif -Patch33: file-5.12-ocloexec.patch +Patch33: file-5.16-ocloexec.patch Patch34: file-5.12-endian.patch Patch35: file-5.12-nitpick.dif Patch36: file-5.15-clear-invalid.patch diff --git a/python-magic.changes b/python-magic.changes index 70644a4..5eadeb0 100644 --- a/python-magic.changes +++ b/python-magic.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Mon Dec 2 11:31:12 UTC 2013 - werner@suse.de + +- Make it ready for file 5.16 + ------------------------------------------------------------------- Tue Oct 1 10:43:20 UTC 2013 - werner@suse.de -- Make if ready for file 5.15 +- Make it ready for file 5.15 ------------------------------------------------------------------- Tue Mar 12 10:37:20 UTC 2013 - idonmez@suse.com diff --git a/python-magic.spec b/python-magic.spec index e933bf3..529d7da 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -23,7 +23,7 @@ BuildRequires: libtool BuildRequires: python-devel BuildRequires: zlib-devel Url: http://www.darwinsys.com/file/ -Version: 5.15 +Version: 5.16 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause and BSD-4-Clause