From 1c775dbaa8baefbaf89d939765c614ad63ca7e26d282029fb1665c31b9092448 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 23 Mar 2012 14:41:17 +0000
Subject: [PATCH 1/2] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=41
---
 file-5.10.tar.gz  |  3 ---
 file-5.11.tar.gz  |  3 +++
 file.changes      |  8 +++++++-
 file.spec         | 19 ++++++++++---------
 python-magic.spec | 10 +++++-----
 5 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 100644 file-5.10.tar.gz
 create mode 100644 file-5.11.tar.gz

diff --git a/file-5.10.tar.gz b/file-5.10.tar.gz
deleted file mode 100644
index 927d74d..0000000
--- a/file-5.10.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73ae51889006b1ddb95db729237d411eb8d353884dfb149f0b4427d314aff68a
-size 608726
diff --git a/file-5.11.tar.gz b/file-5.11.tar.gz
new file mode 100644
index 0000000..1519c1d
--- /dev/null
+++ b/file-5.11.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7
+size 610019
diff --git a/file.changes b/file.changes
index 0903464..70d2904 100644
--- a/file.changes
+++ b/file.changes
@@ -1,7 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 21 12:39:50 UTC 2012 - werner@suse.de
+
+- Update to file version 5.11 (bnc#753303, CVE-2012-1571)
+  * Fix CDF parsing issues found by CERT's fuzzing tool (Will Dormann)
+
 -------------------------------------------------------------------
 Mon Jan 16 13:42:35 UTC 2012 - werner@suse.de
 
-- Update to file version 5.10 
+- Update to file version 5.10
   * Add magic for /usr/bin/env Perl scripts
   * Weaken generic script magic to avoid clashing with
     language-specific magic.
diff --git a/file.spec b/file.spec
index c33daa1..8f09147 100644
--- a/file.spec
+++ b/file.spec
@@ -16,25 +16,25 @@
 #
 
 
-
 Name:           file
-BuildRequires:  findutils zlib-devel
+BuildRequires:  findutils
 BuildRequires:  libtool
+BuildRequires:  zlib-devel
 Url:            http://www.darwinsys.com/file/
-License:        BSD 2 Clause
-Group:          Productivity/File utilities
 # bug437293
 %ifarch ppc64
 Obsoletes:      file-64bit
 %endif
 #
 # Set Version also in python-magic.spec
-Version:        5.10
-Release:        1
+Version:        5.11
+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-%{version}.dif
+Patch:          file-5.10.dif
 Patch1:         file-5.07-misc.dif
 Patch4:         file-4.24-autoconf.dif
 Patch5:         file-4.03-tex.dif
@@ -69,11 +69,12 @@ specified file. File type recognition is controlled by the file
 used by apsfilter to permit automatic printing of different file types.
 
 %package     -n file-devel
-License:        Other uncritical OpenSource License
 Summary:        Include Files and Libraries mandatory for Development
+License:        Other uncritical OpenSource License
 Group:          Development/Libraries/Other
 Provides:       file:/usr/include/magic.h
-Requires:       file = %{version} glibc-devel
+Requires:       file = %{version}
+Requires:       glibc-devel
 
 %description -n file-devel
 This package contains all necessary include files and libraries needed
diff --git a/python-magic.spec b/python-magic.spec
index 4af222e..4b3620d 100644
--- a/python-magic.spec
+++ b/python-magic.spec
@@ -16,18 +16,18 @@
 #
 
 
-
 Name:           python-magic
 %define build_python_bindings 1
-BuildRequires:  findutils zlib-devel
+BuildRequires:  findutils
 BuildRequires:  libtool
 BuildRequires:  python-devel
+BuildRequires:  zlib-devel
 Url:            http://www.darwinsys.com/file/
+Version:        5.10
+Release:        0
+Summary:        Python module to use libmagic
 License:        BSD 3 Clause, BSD 4 Clause
 Group:          Development/Languages/Python
-Version:        5.10
-Release:        1
-Summary:        Python module to use libmagic
 %py_requires
 Source99:       file.spec
 %{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/file.spec)}

From 7fcd4cceaed1e9c9390eaddec40973ec7470598afd84a513c8ad4a662312f5ca Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 23 Mar 2012 14:41:56 +0000
Subject: [PATCH 2/2] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=42
---
 python-magic.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-magic.spec b/python-magic.spec
index 4b3620d..b06cec5 100644
--- a/python-magic.spec
+++ b/python-magic.spec
@@ -26,7 +26,7 @@ Url:            http://www.darwinsys.com/file/
 Version:        5.10
 Release:        0
 Summary:        Python module to use libmagic
-License:        BSD 3 Clause, BSD 4 Clause
+License:        BSD-3-Clause and BSD-4-Clause
 Group:          Development/Languages/Python
 %py_requires
 Source99:       file.spec