Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at Thu Apr 14 09:07:06 CEST 2011.
-------- --- php5/php5.changes 2011-04-02 02:55:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2011-04-14 01:41:42.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 13 23:39:33 UTC 2011 - [email protected] + +- fix crash on destruction. +- allow openssl extension to be built w/o SSLv2 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- php5-dtor-err-crash.patch php5-openssl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.bC28Lo/_old 2011-04-14 09:06:32.000000000 +0200 +++ /var/tmp/diff_new_pack.bC28Lo/_new 2011-04-14 09:06:32.000000000 +0200 @@ -31,7 +31,7 @@ BuildRequires: db-devel enchant-devel gmp-devel imap-devel libicu-devel libtidy-devel BuildRequires: libtiff-devel libxslt-devel mm-devel net-snmp-devel openldap2-devel BuildRequires: pam-devel pkgconfig postfix postgresql-devel unixODBC-devel update-alternatives -BuildRequires: krb5-devel libevent-devel libmcrypt-devel +BuildRequires: krb5-devel libevent-devel libmcrypt-devel tcpd-devel #BuildRequires: mysql-devel %if %{with_spell} BuildRequires: aspell-devel @@ -77,7 +77,7 @@ ### ### Version: 5.3.6 -Release: 1 +Release: 2 License: The PHP License, version 3.01 Group: Development/Languages/Other Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter @@ -118,6 +118,8 @@ Patch26: php-5.3.4-pts.patch Patch27: php-5.3.4-format-string-issues.patch Patch28: php-5.3.6-intl.patch +Patch29: php5-openssl.patch +Patch30: php5-dtor-err-crash.patch Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -1229,6 +1231,8 @@ %patch26 %patch27 %patch28 +%patch29 +%patch30 # we build three SAPI %{__mkdir_p} build-apache2 build-fpm %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi ++++++ php5-dtor-err-crash.patch ++++++ Index: main/main.c =================================================================== --- main/main.c (revisión: 309646) +++ main/main.c (revisión: 309647) @@ -908,9 +908,11 @@ if (display) { if (PG(last_error_message)) { free(PG(last_error_message)); + PG(last_error_message) = NULL; } if (PG(last_error_file)) { free(PG(last_error_file)); + PG(last_error_file) = NULL; } if (!error_filename) { error_filename = "Unknown"; ++++++ php5-openssl.patch ++++++ Index: ext/openssl/openssl.c =================================================================== --- ext/openssl/openssl.c (revisión: 310212) +++ ext/openssl/openssl.c (copia de trabajo) @@ -47,6 +47,7 @@ #include <openssl/rand.h> #include <openssl/ssl.h> #include <openssl/pkcs12.h> +#include <openssl/engine.h> /* Common */ #include <time.h> @@ -983,7 +984,12 @@ OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); OpenSSL_add_all_algorithms(); +/* Load all bundled ENGINEs into memory and make them visible */ + ENGINE_load_builtin_engines(); + /* Register all of them for every algorithm they collectively implement */ + ENGINE_register_all_complete(); + ERR_load_ERR_strings(); ERR_load_crypto_strings(); ERR_load_EVP_strings(); Index: ext/openssl/xp_ssl.c =================================================================== --- ext/openssl/xp_ssl.c (revisión: 310212) +++ ext/openssl/xp_ssl.c (copia de trabajo) @@ -329,9 +329,14 @@ method = SSLv23_client_method(); break; case STREAM_CRYPTO_METHOD_SSLv2_CLIENT: +#ifdef OPENSSL_NO_SSL2 + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled in openSSL"); + return -1; +#else sslsock->is_client = 1; method = SSLv2_client_method(); break; +#endif case STREAM_CRYPTO_METHOD_SSLv3_CLIENT: sslsock->is_client = 1; method = SSLv3_client_method(); @@ -349,9 +354,14 @@ method = SSLv3_server_method(); break; case STREAM_CRYPTO_METHOD_SSLv2_SERVER: +#ifdef OPENSSL_NO_SSL2 + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled in openSSL"); + return -1; +#else sslsock->is_client = 0; method = SSLv2_server_method(); break; +#endif case STREAM_CRYPTO_METHOD_TLS_SERVER: sslsock->is_client = 0; method = TLSv1_server_method(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
