[arch-commits] Commit in php/trunk (3 files)

[Pierre Schmitz]

    Date: Saturday, March 19, 2011 @ 11:53:37
  Author: pierre
Revision: 115705

upstream update; using the old rediffed suhosin patch for now

Added:
  php/trunk/suhosin-patch-5.3.6-0.9.10.patch.gz
Modified:
  php/trunk/PKGBUILD
  php/trunk/php.ini.patch

---------------+
 PKGBUILD      |   24 ++++++++++++++----------
 php.ini.patch |   20 ++++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-19 15:04:14 UTC (rev 115704)
+++ PKGBUILD	2011-03-19 15:53:37 UTC (rev 115705)
@@ -23,9 +23,9 @@
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.5
-pkgrel=2
-_suhosinver=5.3.4-0.9.10
+pkgver=5.3.6
+pkgrel=1
+_suhosinver=${pkgver}-0.9.10
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -33,14 +33,13 @@
              'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
-options=('!makeflags')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
+        "suhosin-patch-${_suhosinver}.patch.gz"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
-md5sums=('8aaf20c95e91f25c5b6a591e5d6d61b9'
-         '69683b97f1e8d8c7ad01eebcbb8a56fa'
-         '3238300834d831a13f9479e5384a5f08'
+md5sums=('2286f5a82a6e8397955a0025c1c2ad98'
+         'fff1a38877142f3ae6036dbe5a85d0a6'
+         '39eaa70d276fc3d45d6bcf6cd5ae1106'
          '96ca078be6729b665be8a865535a97bf'
          'b136a184dd055c559a03eb8bac562a3c'
          'd50ff349da08110a7cc8c691ce2d0423'
@@ -210,6 +209,11 @@
 	make
 }
 
+# check() {
+# 	cd ${srcdir}/build-php
+# 	make test
+# }
+
 package_php() {
 	pkgdesc='An HTML-embedded scripting language'
 	depends=('pcre' 'libxml2' 'bzip2' 'openssl')
@@ -219,7 +223,7 @@
 	backup=('etc/php/php.ini')
 
 	cd ${srcdir}/build-php
-	make INSTALL_ROOT=${pkgdir} install
+	make -j1 INSTALL_ROOT=${pkgdir} install
 	install -d -m755 ${pkgdir}/usr/share/pear
 	# install php.ini
 	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
@@ -275,7 +279,7 @@
 	backup=('etc/php/pear.conf')
 
 	cd ${srcdir}/build-pear
-	make install-pear INSTALL_ROOT=${pkgdir}
+	make -j1 install-pear INSTALL_ROOT=${pkgdir}
 	local i
 	while read i; do
 		[ ! -e "$i" ] || rm -rf "$i"

Modified: php.ini.patch
===================================================================
--- php.ini.patch	2011-03-19 15:04:14 UTC (rev 115704)
+++ php.ini.patch	2011-03-19 15:53:37 UTC (rev 115705)
@@ -1,17 +1,17 @@
---- php.ini-production	2010-12-10 22:38:28.573491945 +0100
-+++ php.ini-production	2010-12-10 23:10:01.078209263 +0100
+--- php.ini-production	2011-02-09 01:25:44.000000000 +0100
++++ php.ini-production	2011-03-19 11:11:44.496987763 +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.
  ; http://php.net/open-basedir
 -;open_basedir =
 +open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
-
+ 
  ; 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 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
-
+ 
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
 +include_path = ".:/usr/share/pear"
@@ -19,15 +19,15 @@
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
 @@ -804,7 +804,7 @@
-
+ 
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
 -; extension_dir = "./"
 +extension_dir = "/usr/lib/php/modules/"
  ; On windows:
  ; extension_dir = "ext"
-
-@@ -938,49 +938,49 @@
+ 
+@@ -938,53 +938,49 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -64,7 +64,11 @@
 -;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
@@ -117,6 +121,6 @@
 +;extension=xmlrpc.so
 +;extension=xsl.so
 +;extension=zip.so
-
+ 
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;

Added: suhosin-patch-5.3.6-0.9.10.patch.gz
===================================================================
(Binary files differ)


Property changes on: php/trunk/suhosin-patch-5.3.6-0.9.10.patch.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream