Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	php70.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 2 11:23:56 UTC 2016 - cs@linux-administrator.com + +- update patch php-7.0.7-curltlsconst.patch + +------------------------------------------------------------------- Thu Jun 2 09:19:06 UTC 2016 - cs@linux-administrator.com - update to release 7.0.7
[-] [+]	Changed	php70.spec ^
@@ -153,7 +153,7 @@ # drop "Configure command" from phpinfo output Patch47: php-5.4.9-phpinfo.patch Patch48: php-5.5.0-icuconfig.patch -Patch49: php-7.0.2-curltlsconst.patch +Patch49: php-7.0.7-curltlsconst.patch # Fixes for tests @@ -995,9 +995,9 @@ %patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo %patch48 -p1 -b .icuconfig -# %if 0%{?rhel} >= 6 -# %patch49 -p1 -b .curltlsconst -# %endif +%if 0%{?rhel} >= 6 +%patch49 -p1 -b .curltlsconst +%endif # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE
[-] [+]	Added	php-7.0.7-curltlsconst.patch ^
@@ -0,0 +1,16 @@ +diff -Naru php-7.0.7-curltlsconst/ext/curl/interface.c php-7.0.7/ext/curl/interface.c +--- php-7.0.7-curltlsconst/ext/curl/interface.c 2016-05-25 13:13:46.000000000 +0000 ++++ php-7.0.7/ext/curl/interface.c 2016-05-28 07:44:02.488742366 +0000 +@@ -1257,11 +1257,11 @@ + + #if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 / + REGISTER_CURL_CONSTANT(CURLOPT_LOGIN_OPTIONS); ++#endif + + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_0); + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_1); + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2); +-#endif + + #if LIBCURL_VERSION_NUM >= 0x072400 / Available since 7.36.0 */ + REGISTER_CURL_CONSTANT(CURLOPT_EXPECT_100_TIMEOUT_MS);