From 95680abeaf15c351fa67d0acbb7e13b948efbb78 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 3 May 2014 09:59:42 +0200
Subject: PHP 5.6.0beta2

---
 php-5.6.0-readline.patch | 17 +++++++++++++++++
 php-fpm-www.conf         |  4 ++--
 php56.spec               |  9 +++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 php-5.6.0-readline.patch

diff --git a/php-5.6.0-readline.patch b/php-5.6.0-readline.patch
new file mode 100644
index 0000000..f015a2e
--- /dev/null
+++ b/php-5.6.0-readline.patch
@@ -0,0 +1,17 @@
+
+Revert http://git.php.net/?p=php-src.git;a=patch;h=1c0fccfc9abaaea02ae717547bc3b69fcb2de86c
+
+diff -up php-5.6.0beta2/sapi/phpdbg/config.m4.readline php-5.6.0beta2/sapi/phpdbg/config.m4
+--- php-5.6.0beta2/sapi/phpdbg/config.m4.readline	2014-05-03 08:36:56.693265559 +0200
++++ php-5.6.0beta2/sapi/phpdbg/config.m4	2014-05-03 08:37:56.542512577 +0200
+@@ -20,10 +20,6 @@ if test "$PHP_PHPDBG" != "no"; then
+   PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE"
+   PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c"
+ 
+-  if test "$PHP_READLINE" != "no"; then
+-  	PHPDBG_EXTRA_LIBS="-lreadline"
+-  fi
+-  
+   PHP_SUBST(PHP_PHPDBG_CFLAGS)
+   PHP_SUBST(PHP_PHPDBG_FILES)
+   PHP_SUBST(PHPDBG_EXTRA_LIBS)
diff --git a/php-fpm-www.conf b/php-fpm-www.conf
index 502feff..e2f3dc8 100644
--- a/php-fpm-www.conf
+++ b/php-fpm-www.conf
@@ -27,10 +27,10 @@ listen.allowed_clients = 127.0.0.1
 ; permissions must be set in order to allow connections from a web server. Many
 ; BSD-derived systems allow connections regardless of permissions. 
 ; Default Values: user and group are set as the running user
-;                 mode is set to 0666
+;                 mode is set to 0660
 ;listen.owner = nobody
 ;listen.group = nobody
-;listen.mode = 0666
+;listen.mode = 0660
 
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
diff --git a/php56.spec b/php56.spec
index 02c55b0..ca3dd28 100644
--- a/php56.spec
+++ b/php56.spec
@@ -118,13 +118,13 @@
 %endif
 
 #global snapdate      201404090430
-%global rcver         beta1
+%global rcver         beta2
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.6.0
 %if 0%{?snapdate:1}%{?rcver:1}
-Release: 0.6.%{?snapdate}%{?rcver}%{?dist}
+Release: 0.7.%{?snapdate}%{?rcver}%{?dist}
 %else
 Release: 1%{?dist}
 %endif
@@ -164,6 +164,7 @@ Patch5: php-5.2.0-includedir.patch
 Patch6: php-5.2.4-embed.patch
 Patch7: php-5.3.0-recode.patch
 Patch8: php-5.4.7-libdb.patch
+Patch9: php-5.6.0-readline.patch
 
 # Fixes for extension modules
 # https://bugs.php.net/63171 no odbc call during timeout
@@ -890,6 +891,7 @@ rm -rf ext/json
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
 %patch8 -p1 -b .libdb
+%patch9 -p1 -b .readline
 
 %patch21 -p1 -b .odbctimer
 
@@ -1909,6 +1911,9 @@ fi
 
 
 %changelog
+* Sat May  3 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.7.beta2
+- php 5.6.0beta2
+
 * Thu Apr 10 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.6.beta1
 - php 5.6.0beta1
 
-- 
cgit