rpms/php/devel php-5.0.4-tests-dashn.patch, NONE, 1.1 php-5.0.4-tests-sunfunc.patch, NONE, 1.1 php-5.0.4-tests-wddx.patch, NONE, 1.1 php.spec, 1.71, 1.72 php-4.3.1-tests.patch, 1.3, NONE

Tue Apr 19 13:32:09 UTC 2005

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25844

Modified Files:
	php.spec 
Added Files:
	php-5.0.4-tests-dashn.patch php-5.0.4-tests-sunfunc.patch 
	php-5.0.4-tests-wddx.patch 
Removed Files:
	php-4.3.1-tests.patch 
Log Message:
* Wed Apr 13 2005 Joe Orton <jorton at redhat.com> 5.0.4-7
- split out dba and bcmath extensions into subpackages
- BuildRequire gcc-c++ to avoid AC_PROG_CXX{,CPP} failure (#155221)


php-5.0.4-tests-dashn.patch:
 Makefile.global                          |    4 ++--
 ext/standard/tests/file/bug26615.phpt    |    2 +-
 ext/standard/tests/file/bug26938.phpt    |    2 +-
 ext/standard/tests/file/proc_open01.phpt |    2 +-
 ext/xml/tests/bug32001.phpt              |    2 +-
 tests/lang/bug21800.phpt                 |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE php-5.0.4-tests-dashn.patch ---

Pass -n to php when running tests, to ensure that the system inidir
and hence the installed (old) shared extensions are not loaded.

- when running run-tests.php itself
- passed to run-tests.php to ensure it's passed when running each test case
- in cases where the PHP executable is run by a test case

--- php-5.0.4/ext/xml/tests/bug32001.phpt.tests
+++ php-5.0.4/ext/xml/tests/bug32001.phpt
@@ -151,7 +151,7 @@
 	new testcase("GB2312",    1),
 );
 
-preg_match("/^libxml2 Version.*\$/im", `$_ENV[TEST_PHP_EXECUTABLE] -i`, $match);
+preg_match("/^libxml2 Version.*\$/im", `$_ENV[TEST_PHP_EXECUTABLE] -i -n`, $match);
 
 echo $match[0], "\n";
 
--- php-5.0.4/ext/standard/tests/file/proc_open01.phpt.tests
+++ php-5.0.4/ext/standard/tests/file/proc_open01.phpt
@@ -9,7 +9,7 @@
 	die("no php executable defined");
 } 
 $proc = proc_open(
-	$php,
+	$php . " -n",
 	array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
 	$pipes
 );
--- php-5.0.4/ext/standard/tests/file/bug26938.phpt.tests
+++ php-5.0.4/ext/standard/tests/file/bug26938.phpt
@@ -5,7 +5,7 @@
 $out = array();
 $status = -1;
 $php = getenv('TEST_PHP_EXECUTABLE');
-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.0.4/ext/standard/tests/file/bug26615.phpt.tests
+++ php-5.0.4/ext/standard/tests/file/bug26615.phpt
@@ -4,7 +4,7 @@
 <?php
 $out = array();
 $status = -1;
-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);
 print_r($out);
 ?>
 --EXPECT--
--- php-5.0.4/tests/lang/bug21800.phpt.tests
+++ php-5.0.4/tests/lang/bug21800.phpt
@@ -5,7 +5,7 @@
 --FILE--
 <?php
 $exe = getenv('TEST_PHP_EXECUTABLE');
-$fh = popen("$exe -a", 'w');
+$fh = popen("$exe -a -n", 'w');
 if ($fh !== false) {
 	fwrite($fh, "<?php echo ':test:'; ?>\n\n");
 	fclose($fh);
--- php-5.0.4/Makefile.global.tests
+++ php-5.0.4/Makefile.global
@@ -51,11 +51,11 @@
 install-su: install-pear install-tester
 
 test: 
-	- at if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
+	@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -n -d 'output_buffering=0' $(top_srcdir)/run-tests.php -n $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi

php-5.0.4-tests-sunfunc.patch:
 sunfuncts.phpt |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE php-5.0.4-tests-sunfunc.patch ---

The timestamps were wrong in the test case, but were not adjusted to the
correct expected values after the fix; http://bugs.php.net/bug.php?id=31853

--- php-5.0.4/ext/standard/tests/general_functions/sunfuncts.phpt.tests-sunfunc
+++ php-5.0.4/ext/standard/tests/general_functions/sunfuncts.phpt
@@ -18,27 +18,27 @@
 }
 ?>
 --EXPECT--
-1041293199 06:39 6.652455761896
-1041293806 16:46 16.76937486746
-1043971592 06:32 6.54537029266
-1043972233 17:13 17.21752470874
-1046390766 06:06 6.115652675685
-1046391456 17:36 17.6108549623
-1049069128 05:28 5.472742029069
-1049069878 17:58 17.97255258437
-1051661094 04:54 4.901229982859
-1051661898 18:18 18.31368876948
-1054339474 04:34 4.57442928945
-1054340319 18:39 18.65640094324
-1056931476 04:36 4.616120450519
-1056932328 18:48 18.80887165777
-1059609894 04:54 4.906882509836
-1059610715 18:35 18.59928600203
-1062288314 05:14 5.236889557074
-1062289083 18:03 18.06054178788
-1064880332 05:32 5.542366581139
-1064881044 17:24 17.41150561492
-1067558754 05:54 5.916208842058
-1067559410 16:50 16.83369857063
-1070150780 06:20 6.34622155207
-1070151395 16:35 16.58358905554
+1041316748 06:39 6.652455761896
+1041353169 16:46 16.76937486746
+1043994763 06:32 6.54537029266
+1044033183 17:13 17.21752470874
+1046412416 06:06 6.115652675685
+1046453799 17:36 17.6108549623
+1049088501 05:28 5.472742029069
+1049133501 17:58 17.97255258437
+1051678444 04:54 4.901229982859
+1051726729 18:18 18.31368876948
+1054355667 04:34 4.57442928945
+1054406363 18:39 18.65640094324
+1056947818 04:36 4.616120450519
+1056998911 18:48 18.80887165777
+1059627264 04:54 4.906882509836
+1059676557 18:35 18.59928600203
+1062306852 05:14 5.236889557074
+1062353017 18:03 18.06054178788
+1064899952 05:32 5.542366581139
+1064942681 17:24 17.41150561492
+1067579698 05:54 5.916208842058
+1067619001 16:50 16.83369857063
+1070173246 06:20 6.34622155207
+1070210100 16:35 16.58358905554

php-5.0.4-tests-wddx.patch:
 001.phpt |    2 +-
 wddx.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE php-5.0.4-tests-wddx.patch ---

The wddx tests presume that "2040-06-12T04:32:12" cannot be parsed;
that's only true on platforms with a 32-bit time_t.

--- php-5.0.4/ext/wddx/tests/001.phpt.wddxtests
+++ php-5.0.4/ext/wddx/tests/001.phpt
@@ -18,7 +18,7 @@
   ["aDateTime2"]=>
   int(329632332)
   ["aDateTime3"]=>
-  string(22) "2040-06-12T04:32:12+00"
+  string(12) "NotADateTime"
   ["aBoolean"]=>
   bool(true)
   ["anArray"]=>
--- php-5.0.4/ext/wddx/tests/wddx.xml.wddxtests
+++ php-5.0.4/ext/wddx/tests/wddx.xml
@@ -20,7 +20,7 @@
                          <dateTime>1980-06-12T04:32:12+00</dateTime>
                      </var>
                      <var name='aDateTime3'>
-                         <dateTime>2040-06-12T04:32:12</dateTime>
+                         <dateTime>NotADateTime</dateTime>
                      </var>
                      <var name='aBoolean'>
                          <boolean value='true'/>


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- php.spec	13 Apr 2005 09:52:41 -0000	1.71
+++ php.spec	19 Apr 2005 13:32:06 -0000	1.72
@@ -7,7 +7,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.0.4
-Release: 6
+Release: 7
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -26,7 +26,6 @@
 Patch3: php-5.0.4-lib64.patch
 Patch4: php-4.2.2-cxx.patch
 Patch5: php-4.3.3-install.patch
-Patch6: php-4.3.1-tests.patch
 Patch7: php-4.3.2-libtool15.patch
 Patch9: php-4.3.6-umask.patch
 Patch10: php-5.0.2-gdnspace.patch
@@ -45,6 +44,11 @@
 Patch30: php-5.0.4-dlopen.patch
 Patch31: php-5.0.0-easter.patch
 
+# Fixes for tests
+Patch50: php-5.0.4-tests-dashn.patch
+Patch51: php-5.0.4-tests-wddx.patch
+Patch52: php-5.0.4-tests-sunfunc.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 
 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
@@ -52,7 +56,7 @@
 BuildRequires: httpd-devel >= 2.0.46-1, libjpeg-devel, libpng-devel, pam-devel
 BuildRequires: libstdc++-devel, openssl-devel
 BuildRequires: zlib-devel, pcre-devel >= 4.5, smtpdaemon
-BuildRequires: bzip2, fileutils, file >= 4.0, perl, libtool >= 1.4.3
+BuildRequires: bzip2, fileutils, file >= 4.0, perl, libtool >= 1.4.3, gcc-c++
 Obsoletes: php-dbg, mod_php, php3, phpfi, stronghold-php, php-openssl
 # Enforce Apache module ABI compatibility
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
@@ -299,13 +303,30 @@
 The php-gd package contains a dynamic shared object that will add
 support for using the gd graphics library to PHP.
 
+%package bcmath
+Summary: A module for PHP applications for using the bcmath library
+Group: Development/Languages
+Requires: php = %{version}-%{release}
+
+%description bcmath
+The php-bcmath package contains a dynamic shared object that will add
+support for using the bcmath library to PHP.
+
+%package dba
+Summary: A database abstraction layer module for PHP applications
+Group: Development/Languages
+Requires: php = %{version}-%{release}
+
+%description dba
+The php-dba package contains a dynamic shared object that will add
+support for using the DBA database abstraction layer to PHP.
+
 %prep
 %setup -q
 %patch2 -p1 -b .config
 %patch3 -p1 -b .lib64
 %patch4 -p1 -b .cxx
 %patch5 -p1 -b .install
-%patch6 -p1 -b .tests
 %patch7 -p1 -b .libtool15
 %patch9 -p1 -b .umask
 %patch10 -p1 -b .gdnspace
@@ -321,6 +342,10 @@
 %patch30 -p1 -b .dlopen
 %patch31 -p1 -b .easter
 
+%patch50 -p1 -b .tests-dashn
+%patch51 -p1 -b .tests-wddx
+%patch52 -p1 -b .tests-sunfunc
+
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
 cp TSRM/LICENSE TSRM_LICENSE
@@ -398,7 +423,6 @@
         --with-pcre-regex=%{_prefix} \
 	--with-zlib \
 	--with-layout=GNU \
-	--enable-bcmath \
 	--enable-exif \
 	--enable-ftp \
 	--enable-magic-quotes \
@@ -441,6 +465,8 @@
       --enable-mbregex \
       --with-ncurses=shared \
       --with-gd=shared \
+      --enable-bcmath=shared \
+      --enable-dba=shared \
       --with-xmlrpc=shared \
       --with-ldap=shared \
       --with-mysql=shared,%{_prefix} \
@@ -461,7 +487,8 @@
 pushd build-apache
 build --with-apxs2=%{_sbindir}/apxs \
       --without-mysql --without-gd \
-      --without-odbc --disable-dom
+      --without-odbc --disable-dom \
+      --disable-dba
 popd
 
 %check
@@ -516,7 +543,7 @@
 
 # Generate files lists and stub .ini files for each subpackage
 for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
-    mbstring ncurses gd dom xsl soap \
+    mbstring ncurses gd dom xsl soap bcmath dba \
     %{?_with_oci8:oci8} %{?_with_mssql:mssql} %{?_with_mhash:mhash} \
     %{?_with_ibase:interbase}; do
     cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
@@ -592,6 +619,8 @@
 %files ncurses -f files.ncurses
 %files gd -f files.gd
 %files soap -f files.soap
+%files bcmath -f files.bcmath
+%files dba -f files.dba
 
 %if %{with_oci8}
 %files oci8 -f files.oci8
@@ -607,6 +636,10 @@
 %endif
 
 %changelog
+* Wed Apr 13 2005 Joe Orton <jorton at redhat.com> 5.0.4-7
+- split out dba and bcmath extensions into subpackages
+- BuildRequire gcc-c++ to avoid AC_PROG_CXX{,CPP} failure (#155221)
+
 * Wed Apr 13 2005 Joe Orton <jorton at redhat.com> 5.0.4-6
 - build /usr/bin/php with the CLI SAPI, and add /usr/bin/php-cgi,
   built with the CGI SAPI (thanks to Edward Rudd, #137704)


--- php-4.3.1-tests.patch DELETED ---


