summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-11-13 13:08:22 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-11-13 13:08:22 +0000
commit627105570f87f6983efd9850c0db892401f12d5c (patch)
tree99819da9f63d739b14ca35901d56ab133f05aa9c /main
parentcc45211893db12cf391553103092a584ec2577e1 (diff)
downloadaports-627105570f87f6983efd9850c0db892401f12d5c.tar.bz2
aports-627105570f87f6983efd9850c0db892401f12d5c.tar.xz
main/php: move 5.3.0 from testing to main
Diffstat (limited to 'main')
-rw-r--r--main/php/APKBUILD47
-rw-r--r--main/php/php.post-upgrade11
2 files changed, 38 insertions, 20 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 01cbab1ae..86fe3f707 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Carlo Landmeter <clandmeter at gmail>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=php
-pkgver=5.2.11
-_suhosinver=${pkgver}-0.9.7
-pkgrel=0
+pkgver=5.3.0
+_suhosinver=${pkgver}-0.9.8
+pkgrel=3
pkgdesc="The PHP language runtime engine"
url="http://www.php.net/"
license="PHP-3"
depends=
-install=
+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
@@ -28,10 +28,10 @@ subpackages="$pkgname-dev $pkgname-doc
$pkgname-gmp
$pkgname-iconv
$pkgname-imap
+ $pkgname-intl
$pkgname-json
$pkgname-ldap
$pkgname-mcrypt
- $pkgname-mime_magic
$pkgname-mysql
$pkgname-mysqli
$pkgname-odbc
@@ -42,6 +42,7 @@ subpackages="$pkgname-dev $pkgname-doc
$pkgname-pdo_pgsql
$pkgname-pdo_sqlite
$pkgname-pgsql
+ $pkgname-phar
$pkgname-posix
$pkgname-pspell
$pkgname-shmop
@@ -49,6 +50,7 @@ subpackages="$pkgname-dev $pkgname-doc
$pkgname-soap
$pkgname-sockets
$pkgname-sqlite
+ $pkgname-sqlite3
$pkgname-sysvmsg
$pkgname-sysvsem
$pkgname-sysvshm
@@ -61,6 +63,7 @@ subpackages="$pkgname-dev $pkgname-doc
source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
+ gd-info-segfault.patch
"
build() {
@@ -70,6 +73,9 @@ build() {
gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \
| patch -p1 || return 1
+ # fix gd segfault; http://bugs.php.net/bug.php?id=49193
+ patch -p0 -i ${srcdir}/gd-info-segfault.patch || return 1
+
phpextensions="--enable-bcmath=shared \
--enable-calendar=shared \
--enable-dba=shared \
@@ -107,13 +113,12 @@ build() {
--with-jpeg-dir=shared,/usr \
--with-ldap=shared \
--with-mcrypt=shared \
- --with-mime-magic=shared \
--with-mysql-sock=/tmp/mysql.sock \
- --with-mysql=shared \
- --with-mysqli=shared \
+ --with-mysql=shared,mysqlnd \
+ --with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-pcre-regex=/usr \
- --with-pdo-mysql=shared \
+ --with-pdo-mysql=shared,mysqlnd \
--with-pdo-odbc=shared,unixODBC,/usr \
--with-pdo-pgsql=shared \
--with-pdo-sqlite=shared,/usr \
@@ -159,15 +164,17 @@ build() {
sed -i -e '/^BUILD_CGI/s/$(LDFLAGS)/-lpthread $(LDFLAGS)/' Makefile
make || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make -j1 INSTALL_ROOT="$pkgdir" install || return 1
- # fix the extension_dir
- sed -i -e 's/^extension_dir/\;extension_dir/' php.ini-recommended
- install -D -m644 php.ini-recommended "$pkgdir"/etc/php/php.ini
+ install -D -m644 php.ini-production "$pkgdir"/etc/php/php.ini
}
_mv_mod() {
pkgdesc="$1 php extension"
- local d=usr/lib/php/20060613
+ local d=usr/lib/php/20090626
mkdir -p "$subpkgdir/$d"
mv "$pkgdir/$d/${1}.so" "$subpkgdir/$d/" || return 1
install -d "$subpkgdir"/etc/php/conf.d
@@ -188,11 +195,10 @@ gettext() { _mv_mod gettext; }
gmp() { _mv_mod gmp; }
iconv() { _mv_mod iconv; }
imap() { _mv_mod imap; }
-#intl() { _mv_mod intl; }
+intl() { _mv_mod intl; }
json() { _mv_mod json; }
ldap() { _mv_mod ldap; }
mcrypt() { _mv_mod mcrypt; }
-mime_magic() { _mv_mod mime_magic; }
mysql() { _mv_mod mysql; }
mysqli() { _mv_mod mysqli; }
odbc() { _mv_mod odbc; }
@@ -202,9 +208,9 @@ pdo_mysql() { _mv_mod pdo_mysql; }
pdo_odbc() { _mv_mod pdo_odbc; }
pdo_pgsql() { _mv_mod pdo_pgsql; }
pdo_sqlite() { _mv_mod pdo_sqlite; }
-#phar() { _mv_mod phar; }
-pgsql() { _mv_mod pgsql; }
+phar() { _mv_mod phar; }
posix() { _mv_mod posix; }
+pgsql() { _mv_mod pgsql; }
pspell() { _mv_mod pspell; }
#session() { _mv_mod session; }
shmop() { _mv_mod shmop; }
@@ -212,7 +218,7 @@ snmp() { _mv_mod snmp; }
soap() { _mv_mod soap; }
sockets() { _mv_mod sockets; }
sqlite() { _mv_mod sqlite; }
-#sqlite3() { _mv_mod sqlite3; }
+sqlite3() { _mv_mod sqlite3; }
sysvmsg() { _mv_mod sysvmsg; }
sysvsem() { _mv_mod sysvsem; }
sysvshm() { _mv_mod sysvshm; }
@@ -230,5 +236,6 @@ dev() {
mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/
}
-md5sums="286bf34630f5643c25ebcedfec5e0a09 php-5.2.11.tar.bz2
-8f9de4d97fae6eba163cf3699509a260 suhosin-patch-5.2.11-0.9.7.patch.gz"
+md5sums="846760cd655c98dfd86d6d97c3d964b0 php-5.3.0.tar.bz2
+a23a3d54e177ac0ad30f78d928ba8177 suhosin-patch-5.3.0-0.9.8.patch.gz
+1c1a50aae7207b12d27bdecd8967e7ce gd-info-segfault.patch"
diff --git a/main/php/php.post-upgrade b/main/php/php.post-upgrade
new file mode 100644
index 000000000..98c959958
--- /dev/null
+++ b/main/php/php.post-upgrade
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+new=$1
+old=$2
+
+if [ "$(apk version -t $old 5.3)" = "<" ]; then
+ echo "*"
+ echo "* Please see migration notes here: http://php.net/migration53"
+ echo "*"
+fi
+