[packages/file] up to 5.20

[glen]

commit 2fa80c788cd2ae332c51330fd11284e7632616e2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Oct 11 11:37:24 2014 +0300

    up to 5.20

 file-CVE-2014-3587.patch | 30 ------------------------------
 file.spec                | 10 ++++------
 2 files changed, 4 insertions(+), 36 deletions(-)
---
diff --git a/file.spec b/file.spec
index d8f7a80..9cfe9ce 100644
--- a/file.spec
+++ b/file.spec
@@ -29,12 +29,12 @@ Summary(uk.UTF-8):	Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.19
-Release:	3
+Version:	5.20
+Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	e3526f59023f3f7d1ffa4d541335edab
+# Source0-md5:	5d5e13eb3e0e13839da869a31790faf2
 Source1:	http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:	%{name}-zisofs.magic
@@ -43,8 +43,7 @@ Source4:	%{name}-magic.mime-gen.awk
 Patch0:		%{name}-selinux.patch
 Patch1:		searchpath.patch
 Patch2:		automake.patch
-Patch3:		%{name}-CVE-2014-3587.patch
-Patch4:		%{name}-perl.patch
+Patch3:		%{name}-perl.patch
 URL:		http://www.darwinsys.com/file/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -271,7 +270,6 @@ Wiązania Pythona 3 do biblioteki libmagic.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
diff --git a/file-CVE-2014-3587.patch b/file-CVE-2014-3587.patch
deleted file mode 100644
index 58a1688..0000000
--- a/file-CVE-2014-3587.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 0641e56be1af003aa02c7c6b0184466540637233
-Author: Christos Zoulas <christos at zoulas.com>
-Date:   Thu Aug 7 09:38:35 2014 +0000
-
-    Prevent wrap around (Remi Collet at redhat)
-
-diff --git a/src/cdf.c b/src/cdf.c
-index 5dbf3b1..3e691f4 100644
---- a/src/cdf.c
-+++ b/src/cdf.c
-@@ -35,7 +35,7 @@
- #include "file.h"
- 
- #ifndef lint
--FILE_RCSID("@(#)$File: cdf.c,v 1.63 2014/06/09 13:04:37 christos Exp $")
-+FILE_RCSID("@(#)$File: cdf.c,v 1.64 2014/07/24 19:35:39 christos Exp $")
- #endif
- 
- #include <assert.h>
-@@ -835,6 +835,10 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
- 		q = (const uint8_t *)(const void *)
- 		    ((const char *)(const void *)p + ofs
- 		    - 2 * sizeof(uint32_t));
-+		if (q < p) {
-+			DPRINTF(("Wrapped around %p < %p\n", q, p));
-+			goto out;
-+		}
- 		if (q > e) {
- 			DPRINTF(("Ran of the end %p > %p\n", q, e));
- 			goto out;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/2fa80c788cd2ae332c51330fd11284e7632616e2