Date: Monday, August 22, 2011 @ 09:24:52 Author: pierre Revision: 136079
upgpkg: php 5.3.7-3 Backuport fix for crypt issue see https://bugs.php.net/bug.php?id=55439 Added: php/trunk/crypt.patch Modified: php/trunk/PKGBUILD -------------+ PKGBUILD | 11 ++++++++--- crypt.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-22 13:09:39 UTC (rev 136078) +++ PKGBUILD 2011-08-22 13:24:52 UTC (rev 136079) @@ -24,7 +24,7 @@ 'php-xsl') pkgver=5.3.7 _suhosinver=${pkgver}-0.9.10 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -35,14 +35,16 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"; "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"; 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm') + 'logrotate.d.php-fpm' + 'crypt.patch') md5sums=('2d47d003c96de4e88863ff38da61af33' '08582e502fed8221c6577042ca45ddb8' '39eaa70d276fc3d45d6bcf6cd5ae1106' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' '09005dabd90c48ddd392b3dbf05f8a82' - '07c4e412909ac65a44ec90e7a2c4bade') + '07c4e412909ac65a44ec90e7a2c4bade' + '8e079c6d9b31358d59b98aa3dbd7d692') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ @@ -135,6 +137,9 @@ cd ${srcdir}/${pkgbase}-${pkgver} + # Fix MD5 crypt(); see https://bugs.php.net/bug.php?id=55439 + patch -p0 -i ${srcdir}/crypt.patch + # apply suhosin patch patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch Added: crypt.patch =================================================================== --- crypt.patch (rev 0) +++ crypt.patch 2011-08-22 13:24:52 UTC (rev 136079) @@ -0,0 +1,13 @@ +Index: ext/standard/php_crypt_r.c +=================================================================== +--- ext/standard/php_crypt_r.c (Revision 315217) ++++ ext/standard/php_crypt_r.c (Revision 315218) +@@ -382,7 +382,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); +
