From 0efdb4f0a1b1851a545d09843b7487ad21c5404b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 19 Aug 2013 09:25:30 +0200
Subject: [PATCH] update to 5.5.1, fixes for CVE-2011-4718 + CVE-2013-4248

---
 .gitignore                                            |  1 +
 ...stem-libzip.patch => php-5.5.2-system-libzip.patch |  2 +-
 php.spec                                              | 11 +++++++----
 sources                                               |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
 rename php-5.5.0-system-libzip.patch => php-5.5.2-system-libzip.patch (99%)

diff --git a/.gitignore b/.gitignore
index 47e9626..4a7d915 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ php-5.4.*.bz2
 /php-5.5.0RC3-strip.tar.xz
 /php-5.5.0-strip.tar.xz
 /php-5.5.1-strip.tar.xz
+/php-5.5.2-strip.tar.xz
diff --git a/php-5.5.0-system-libzip.patch b/php-5.5.2-system-libzip.patch
similarity index 99%
rename from php-5.5.0-system-libzip.patch
rename to php-5.5.2-system-libzip.patch
index e453411..b014e72 100644
--- a/php-5.5.0-system-libzip.patch
+++ b/php-5.5.2-system-libzip.patch
@@ -3,7 +3,7 @@ diff -up php-5.5.2RC1/ext/zip/config.m4.systzip php-5.5.2RC1/ext/zip/config.m4
 +++ php-5.5.2RC1/ext/zip/config.m4	2013-08-08 09:24:07.577567241 +0200
 @@ -13,65 +13,116 @@ fi
  PHP_ARG_WITH(pcre-dir, pcre install prefix,
- [  --with-pcre-dir           ZIP: pcre install prefix], no, no)
+ [  --with-pcre-dir         ZIP: pcre install prefix], no, no)
  
 +PHP_ARG_WITH(libzip, libzip,
 +[ --with-libzip[=DIR]        ZIP: use libzip], no, no)
diff --git a/php.spec b/php.spec
index cb34b19..bb3e59b 100644
--- a/php.spec
+++ b/php.spec
@@ -3,7 +3,7 @@
 %global zendver     20121212
 %global pdover      20080721
 # Extension version
-%global opcachever  7.0.2-dev
+%global opcachever  7.0.3-dev
 
 # Adds -z now to the linker flags
 %global _hardened_build 1
@@ -68,8 +68,8 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.5.1
-Release: 3%{?dist}
+Version: 5.5.2
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -112,7 +112,7 @@ Patch42: php-5.3.1-systzdata-v10.patch
 # See http://bugs.php.net/53436
 Patch43: php-5.4.0-phpize.patch
 # Use system libzip instead of bundled one
-Patch44: php-5.5.0-system-libzip.patch
+Patch44: php-5.5.2-system-libzip.patch
 # Use -lldap_r for OpenLDAP
 Patch45: php-5.4.8-ldap_r.patch
 # Make php_config.h constant across builds
@@ -1537,6 +1537,9 @@ exit 0
 
 
 %changelog
+* Mon Aug 19 2013 Remi Collet <rcollet@redhat.com> - 5.5.2-1
+- update to 5.5.1, fixes for CVE-2011-4718 + CVE-2013-4248
+
 * Thu Aug 08 2013 Remi Collet <rcollet@redhat.com> - 5.5.1-3
 - improve system libzip patch
 
diff --git a/sources b/sources
index ff3aecd..33d1576 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79bcf1671bcf2c032a0aa1e5bfdda6b7  php-5.5.1-strip.tar.xz
+a2fbb6b185db3a80763de359c7c169a2  php-5.5.2-strip.tar.xz