[arch-commits] Commit in php/repos (extra-i686 extra-i686/PKGBUILD extra-i686/php.ini)

[Pierre Schmitz]

    Date: Friday, February 27, 2009 @ 11:25:47
  Author: pierre
Revision: 27877

Merged revisions 27856,27874 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/php/trunk

........
  r27856 | pierre | 2009-02-27 09:57:40 +0100 (Fr, 27 Feb 2009) | 1 line
  
  prepare for PHP 5.2.9
........
  r27874 | pierre | 2009-02-27 16:45:59 +0100 (Fr, 27 Feb 2009) | 1 line
  
  upgpkg: php 5.2.9-1
........

Modified:
  php/repos/extra-i686/	(properties)
  php/repos/extra-i686/PKGBUILD
  php/repos/extra-i686/php.ini

----------+
 PKGBUILD |    9 +++++----
 php.ini  |   18 ++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)


Property changes on: php/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /php/trunk:1-25784
   + /php/trunk:1-27876

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-27 16:08:14 UTC (rev 27876)
+++ extra-i686/PKGBUILD	2009-02-27 16:25:47 UTC (rev 27877)
@@ -2,9 +2,9 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=php
-pkgver=5.2.8
+pkgver=5.2.9
 pkgrel=1
-_suhosinver=${pkgver}-0.9.6.3
+_suhosinver=5.2.8-0.9.6.3
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -40,9 +40,9 @@
 source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" \
         'php.ini' 'apache.conf' 'db-configure.patch')
-md5sums=('8760a833cf10433d3e72271ab0d0eccf'
+md5sums=('280d6cda7f72a4fc6de42fda21ac2db7'
          'd455c3dd5b652046dbac2951a58f64fa'
-         'f131ec28cb079f604588c7ffefae5f62'
+         '1b8156a6208e2b96a65fff1e67dd4a43'
          '96ca078be6729b665be8a865535a97bf'
          '74e5ce5a02488ec91b1c59f539e42936')
 
@@ -135,6 +135,7 @@
 	patch -p0 -i ${srcdir}/db-configure.patch || return 1
 
 	# apply suhosin patch
+	sed -e 's/1997-2008/1997-2009/' -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
 	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch || return 1
 
 	# cli

Modified: extra-i686/php.ini
===================================================================
--- extra-i686/php.ini	2009-02-27 16:08:14 UTC (rev 27876)
+++ extra-i686/php.ini	2009-02-27 16:25:47 UTC (rev 27877)
@@ -94,7 +94,8 @@
 ; - magic_quotes_gpc = Off         [Performance]
 ;     Input data is no longer escaped with slashes so that it can be sent into
 ;     SQL databases without further manipulation.  Instead, you should use the
-;     function addslashes() on each input element you wish to send to a database.
+;     database vendor specific escape string function on each input element you
+;     wish to send to a database.
 ; - variables_order = "GPCS"       [Performance]
 ;     The environment variables are not hashed into the $_ENV.  To access
 ;     environment variables, you can use getenv() instead.
@@ -385,7 +386,7 @@
 log_errors_max_len = 1024
 
 ; Do not log repeated messages. Repeated errors must occur in same file on same
-; line until ignore_repeated_source is set true.
+; line unless ignore_repeated_source is set true.
 ignore_repeated_errors = Off
 
 ; Ignore source of message when ignoring repeated messages. When this setting
@@ -403,6 +404,11 @@
 ; Store the last error/warning message in $php_errormsg (boolean).
 track_errors = Off
 
+; Turn off normal error reporting and emit XML-RPC error XML
+;xmlrpc_errors = 0
+; An XML-RPC faultCode
+;xmlrpc_error_number = 0
+
 ; Disable the inclusion of HTML tags in error messages.
 ; Note: Never use this feature for production boxes.
 ;html_errors = Off
@@ -418,7 +424,7 @@
 ;docref_ext = .html
 
 ; String to output before an error message.
-;error_prepend_string = "<font color=ff0000>"
+;error_prepend_string = "<font color=#ff0000>"
 
 ; String to output after an error message.
 ;error_append_string = "</font>"
@@ -655,10 +661,6 @@
 [sqlite]
 ;sqlite.assoc_case = 0
 
-[xmlrpc]
-;xmlrpc_error_number = 0
-;xmlrpc_errors = 0
-
 [Pcre]
 ;PCRE library backtracking limit.
 ;pcre.backtrack_limit=100000
@@ -841,7 +843,7 @@
 ; Notice message logging require a little overheads.
 pgsql.ignore_notice = 0
 
-; Log PostgreSQL backends Noitce message or not.
+; Log PostgreSQL backends Notice message or not.
 ; Unless pgsql.ignore_notice=0, module cannot log notice message.
 pgsql.log_notice = 0