- updated to 2.2.0 (fixes CVE-2012-6702 CVE-2016-0718 CVE-2016-4472 CVE-2016-5300

- updated ac_fixes patch

diff --git a/expat-ac_fixes.patch b/expat-ac_fixes.patch
index 1cad0daab1283a2b27e5c05def4863e520a7cce1..15342967fc818dbb951a3ee76a4bf692551b9ce4 100644 (file)
--- a/expat-ac_fixes.patch
+++ b/expat-ac_fixes.patch
@@ -1,14 +1,5 @@
 --- expat-2.1.1/configure.ac~  2012-07-28 10:41:03.000000000 +0300
 +++ expat-2.1.1/configure.ac   2012-07-28 10:41:41.511402972 +0300
-@@ -26,7 +26,7 @@
- define([expat_version], ifdef([__gnu__],
-                               [esyscmd(conftools/get-version.sh lib/expat.h)],
-                               [2.1.x]))
--AC_INIT(expat, expat_version, expat-bugs@libexpat.org)
-+AC_INIT(expat, 2.1.1, expat-bugs@libexpat.org)
- undefine([expat_version])
- 
- AC_CONFIG_SRCDIR(Makefile.in)
 @@ -51,8 +51,6 @@
  
  AC_CONFIG_HEADER(expat_config.h)

diff --git a/expat.spec b/expat.spec
index ddec9cac521b42209ca8bd3e8366c5f46fac494d..34e815125489aa9073c053a38557abf0199feb1a 100644 (file)
--- a/expat.spec
+++ b/expat.spec
@@ -9,15 +9,15 @@ Summary(pt_BR.UTF-8): Biblioteca XML expat
 Summary(ru.UTF-8):     Переносимая библиотека разбора XML (expat)
 Summary(uk.UTF-8):     Переносима бібліотека розбору XML (expat)
 Name:          expat
-Version:       2.1.1
+Version:       2.2.0
 Release:       1
 Epoch:         1
 License:       Thai Open Source Software Center Ltd (distributable)
 Group:         Applications/Publishing/XML
 Source0:       http://downloads.sourceforge.net/expat/%{name}-%{version}.tar.bz2
-# Source0-md5: 7380a64a8e3a9d66a9887b01d0d7ea81
+# Source0-md5: 2f47841c829facb346eb6e3fab5212e2
 Patch0:                %{name}-ac_fixes.patch
-Patch3:                %{name}-2.0.1-check_stopped_parser.patch
+Patch1:                %{name}-2.0.1-check_stopped_parser.patch
 URL:           http://www.libexpat.org/
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake
@@ -117,7 +117,7 @@ Bibliotecas estáticas para desenvolvimento com a biblioteca expat.
 %prep
 %setup -q
 %patch0 -p1
-%patch3 -p0
+%patch1 -p0
 
 %build
 %{__libtoolize}