From eb8119e9e6d55cbcf77a87bb775602d382780e56 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sun, 18 Aug 2013 15:01:47 +0300
Subject: [PATCH] up to 5.4.18; fixes CVE-2013-4113 and CVE-2013-4248

---
 php-sh.patch | 13 -------------
 php.spec     |  6 ++----
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 php-sh.patch

diff --git a/php-sh.patch b/php-sh.patch
deleted file mode 100644
index e2c6770..0000000
--- a/php-sh.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- php-5.1.6/acinclude.m4.orig	2006-11-21 10:43:13.179505000 +0100
-+++ php-5.1.6/acinclude.m4	2006-11-21 10:55:32.479505000 +0100
-@@ -68,8 +68,8 @@
-     changequote({,})
-     ep_dir="`echo $1|$SED 's%/*[^/][^/]*/*$%%'`"
-     changequote([,])
--    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
--    $2="$ep_realdir/`basename \"$1\"`"
-+    ep_realdir="$(cd "$ep_dir" && pwd)"
-+    $2="$ep_realdir/$(basename "$1")"
-   fi
- ])
- 
diff --git a/php.spec b/php.spec
index 2d8292b..1693960 100644
--- a/php.spec
+++ b/php.spec
@@ -135,13 +135,13 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	5.4.17
+Version:	5.4.18
 Release:	%{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	1e027e99e2a874310fd518e87e3947af
+# Source0-md5:	b2e185b46b22a48a385cf21a0dc76e65
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -162,7 +162,6 @@ Patch5:		%{orgname}-filter-shared.patch
 Patch6:		%{orgname}-build_modules.patch
 Patch7:		%{orgname}-sapi-ini-file.patch
 Patch8:		%{orgname}-config-file-scan-dir.patch
-Patch9:		%{orgname}-sh.patch
 Patch10:	%{orgname}-ini.patch
 Patch11:	embed.patch
 %if %{with type_hints}
@@ -1876,7 +1875,6 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %patch6 -p1
 %patch8 -p1
 %patch7 -p1
-%patch9 -p1
 cp -p php.ini-production php.ini
 %patch10 -p1
 %if %{with type_hints}
-- 
2.44.0