diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/php/APKBUILD | 86 | ||||
| -rw-r--r-- | main/php/php-install-pear-xml.patch | 8 |
2 files changed, 63 insertions, 31 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index e74d73831..53c85ca26 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -1,22 +1,51 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=php -pkgver=5.3.23 -_suhosinver=5.3.9-0.9.10 -pkgrel=1 +pkgver=5.4.14 +pkgrel=0 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" arch="all" license="PHP-3" depends="$pkgname-cgi" install="$pkgname.post-upgrade" -makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev - curl-dev libpng-dev libjpeg-turbo-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 - net-snmp-dev libxslt-dev openldap-dev pkgconfig - libgcrypt-dev apache2-dev apr-dev apr-util-dev libevent-dev - readline-dev enchant-dev gdbm-dev freetds-dev expat-dev" +makedepends=" + apache2-dev + apr-dev + apr-util-dev + aspell-dev + bzip2-dev + curl-dev + db-dev + enchant-dev + expat-dev + freetds-dev + freetype-dev + gdbm-dev + gettext-dev + gmp-dev + icu-dev + imap-dev + libevent-dev + libgcrypt-dev + libiconv-dev + libjpeg-turbo-dev + libmcrypt-dev + libpng-dev + libtool + libxml2-dev + libxslt-dev + mysql-dev + net-snmp-dev + openldap-dev + openssl-dev + pcre-dev + postgresql-dev + readline-dev + sqlite-dev + unixodbc-dev + zlib-dev + " subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi $pkgname-cli $pkgname-fpm $pkgname-apache2 $pkgname-embed $pkgname-pear @@ -56,7 +85,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi $pkgname-snmp $pkgname-soap $pkgname-sockets - $pkgname-sqlite $pkgname-sqlite3 $pkgname-sysvmsg $pkgname-sysvsem @@ -73,14 +101,13 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi " source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 - http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz - php-install-pear-xml.patch php-fpm.initd php5-module.conf + php-install-pear-xml.patch " -_apiver="20090626" -_extdir="/usr/lib/php/$_apiver" +_apiver="20100412" +_extdir="/usr/lib/php/modules" _srcdir="$srcdir"/$pkgname-$pkgver prepare() { @@ -105,6 +132,8 @@ _do_build() { local _builddir="$srcdir"/build-$_flavor mkdir -p "$_builddir" cd "$_builddir" + export EXTENSION_DIR=$_extdir + export PEAR_INSTALLDIR=/usr/share/pear "$_srcdir"/configure $@ || return 1 sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile # see #183 make || return 1 @@ -141,7 +170,7 @@ build() { --enable-exif=shared \ --with-freetype-dir=shared,/usr \ --enable-ftp=shared \ - --with-gd=shared,/usr \ + --with-gd=shared \ --enable-gd-native-ttf \ --with-gdbm=shared \ --with-gettext=shared \ @@ -179,8 +208,6 @@ build() { --with-snmp=shared \ --enable-soap=shared \ --enable-sockets=shared \ - --with-sqlite=shared \ - --enable-sqlite-utf8 \ --with-sqlite3=shared,/usr \ --enable-sysvmsg=shared \ --enable-sysvsem=shared \ @@ -199,7 +226,6 @@ build() { --without-qdbm \ --with-mssql=shared \ --with-pdo-dblib=shared \ - --enable-mailparse \ " # cgi, fcgi, cli, pear and extensions @@ -290,7 +316,7 @@ doc() { # doc files _docs="CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS \ - TODO TODO-5.1 TODO-PHP5 UPGRADING UPGRADING.INTERNALS" + UPGRADING UPGRADING.INTERNALS" for _doc in $_docs README.*; do install -Dm644 "$srcdir"/$pkgname-$pkgver/$_doc \ "$subpkgdir"/usr/share/doc/$pkgname/$_doc || return 1 @@ -409,7 +435,7 @@ pdo() { _mv_ext pdo; } pdo_mysql() { _mv_ext pdo_mysql "php-pdo mysql"; } pdo_odbc() { _mv_ext pdo_odbc "php-pdo unixodbc"; } pdo_pgsql() { _mv_ext pdo_pgsql "php-pdo postgresql-client"; } -pdo_sqlite() { _mv_ext pdo_sqlite "php-pdo sqlite"; } +pdo_sqlite() { _mv_ext pdo_sqlite "php-pdo sqlite3"; } pgsql() { _mv_ext pgsql "postgresql-client"; } phar() { _mv_ext phar @@ -422,8 +448,7 @@ shmop() { _mv_ext shmop; } snmp() { _mv_ext snmp; } soap() { _mv_ext soap; } sockets() { _mv_ext sockets; } -sqlite() { _mv_ext sqlite php-pdo_sqlite; } -sqlite3() { _mv_ext sqlite3 sqlite; } +sqlite3() { _mv_ext sqlite3; } sysvmsg() { _mv_ext sysvmsg; } sysvsem() { _mv_ext sysvsem; } sysvshm() { _mv_ext sysvshm; } @@ -437,8 +462,15 @@ mssql() { _mv_ext mssql; } pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; } wddx() { _mv_ext wddx; } -md5sums="ab7bd1dd3bbc8364cb9fcaa2d79fb502 php-5.3.23.tar.bz2 -c099b3d7eac95018ababd41ded7f3066 suhosin-patch-5.3.9-0.9.10.patch.gz -5111e3be06d391f8772587c675240fab php-install-pear-xml.patch +md5sums="cfdc044be2c582991a1fe0967898fa38 php-5.4.14.tar.bz2 9ab162ff3428511a68aa9801c746e0d5 php-fpm.initd -67719f428f44ec004da18705cbabe2ee php5-module.conf" +67719f428f44ec004da18705cbabe2ee php5-module.conf +483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch" +sha256sums="5450f3843bc651eb3fb00601f0cce1930aaaf65c7c966c02fe4a46f9c81be20a php-5.4.14.tar.bz2 +96e68f7c545adcac56ed1f5824b33041e270680ca884a9cfe27e7f4ac8abfd3b php-fpm.initd +ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f php5-module.conf +f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab php-install-pear-xml.patch" +sha512sums="7279e7e621440038dca6a2086963fc0852260716aeb6cefe952ba1dade1797b2eaf8eeed3b26d053015079135ee5e8cc6bacd9184b1a9dc77b36169fe75448f2 php-5.4.14.tar.bz2 +33247a1c9188eba893bb0be13456eeeec9b971c7f482a4e2bd0f318fb63d8c67d379a021840768bef8e4d630be859c5bdb424c1e90b9b816ec691c078147e915 php-fpm.initd +895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 php5-module.conf +f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 php-install-pear-xml.patch" diff --git a/main/php/php-install-pear-xml.patch b/main/php/php-install-pear-xml.patch index f7a6fff58..18747be94 100644 --- a/main/php/php-install-pear-xml.patch +++ b/main/php/php-install-pear-xml.patch @@ -1,5 +1,5 @@ ---- ./pear/Makefile.frag.orig -+++ ./pear/Makefile.frag +--- ./pear/Makefile.frag.orig 2013-04-12 07:02:27.041602514 +0000 ++++ ./pear/Makefile.frag 2013-04-12 07:04:09.065836822 +0000 @@ -2,8 +2,11 @@ peardir=$(PEAR_INSTALLDIR) @@ -8,8 +8,8 @@ +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) +-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 ++PEAR_INSTALL_FLAGS = -n -dshort_open_tag=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` |