packages: php/bug-52078-fileinode.patch, php/fix-test-run.patch, php/php-in...

glen glen at pld-linux.org
Sun Dec 12 22:00:07 CET 2010 

Author: glen                         Date: Sun Dec 12 21:00:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.3.4, builds with -sp 7

---- Files affected:
packages/php:
   bug-52078-fileinode.patch (1.4 -> 1.5) , fix-test-run.patch (1.8 -> 1.9) , php-ini.patch (1.39 -> 1.40) , php-mysqli-charsetphpini.patch (1.4 -> 1.5) , php.spec (1.909 -> 1.910) , bug-51901.patch (1.1 -> NONE)  (REMOVED), bug-52533.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/php/bug-52078-fileinode.patch
diff -u packages/php/bug-52078-fileinode.patch:1.4 packages/php/bug-52078-fileinode.patch:1.5
--- packages/php/bug-52078-fileinode.patch:1.4	Wed Aug  4 15:29:09 2010
+++ packages/php/bug-52078-fileinode.patch	Sun Dec 12 22:00:01 2010
@@ -19,17 +19,6 @@
  - Iteration 5 -
  
  Warning: fileinode(): stat failed for %s//fileinode_variation3/*.tmp in %s on line %d
-@@ -75,8 +75,8 @@
- Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d
- bool(false)
- - Iteration 7 -
--int(%d)
-+int(%i)
- - Iteration 8 -
--int(%d)
-+int(%i)
- 
- *** Done ***
 --- php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt~	2007-11-05 19:43:21.000000000 +0200
 +++ php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt	2010-07-26 19:31:43.613553760 +0300
 @@ -28,9 +28,9 @@

================================================================
Index: packages/php/fix-test-run.patch
diff -u packages/php/fix-test-run.patch:1.8 packages/php/fix-test-run.patch:1.9
--- packages/php/fix-test-run.patch:1.8	Sun Jul 25 12:15:50 2010
+++ packages/php/fix-test-run.patch	Sun Dec 12 22:00:01 2010
@@ -12,8 +12,8 @@
  PHP_SUBST(PHP_MODULES)
  PHP_SUBST(PHP_ZEND_EX)
  
---- php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
-+++ php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
+--- php-5.3.4/Makefile.global~	2010-12-12 23:08:32.000000000 +0200
++++ php-5.3.4/Makefile.global	2010-12-12 23:09:31.246644108 +0200
 @@ -77,7 +77,8 @@
  		done; \
  	fi
@@ -37,7 +37,7 @@
  	fi`
  PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
  
-@@ -320,7 +327,10 @@
+@@ -114,7 +114,10 @@
  		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
  		TEST_PHP_SRCDIR=$(top_srcdir) \
  		CC="$(CC)" \
@@ -46,9 +46,9 @@
 +			-d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
 +			$(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
 +			-d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
+ 		rm $(top_builddir)/tmp-php.ini; \
  	else \
  		echo "ERROR: Cannot run tests without CLI sapi."; \
- 	fi
 --- php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
 +++ php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
 @@ -296,7 +296,7 @@

================================================================
Index: packages/php/php-ini.patch
diff -u packages/php/php-ini.patch:1.39 packages/php/php-ini.patch:1.40
--- packages/php/php-ini.patch:1.39	Sat Feb 20 18:16:22 2010
+++ packages/php/php-ini.patch	Sun Dec 12 22:00:01 2010
@@ -1,5 +1,5 @@
---- php-5.3.1/php.ini	2010-02-20 16:23:03.343575520 +0200
-+++ php-5.3.1/php.ini	2010-02-20 16:19:19.737335390 +0200
+--- php-5.3.4/php.ini~	2010-12-12 23:03:42.000000000 +0200
++++ php-5.3.4/php.ini	2010-12-12 23:05:56.583592856 +0200
 @@ -223,7 +223,7 @@
  ; Development Value: Off
  ; Production Value: Off
@@ -92,7 +92,20 @@
  
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
-@@ -938,54 +891,6 @@
+@@ -876,11 +876,7 @@
+ ;
+ ;   extension=modulename.extension
+ ;
+-; For example, on Windows:
+-;
+-;   extension=msql.dll
+-;
+-; ... or under UNIX:
++; For example under UNIX:
+ ;
+ ;   extension=msql.so
+ ;
+@@ -891,49 +887,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -104,8 +117,6 @@
 -;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
--;extension=php_dba.dll
--;extension=php_exif.dll
 -;extension=php_fileinfo.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
@@ -115,8 +126,7 @@
 -;extension=php_interbase.dll
 -;extension=php_ldap.dll
 -;extension=php_mbstring.dll
--;extension=php_ming.dll
--;extension=php_mssql.dll
+-;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 -;extension=php_mysql.dll
 -;extension=php_mysqli.dll
 -;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
@@ -130,7 +140,6 @@
 -;extension=php_pdo_pgsql.dll
 -;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
--;extension=php_phar.dll
 -;extension=php_pspell.dll
 -;extension=php_shmop.dll
 -;extension=php_snmp.dll
@@ -143,10 +152,11 @@
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
 -;extension=php_zip.dll
--
++; Ideally in PLD Linux you should install appropriate php-<extension> or
++; php-pecl-<extension> package.
+ 
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
- ;;;;;;;;;;;;;;;;;;;
 @@ -1235,6 +1140,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60

================================================================
Index: packages/php/php-mysqli-charsetphpini.patch
diff -u packages/php/php-mysqli-charsetphpini.patch:1.4 packages/php/php-mysqli-charsetphpini.patch:1.5
--- packages/php/php-mysqli-charsetphpini.patch:1.4	Sat Feb 20 00:18:29 2010
+++ packages/php/php-mysqli-charsetphpini.patch	Sun Dec 12 22:00:01 2010
@@ -16,15 +16,15 @@
  	mysqli_globals->reconnect = 0;
  	mysqli_globals->report_mode = 0;
  	mysqli_globals->report_ht = 0;
---- php-5.3.1/ext/mysqli/mysqli_nonapi.c~	2009-11-12 19:48:36.000000000 +0200
-+++ php-5.3.1/ext/mysqli/mysqli_nonapi.c	2010-02-20 01:02:24.838907461 +0200
-@@ -60,7 +60,7 @@
+--- php-5.3.4/ext/mysqli/mysqli_nonapi.c~	2010-12-12 23:07:03.000000000 +0200
++++ php-5.3.4/ext/mysqli/mysqli_nonapi.c	2010-12-12 23:07:36.497424912 +0200
+@@ -61,7 +61,7 @@
  	MY_MYSQL			*mysql = NULL;
  	MYSQLI_RESOURCE		*mysqli_resource = NULL;
  	zval				*object = getThis();
 -	char				*hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
 +	char				*hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL, *connect_charset=NULL;
- 	unsigned int		hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
+ 	int					hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
  	zend_bool			persistent = FALSE;
  	long				port = 0, flags = 0;
 @@ -241,6 +241,12 @@

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.909 packages/php/php.spec:1.910
--- packages/php/php.spec:1.909	Sat Dec 11 22:22:49 2010
+++ packages/php/php.spec	Sun Dec 12 22:00:01 2010
@@ -102,7 +102,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel		11
+%define		rel		0.1
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -110,13 +110,13 @@
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
-Version:	5.3.3
+Version:	5.3.4
 Release:	%{rel}%{?with_type_hints:th}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	21ceeeb232813c10283a5ca1b4c87b48
+# Source0-md5:	2c069d8f690933e3bf6a8741ed818150
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-apache.ini
@@ -180,9 +180,7 @@
 Patch53:	fix-test-run.patch
 Patch54:	mysqlnd-shared.patch
 Patch55:	bug-52078-fileinode.patch
-Patch56:	bug-51901.patch
 Patch57:	bug-52448.patch
-Patch58:	bug-52533.patch
 Patch59:	%{name}-systzdata.patch
 Patch60:	%{name}-oracle-instantclient.patch
 Patch61:	%{name}-krb5-ac.patch
@@ -1803,7 +1801,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch8 -p1
+#%patch8 -p1
 %patch7 -p1
 %patch9 -p1
 cp php.ini-production php.ini
@@ -1856,9 +1854,7 @@
 %patch54 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
-%patch56 -p0
 %patch57 -p1
-%patch58 -p1
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
@@ -2229,7 +2225,7 @@
 install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi}} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
 	$RPM_BUILD_ROOT/etc/{apache/conf.d,httpd/conf.d} \
-	$RPM_BUILD_ROOT%{_mandir}/man1 \
+	$RPM_BUILD_ROOT%{_mandir}/man{1,8} \
 
 cp -af php_config.h.cli main/php_config.h
 cp -af Makefile.cli Makefile
@@ -2271,7 +2267,7 @@
 %if %{with fpm}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/fpm.d,%{_sbindir}}
 libtool --silent --mode=install install sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}
-cp -a sapi/fpm/php-fpm.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8
 cp -a sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/php-fpm
@@ -2696,7 +2692,7 @@
 %dir %{_sysconfdir}/fpm.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf
 %attr(755,root,root) %{_sbindir}/php-fpm
-%{_mandir}/man1/php-fpm.1*
+%{_mandir}/man8/php-fpm.8*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/php-fpm
 %attr(754,root,root) /etc/rc.d/init.d/php-fpm
 %endif
@@ -3165,6 +3161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.910  2010/12/12 21:00:01  glen
+- up to 5.3.4, builds with -sp 7
+
 Revision 1.909  2010/12/11 21:22:49  arekm
 - rel 11; BIG FAT WARNING: we are now building php WITHOUT ZTS
 (zend thread safety) as it was "for code maintainers only!!".
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/bug-52078-fileinode.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/fix-test-run.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-ini.patch?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-mysqli-charsetphpini.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.909&r2=1.910&f=u

More information about the pld-cvs-commit mailing list