summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt14
-rw-r--r--php-5.6.3-ldap_r.patch17
-rw-r--r--php-7.1.15-ldap_r.patch19
-rw-r--r--php71.spec10
4 files changed, 33 insertions, 27 deletions
diff --git a/failed.txt b/failed.txt
index 04288dd..42527cc 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,24 +1,24 @@
-===== 7.1.14 (2018-02-01)
+===== 7.1.15RC1 (2018-03-01)
$ grep -r 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/el6i/build.log:Tests failed : 0
/var/lib/mock/el6x/build.log:Tests failed : 0
/var/lib/mock/el7x/build.log:Tests failed : 1
-/var/lib/mock/fc24i/build.log:Tests failed : 0
-/var/lib/mock/fc24x/build.log:Tests failed : 0
+/var/lib/mock/fc24i/build.log:Tests failed : 1
+/var/lib/mock/fc24x/build.log:Tests failed : 1
/var/lib/mock/fc25i/build.log:Tests failed : 0
/var/lib/mock/fc25x/build.log:Tests failed : 0
-/var/lib/mock/fc26i/build.log:Tests failed : 0
-/var/lib/mock/fc26x/build.log:Tests failed : 1
+/var/lib/mock/fc26i/build.log:Tests failed : 1
+/var/lib/mock/fc26x/build.log:Tests failed : 0
/var/lib/mock/fc27i/build.log:Tests failed : 0
/var/lib/mock/fc27x/build.log:Tests failed : 0
el7x:
- 1 Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
-fc26x:
1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
+fc24i, fc24x, fc26i:
+ 1 Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
1 proc_open give erratic test results :(
diff --git a/php-5.6.3-ldap_r.patch b/php-5.6.3-ldap_r.patch
deleted file mode 100644
index b335488..0000000
--- a/php-5.6.3-ldap_r.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Use -lldap_r by default.
-
---- php-5.4.8/ext/ldap/config.m4.ldap_r
-+++ php-5.4.8/ext/ldap/config.m4
-@@ -117,7 +117,10 @@ if test "$PHP_LDAP" != "no"; then
- LDAP_PTHREAD=
- fi
-
-- if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
-+ if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then
-+ PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-+ elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
- PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-
diff --git a/php-7.1.15-ldap_r.patch b/php-7.1.15-ldap_r.patch
new file mode 100644
index 0000000..ab65a14
--- /dev/null
+++ b/php-7.1.15-ldap_r.patch
@@ -0,0 +1,19 @@
+
+Use -lldap_r by default.
+
+diff -up php-7.1.15RC1/ext/ldap/config.m4.ldap_r php-7.1.15RC1/ext/ldap/config.m4
+--- php-7.1.15RC1/ext/ldap/config.m4.ldap_r 2018-02-14 07:28:23.608321317 +0100
++++ php-7.1.15RC1/ext/ldap/config.m4 2018-02-14 07:28:58.527492025 +0100
+@@ -119,7 +119,11 @@ if test "$PHP_LDAP" != "no"; then
+
+ MACHINE_INCLUDES=$($CC -dumpmachine)
+
+- if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
++ if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then
++ PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
++
++ elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
+ PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+
diff --git a/php71.spec b/php71.spec
index 07996d5..c67ec36 100644
--- a/php71.spec
+++ b/php71.spec
@@ -107,8 +107,8 @@
%global db_devel libdb-devel
%endif
-%global upver 7.1.14
-#global rcver RC1
+%global upver 7.1.15
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -158,7 +158,7 @@ Patch42: php-7.1.0-systzdata-v14.patch
# See http://bugs.php.net/53436
Patch43: php-5.4.0-phpize.patch
# Use -lldap_r for OpenLDAP
-Patch45: php-5.6.3-ldap_r.patch
+Patch45: php-7.1.15-ldap_r.patch
# drop "Configure command" from phpinfo output
Patch47: php-5.6.3-phpinfo.patch
# Automatically load OpenSSL configuration file
@@ -2054,6 +2054,10 @@ fi
%changelog
+* Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 7.1.15~RC1-1
+- Update to 7.1.15RC1
+- adapt ldap patch
+
* Wed Jan 31 2018 Remi Collet <remi@remirepo.net> - 7.1.14-1
- Update to 7.1.14 - http://www.php.net/releases/7_1_14.php