Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/packagekit/PKGBUILD
	community/bird/PKGBUILD
	community/camlp5/PKGBUILD
	community/exim/PKGBUILD
	community/ibus-table-extraphrase/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/torcs/PKGBUILD
	core/db/PKGBUILD
	core/iproute2/PKGBUILD
	core/libsasl/PKGBUILD
	core/openldap/PKGBUILD
	core/pam/PKGBUILD
	core/util-linux/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/php/PKGBUILD
	extra/postfix/PKGBUILD
	extra/python-lxml/PKGBUILD
	extra/rdesktop/PKGBUILD
	extra/redland/PKGBUILD
	extra/subversion/PKGBUILD
	extra/tidyhtml/PKGBUILD
	extra/transmission/PKGBUILD
	extra/windowmaker/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libdrm/no-pthread-stubs.patch
	multilib/lib32-openssl/PKGBUILD

3 files changed, 21 insertions, 49 deletions

diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 86b76f2fa..63827e0ed 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145339 2011-12-21 20:47:24Z andrea $
+# $Id: PKGBUILD 146477 2012-01-11 15:22:26Z stephane $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,9 +21,9 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.8
+pkgver=5.3.9
 _suhosinver=5.3.7-0.9.10
-pkgrel=6
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
 url='http://www.php.net'
@@ -36,13 +36,13 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
-md5sums=('704cd414a0565d905e1074ffdc1fadfb'
+md5sums=('dd3288ed5c08cd61ac5bf619cb357521'
          '08582e502fed8221c6577042ca45ddb8'
          '5bf4473f658404aa9a97bf026ecef8e9'
-         '65606c606df97a0760dfe5aaf9893afc'
+         'ffc338e8ce2a990f6f2a486355bbab65'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
-         '09005dabd90c48ddd392b3dbf05f8a82'
+         '740ec5fe2ecfd9d7febd4081c90ec65b'
          '07c4e412909ac65a44ec90e7a2c4bade')
 
 build() {
@@ -137,7 +137,7 @@ build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
+	sed 's/1997-2011/1997-2012/g' ${srcdir}/suhosin-patch-${_suhosinver}.patch | patch -p1
 
 	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index b4dd32f96..b923edb38 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
---- sapi/fpm/php-fpm.conf.in	2011-07-04 23:22:56.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2011-08-12 16:56:23.686606725 +0200
+--- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2012-01-11 10:50:14.905161442 +0100
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p arguement)
@@ -17,8 +17,8 @@
 +pid = run/php-fpm/php-fpm.pid
  
  ; Error log file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -102,7 +102,8 @@
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+@@ -140,7 +140,8 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
@@ -28,7 +28,7 @@
  
  ; Set listen(2) backlog. A value of '-1' means unlimited.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -121,9 +122,9 @@
+@@ -151,9 +152,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
  ;                 mode is set to 0666
@@ -38,38 +38,10 @@
 +listen.owner = @php_fpm_user@
 +listen.group = @php_fpm_group@
 +listen.mode = 0660
- 
- ; Unix user/group of processes
- ; Note: The user is mandatory. If the group is not set, the default user's group
-@@ -163,23 +164,23 @@
- ; The number of child processes created on startup.
- ; Note: Used only when pm is set to 'dynamic'
- ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
--;pm.start_servers = 20
-+pm.start_servers = 20
- 
- ; The desired minimum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.min_spare_servers = 5
-+pm.min_spare_servers = 5
- 
- ; The desired maximum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.max_spare_servers = 35
-+pm.max_spare_servers = 35
   
- ; The number of requests each child process should execute before respawning.
- ; This can be useful to work around memory leaks in 3rd party libraries. For
- ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
- ; Default Value: 0
--;pm.max_requests = 500
-+pm.max_requests = 500
- 
- ; The URI to view the FPM status page. If this value is not set, no URI will be
- ; recognized as a status page. By default, the status page shows the following
-@@ -333,7 +334,7 @@
+ ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
+ ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+@@ -442,7 +443,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index 46c842921..3dc5b6560 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -1,5 +1,5 @@
---- php.ini-production	2011-02-09 01:25:44.000000000 +0100
-+++ php.ini-production	2011-03-19 11:11:44.496987763 +0100
+--- php.ini-production	2011-12-15 11:31:02.000000000 +0100
++++ php.ini-production	2012-01-11 10:43:02.069936043 +0100
 @@ -376,7 +376,7 @@
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
@@ -9,7 +9,7 @@
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names. This directive is
-@@ -781,7 +781,7 @@
+@@ -793,7 +793,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -804,7 +804,7 @@
+@@ -816,7 +816,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -938,53 +938,49 @@
+@@ -950,53 +950,49 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -52,7 +52,7 @@
 -;extension=php_mysql.dll
 -;extension=php_mysqli.dll
 -;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+-;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 -;extension=php_openssl.dll
 -;extension=php_pdo_firebird.dll
 -;extension=php_pdo_mssql.dll