Hello community, here is the log from the commit of package php5 checked in at Fri May 4 00:44:38 CEST 2007. -------- --- php5/php5.changes 2007-03-30 11:34:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2007-05-03 13:44:31.000000000 +0200 @@ -1,0 +2,17 @@ +Thu May 3 13:44:11 CEST 2007 - mmarek@suse.cz + +- fixed some new compiler warnings + +------------------------------------------------------------------- +Thu May 3 08:25:46 UTC 2007 - judas_iscariote@shorewall.net + +- upgrade to PHP 5.2.2, fixed hundreds of bugs including MOPB ones + if you need the complete changes see http://www.php.net/ChangeLog-5.php#5.2.2 + +------------------------------------------------------------------- +Thu May 3 04:47:57 UTC 2007 - judas_iscariote + +- Upgrade suhosin extension to version 0.9.19 see + http://www.hardened-php.net/suhosin/changelog.html for details + +------------------------------------------------------------------- @@ -400,0 +418,5 @@ +Wed Jan 25 21:40:11 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- @@ -412,5 +433,0 @@ -Wed Jan 25 21:40:11 CET 2006 - mls@suse.de - -- converted neededforbuild to BuildRequires - -------------------------------------------------------------------- @@ -469,0 +487,5 @@ +Tue Jan 10 01:59:39 CET 2006 - ro@suse.de + +- avoid rpath /usr/ssl/lib in curl ext + +------------------------------------------------------------------- @@ -495,5 +516,0 @@ -Tue Jan 10 01:59:39 CET 2006 - ro@suse.de - -- avoid rpath /usr/ssl/lib in curl ext - -------------------------------------------------------------------- @@ -1457,5 +1473,0 @@ -Mon Oct 16 17:58:45 GMT 2000 - bk@suse.de - -- s390: --with-gd=yes -> --with-gd=shared(broken somehow with =yes) - -------------------------------------------------------------------- @@ -1468,0 +1481,5 @@ +Mon Oct 16 17:58:45 GMT 2000 - bk@suse.de + +- s390: --with-gd=yes -> --with-gd=shared(broken somehow with =yes) + +------------------------------------------------------------------- Old: ---- php-5.2.1-revert-phpbug38770.patch php-5.2.1.tar.bz2 php5-importreqvars-secfix.patch php5-MOPB-14-2007-secfix.patch php5-MOPB-20-2007-secfix.patch php5-MOPB-21-2007-secfix.patch php5-MOPB-22-2007-secfix.patch php5-MOPB-24-2007-secfix.patch suhosin-0.9.18.tar.bz2 suhosin.ini suhosin-patch-5.2.1-0.9.6.2.patch.gz suhosin-patch-fixes.patch New: ---- php-5.2.2.tar.bz2 suhosin-0.9.19.tgz suhosin-patch-5.2.2-0.9.6.2.patch.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.mgf817/_old 2007-05-04 00:39:58.000000000 +0200 +++ /var/tmp/diff_new_pack.mgf817/_new 2007-05-04 00:39:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package php5 (Version 5.2.1) +# spec file for package php5 (Version 5.2.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: php5 -%define suhosin_version 0.9.18 +%define suhosin_version 0.9.19 %define suhosin_patch_version 0.9.6.2 %define with_suhosin_patch 1 %define pkg_name php5 @@ -47,6 +47,8 @@ #support t1lib in gd in 10.3 or later %if 0%{?suse_version} > 1020 BuildRequires: t1lib-devel +#10.3 does not install sendmail binary with the minimal system +Requires: smtp_daemon %endif %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR @@ -64,8 +66,8 @@ %define apache2_serverroot %(%{apxs2} -q PREFIX) ### ### -Version: 5.2.1 -Release: 4 +Version: 5.2.2 +Release: 1 License: Other uncritical OpenSource License Group: Productivity/Networking/Web/Servers Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter @@ -75,8 +77,7 @@ Obsoletes: php5-dbx php5-dio php5-fam php5-filepro php5-yp Source0: php-%{version}.tar.bz2 Source1: php-suse-addons.tar.bz2 -Source2: suhosin-%{suhosin_version}.tar.bz2 -Source3: suhosin.ini +Source2: suhosin-%{suhosin_version}.tgz Source4: README.SUSE-pear #SUSE specific stuff Patch1: php5-config.patch @@ -87,21 +88,11 @@ Patch5: php5-really-with-libedit.patch %if %{with_suhosin_patch} Patch6: suhosin-patch-%{version}-%{suhosin_patch_version}.patch.gz -Patch7: suhosin-patch-fixes.patch %endif #bugs Patch8: php5-really-norpath.patch -Patch9: php-5.2.1-revert-phpbug38770.patch -#security fixes -Patch10: php5-MOPB-14-2007-secfix.patch -# see http://www.securityfocus.com/bid/22886 -Patch11: php5-importreqvars-secfix.patch -Patch12: php5-MOPB-20-2007-secfix.patch -Patch13: php5-MOPB-21-2007-secfix.patch -Patch14: php5-MOPB-22-2007-secfix.patch -Patch15: php5-MOPB-24-2007-secfix.patch # compiler warnings -Patch16: php5-warnings.patch +Patch9: php5-warnings.patch URL: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Icon: php5.xpm @@ -576,6 +567,7 @@ Summary: PHP5 Extension Module Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version} %{name}-pdo = %{version} +Obsoletes: %{name}-mysqli < 5.2.0 %description mysql PHP functions for access to MySQL database servers. @@ -733,12 +725,13 @@ %endif %package readline Provides: php-readline -Summary: PHP5 Extension Module +Summary: PHP5 readline extension Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version} libedit %description readline -This module provides readline support. +PHP interface to libedit, which provides editable command line as well +as PHP interactive mode (php -a) @@ -1080,17 +1073,9 @@ %patch5 %if %{with_suhosin_patch} %patch6 -p1 -%patch7 %endif %patch8 -p1 %patch9 -%patch10 -%patch11 -%patch12 -%patch13 -%patch14 -%patch15 -%patch16 # we build three SAPI mkdir -p build-apache2 mkdir -p build-fastcgi/sapi/cgi/libfcgi @@ -1181,6 +1166,9 @@ # - session need to be builtin, otherwise sqlite and other session engines fail # - pcre is needed for PEAR # - filter is builtin due security reasons +#We have still have harcoded RPATH in some modules +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' libtool %{__make} %{?jobs:-j%jobs PHP_PEAR_PHP_BIN=%{_bindir}/%{pkg_name}} popd } @@ -1294,18 +1282,16 @@ # --enable-embedded-mysqli \ cd build-cli # Run tests, using the CLI SAPI -export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 -unset TZ LANG LC_ALL -if ! make test; then - set +x - for f in `find .. -name \*.diff -type f -print`; do +export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 LANG=POSIX LC_ALL=POSIX +unset TZ +make test +set +x +for f in `find .. -name \*.diff -type f -print`; do echo "TEST FAILURE: $f --" cat "$f" echo "-- $f result ends." - done - set -x - #exit 1 -fi +done +set -x unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ %install @@ -1350,7 +1336,7 @@ echo "extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/$ext.ini done #suhosin configuration -install -m 644 %{S:3} %{buildroot}/%{php_sysconf}/conf.d/suhosin.ini +install -m 644 ext/suhosin/suhosin.ini %{buildroot}/%{php_sysconf}/conf.d/suhosin.ini # list of builtin modules builtin_modules=`./build-cli/sapi/cli/php -m | egrep -v '^(\[.*)?$' | sort | tr '\n' ' '` # update readme @@ -1419,9 +1405,13 @@ fi %post -n apache2-mod_php5 -if a2enmod -q php4 && ! a2enmod -q php5; then +#some distro versions does not have this tool. +if [ -x /usr/sbin/a2enmod ] +then + if a2enmod -q php4 && ! a2enmod -q php5; then a2dismod php4 a2enmod php5 + fi fi %clean @@ -1728,6 +1718,14 @@ %config(noreplace) %{php_sysconf}/conf.d/zlib.ini %changelog +* Thu May 03 2007 - mmarek@suse.cz +- fixed some new compiler warnings +* Thu May 03 2007 - judas_iscariote@shorewall.net +- upgrade to PHP 5.2.2, fixed hundreds of bugs including MOPB ones + if you need the complete changes see http://www.php.net/ChangeLog-5.php#5.2.2 + Thu May 3 04:47:57 UTC 2007 - judas_iscariote +- Upgrade suhosin extension to version 0.9.19 see + http://www.hardened-php.net/suhosin/changelog.html for details * Fri Mar 30 2007 - mmarek@suse.de - added bison to BuildRequires, removed update-desktop-files * Thu Mar 22 2007 - mmarek@suse.de ++++++ php-5.2.1.tar.bz2 -> php-5.2.2.tar.bz2 ++++++ php5/php-5.2.1.tar.bz2 /mounts/work_src_done/STABLE/php5/php-5.2.2.tar.bz2 differ: byte 11, line 1 ++++++ php5-warnings.patch ++++++ --- /var/tmp/diff_new_pack.mgf817/_old 2007-05-04 00:39:59.000000000 +0200 +++ /var/tmp/diff_new_pack.mgf817/_new 2007-05-04 00:39:59.000000000 +0200 @@ -1,6 +1,4 @@ -# with GCC, identical string literals happen to have the same address, -# but we still need the patch to avoid the warning ---- ext/xmlrpc/xmlrpc-epi-php.c +--- ext/xmlrpc/xmlrpc-epi-php.c.orig +++ ext/xmlrpc/xmlrpc-epi-php.c @@ -170,7 +170,7 @@ typedef struct _xmlrpc_callback_data { @@ -11,3 +9,54 @@ /* value types */ #define OBJECT_TYPE_ATTR "xmlrpc_type" +--- Zend/zend_canary.c.orig ++++ Zend/zend_canary.c +@@ -21,6 +21,9 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <unistd.h> ++#include <time.h> ++#include <fcntl.h> + + + #if SUHOSIN_PATCH +--- TSRM/tsrm_virtual_cwd.c.orig ++++ TSRM/tsrm_virtual_cwd.c +@@ -643,7 +643,7 @@ CWD_API int virtual_file_ex(cwd_state *s + char orig_path[MAXPATHLEN]; + realpath_cache_bucket *bucket; + time_t t = 0; +- int ret; ++ int ret = 0; + int use_cache; + int use_relative_path = 0; + TSRMLS_FETCH(); +--- ext/mysqli/mysqli_prop.c.orig ++++ ext/mysqli/mysqli_prop.c +@@ -86,8 +86,8 @@ static int __func(mysqli_object *obj, zv + ZVAL_LONG(*retval, l);\ + } else { \ + char *ret; \ +- int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (my_ulonglong)l); \ +- ZVAL_STRINGL(*retval, ret, l, 0); \ ++ int len = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (my_ulonglong)l); \ ++ ZVAL_STRINGL(*retval, ret, len, 0); \ + } \ + }\ + return SUCCESS;\ +--- main/output.c.orig ++++ main/output.c +@@ -430,9 +430,12 @@ static int php_ob_init_named(uint initia + tmp_buf.chunk_size = chunk_size; + tmp_buf.status = 0; + tmp_buf.internal_output_handler = NULL; ++ tmp_buf.internal_output_handler_buffer = NULL; ++ tmp_buf.internal_output_handler_buffer_size = 0; + tmp_buf.handler_name = estrdup(handler_name&&handler_name[0]?handler_name:OB_DEFAULT_HANDLER_NAME); + tmp_buf.erase = erase; + ++ + if (OG(ob_nesting_level)>0) { + #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) + if (!strncmp(handler_name, "ob_gzhandler", sizeof("ob_gzhandler")) && php_ob_gzhandler_check(TSRMLS_C)) { ++++++ suhosin-patch-5.2.1-0.9.6.2.patch.gz -> suhosin-patch-5.2.2-0.9.6.2.patch.gz ++++++ Files php5/suhosin-patch-5.2.1-0.9.6.2.patch.gz and /mounts/work_src_done/STABLE/php5/suhosin-patch-5.2.2-0.9.6.2.patch.gz differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de