diff options
Diffstat (limited to 'main/php')
| -rw-r--r-- | main/php/APKBUILD | 24 | ||||
| -rw-r--r-- | main/php/php-install-pear-xml.patch | 15 |
2 files changed, 35 insertions, 4 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 1b72cc30..7c044c8c 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -3,7 +3,7 @@ pkgname=php pkgver=5.3.2 _suhosinver=${pkgver}-0.9.9.1 -pkgrel=1 +pkgrel=6 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" license="PHP-3" @@ -12,10 +12,10 @@ install="$pkgname.post-upgrade" makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev sqlite-dev libtool libltdl postgresql-dev db-dev unixodbc-dev icu-dev - gd-dev gmp-dev gettext-dev imap-dev aspell-dev + gd-dev gmp5-dev gettext-dev imap-dev aspell-dev net-snmp-dev libxslt-dev cyrus-sasl-dev openldap-dev pkgconfig libgcrypt-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-cli +subpackages="$pkgname-dev $pkgname-doc $pkgname-cli $pkgname-pear $pkgname-bcmath $pkgname-bz2 $pkgname-calendar @@ -63,6 +63,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz + php-install-pear-xml.patch zend_execute_API.c.patch " @@ -71,6 +72,9 @@ _extdir="/usr/lib/php/20090626" build() { cd "$srcdir/$pkgname-$pkgver" + # beat the pear installer into using xml.so + patch -p1 -i "$srcdir"/php-install-pear-xml.patch || return 1 + # apply suhosin patch gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \ | patch -p1 || return 1 @@ -112,7 +116,7 @@ build() { --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 \ @@ -178,6 +182,17 @@ cli() { mv "$pkgdir"/usr/bin/php "$subpkgdir"/usr/bin/ } +pear() { + depends="php" + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/share + mkdir -p "$subpkgdir"/etc/php + mv "$pkgdir"/usr/share/pear "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/bin/pear* "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/bin/pecl "$subpkgdir"/usr/bin/ + mv "$pkgdir"/etc/php/pear.conf "$subpkgdir"/etc/php/ +} + _mv_mod() { pkgdesc="$1 php extension" mkdir -p "$subpkgdir/$_extdir" @@ -243,4 +258,5 @@ dev() { md5sums="46f500816125202c48a458d0133254a4 php-5.3.2.tar.bz2 4647b05330862d6a1fc4469245cc6ade suhosin-patch-5.3.2-0.9.9.1.patch.gz +5111e3be06d391f8772587c675240fab php-install-pear-xml.patch 55f9d24316a57e0c0f6b4b84791a1a17 zend_execute_API.c.patch" diff --git a/main/php/php-install-pear-xml.patch b/main/php/php-install-pear-xml.patch new file mode 100644 index 00000000..f7a6fff5 --- /dev/null +++ b/main/php/php-install-pear-xml.patch @@ -0,0 +1,15 @@ +--- ./pear/Makefile.frag.orig ++++ ./pear/Makefile.frag +@@ -2,8 +2,11 @@ + + peardir=$(PEAR_INSTALLDIR) + ++# help the built php to find xml extension so we can install pear ++PEAR_INSTALL_XML_FLAGS = -d extension_dir="$(top_builddir)/modules" -d extension=xml.so ++ + # Skip all php.ini files altogether +-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 ++PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 $(PEAR_INSTALL_XML_FLAGS) + + WGET = `which wget 2>/dev/null` + FETCH = `which fetch 2>/dev/null` |