SHA256
1
0
forked from pool/file

Accepting request 528198 from Base:System

- Update to file version 5.32
  * Always reset state in {file,buffer}_apprentice (Krzysztof Wilczynski)
  * Fix always true condition (Thomas Jarosch)
  * pickier parsing of numeric values in magic files.
  * PR/615 add magic_getflags()
- This release fix the bug bsc#1056838 for CVE-2017-1000249
- Remove patch file-5.31-fix-tga.dif as now upstream
- Rename patch file-5.31.dif which now becomes file-5.32.dif
- Modify the patches
  * file-5.16-ocloexec.patch
  * file-5.19-biorad.dif
  * file-5.19-printf.dif
  * file-5.23-endian.patch
  * file-5.28-btrfs-image.dif

OBS-URL: https://build.opensuse.org/request/show/528198
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=102
This commit is contained in:
Dominique Leuenberger 2017-09-25 11:48:48 +00:00 committed by Git OBS Bridge
commit d2fb2c960e
13 changed files with 70 additions and 93 deletions

View File

@ -6,8 +6,8 @@
4 files changed, 6 insertions(+), 6 deletions(-)
--- src/apprentice.c
+++ src/apprentice.c 2017-05-24 11:06:21.590079956 +0000
@@ -1104,7 +1104,7 @@ load_1(struct magic_set *ms, int action,
+++ src/apprentice.c 2017-09-13 10:32:02.149905845 +0000
@@ -1146,7 +1146,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'",
@@ -2953,7 +2953,7 @@ apprentice_map(struct magic_set *ms, con
@@ -3032,7 +3032,7 @@ apprentice_map(struct magic_set *ms, con
if (dbname == NULL)
goto error;
@ -25,7 +25,7 @@
goto error;
if (fstat(fd, &st) == -1) {
@@ -3090,7 +3090,7 @@ apprentice_compile(struct magic_set *ms,
@@ -3169,7 +3169,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-05-24 11:06:21.590079956 +0000
+++ src/compress.c 2017-09-13 10:32:02.149905845 +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-05-24 11:06:21.590079956 +0000
+++ src/file.c 2017-09-13 10:32:02.149905845 +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-05-24 11:06:21.590079956 +0000
+++ src/magic.c 2017-09-13 10:32:02.149905845 +0000
@@ -442,7 +442,7 @@ file_or_fd(struct magic_set *ms, const c
else
pos = lseek(fd, (off_t)0, SEEK_CUR);

View File

@ -3,8 +3,8 @@
1 file changed, 2 insertions(+)
--- magic/Magdir/images
+++ magic/Magdir/images 2017-03-02 13:17:22.400510894 +0000
@@ -1007,6 +1007,8 @@
+++ magic/Magdir/images 2017-09-13 10:31:09.318884599 +0000
@@ -1021,6 +1021,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

View File

@ -3,8 +3,8 @@
1 file changed, 6 insertions(+)
--- src/apprentice.c
+++ src/apprentice.c 2017-05-24 11:04:53.931691878 +0000
@@ -2358,6 +2358,12 @@ check_format_type(const char *ptr, int t
+++ src/apprentice.c 2017-09-13 10:30:42.203386956 +0000
@@ -2400,6 +2400,12 @@ check_format_type(const char *ptr, int t
ptr++;
if (*ptr == '#')
ptr++;

View File

@ -4,7 +4,7 @@
2 files changed, 10 insertions(+), 113 deletions(-)
--- src/apprentice.c
+++ src/apprentice.c 2017-05-24 11:06:41.689710213 +0000
+++ src/apprentice.c 2017-09-13 10:32:39.981204996 +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);
@@ -3181,67 +3184,6 @@ byteswap(struct magic *magic, uint32_t n
@@ -3260,67 +3263,6 @@ byteswap(struct magic *magic, uint32_t n
}
/*
@ -97,7 +97,7 @@
*/
private void
--- src/cdf.c
+++ src/cdf.c 2017-05-24 11:08:39.095549469 +0000
+++ src/cdf.c 2017-09-13 10:32:39.981204996 +0000
@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.106 201
#ifdef HAVE_LIMITS_H
#include <limits.h>

View File

@ -9,15 +9,14 @@ superblock. Rather than duplicate the superblock printer, split
that out and use it with both the on-disk superblock and the ones
contained within the image.
---
magic/Magdir/filesystems | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
Index: file-5.31/magic/Magdir/filesystems
===================================================================
--- file-5.31.orig/magic/Magdir/filesystems
+++ file-5.31/magic/Magdir/filesystems
@@ -2246,20 +2246,29 @@
diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -2245,20 +2245,29 @@
>>0x10060 string >\0 lockproto %s)
# Russell Coker <russell@coker.com.au>

View File

@ -1,38 +0,0 @@
From bb421c437d406760fb9f70f49e2eb5c504528450 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 5 Jun 2017 17:40:31 +0000
Subject: [PATCH] use default to avoid dup printing (Stephan Kulow)
---
magic/Magdir/images | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
Index: file-5.31/magic/Magdir/images
===================================================================
--- file-5.31.orig/magic/Magdir/images
+++ file-5.31/magic/Magdir/images
@@ -35,11 +35,6 @@
>>>16 ubyte <33
# skip more by looking for pixel size 0Fh 10h 18h 20h
>>>>16 ubyte&0xC0 0x00
-# skip 260-16.ico by looking for no color map
->>>>>1 ubyte 0
-# implies no first map entry
->>>>>>3 uleshort 0
->>>>>>>0 use tga-image
# Color Map
>>>>>1 belong&0xfff7ffff 0x01010000
>>>>>>0 use tga-image
@@ -47,6 +42,12 @@
>>>>>>0 use tga-image
>>>>>1 belong&0xfff7ffff 0x00030000
>>>>>>0 use tga-image
+>>>>>1 default x
+# skip 260-16.ico by looking for no color map
+>>>>>>1 ubyte 0
+# implies no first map entry
+>>>>>>>3 uleshort 0
+>>>>>>>>0 use tga-image
# display tga bitmap image information
0 name tga-image
>2 ubyte <34 Targa image data

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:09c588dac9cff4baa054f51a36141793bcf64926edc909594111ceae60fce4ee
size 791572

View File

@ -10,7 +10,7 @@
8 files changed, 312 insertions(+), 67 deletions(-)
--- magic/Magdir/elf
+++ magic/Magdir/elf 2017-05-24 11:09:26.622674297 +0000
+++ magic/Magdir/elf 2017-09-13 10:34:21.207329793 +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-05-24 11:09:26.622674297 +0000
+++ magic/Magdir/linux 2017-09-13 10:34:21.207329793 +0000
@@ -101,23 +101,27 @@
# and Nicolas Lichtmaier <nick@debian.org>
# 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-05-24 11:09:26.626674222 +0000
+++ magic/Magdir/msad 2017-09-13 10:34:21.207329793 +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-05-24 11:09:26.626674222 +0000
+++ magic/Magdir/msdos 2017-09-13 10:34:21.211329718 +0000
@@ -104,9 +104,9 @@
>>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
>>>(0x3c.l+22) leshort&0x1000 >0 system file
@ -98,7 +98,7 @@
# updated by Joerg Jenderek at Oct 2008,2015
--- magic/Makefile.am
+++ magic/Makefile.am 2017-05-24 11:10:19.821694359 +0000
+++ magic/Makefile.am 2017-09-13 10:34:21.211329718 +0000
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@ -116,7 +116,7 @@
$(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \
@@ -86,7 +85,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
@@ -87,7 +86,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 \
@@ -127,6 +125,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
@@ -129,6 +127,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 \
@@ -135,7 +135,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
@@ -137,7 +137,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 \
@@ -143,7 +142,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
@@ -145,7 +144,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 \
@@ -165,10 +163,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -167,10 +165,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 \
@@ -220,6 +218,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
@@ -222,6 +220,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 \
@@ -293,8 +293,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
@@ -295,8 +295,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
@@ -306,19 +318,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
@@ -308,19 +320,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-05-24 11:10:33.469442910 +0000
+++ magic/Makefile.in 2017-09-13 10:34:21.211329718 +0000
@@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@
MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
@ -250,7 +250,7 @@
$(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \
@@ -358,7 +357,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
@@ -359,7 +358,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 \
@@ -399,6 +397,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
@@ -401,6 +399,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 \
@@ -407,7 +407,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
@@ -409,7 +409,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 \
@@ -415,7 +414,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
@@ -417,7 +416,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 \
@@ -437,10 +435,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
@@ -439,10 +437,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 \
@@ -492,6 +490,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
@@ -494,6 +492,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 \
@@ -565,10 +565,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \
@@ -567,10 +567,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}
@@ -790,23 +802,25 @@ uninstall-am: uninstall-pkgdataDATA
@@ -792,23 +804,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-05-24 11:09:26.662673560 +0000
+++ src/Makefile.am 2017-09-13 10:34:21.227329422 +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-05-24 11:09:26.662673560 +0000
+++ src/dcore.c 2017-09-13 10:34:21.227329422 +0000
@@ -0,0 +1,207 @@
+/*
+ * Show goo about ELF core files

3
file-5.32.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50
size 797025

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Sep 13 10:35:43 UTC 2017 - werner@suse.de
- Update to file version 5.32
* Always reset state in {file,buffer}_apprentice (Krzysztof Wilczynski)
* Fix always true condition (Thomas Jarosch)
* pickier parsing of numeric values in magic files.
* PR/615 add magic_getflags()
- This release fix the bug bsc#1056838 for CVE-2017-1000249
- Remove patch file-5.31-fix-tga.dif as now upstream
- Rename patch file-5.31.dif which now becomes file-5.32.dif
- Modify the patches
* file-5.16-ocloexec.patch
* file-5.19-biorad.dif
* file-5.19-printf.dif
* file-5.23-endian.patch
* file-5.28-btrfs-image.dif
-------------------------------------------------------------------
Mon Jun 5 18:48:22 UTC 2017 - coolo@suse.com

View File

@ -32,7 +32,7 @@ Obsoletes: file-64bit
%endif
#
# Set Version also in python-magic.spec
Version: 5.31
Version: 5.32
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.31.dif
Patch: file-5.32.dif
Patch1: file-5.19-misc.dif
Patch4: file-4.24-autoconf.dif
Patch5: file-5.14-tex.dif
@ -64,7 +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
Patch40: file-5.31-fix-tga.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@ -133,7 +132,6 @@ to develop applications that require the magic "file" interface.
%patch36 -p1 -b .clear
%patch37 -p1 -b .getenv
%patch39 -p1 -b .btrfs
%patch40 -p1 -b .tga
%patch -b .0
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
rm -fv src/magic.h

View File

@ -28,7 +28,7 @@ BuildRequires: python-devel
BuildRequires: python-setuptools
BuildRequires: zlib-devel
Url: http://www.darwinsys.com/file/
Version: 5.31
Version: 5.32
Release: 0
Summary: Python module to use libmagic
License: BSD-3-Clause and BSD-4-Clause

View File

@ -28,7 +28,7 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: zlib-devel
Url: http://www.darwinsys.com/file/
Version: 5.31
Version: 5.32
Release: 0
Summary: Python module to use libmagic
License: BSD-3-Clause and BSD-4-Clause