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

Pierre Schmitz pierre at archlinux.org
Wed Jan 28 22:23:36 UTC 2009


    Date: Wednesday, January 28, 2009 @ 17:23:36
  Author: pierre
Revision: 25785

Merged revisions 21676,21895,25781 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/php/trunk

........
  r21676 | pierre | 2008-12-14 14:15:59 +0100 (So, 14 Dez 2008) | 1 line
  
  prepare for future rebuilds
........
  r21895 | pierre | 2008-12-17 16:32:11 +0100 (Mi, 17 Dez 2008) | 1 line
  
  hardcoded ver not needed anymore
........
  r25781 | pierre | 2009-01-28 22:56:59 +0100 (Mi, 28 Jan 2009) | 1 line
  
  upgpkg: php 5.2.8-1
........

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

--------------+
 PKGBUILD     |   84 +++++++++++++++++++++++++++------------------------------
 filter.patch |   11 -------
 php.ini      |    2 +
 3 files changed, 43 insertions(+), 54 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-28 22:15:36 UTC (rev 25784)
+++ extra-i686/PKGBUILD	2009-01-28 22:23:36 UTC (rev 25785)
@@ -2,49 +2,49 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=php
-pkgver=5.2.7
-pkgrel=2
-_suhosinver=0.9.6.3
+pkgver=5.2.8
+pkgrel=1
+_suhosinver=${pkgver}-0.9.6.3
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
 backup=('etc/php/php.ini')
 depends=('glibc' 'readline' 'ncurses' 'libxml2' 'pcre')
-makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' \
-             'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' \
-             'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' \
-             'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db>=4.7')
-optdepends=('bzip2: bz2' \
-            'curl: curl' \
-            'gdbm: dba' \
-            'libpng: gd' \
-            'libjpeg: gd' \
-            'freetype2: gd' \
-            'pam: imap' \
-            'libldap: ldap' \
-            'mcrypt: mcrypt' \
-            'libtool: mcrypt' \
-            'libmysqlclient: mysql/mysqli' \
-            'unixodbc: odbc/pdo_odbc' \
-            'openssl: openssl' \
-            'postgresql-libs: pgsql/pdo_pgsql' \
-            'aspell: pspell' \
-            'net-snmp: snmp' \
-            'sqlite3: sqlite' \
-            'tidyhtml: tidy' \
-            'libxslt: xsl' \
+makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' 
+             'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' 'mhash' 'gmp'
+             'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' 
+             'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db')
+optdepends=('bzip2: bz2'
+            'curl: curl'
+            'gdbm: dba'
+            'libpng: gd'
+            'libjpeg: gd'
+            'freetype2: gd'
+            'pam: imap'
+            'libldap: ldap'
+            'libmcrypt: mcrypt'
+            'libtool: mcrypt'
+            'libmysqlclient: mysql/mysqli/pdo_mysql'
+            'unixodbc: odbc/pdo_odbc'
+            'openssl: openssl'
+            'postgresql-libs: pgsql/pdo_pgsql'
+            'aspell: pspell'
+            'net-snmp: snmp'
+            'sqlite3: pdo_sqlite'
+            'tidyhtml: tidy'
+            'libxslt: xsl'
+            'mhash: mhash'
+            'gmp: gmp'
             )
-options=('emptydirs')
 source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
-        "http://download.suhosin.org/suhosin-patch-${pkgver}-${_suhosinver}.patch.gz" \
-        'php.ini' 'apache.conf' 'db-configure.patch' 'filter.patch')
-md5sums=('9ffc42edbb7faad965699666ddd559bc'
+        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" \
+        'php.ini' 'apache.conf' 'db-configure.patch')
+md5sums=('8760a833cf10433d3e72271ab0d0eccf'
          'd455c3dd5b652046dbac2951a58f64fa'
-         '0ee1dad48f7d67af3d2c78ca6eed68ba'
+         'f131ec28cb079f604588c7ffefae5f62'
          '96ca078be6729b665be8a865535a97bf'
-         '74e5ce5a02488ec91b1c59f539e42936'
-         'b0286fe2fd5f57770cb2d9e15144cd19')
+         '74e5ce5a02488ec91b1c59f539e42936')
 
 build() {
 	phpconfig="--prefix=/usr \
@@ -92,15 +92,15 @@
 	--with-unixODBC=shared,/usr \
 	--enable-pdo=shared \
 	--with-pdo-mysql=shared \
-	--with-pdo-sqlite=shared \
+	--with-pdo-sqlite=shared,/usr \
 	--with-pdo-odbc=shared,unixODBC,/usr \
 	--with-pdo-pgsql=shared \
 	--with-sqlite=shared \
+	--enable-sqlite-utf8 \
 	--with-pgsql=shared \
 	--enable-shmop=shared \
 	--with-snmp=shared \
 	--enable-soap=shared \
-	--enable-sqlite-utf8=shared \
 	--enable-sysvmsg=shared \
 	--enable-sysvsem=shared \
 	--enable-sysvshm=shared \
@@ -122,18 +122,20 @@
 	--with-pspell=shared \
 	--with-freetype-dir=shared,/usr \
 	--with-mime-magic=shared \
+	--with-gmp=shared \
+	--with-mhash=shared \
 	"
 
+	PEAR_INSTALLDIR=/usr/share/pear
+	export PEAR_INSTALLDIR
+
 	cd ${srcdir}/${pkgname}-${pkgver}
 
-	# fix magic_quotes_gpc; see http://bugs.php.net/bug.php?id=46759
-	patch -p0 -i ${srcdir}/filter.patch || return 1
-
 	# avoid linking against old db version
 	patch -p0 -i ${srcdir}/db-configure.patch || return 1
 
 	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${pkgver}-${_suhosinver}.patch || return 1
+	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch || return 1
 
 	# cli
 	./configure ${phpconfig} \
@@ -146,12 +148,8 @@
 	# make test
 	make INSTALL_ROOT=${pkgdir} install || return 1
 
-	# fix pear path
-	sed "s|$PWD||g" -i ${pkgdir}/usr/{bin/pear,share/pear/pearcmd.php}
 	# cleanup
 	rm -f ${pkgdir}`${pkgdir}/usr/bin/php-config --extension-dir`/*.a
-	rm -rf ${pkgdir}/{.registry,.channels,.depdb*,.lock,.filemap}
-	rmdir ${pkgdir}/usr/include/php/include
 	# install php.ini
 	install -D -m644 ${srcdir}/php.ini ${pkgdir}/etc/php/php.ini
 	install -d -m755 ${pkgdir}/etc/php/conf.d/

Deleted: extra-i686/filter.patch
===================================================================
--- extra-i686/filter.patch	2009-01-28 22:15:36 UTC (rev 25784)
+++ extra-i686/filter.patch	2009-01-28 22:23:36 UTC (rev 25785)
@@ -1,11 +0,0 @@
---- ext/filter/filter.c	2008/11/02 22:04:40	1.52.2.43
-+++ ext/filter/filter.c	2008/12/06 17:16:36	1.52.2.44
-@@ -403,7 +403,7 @@
- 		Z_STRLEN(new_var) = val_len;
- 		Z_TYPE(new_var) = IS_STRING;
- 
--		if (IF_G(default_filter) != FILTER_UNSAFE_RAW || IF_G(default_filter_flags) != 0) {
-+		if (IF_G(default_filter) != FILTER_UNSAFE_RAW) {
- 			zval *tmp_new_var = &new_var;
- 			Z_STRVAL(new_var) = estrndup(*val, val_len);
- 			INIT_PZVAL(tmp_new_var);

Modified: extra-i686/php.ini
===================================================================
--- extra-i686/php.ini	2009-01-28 22:15:36 UTC (rev 25784)
+++ extra-i686/php.ini	2009-01-28 22:23:36 UTC (rev 25785)
@@ -1264,11 +1264,13 @@
 ;extension=ftp.so
 ;extension=gd.so
 extension=gettext.so
+;extension=gmp.so
 ;extension=iconv.so
 ;extension=imap.so
 ;extension=json.so
 ;extension=ldap.so
 ;extension=mcrypt.so
+;extension=mhash.so
 ;extension=mime_magic.so
 ;extension=mysql.so
 ;extension=mysqli.so




More information about the arch-commits mailing list