Accepting request 265566 from Base:System

- Drop patch file-5.20-CVE-2014-3710.patch as now part of upstream 
- Update to file version 5.21
  * Fix CVE-2014-8116 and CVE-2014-8117 (bsc#910252 and bsc#910253)
  * there was an incorrect free in magic_load_buffers()
  * there was an out of bounds read for some pascal strings
  * there was a memory leak in magic lists
  * don't interpret strings printed from files using the current
    locale, convert them to ascii format first.
  * there was an out of bounds read in elf note reads
  * fix MacOS/X locale.h vs. xlocale.h issues

- Add patch file-5.20-CVE-2014-3710.patch to fic bsc#902367
  CVE-2014-3710: file: out-of-bounds read in elf note headers    

- adapt version in specfile to 5.21

OBS-URL: https://build.opensuse.org/request/show/265566
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=86

file-5.14-tex.dif

@@ -1,7 +1,7 @@
 --- magic/Localstuff
 +++ magic/Localstuff	2013-09-30 00:00:00.000000000 +0000
 @@ -5,3 +5,12 @@
- # $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $
+ # $File: Localstuff,v 1.5 2007/01/12 17:38:27 christos Exp $
  # Add any locally observed files here.  Remember:
  # text if readable, executable if runnable binary, data if unreadable.
 +

file-5.20.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5bc36bfbb83a009da25a7174848f1bc5824be03192a8fdce7f83dc897ed2d247
-size 725937

file-5.21.tar.gz

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

file.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Dec 17 13:08:34 UTC 2014 - werner@suse.de
+
+- Drop patch file-5.20-CVE-2014-3710.patch as now part of upstream 
+- Update to file version 5.21
+  * Fix CVE-2014-8116 and CVE-2014-8117 (bsc#910252 and bsc#910253)
+  * there was an incorrect free in magic_load_buffers()
+  * there was an out of bounds read for some pascal strings
+  * there was a memory leak in magic lists
+  * don't interpret strings printed from files using the current
+    locale, convert them to ascii format first.
+  * there was an out of bounds read in elf note reads
+  * fix MacOS/X locale.h vs. xlocale.h issues
+
+-------------------------------------------------------------------
+Thu Oct 23 11:36:19 UTC 2014 - werner@suse.de
+
+- Add patch file-5.20-CVE-2014-3710.patch to fic bsc#902367
+  CVE-2014-3710: file: out-of-bounds read in elf note headers    
+
 -------------------------------------------------------------------
 Mon Oct 13 10:57:42 UTC 2014 - werner@suse.de
 

file.spec

@@ -30,7 +30,7 @@ Obsoletes:      file-64bit
 %endif
 #
 # Set Version also in python-magic.spec
-Version:        5.20
+Version:        5.21
 Release:        0
 Summary:        A Tool to Determine File Types
 License:        BSD-2-Clause

python-magic.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 17 13:13:59 UTC 2014 - werner@suse.de
+
+- adapt version in specfile to 5.21
+
 -------------------------------------------------------------------
 Mon Oct 13 13:19:32 UTC 2014 - werner@suse.de
 

python-magic.spec

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