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

Pierre Schmitz pierre at archlinux.org
Thu Nov 19 06:46:53 EST 2009


    Date: Thursday, November 19, 2009 @ 06:46:52
  Author: pierre
Revision: 59023

update to 5.3.1; relocate patches; update mysql socket location

Modified:
  php/trunk/PKGBUILD
  php/trunk/db-configure.patch
  php/trunk/php.ini.patch
Deleted:
  php/trunk/gd-info-segfault.patch

------------------------+
 PKGBUILD               |   22 +++++++++-------------
 db-configure.patch     |    6 +++---
 gd-info-segfault.patch |   26 --------------------------
 php.ini.patch          |   22 ++++++++++++++--------
 4 files changed, 26 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-11-19 11:14:58 UTC (rev 59022)
+++ PKGBUILD	2009-11-19 11:46:52 UTC (rev 59023)
@@ -20,9 +20,9 @@
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.0
-pkgrel=5
-_suhosinver=${pkgver}-0.9.8
+pkgver=5.3.1
+pkgrel=1
+_suhosinver=${pkgver}RC1-0.9.8
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -33,13 +33,12 @@
 options=('!makeflags')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
-        'php.ini.patch' 'apache.conf' 'db-configure.patch' 'gd-info-segfault.patch')
-md5sums=('846760cd655c98dfd86d6d97c3d964b0'
-         'a23a3d54e177ac0ad30f78d928ba8177'
-         '67c63d2c8a976a333bbd2216cdd60413'
+        'php.ini.patch' 'apache.conf' 'db-configure.patch')
+md5sums=('63e97ad450f0f7259e785100b634c797'
+         'c3ff0cb5fa728420d56f8ed139446647'
+         'd6f94150f47047882c6716575e12e99b'
          '96ca078be6729b665be8a865535a97bf'
-         '45ecb6fb0aadfd3462097e3bab951aa5'
-         '1c1a50aae7207b12d27bdecd8967e7ce')
+         '45ecb6fb0aadfd3462097e3bab951aa5')
 
 build() {
 	phpconfig="--prefix=/usr \
@@ -95,7 +94,7 @@
 		--with-jpeg-dir=shared,/usr \
 		--with-ldap=shared \
 		--with-mcrypt=shared \
-		--with-mysql-sock=/tmp/mysql.sock \
+		--with-mysql-sock=/var/run/mysqld/mysqld.sock \
 		--with-mysql=shared,mysqlnd \
 		--with-mysqli=shared,mysqlnd \
 		--with-openssl=shared \
@@ -136,9 +135,6 @@
 	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch || return 1
 
-	# fix gd segfault; http://bugs.php.net/bug.php?id=49193
-	patch -p0 -i ${srcdir}/gd-info-segfault.patch || return 1
-
 	# php
 	mkdir ${srcdir}/build-php
 	cd ${srcdir}/build-php

Modified: db-configure.patch
===================================================================
--- db-configure.patch	2009-11-19 11:14:58 UTC (rev 59022)
+++ db-configure.patch	2009-11-19 11:46:52 UTC (rev 59023)
@@ -1,6 +1,6 @@
---- configure.orig	2009-06-29 17:46:18.000000000 +0200
-+++ configure	2009-08-14 08:34:52.000000000 +0200
-@@ -29088,43 +29088,15 @@
+--- configure	2009-11-18 21:11:57.000000000 +0100
++++ configure	2009-11-19 12:42:50.881918639 +0100
+@@ -29292,43 +29292,15 @@
    
    unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
  

Deleted: gd-info-segfault.patch
===================================================================
--- gd-info-segfault.patch	2009-11-19 11:14:58 UTC (rev 59022)
+++ gd-info-segfault.patch	2009-11-19 11:46:52 UTC (rev 59023)
@@ -1,26 +0,0 @@
-Index: ext/gd/libgd/gd_compat.c
-===================================================================
---- ext/gd/libgd/gd_compat.c	(Revision 286947)
-+++ ext/gd/libgd/gd_compat.c	(Revision 286948)
-@@ -14,7 +14,7 @@
- 	return JPEG_LIB_VERSION;
- }
- 
--int gdJpegGetVersionString()
-+const char * gdJpegGetVersionString()
- {
- 	switch(JPEG_LIB_VERSION) {
- 		case 62:
-Index: ext/gd/libgd/gd_compat.h
-===================================================================
---- ext/gd/libgd/gd_compat.h	(Revision 286947)
-+++ ext/gd/libgd/gd_compat.h	(Revision 286948)
-@@ -8,7 +8,7 @@
- #endif
- 
- const char * gdPngGetVersionString();
--int gdJpegGetVersionString();
-+const char * gdJpegGetVersionString();
- int gdJpegGetVersionInt();
- int overflow2(int a, int b);
- 

Modified: php.ini.patch
===================================================================
--- php.ini.patch	2009-11-19 11:14:58 UTC (rev 59022)
+++ php.ini.patch	2009-11-19 11:46:52 UTC (rev 59023)
@@ -1,5 +1,5 @@
---- php.ini-production	2009-06-30 01:05:38.000000000 +0200
-+++ php.ini	2009-06-30 01:02:15.000000000 +0200
+--- php.ini-production	2009-11-12 18:20:01.000000000 +0100
++++ php.ini	2009-11-19 12:39:03.305274757 +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
-@@ -785,7 +785,7 @@
+@@ -781,7 +781,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -808,7 +808,7 @@
+@@ -804,7 +804,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,10 +27,16 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -945,47 +945,49 @@
- ; extension folders as well as the separate PECL DLL download (PHP 5).
- ; Be sure to appropriately set the extension_dir directive.
- ; 
+@@ -938,53 +938,49 @@
+ ; If you only provide the name of the extension, PHP will look for it in its
+ ; default extension directory.
+ ;
+-; Windows Extensions
+-; Note that ODBC support is built in, so no dll is needed for it.
+-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
+-; extension folders as well as the separate PECL DLL download (PHP 5).
+-; Be sure to appropriately set the extension_dir directive.
+-;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_dba.dll



More information about the arch-commits mailing list