- updated to 2.1.1 (fixes CVE-2015-1283)

- updated ac_fixes patch

diff --git a/expat-ac_fixes.patch b/expat-ac_fixes.patch
index 0a36e887033cd6bd8c7e1fffee6d3ca66a055207..1cad0daab1283a2b27e5c05def4863e520a7cce1 100644 (file)
--- a/expat-ac_fixes.patch
+++ b/expat-ac_fixes.patch
@@ -1,11 +1,11 @@
---- expat-2.1.0/configure.in~  2012-07-28 10:41:03.000000000 +0300
-+++ expat-2.1.0/configure.in   2012-07-28 10:41:41.511402972 +0300
+--- 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.0, expat-bugs@libexpat.org)
++AC_INIT(expat, 2.1.1, expat-bugs@libexpat.org)
  undefine([expat_version])
  
  AC_CONFIG_SRCDIR(Makefile.in)

diff --git a/expat.spec b/expat.spec
index 36825906c98dd569d6874f8207f1850869a78af8..ddec9cac521b42209ca8bd3e8366c5f46fac494d 100644 (file)
--- a/expat.spec
+++ b/expat.spec
@@ -9,17 +9,17 @@ 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.0
-Release:       2
+Version:       2.1.1
+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.gz
-# Source0-md5: dd7dab7a5fea97d2a6a43f511449b7cd
+Source0:       http://downloads.sourceforge.net/expat/%{name}-%{version}.tar.bz2
+# Source0-md5: 7380a64a8e3a9d66a9887b01d0d7ea81
 Patch0:                %{name}-ac_fixes.patch
 Patch3:                %{name}-2.0.1-check_stopped_parser.patch
 URL:           http://www.libexpat.org/
-BuildRequires: autoconf >= 2.52
+BuildRequires: autoconf >= 2.58
 BuildRequires: automake
 BuildRequires: libtool
 Obsoletes:     libexpat1_95
@@ -121,7 +121,7 @@ Bibliotecas estáticas para desenvolvimento com a biblioteca expat.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %configure \