Author: baggins Date: Wed Mar 17 13:22:00 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- reverted 1.849
- updated patch so it has the same functionality as on PHP_5_2
---- Files affected:
packages/php:
php-sapi-ini-file.patch (1.10 -> 1.11) , php.spec (1.860 -> 1.861)
---- Diffs:
================================================================
Index: packages/php/php-sapi-ini-file.patch
diff -u packages/php/php-sapi-ini-file.patch:1.10
packages/php/php-sapi-ini-file.patch:1.11
--- packages/php/php-sapi-ini-file.patch:1.10 Mon Jul 6 21:37:51 2009
+++ packages/php/php-sapi-ini-file.patch Wed Mar 17 14:21:55 2010
@@ -1,5 +1,45 @@
--- php-5.3.0/main/php_ini.c.org 2009-07-06 17:32:30.309904482 +0200
+++ php-5.3.0/main/php_ini.c 2009-07-06 17:36:45.529879052 +0200
+@@ -474,6 +480,24 @@
+ }
+ }
+ }
++ /* Search (global) php.ini file in search path */
++ if (!fh.handle.fp) {
++ fh.handle.fp = php_fopen_with_path("php.ini", "r",
php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
++ if (fh.handle.fp) {
++ fh.filename = php_ini_opened_path;
++ PG(safe_mode) = safe_mode_state;
++ PG(open_basedir) = open_basedir;
++ fh.type = ZEND_HANDLE_FP;
++ zend_parse_ini_file(&fh, 1,
ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t) php_ini_parser_cb,
&configuration_hash TSRMLS_CC);
++ safe_mode_state = PG(safe_mode);
++ open_basedir = PG(open_basedir);
++ PG(safe_mode) = 0;
++ PG(open_basedir) = NULL;
++ fh.handle.fp = NULL;
++ efree(php_ini_opened_path);
++ fh.filename = php_ini_opened_path = NULL;
++ }
++ }
+
+ /* Otherwise search for php-%sapi-module-name%.ini file in
search path */
+ if (!fh.handle.fp) {
+@@ -486,14 +510,6 @@
+ fh.filename = php_ini_opened_path;
+ }
+ }
+-
+- /* If still no ini file found, search for php.ini file in
search path */
+- if (!fh.handle.fp) {
+- fh.handle.fp = php_fopen_with_path("php.ini", "r",
php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+- if (fh.handle.fp) {
+- fh.filename = php_ini_opened_path;
+- }
+- }
+ }
+
+ if (free_ini_search_path) {
@@ -620,12 +620,14 @@
zend_llist scanned_ini_list;
zend_llist_element *element;
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.860 packages/php/php.spec:1.861
--- packages/php/php.spec:1.860 Tue Mar 16 11:36:51 2010
+++ packages/php/php.spec Wed Mar 17 14:21:55 2010
@@ -2147,27 +2147,29 @@
sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini >
$RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-# per SAPI ini directories
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/cli.d/php-cli.ini
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cgi-fcgi.d/php-cgi-fcgi.ini
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
%if %{with apache1}
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.d/php-apache.ini
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
rm -f $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.la
%endif
%if %{with apache2}
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php.conf
-cp -a %{SOURCE4}
$RPM_BUILD_ROOT%{_sysconfdir}/apache2handler.d/php-apache2handler.ini
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
rm -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
cp -a conf.d/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
+# per SAPI ini directories
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
+
# for CLI SAPI only
mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d}
@@ -2262,13 +2264,6 @@
/^\(Add\|Load\)Module.*php5\.\(so\|c\)/d
' /etc/apache/apache.conf
%service -q apache restart
-
-%triggerpostun -n apache1-mod_php -- apache1-mod_php < 4:5.3.2-0.15
-# rescue configs.
-if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
- mv -f %{_sysconfdir}/apache.d/php-apache.ini{,.rpmnew}
- mv -f %{_sysconfdir}/php-apache.ini.rpmsave
%{_sysconfdir}/apache.d/php-apache.ini
-fi
%endif
%if %{with apache2}
@@ -2278,31 +2273,8 @@
cp -f %{_sysconfdir}/php-apache2handler.ini{,.rpmnew}
mv -f %{_sysconfdir}/php-apache.ini.rpmsave
%{_sysconfdir}/php-apache2handler.ini
fi
-
-%triggerpostun -n apache-mod_php -- apache-mod_php < 4:5.3.2-0.15
-# rescue configs.
-if [ -f %{_sysconfdir}/php-apache2handler.ini.rpmsave ]; then
- mv -f
%{_sysconfdir}/php-apache2handler.d/php-apache2handler.ini{,.rpmnew}
- mv -f %{_sysconfdir}/php-apache2handler.ini.rpmsave
%{_sysconfdir}/php-apache2handler.d/php-apache2handler.ini
-fi
%endif
-%triggerpostun cgi -- php-cgi < 4:5.3.2-0.15
-# rescue configs.
-for f in php-cgi.ini php-cgi-fcgi.ini ; do
- if [ -f %{_sysconfdir}/$f.rpmsave ]; then
- mv -f %{_sysconfdir}/cgi-fcgi.d/$f{,.rpmnew}
- mv -f %{_sysconfdir}/$f.rpmsave %{_sysconfdir}/cgi-fcgi.d/$f
- fi
-done
-
-%triggerpostun cli -- php-cli < 4:5.3.2-0.15
-# rescue configs.
-if [ -f %{_sysconfdir}/php-cli.ini.rpmsave ]; then
- mv -f %{_sysconfdir}/cli.d/php-cli.ini{,.rpmnew}
- mv -f %{_sysconfdir}/php-cli.ini.rpmsave
%{_sysconfdir}/cli.d/php-cli.ini
-fi
-
# common macros called at extension post/postun scriptlet
%define extension_scripts() \
%post %1 \
@@ -2541,7 +2513,7 @@
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/apache/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache.d
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache.d/php-apache.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
%attr(755,root,root) %{_libdir}/apache1/libphp5.so
%endif
@@ -2550,7 +2522,7 @@
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/httpd/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache2handler.d
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache2handler.d/php-apache2handler.ini
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/php-apache2handler.ini
%attr(755,root,root) %{_libdir}/apache/libphp5.so
%endif
@@ -2563,14 +2535,14 @@
%files cgi
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cgi-fcgi.d
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/cgi-fcgi.d/php-cgi-fcgi.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
%attr(755,root,root) %{_bindir}/php.cgi
%attr(755,root,root) %{_bindir}/php.fcgi
%files cli
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cli.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/php-cli.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
%attr(755,root,root) %{_bindir}/php.cli
%{_mandir}/man1/php.1*
%{_mandir}/man1/php.cli.1*
@@ -3053,6 +3025,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.861 2010/03/17 13:21:55 baggins
+- reverted 1.849
+- updated patch so it has the same functionality as on PHP_5_2
+
Revision 1.860 2010/03/16 10:36:51 glen
- imap ext R: pcre
- phar ext R: spl
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-sapi-ini-file.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.860&r2=1.861&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
