Hello community,
here is the log from the commit of package file for openSUSE:Factory checked in
at 2017-06-12 15:10:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/file (Old)
and /work/SRC/openSUSE:Factory/.file.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file"
Mon Jun 12 15:10:36 2017 rev:101 rq:501318 version:5.31
Changes:
--------
--- /work/SRC/openSUSE:Factory/file/file.changes 2017-06-02
10:30:10.274704093 +0200
+++ /work/SRC/openSUSE:Factory/.file.new/file.changes 2017-06-12
15:10:43.144169474 +0200
@@ -1,0 +2,6 @@
+Mon Jun 5 18:48:22 UTC 2017 - co...@suse.com
+
+- add file-5.31-fix-tga.dif upstream commited after I reported
+ a failure in File::Unpack's test suite
+
+-------------------------------------------------------------------
python3-magic.changes: same change
New:
----
file-5.31-fix-tga.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file.spec ++++++
--- /var/tmp/diff_new_pack.O7iTua/_old 2017-06-12 15:10:44.272010336 +0200
+++ /var/tmp/diff_new_pack.O7iTua/_new 2017-06-12 15:10:44.272010336 +0200
@@ -64,6 +64,7 @@
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
@@ -132,6 +133,7 @@
%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
python3-magic.spec: same change
++++++ file-5.28-btrfs-image.dif ++++++
--- /var/tmp/diff_new_pack.O7iTua/_old 2017-06-12 15:10:44.411990584 +0200
+++ /var/tmp/diff_new_pack.O7iTua/_new 2017-06-12 15:10:44.411990584 +0200
@@ -13,10 +13,11 @@
magic/Magdir/filesystems | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
-diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
---- a/magic/Magdir/filesystems
-+++ b/magic/Magdir/filesystems
-@@ -2229,20 +2229,29 @@
+Index: file-5.31/magic/Magdir/filesystems
+===================================================================
+--- file-5.31.orig/magic/Magdir/filesystems
++++ file-5.31/magic/Magdir/filesystems
+@@ -2246,20 +2246,29 @@
>>0x10060 string >\0 lockproto %s)
# Russell Coker <russ...@coker.com.au>
++++++ file-5.31-fix-tga.dif ++++++
>From bb421c437d406760fb9f70f49e2eb5c504528450 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <chris...@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
