remi pushed to php-pecl-zendopcache (epel7). "update to 7.0.5"

[notifications at fedoraproject.org]

>From dc133aa2756d2556242855687cb679832ccc8336 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Tue, 14 Apr 2015 09:09:26 +0200
Subject: update to 7.0.5


diff --git a/.gitignore b/.gitignore
index cb759e8..85a2336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /zendopcache-7.0.2.tgz
 /zendopcache-7.0.3.tgz
 /zendopcache-7.0.4.tgz
+/zendopcache-7.0.5.tgz
diff --git a/php-pecl-zendopcache.spec b/php-pecl-zendopcache.spec
index 1267463..489a5f3 100644
--- a/php-pecl-zendopcache.spec
+++ b/php-pecl-zendopcache.spec
@@ -12,8 +12,8 @@
 %global plug_name  opcache
 
 Name:          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
@@ -25,8 +25,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
-
 BuildRequires: php-devel >= 5.2.0
 BuildRequires: php-pear
 
@@ -60,10 +58,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
@@ -131,6 +128,9 @@ fi
 
 
 %changelog
+* Tue Apr 14 2015 Remi Collet <remi at fedoraproject.org> - 7.0.5-1
+- Update to 7.0.5
+
 * Wed Apr  8 2015 Remi Collet <remi at fedoraproject.org> - 7.0.4-2
 - fix use after free in opcache CVE-2015-1351
 
diff --git a/sources b/sources
index c69c23d..ca76c19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7aad5d4bc0abd4c2c03c9f9305e9c36d  zendopcache-7.0.4.tgz
+0c2710c272e398bea89d41dee42ee633  zendopcache-7.0.5.tgz
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 at 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 v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-pecl-zendopcache.git/commit/?h=epel7&id=dc133aa2756d2556242855687cb679832ccc8336