diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-12-14 14:38:48 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-12-14 14:38:48 +0100 |
| commit | 975fc36b53874018ee5b4ed83f826f964de9264f (patch) | |
| tree | 71301a718158875f4cad8bb45d3dc6c6235bec11 | |
| parent | 3d7f133daa650f822e2a6f5c6e3e0e9d8c9b6987 (diff) | |
php/curl: add CURL_SSLVERSION_TLSv1_x constant
| -rw-r--r-- | php-5.5.30-curl.patch | 14 | ||||
| -rw-r--r-- | php.spec | 9 |
2 files changed, 22 insertions, 1 deletions
diff --git a/php-5.5.30-curl.patch b/php-5.5.30-curl.patch new file mode 100644 index 0000000..0c72d56 --- /dev/null +++ b/php-5.5.30-curl.patch @@ -0,0 +1,14 @@ +diff -up php-5.5.30/ext/curl/interface.c.old php-5.5.30/ext/curl/interface.c +--- php-5.5.30/ext/curl/interface.c.old 2015-12-14 13:58:27.911676702 +0100 ++++ php-5.5.30/ext/curl/interface.c 2015-12-14 14:08:04.581124497 +0100 +@@ -1213,7 +1213,9 @@ PHP_MINIT_FUNCTION(curl) + REGISTER_CURL_CONSTANT(CURLSSLOPT_ALLOW_BEAST); + #endif + +-#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */ ++#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 (in upstream curl 7.34) ++ backported in RHEL-7 curl-7.29.0-16.el7 rhbz#1012136 ++ backported in RHEL-6 curl-7.19.7-43.el6 rhbz#1036789 */ + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_0); + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_1); + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2); @@ -177,6 +177,7 @@ Patch5: php-5.6.3-includedir.patch Patch6: php-5.6.3-embed.patch Patch7: php-5.3.0-recode.patch Patch8: php-5.6.17-libdb.patch +Patch9: php-5.5.30-curl.patch # Fixes for extension modules # https://bugs.php.net/63171 no odbc call during timeout @@ -877,6 +878,9 @@ support for using the enchant library to PHP. %patch6 -p1 -b .embed %patch7 -p1 -b .recode %patch8 -p1 -b .libdb +%if 0%{?rhel} +%patch9 -p1 -b .curltls +%endif %patch21 -p1 -b .odbctimer @@ -1691,7 +1695,7 @@ fi %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf %config(noreplace) %{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm -# %{_prefix}/lib/tmpfiles.d/php-fpm.conf +# {_prefix}/lib/tmpfiles.d/php-fpm.conf %if %{with_systemd} %{_unitdir}/%{?scl_prefix}php-fpm.service %dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d @@ -1786,6 +1790,9 @@ fi %changelog +* Mon Dec 14 2015 Remi Collet <remi@fedoraproject.org> 5.6.17-0.2.RC1 +- curl: add CURL_SSLVERSION_TLSv1_x constant + * Thu Dec 10 2015 Remi Collet <remi@fedoraproject.org> 5.6.17-0.1.RC1 - update to 5.6.17RC1 |