From 1912351d39cc92dbfcdb49a5f6c0b7615133c486 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 14 Apr 2015 07:48:05 +0200
Subject: php-pecl-zendopcache: 7.0.5

---
 REFLECTION                      |  2 +-
 php-pecl-zendopcache.spec       | 12 ++++++------
 zendopcache-CVE-2015-1352.patch | 26 --------------------------
 3 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 zendopcache-CVE-2015-1352.patch

diff --git a/REFLECTION b/REFLECTION
index f6bbbc4..6b2cae0 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #69 Zend OPcache version 7.0.4FE ] {
+Extension [ <persistent> extension #75 Zend OPcache version 7.0.5FE ] {
 
   - INI {
     Entry [ opcache.enable <ALL> ]
diff --git a/php-pecl-zendopcache.spec b/php-pecl-zendopcache.spec
index c14705c..71d0165 100644
--- a/php-pecl-zendopcache.spec
+++ b/php-pecl-zendopcache.spec
@@ -14,8 +14,8 @@
 %global plug_name  opcache
 
 Name:          %{?scl_prefix}php-pecl-%{pecl_name}
-Version:       7.0.4
-Release:       2%{?dist}
+Version:       7.0.5
+Release:       1%{?dist}
 Summary:       The Zend OPcache
 
 Group:         Development/Libraries
@@ -27,8 +27,6 @@ Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source1:       %{plug_name}.ini
 Source2:       %{plug_name}-default.blacklist
 
-Patch0:        %{pecl_name}-CVE-2015-1352.patch
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: %{?scl_prefix}php-devel >= 5.2.0
 BuildRequires: %{?scl_prefix}php-pear
@@ -75,10 +73,9 @@ bytecode optimization patterns that make code execution faster.
 mv %{pecl_name}-%{version} NTS
 
 pushd NTS
-%patch0 -p1 -b .cve1352
 
 # Sanity check, really often broken
-extver=$(sed -n '/#define PHP_ZENDOPCACHE_VERSION/{s/.* "//;s/".*$//;p}' ZendAccelerator.h)
+extver=$(sed -n '/#define PHP_ZENDOPCACHE_VERSION/{s/.*"7/7/;s/".*$//;p}' ZendAccelerator.h)
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
    : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}.
    exit 1
@@ -207,6 +204,9 @@ fi
 
 
 %changelog
+* Tue Apr 14 2015 Remi Collet <remi@fedoraproject.org> - 7.0.5-1
+- Update to 7.0.4
+
 * Wed Apr  8 2015 Remi Collet <remi@fedoraproject.org> - 7.0.4-2
 - fix use after free in opcache CVE-2015-1351
 - drop runtime dependency on pear, new scriptlets
diff --git a/zendopcache-CVE-2015-1352.patch b/zendopcache-CVE-2015-1352.patch
deleted file mode 100644
index c6d8d28..0000000
--- a/zendopcache-CVE-2015-1352.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9a88100573c40b9f59baa2f2d138809eb47b4317 Mon Sep 17 00:00:00 2001
-From: Xinchen Hui <laruence@php.net>
-Date: Thu, 8 Jan 2015 16:32:20 +0800
-Subject: [PATCH] Fixed bug #68677 (Use After Free in OPcache)
-
-(cherry picked from commit 777c39f4042327eac4b63c7ee87dc1c7a09a3115)
----
- zend_shared_alloc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zend_shared_alloc.c b/zend_shared_alloc.c
-index bbe26e8..8880b88 100644
---- a/zend_shared_alloc.c
-+++ b/zend_shared_alloc.c
-@@ -346,10 +346,10 @@ void *_zend_shared_memdup(void *source, size_t size, zend_bool free_source TSRML
- 	retval = ZCG(mem);;
- 	ZCG(mem) = (void*)(((char*)ZCG(mem)) + ZEND_ALIGNED_SIZE(size));
- 	memcpy(retval, source, size);
-+	zend_shared_alloc_register_xlat_entry(source, retval);
- 	if (free_source) {
- 		interned_efree((char*)source);
- 	}
--	zend_shared_alloc_register_xlat_entry(source, retval);
- 	return retval;
- }
- 
-- 
cgit