From dcc383758424b1980806f04c718cfceb2e321931 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 26 Apr 2016 11:13:11 +0200
Subject: php 5.4: add fix for #64938

---
 php.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index a4ed08e..5cfb08a 100644
--- a/php.spec
+++ b/php.spec
@@ -119,7 +119,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: 5.4.45
-Release: 7%{?dist}
+Release: 8%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -200,6 +200,7 @@ Patch217: bug71906.patch
 Patch218: bug71798.patch
 Patch219: bug71704.patch
 Patch220: bug71527.patch
+Patch221: bug64938.patch
 
 # Fixes for tests (300+)
 # Backported from 5.5
@@ -858,6 +859,7 @@ support for using the enchant library to PHP.
 %patch218 -p1 -b .bug71798
 %patch219 -p1 -b .bug71704
 %patch220 -p1 -b .bug71527
+%patch221 -p1 -b .bug64938
 
 # Fixes for tests
 %patch300 -p1 -b .datetests1
@@ -1681,6 +1683,10 @@ EOF
 
 
 %changelog
+* Tue Apr 26 2016 Remi Collet <remi@fedoraproject.org> 5.4.45-8
+- Fix #64938: libxml_disable_entity_loader setting is shared
+  between threads  CVE-2015-8866
+
 * Tue Mar 29 2016 Remi Collet <remi@fedoraproject.org> 5.4.45-7
 - Fix #71860: Require valid paths for phar filenames
   CVE-2016-4072
-- 
cgit