[php/f20] Update to 5.5.18

[Remi Collet]

commit b2730a2f36adeacb113f1a5b230f9c2333bc976f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Oct 16 14:49:00 2014 +0200

    Update to 5.5.18

 .gitignore               |    1 +
 php-5.5.17-openssl.patch |  199 ----------------------------------------------
 php-bug65641.patch       |   63 ---------------
 php.spec                 |   13 ++--
 sources                  |    2 +-
 5 files changed, 8 insertions(+), 270 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e90c23..3ec829b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ php-5.6.*.xz
 /php-5.5.15-strip.tar.xz
 /php-5.5.16-strip.tar.xz
 /php-5.5.17-strip.tar.xz
+/php-5.5.18-strip.tar.xz
diff --git a/php.spec b/php.spec
index 1f7b8cc..f53456f 100644
--- a/php.spec
+++ b/php.spec
@@ -68,8 +68,8 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.5.17
-Release: 2%{?dist}
+Version: 5.5.18
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -121,9 +121,6 @@ Patch46: php-5.4.9-fixheader.patch
 Patch47: php-5.4.9-phpinfo.patch
 
 # Upstream fixes (100+)
-Patch100: php-bug65641.patch
-# Revert to fix regression
-Patch101: php-5.5.17-openssl.patch
 
 # Security fixes (200+)
 
@@ -734,8 +731,6 @@ support for using the enchant library to PHP.
 %patch47 -p1 -b .phpinfo
 
 # upstream patches
-%patch100 -p1 -b .bug65641
-%patch101 -p1 -R -b .revert
 
 # security patches
 
@@ -1556,6 +1551,10 @@ exit 0
 
 
 %changelog
+* Thu Oct 16 2014 Remi Collet <remi at fedoraproject.org> 5.5.18-1
+- Update to 5.5.18
+  http://www.php.net/releases/5_5_18.php
+
 * Sat Sep 20 2014 Remi Collet <remi at fedoraproject.org> 5.5.17-2
 - openssl: fix regression introduce in changes for upstream
   bug #65137 and #41631, revert to 5.5.16 behavior
diff --git a/sources b/sources
index 899f83c..bacaa41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b8dd2d8f681d402e3bc876d86863e53  php-5.5.17-strip.tar.xz
+3769fb3501abaf04bccf47ff006db707  php-5.5.18-strip.tar.xz