Hello community, here is the log from the commit of package php5 checked in at Mon Nov 6 22:39:22 CET 2006. -------- --- php5/php5.changes 2006-10-26 12:19:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2006-11-06 10:31:07.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Nov 6 10:15:34 CET 2006 - mmarek@suse.cz + +- updated to 5.2.0 final +- merged changes from buildservice (by soporte@onfocus.cl): + - updated suhosin to 0.9.10 + - added suhosin patch + - build with system PCRE if suse_release > 10.1 only [#215610] + - suhosin extension does not require PDO + - suhosin added to the reccommended list + - php5-pspell to require at least aspell-en otherwise is useless + [#217272] + +------------------------------------------------------------------- Old: ---- php-5.2.0RC6.tar.bz2 suhosin-0.9.9.tar.bz2 New: ---- php-5.2.0.tar.bz2 suhosin-0.9.10.tar.bz2 suhosin-patch-5.2.0-0.9.6.patch.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.l2FbYy/_old 2006-11-06 22:38:16.000000000 +0100 +++ /var/tmp/diff_new_pack.l2FbYy/_new 2006-11-06 22:38:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package php5 (Version 5.2.0RC6) +# spec file for package php5 (Version 5.2.0) # # Copyright (c) 2006 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.9 +%define suhosin_version 0.9.10 %define pkg_name php5 %define with_libedit 1 %define with_spell 1 @@ -31,7 +31,7 @@ # I would like this to become a hard dependency, as PHP is # documented to have this modules by default (no addtional libs are needed) Recommends: php-ctype php-dom php-iconv php-sqlite php-tokenizer -Recommends: php-xmlreader php-xmlwriter php-json php-hash +Recommends: php-xmlreader php-xmlwriter php-json php-hash php-suhosin # other highly reccommended extensions Suggests: php-mbstring php-gd php-pear php-gettext php-mysql %else @@ -41,6 +41,10 @@ %if %{with_libedit} BuildRequires: libedit-devel %endif +# use system PCRE on 10.2 an up only, previous versions will not work. +%if 0%{?suse_version} > 1010 +BuildRequires: pcre-devel +%endif %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR %define cgi_dir /srv/www/cgi-bin @@ -58,9 +62,9 @@ %define apache2_serverroot %(%{apxs2} -q PREFIX) ### ### -Version: 5.2.0RC6 -Release: 5 -License: Other License(s), see package +Version: 5.2.0 +Release: 1 +License: Other uncritical OpenSource License, Other License(s), see package Group: Productivity/Networking/Web/Servers Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter %if %{with_libedit} @@ -72,6 +76,7 @@ Source1: php-suse-addons.tar.bz2 Source2: suhosin-%{suhosin_version}.tar.bz2 Source3: suhosin.ini +Patch0: suhosin-patch-5.2.0-0.9.6.patch.gz #SUSE specific stuff Patch1: php5-config.patch Patch2: php5-phpize.patch @@ -691,7 +696,7 @@ Provides: php-pspell Summary: PHP5 pspell extension Group: Productivity/Networking/Web/Servers -Requires: %{name} = %{version} +Requires: %{name} = %{version} aspell-en %description pspell PHP interface to the aspell, which provides spell checking @@ -807,7 +812,7 @@ Provides: php-suhosin Summary: PHP5 Extension Module Group: Productivity/Networking/Web/Servers -Requires: %{name} = %{version} %{name}-pdo = %{version} +Requires: %{name} = %{version} %description suhosin Suhosin is an advanced protection system for PHP installations. It was @@ -1030,6 +1035,7 @@ %setup -q -n php-%{version} -a 1 tar xf %{S:2} -C ext mv ext/suhosin-%{suhosin_version} ext/suhosin +%patch0 -p1 %patch1 %patch2 %patch3 -p1 @@ -1088,7 +1094,11 @@ --enable-filter \ --enable-session \ --with-mm \ +%if 0%{?suse_version} > 1010 + --with-pcre-regex=%{_usr} \ +%else --with-pcre-regex \ +%endif --enable-xml \ --enable-simplexml \ --enable-spl \ @@ -1587,6 +1597,16 @@ %config(noreplace) %{php_sysconf}/conf.d/zlib.ini %changelog -n php5 +* Mon Nov 06 2006 - mmarek@suse.cz +- updated to 5.2.0 final +- merged changes from buildservice (by soporte@onfocus.cl): + - updated suhosin to 0.9.10 + - added suhosin patch + - build with system PCRE if suse_release > 10.1 only [#215610] + - suhosin extension does not require PDO + - suhosin added to the reccommended list + - php5-pspell to require at least aspell-en otherwise is useless + [#217272] * Thu Oct 26 2006 - anosek@suse.cz - php5-sqlite now uses our sqlite and sqlite2 packages to build and not bundled ones [#201440] ++++++ php-5.2.0RC6.tar.bz2 -> php-5.2.0.tar.bz2 ++++++ php5/php-5.2.0RC6.tar.bz2 /mounts/work_src_done/STABLE/php5/php-5.2.0.tar.bz2 differ: char 11, line 1 ++++++ suhosin-0.9.9.tar.bz2 -> suhosin-0.9.10.tar.bz2 ++++++ ++++ 22231 lines of diff (skipped) ++++++ suhosin-patch-5.2.0-0.9.6.patch.gz ++++++ ++++ 2634 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org