diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-23 12:44:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-23 12:44:59 +0000 |
| commit | 929405ed9421fb1389b12f2282b15816e451912c (patch) | |
| tree | 6e188f63764dab538d77145d0358c431613e34f9 | |
| parent | 9f3cd5c2c7ce5197c535aa8dd12a869284c0bf72 (diff) | |
| download | alpine_aports-929405ed9421fb1389b12f2282b15816e451912c.tar.bz2 alpine_aports-929405ed9421fb1389b12f2282b15816e451912c.tar.xz alpine_aports-929405ed9421fb1389b12f2282b15816e451912c.zip | |
main/php: upgrade to 5.3.8
| -rw-r--r-- | main/php/APKBUILD | 8 | ||||
| -rw-r--r-- | main/php/php-crypt-fix-r315218.patch | 13 |
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 @@ | |||
| 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
| 2 | # Maintainer: Matt Smith <mcs@darkregion.net> | 2 | # Maintainer: Matt Smith <mcs@darkregion.net> |
| 3 | pkgname=php | 3 | pkgname=php |
| 4 | pkgver=5.3.7 | 4 | pkgver=5.3.8 |
| 5 | _suhosinver=5.3.7-0.9.10 | 5 | _suhosinver=5.3.7-0.9.10 |
| 6 | pkgrel=1 | 6 | pkgrel=0 |
| 7 | pkgdesc="The PHP language runtime engine" | 7 | pkgdesc="The PHP language runtime engine" |
| 8 | url="http://www.php.net/" | 8 | url="http://www.php.net/" |
| 9 | arch="all" | 9 | arch="all" |
| @@ -73,7 +73,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi | |||
| 73 | # http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz | 73 | # http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz |
| 74 | source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 | 74 | source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 |
| 75 | suhosin-patch-${_suhosinver}.patch | 75 | suhosin-patch-${_suhosinver}.patch |
| 76 | php-crypt-fix-r315218.patch | ||
| 77 | php-fpm.initd | 76 | php-fpm.initd |
| 78 | php5-module.conf | 77 | php5-module.conf |
| 79 | " | 78 | " |
| @@ -425,8 +424,7 @@ zlib() { _mv_ext zlib; } | |||
| 425 | mssql() { _mv_ext mssql; } | 424 | mssql() { _mv_ext mssql; } |
| 426 | pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; } | 425 | pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; } |
| 427 | 426 | ||
| 428 | md5sums="2d47d003c96de4e88863ff38da61af33 php-5.3.7.tar.bz2 | 427 | md5sums="704cd414a0565d905e1074ffdc1fadfb php-5.3.8.tar.bz2 |
| 429 | 8bd8840465d6bcd8e1e5d2cec80a1bfc suhosin-patch-5.3.7-0.9.10.patch | 428 | 8bd8840465d6bcd8e1e5d2cec80a1bfc suhosin-patch-5.3.7-0.9.10.patch |
| 430 | 15464f965b6957c19684c992c669e1c2 php-crypt-fix-r315218.patch | ||
| 431 | 8f2bb2b744a2de50025842cb51fb6a3a php-fpm.initd | 429 | 8f2bb2b744a2de50025842cb51fb6a3a php-fpm.initd |
| 432 | 67719f428f44ec004da18705cbabe2ee php5-module.conf" | 430 | 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 @@ | |||
| 1 | Index: php-src/trunk/ext/standard/php_crypt_r.c | ||
| 2 | =================================================================== | ||
| 3 | --- trunk/ext/standard/php_crypt_r.c (revision 315217) | ||
| 4 | +++ trunk/ext/standard/php_crypt_r.c (revision 315218) | ||
| 5 | @@ -377,7 +377,7 @@ | ||
| 6 | /* Now make the output string */ | ||
| 7 | memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN); | ||
| 8 | strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1); | ||
| 9 | - strlcat(passwd, "$", 1); | ||
| 10 | + strcat(passwd, "$"); | ||
| 11 | |||
| 12 | PHP_MD5Final(final, &ctx); | ||
| 13 | |||