packages (DEVEL): php/php-ini.patch, php/php.spec, php/spl-shared.patch - p...
glen
glen at pld-linux.org
Mon Aug 8 00:26:18 CEST 2011
Author: glen Date: Sun Aug 7 22:26:18 2011 GMT
Module: packages Tag: DEVEL
---- Log message:
- previous commit was update to 5.4.0alpha2
- up to 5.4.0alpha3
- --enable-magic-quotes removed
- php 5.4: The default_charset setting now defaults to UTF-8.
- BR: autoconf >= 2.59
- package more README files
---- Files affected:
packages/php:
php-ini.patch (1.42 -> 1.42.4.1) , php.spec (1.945.2.1 -> 1.945.2.2) , spl-shared.patch (1.6 -> 1.6.4.1)
---- Diffs:
================================================================
Index: packages/php/php-ini.patch
diff -u packages/php/php-ini.patch:1.42 packages/php/php-ini.patch:1.42.4.1
--- packages/php/php-ini.patch:1.42 Thu Apr 21 12:03:38 2011
+++ packages/php/php-ini.patch Mon Aug 8 00:26:13 2011
@@ -1,5 +1,5 @@
---- 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
+--- php-5.4.0alpha3/php.ini~ 2011-08-08 00:06:52.000000000 +0300
++++ php-5.4.0alpha3/php.ini 2011-08-08 00:09:15.835275555 +0300
@@ -223,7 +223,7 @@
; Development Value: Off
; Production Value: Off
@@ -83,20 +83,7 @@
;;;;;;;;;;;;;;;;
; File Uploads ;
-@@ -876,11 +876,7 @@
- ;
- ; extension=modulename.extension
- ;
--; For example, on Windows:
--;
--; extension=msql.dll
--;
--; ... or under UNIX:
-+; For example under UNIX:
- ;
- ; extension=msql.so
- ;
-@@ -887,39 +887,8 @@
+@@ -795,52 +795,8 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -124,7 +111,6 @@
-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
-;extension=php_openssl.dll
-;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
-;extension=php_pdo_mysql.dll
-;extension=php_pdo_oci.dll
-;extension=php_pdo_odbc.dll
@@ -133,11 +119,25 @@
-;extension=php_pgsql.dll
-;extension=php_pspell.dll
-;extension=php_shmop.dll
+-
+-; The MIBS data available in the PHP distribution must be installed.
+-; See http://www.php.net/manual/en/snmp.installation.php
+-;extension=php_snmp.dll
+-
+-;extension=php_soap.dll
+-;extension=php_sockets.dll
+-;extension=php_sqlite.dll
+-;extension=php_sqlite3.dll
+-;extension=php_sybase_ct.dll
+-;extension=php_tidy.dll
+-;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.
- ; The MIBS data available in the PHP distribution must be installed.
- ; See http://www.php.net/manual/en/snmp.installation.php
+ ;;;;;;;;;;;;;;;;;;;
+ ; Module Settings ;
@@ -1235,6 +1140,9 @@
; http://php.net/mysql.connect-timeout
mysql.connect_timeout = 60
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.945.2.1 packages/php/php.spec:1.945.2.2
--- packages/php/php.spec:1.945.2.1 Sun Aug 7 20:45:44 2011
+++ packages/php/php.spec Mon Aug 8 00:26:13 2011
@@ -1,4 +1,5 @@
# $Revision$, $Date$
+# TODO
# NOTE: mysqlnd does not support ssl or compression (see FAQ at http://dev.mysql.com/downloads/connector/php-mysqlnd/)
# TODO 5.4:
# - do not remove PatchX: definitions until merged to HEAD, needed for tracking their state
@@ -131,8 +132,8 @@
License: PHP
Group: Libraries
#Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-Source0: http://downloads.php.net/stas/%{name}-%{version}alpha2.tar.bz2
-# Source0-md5: 6af29928f5962a855b7763ff81388201
+Source0: http://downloads.php.net/stas/%{name}-%{version}alpha3.tar.bz2
+# Source0-md5: 68f277b9be92e51931ab1d705e7c6bde
Source2: %{name}-mod_%{name}.conf
Source3: %{name}-cgi-fcgi.ini
Source4: %{name}-apache.ini
@@ -207,7 +208,7 @@
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.4d
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -1786,7 +1787,7 @@
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q -n %{name}-%{version}alpha2
+%setup -q -n %{name}-%{version}alpha3
# prep for suhosin patch
%{__sed} -i -e 's,\r$,,' Zend/Zend.dsp Zend/ZendTS.dsp
%patch0 -p1
@@ -2005,7 +2006,6 @@
--enable-gd-native-ttf \
--enable-intl=shared \
--enable-libxml \
- --enable-magic-quotes \
--enable-mbstring=shared,all \
--enable-mbregex \
--enable-pcntl=shared \
@@ -2687,9 +2687,9 @@
%defattr(644,root,root,755)
%doc php.ini-*
%doc CREDITS Zend/ZEND_CHANGES
-%doc LICENSE Zend/LICENSE.Zend EXTENSIONS NEWS
+%doc LICENSE Zend/LICENSE.Zend EXTENSIONS NEWS UPGRADING
%doc README.PHP4-TO-PHP5-THIN-CHANGES
-%doc README.namespaces
+%doc README.namespaces README.Zeus README.MAILINGLIST_RULES
%dir %{_sysconfdir}
%dir %{_sysconfdir}/conf.d
@@ -2698,14 +2698,14 @@
%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{php_extensiondir}
-%doc ext/session/mod_files.sh
-
%files devel
%defattr(644,root,root,755)
%doc README.UNIX-BUILD-SYSTEM
%doc README.EXT_SKEL README.SELF-CONTAINED-EXTENSIONS
%doc CODING_STANDARDS README.EXTENSIONS README.PARAMETER_PARSING_API README.STREAMS
%doc README.SUBMITTING_PATCH README.TESTING README.TESTING2
+%doc README.NEW-OUTPUT-API UPGRADING.INTERNALS
+%doc README.REDIST.BINS README.RELEASE_PROCESS README.SVN-RULES README.UNIX-BUILD-SYSTEM
%attr(755,root,root) %{_bindir}/phpize
%attr(755,root,root) %{_bindir}/php-config
%attr(755,root,root) %{_libdir}/libphp_common.so
@@ -2759,7 +2759,6 @@
%files fileinfo
%defattr(644,root,root,755)
-%doc README.input_filter
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/fileinfo.ini
%attr(755,root,root) %{php_extensiondir}/fileinfo.so
@@ -3139,8 +3138,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.945.2.2 2011/08/07 22:26:13 glen
+- previous commit was update to 5.4.0alpha2
+- up to 5.4.0alpha3
+- --enable-magic-quotes removed
+- php 5.4: The default_charset setting now defaults to UTF-8.
+- BR: autoconf >= 2.59
+- package more README files
+
Revision 1.945.2.1 2011/08/07 18:45:44 glen
-- up to 5.4.0alpha1
+- up to 5.4.0alpha2
- sqlite ext moved to pecl (php-pecl-SQLite)
- --enable-ucd-snmp-hack removed (snmp ext got rewrite)
- safe mode removed (--with-exec-dir option removed)
================================================================
Index: packages/php/spl-shared.patch
diff -u packages/php/spl-shared.patch:1.6 packages/php/spl-shared.patch:1.6.4.1
--- packages/php/spl-shared.patch:1.6 Mon Nov 30 23:49:54 2009
+++ packages/php/spl-shared.patch Mon Aug 8 00:26:13 2011
@@ -35,8 +35,8 @@
REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT", RTIT_BYPASS_CURRENT);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_KEY", RTIT_BYPASS_KEY);
---- php-5.3.1/ext/spl/spl_iterators.h~ 2008-12-31 11:15:49.000000000 +0000
-+++ php-5.3.1/ext/spl/spl_iterators.h 2009-11-27 16:36:35.215748808 +0000
+--- php-5.4.0alpha3/ext/spl/spl_iterators.h~ 2011-07-27 11:48:08.000000000 +0300
++++ php-5.4.0alpha3/ext/spl/spl_iterators.h 2011-08-08 00:12:10.892993117 +0300
@@ -51,7 +51,12 @@
extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
@@ -47,8 +47,8 @@
+#else
extern PHPAPI zend_class_entry *spl_ce_Countable;
+#endif
-
- PHP_MINIT_FUNCTION(spl_iterators);
+ extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator;
+ extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator;
--- php-5.3.1/ext/standard/array.c~ 2009-08-14 06:20:21.000000000 +0000
+++ php-5.3.1/ext/standard/array.c 2009-11-27 16:37:15.029078323 +0000
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-ini.patch?r1=1.42&r2=1.42.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.945.2.1&r2=1.945.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/spl-shared.patch?r1=1.6&r2=1.6.4.1&f=u
More information about the pld-cvs-commit
mailing list