From: Elan Ruusamäe Date: Sun, 12 Dec 2010 21:00:01 +0000 (+0000) Subject: - up to 5.3.4, builds with -sp 7 X-Git-Tag: auto/th/php-5_3_4-1~1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=4e8b2de4e01f19e000cb53932d4da124cc808932;p=packages%2Fphp.git - up to 5.3.4, builds with -sp 7 Changed files: bug-51901.patch -> 1.2 bug-52078-fileinode.patch -> 1.5 bug-52533.patch -> 1.2 fix-test-run.patch -> 1.9 php-ini.patch -> 1.40 php-mysqli-charsetphpini.patch -> 1.5 php.spec -> 1.910 --- diff --git a/bug-51901.patch b/bug-51901.patch deleted file mode 100644 index 7913539..0000000 --- a/bug-51901.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- tests/classes/constants_error_004.phpt.orig 2010-05-24 17:31:12.205545997 +0200 -+++ tests/classes/constants_error_004.phpt 2010-05-24 17:31:19.282420197 +0200 -@@ -10,4 +10,4 @@ - $a = new C(); - ?> - --EXPECTF-- --Fatal error: Undefined class constant 'D::hello' in %s on line %d -+Fatal error: Class 'D' not found in %s on line %d diff --git a/bug-52078-fileinode.patch b/bug-52078-fileinode.patch index 9e1c071..151f4ed 100644 --- a/bug-52078-fileinode.patch +++ b/bug-52078-fileinode.patch @@ -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 @@ diff --git a/bug-52533.patch b/bug-52533.patch deleted file mode 100644 index c80c3a9..0000000 --- a/bug-52533.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- php-5.3.3/ext/curl/tests/curl_multi_getcontent_basic3.phpt~ 2010-08-04 17:01:45.000000000 +0300 -+++ php-5.3.3/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2010-08-04 17:05:11.449380595 +0300 -@@ -55,5 +55,10 @@ - Disallow: /search.php - Disallow: /mod.php - Disallow: /manual/add-note.php -+ -+Disallow: /harming/humans -+Disallow: /ignoring/human/orders -+Disallow: /harm/to/self -+ - CURL2 - diff --git a/fix-test-run.patch b/fix-test-run.patch index 62d9f79..e626605 100644 --- a/fix-test-run.patch +++ b/fix-test-run.patch @@ -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 @@ diff --git a/php-ini.patch b/php-ini.patch index 1a0f66c..dbb0d8e 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -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- or ++; php-pecl- package. + ;;;;;;;;;;;;;;;;;;; ; Module Settings ; - ;;;;;;;;;;;;;;;;;;; @@ -1235,6 +1140,9 @@ ; http://php.net/mysql.connect-timeout mysql.connect_timeout = 60 diff --git a/php-mysqli-charsetphpini.patch b/php-mysqli-charsetphpini.patch index 826c5d0..895a1a7 100644 --- a/php-mysqli-charsetphpini.patch +++ b/php-mysqli-charsetphpini.patch @@ -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 @@ diff --git a/php.spec b/php.spec index e380a7d..122a988 100644 --- a/php.spec +++ b/php.spec @@ -101,7 +101,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %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 @@ -109,13 +109,13 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP 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 @@ -179,9 +179,7 @@ Patch52: pcre-shared.patch 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 @@ -1802,7 +1800,7 @@ Moduł PHP umożliwiający używanie kompresji zlib. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch8 -p1 +#%patch8 -p1 %patch7 -p1 %patch9 -p1 cp php.ini-production php.ini @@ -1855,9 +1853,7 @@ cp php.ini-production php.ini %patch54 -p1 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt %patch55 -p1 -%patch56 -p0 %patch57 -p1 -%patch58 -p1 %patch59 -p1 %patch60 -p1 %patch61 -p1 @@ -2228,7 +2224,7 @@ rm -rf $RPM_BUILD_ROOT 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 @@ -2270,7 +2266,7 @@ cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini %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 @@ -2695,7 +2691,7 @@ fi %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