Hello community,
here is the log from the commit of package file for openSUSE:Factory checked in
at 2017-09-25 13:48:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/file (Old)
and /work/SRC/openSUSE:Factory/.file.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file"
Mon Sep 25 13:48:48 2017 rev:102 rq:528198 version:5.32
Changes:
--------
--- /work/SRC/openSUSE:Factory/file/file.changes 2017-06-12
15:10:43.144169474 +0200
+++ /work/SRC/openSUSE:Factory/.file.new/file.changes 2017-09-25
13:48:58.378995860 +0200
@@ -1,0 +2,18 @@
+Wed Sep 13 10:35:43 UTC 2017 - wer...@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
+
+-------------------------------------------------------------------
python3-magic.changes: same change
Old:
----
file-5.31-fix-tga.dif
file-5.31.dif
file-5.31.tar.gz
New:
----
file-5.32.dif
file-5.32.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file.spec ++++++
--- /var/tmp/diff_new_pack.Or4bC8/_old 2017-09-25 13:48:59.314864196 +0200
+++ /var/tmp/diff_new_pack.Or4bC8/_new 2017-09-25 13:48:59.318863633 +0200
@@ -32,7 +32,7 @@
%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 @@
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 @@
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 @@
%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
++++++ python-magic.spec ++++++
--- /var/tmp/diff_new_pack.Or4bC8/_old 2017-09-25 13:48:59.342860257 +0200
+++ /var/tmp/diff_new_pack.Or4bC8/_new 2017-09-25 13:48:59.346859694 +0200
@@ -28,7 +28,7 @@
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
python3-magic.spec: same change
++++++ file-5.16-ocloexec.patch ++++++
--- /var/tmp/diff_new_pack.Or4bC8/_old 2017-09-25 13:48:59.434847316 +0200
+++ /var/tmp/diff_new_pack.Or4bC8/_new 2017-09-25 13:48:59.434847316 +0200
@@ -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);
++++++ file-5.19-biorad.dif ++++++
--- /var/tmp/diff_new_pack.Or4bC8/_old 2017-09-25 13:48:59.462843377 +0200
+++ /var/tmp/diff_new_pack.Or4bC8/_new 2017-09-25 13:48:59.462843377 +0200
@@ -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
++++++ file-5.19-printf.dif ++++++
--- /var/tmp/diff_new_pack.Or4bC8/_old 2017-09-25 13:48:59.482840564 +0200
+++ /var/tmp/diff_new_pack.Or4bC8/_new 2017-09-25 13:48:59.482840564 +0200
@@ -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++;
++++++ file-5.23-endian.patch ++++++
--- /var/tmp/diff_new_pack.Or4bC8/_old 2017-09-25 13:48:59.502837750 +0200
+++ /var/tmp/diff_new_pack.Or4bC8/_new 2017-09-25 13:48:59.506837188 +0200
@@ -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>
++++++ file-5.28-btrfs-image.dif ++++++
--- /var/tmp/diff_new_pack.Or4bC8/_old 2017-09-25 13:48:59.518835500 +0200
+++ /var/tmp/diff_new_pack.Or4bC8/_new 2017-09-25 13:48:59.522834937 +0200
@@ -9,15 +9,14 @@
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 <russ...@coker.com.au>
++++++ file-5.31-fix-tga.dif -> file-5.32.dif ++++++
++++ 629 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/file/file-5.31-fix-tga.dif
++++ and /work/SRC/openSUSE:Factory/.file.new/file-5.32.dif
++++++ file-5.31.tar.gz -> file-5.32.tar.gz ++++++
++++ 2669 lines of diff (skipped)
