rpms/php
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 7.1.15RC1

Browse Source 
adapt ldap patch
This commit is contained in:
Remi Collet 2018-02-14 12:29:14 +01:00
parent 54e5c1d4e1
commit 7354aefff2
5 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ php-7.2.*.xz
/php-7.1.13.tar.xz
/php-7.1.14RC1.tar.xz
/php-7.1.14.tar.xz
/php-7.1.15RC1.tar.xz

17
php-5.6.3-ldap_r.patch
View File

@ -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)

19
php-7.1.15-ldap_r.patch Normal file
View File

@ -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)

10
php.spec
View File

@ -56,8 +56,8 @@
%global with_mcrypt 0
%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
@ -102,7 +102,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
@ -1539,6 +1539,10 @@ rm -f README.{Zeus,QNX,CVS-RULES}
%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

2
sources
View File

@ -1 +1 @@
SHA512 (php-7.1.14.tar.xz) = 7604e490aef95ae9c87bc4230491328c4cbcce42653234906885f9aa323f867ea941a7dbe80424aa4c4872392559ff5fa2acf1605c402055b6e428e6fe79ece6
SHA512 (php-7.1.15RC1.tar.xz) = 9217fd238ba664f4498cf6e9d53cbc0ecab179267f1ff9750470163c324d327147440f0c553d375a2f73da7c8f818c18c3535162be0085e3fb1002772ff01227