diff options
| -rw-r--r-- | failed.txt | 4 | ||||
| -rw-r--r-- | php-5.6.3-ldap_r.patch | 17 | ||||
| -rw-r--r-- | php-7.1.15-ldap_r.patch | 19 | ||||
| -rw-r--r-- | php.spec | 10 |
4 files changed, 29 insertions, 21 deletions
@@ -6,10 +6,12 @@ $ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log /var/lib/mock/scl71el7x/build.log:Tests failed : 0 /var/lib/mock/scl71fc24x/build.log:Tests failed : 0 /var/lib/mock/scl71fc25x/build.log:Tests failed : 0 -/var/lib/mock/scl71fc26x/build.log:Tests failed : 0 +/var/lib/mock/scl71fc26x/build.log:Tests failed : 1 /var/lib/mock/scl71fc27x/build.log:Tests failed : 0 +fc26x: + 1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.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) + @@ -120,8 +120,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: %{?scl_prefix}php @@ -172,7 +172,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 @@ -1817,6 +1817,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 |