diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-23 06:31:33 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-23 06:31:33 +0000 |
| commit | 94193c1044f516baae20c506d2cf61947273b8d5 (patch) | |
| tree | 99f400f09bd72e697bb646ed40c8948a5f6b0082 /main | |
| parent | 420fc4f8e231b15e000124b357e8a97a41d32694 (diff) | |
| download | aports-94193c1044f516baae20c506d2cf61947273b8d5.tar.bz2 aports-94193c1044f516baae20c506d2cf61947273b8d5.tar.xz | |
main/php: fix crypt() md5 hashing
https://bugs.php.net/bug.php?id=55439
Diffstat (limited to 'main')
| -rw-r--r-- | main/php/APKBUILD | 4 | ||||
| -rw-r--r-- | main/php/php-crypt-fix-r315218.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 3acdbf7ce1..2f0c8d698e 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -3,7 +3,7 @@ pkgname=php pkgver=5.3.7 _suhosinver=5.3.7-0.9.10 -pkgrel=0 +pkgrel=1 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" arch="all" @@ -73,6 +73,7 @@ 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 " @@ -426,5 +427,6 @@ pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; } md5sums="2d47d003c96de4e88863ff38da61af33 php-5.3.7.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 new file mode 100644 index 0000000000..aaf688a2fc --- /dev/null +++ b/main/php/php-crypt-fix-r315218.patch @@ -0,0 +1,13 @@ +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); + |