aboutsummaryrefslogtreecommitdiffstats
path: root/main/php
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-08-23 12:44:59 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-08-23 12:44:59 +0000
commit929405ed9421fb1389b12f2282b15816e451912c (patch)
tree6e188f63764dab538d77145d0358c431613e34f9 /main/php
parent9f3cd5c2c7ce5197c535aa8dd12a869284c0bf72 (diff)
downloadaports-929405ed9421fb1389b12f2282b15816e451912c.tar.bz2
aports-929405ed9421fb1389b12f2282b15816e451912c.tar.xz
main/php: upgrade to 5.3.8
Diffstat (limited to 'main/php')
-rw-r--r--main/php/APKBUILD8
-rw-r--r--main/php/php-crypt-fix-r315218.patch13
2 files changed, 3 insertions, 18 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 2f0c8d698e..303e75be97 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=php
-pkgver=5.3.7
+pkgver=5.3.8
_suhosinver=5.3.7-0.9.10
-pkgrel=1
+pkgrel=0
pkgdesc="The PHP language runtime engine"
url="http://www.php.net/"
arch="all"
@@ -73,7 +73,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi
# http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
suhosin-patch-${_suhosinver}.patch
- php-crypt-fix-r315218.patch
php-fpm.initd
php5-module.conf
"
@@ -425,8 +424,7 @@ zlib() { _mv_ext zlib; }
mssql() { _mv_ext mssql; }
pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; }
-md5sums="2d47d003c96de4e88863ff38da61af33 php-5.3.7.tar.bz2
+md5sums="704cd414a0565d905e1074ffdc1fadfb php-5.3.8.tar.bz2
8bd8840465d6bcd8e1e5d2cec80a1bfc suhosin-patch-5.3.7-0.9.10.patch
-15464f965b6957c19684c992c669e1c2 php-crypt-fix-r315218.patch
8f2bb2b744a2de50025842cb51fb6a3a php-fpm.initd
67719f428f44ec004da18705cbabe2ee php5-module.conf"
diff --git a/main/php/php-crypt-fix-r315218.patch b/main/php/php-crypt-fix-r315218.patch
deleted file mode 100644
index aaf688a2fc..0000000000
--- a/main/php/php-crypt-fix-r315218.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: php-src/trunk/ext/standard/php_crypt_r.c
-===================================================================
---- trunk/ext/standard/php_crypt_r.c (revision 315217)
-+++ trunk/ext/standard/php_crypt_r.c (revision 315218)
-@@ -377,7 +377,7 @@
- /* Now make the output string */
- memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
- strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
-- strlcat(passwd, "$", 1);
-+ strcat(passwd, "$");
-
- PHP_MD5Final(final, &ctx);
-