diff --git a/.cvsignore b/.cvsignore index c5d4dab..6eddc16 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,5 @@ php-5.2.3 clog *.tar.gz +*.tar.bz2 *.rpm diff --git a/php-5.2.4-tests-dashn.patch b/php-5.2.4-tests-dashn.patch deleted file mode 100644 index 7aaf6a9..0000000 --- a/php-5.2.4-tests-dashn.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- php-5.2.4/ext/standard/tests/file/bug26615.phpt.tests-dashn -+++ php-5.2.4/ext/standard/tests/file/bug26615.phpt -@@ -7,9 +7,9 @@ variables_order=E - $out = array(); - $status = -1; - if (substr(PHP_OS, 0, 3) != 'WIN') { -- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status); -+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status); - } else { -- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status); -+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status); - } - print_r($out); - ?> ---- php-5.2.4/ext/standard/tests/file/proc_open01.phpt.tests-dashn -+++ php-5.2.4/ext/standard/tests/file/proc_open01.phpt -@@ -9,7 +9,7 @@ if ($php === false) { - die("no php executable defined"); - } - $proc = proc_open( -- $php, -+ $php . " -n", - array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')), - $pipes - ); ---- php-5.2.4/ext/standard/tests/file/bug26938.phpt.tests-dashn -+++ php-5.2.4/ext/standard/tests/file/bug26938.phpt -@@ -6,14 +6,14 @@ $out = array(); - $status = -1; - $php = getenv('TEST_PHP_EXECUTABLE'); - if (substr(PHP_OS, 0, 3) != 'WIN') { -- exec($php . ' -r \'' -+ exec($php . ' -n -r \'' - . '$lengths = array(10,20000,10000,5,10000,3);' - . 'foreach($lengths as $length) {' - . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' - . ' print "\n";' - . '}\'', $out, $status); - } else { -- exec($php . ' -r "' -+ exec($php . ' -n -r "' - . '$lengths = array(10,20000,10000,5,10000,3);' - . 'foreach($lengths as $length) {' - . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' ---- php-5.2.4/Makefile.global.tests-dashn -+++ php-5.2.4/Makefile.global -@@ -63,7 +63,7 @@ install-headers: - done; \ - fi - --PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' - PHP_TEST_SHARED_EXTENSIONS = ` \ - if test "x$(PHP_MODULES)" != "x"; then \ - for i in $(PHP_MODULES)""; do \ diff --git a/php-5.2.7-tests-dashn.patch b/php-5.2.7-tests-dashn.patch new file mode 100644 index 0000000..8d70d03 --- /dev/null +++ b/php-5.2.7-tests-dashn.patch @@ -0,0 +1,11 @@ +--- php-5.2.7/Makefile.global.orig 2008-12-05 07:37:27.000000000 +0100 ++++ php-5.2.7/Makefile.global 2008-12-05 07:37:55.000000000 +0100 +@@ -67,7 +67,7 @@ + done; \ + fi + +-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' ++PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' + PHP_TEST_SHARED_EXTENSIONS = ` \ + if test "x$(PHP_MODULES)" != "x"; then \ + for i in $(PHP_MODULES)""; do \ diff --git a/php.spec b/php.spec index 34c9558..39ae867 100644 --- a/php.spec +++ b/php.spec @@ -5,15 +5,15 @@ %define _default_patch_fuzz 2 -Summary: The PHP HTML-embedded scripting language +Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.2.6 -Release: 6 +Version: 5.2.8 +Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://www.php.net/ -Source0: http://www.php.net/distributions/php-%{version}.tar.gz +Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 Source1: php.conf Source2: php.ini Source3: macros.php @@ -36,7 +36,7 @@ Patch31: php-5.2.4-easter.patch Patch32: php-5.2.6-systzdata.patch # Fixes for tests -Patch50: php-5.2.4-tests-dashn.patch +Patch50: php-5.2.7-tests-dashn.patch Patch51: php-5.0.4-tests-wddx.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -327,7 +327,7 @@ support for using the tidy library to PHP. %package mssql Summary: MSSQL database module for PHP Group: Development/Languages -Requires: php-common = %{version}-%{release} +Requires: php-common = %{version}-%{release}, php-pdo BuildRequires: freetds-devel %description mssql @@ -530,6 +530,7 @@ build --enable-force-cgi-redirect \ --with-pdo-mysql=shared,%{_prefix} \ --with-pdo-pgsql=shared,%{_prefix} \ --with-pdo-sqlite=shared,%{_prefix} \ + --with-pdo-dblib=shared,%{_prefix} \ --enable-json=shared \ --enable-zip=shared \ --with-readline \ @@ -578,15 +579,15 @@ unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +# Install the version for embedded script language in applications + php_embed.h +make -C build-embedded install-sapi install-headers INSTALL_ROOT=$RPM_BUILD_ROOT + # Install everything from the CGI SAPI build make -C build-cgi install INSTALL_ROOT=$RPM_BUILD_ROOT # Install the Apache module make -C build-apache install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT -# Install the version for embedded script language in applications -make -C build-embedded install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT - # Install the default configuration file and icons install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ install -m 644 $RPM_SOURCE_DIR/php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini @@ -613,7 +614,7 @@ install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \ mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \ pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json zip \ - dbase mcrypt mhash tidy mssql pspell; do + dbase mcrypt mhash tidy pdo_dblib mssql pspell; do cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini < files.xml cat files.mysqli >> files.mysql # Split out the PDO modules +cat files.pdo_dblib >> files.mssql cat files.pdo_mysql >> files.mysql cat files.pdo_pgsql >> files.pgsql cat files.pdo_odbc >> files.odbc @@ -729,6 +731,11 @@ rm files.* macros.php %files pspell -f files.pspell %changelog +* Sat Jan 03 2009 Remi Collet 5.2.8-1 +- update to 5.2.8 +- add missing php_embed.h (#457777) +- enable pdo_dblib driver in php-mssql + * Tue Nov 4 2008 Joe Orton 5.2.6-6 - move gd_README to php-gd - update to r4 of systzdata patch; introduces a default timezone diff --git a/sources b/sources index 780cc71..cad4924 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1720f95f26c506338f0dba3a51906bbd php-5.2.6.tar.gz +8760a833cf10433d3e72271ab0d0eccf php-5.2.8.tar.bz2