diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-01-23 08:30:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-01-23 08:32:21 +0000 |
| commit | bc7a651405864891312f3556d8f87c6bcb822c7b (patch) | |
| tree | 66b8f3125e383d3e6c704f1d5225b83bb3e13077 /main/php | |
| parent | 4f883135004a3c584b2a9c05f5631875fd56c730 (diff) | |
| download | aports-bc7a651405864891312f3556d8f87c6bcb822c7b.tar.bz2 aports-bc7a651405864891312f3556d8f87c6bcb822c7b.tar.xz | |
main/php: upgrade to 5.6.5
Diffstat (limited to 'main/php')
| -rw-r--r-- | main/php/APKBUILD | 14 | ||||
| -rw-r--r-- | main/php/php-fix-crypt.patch | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 4128e25007..609cb62ed0 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=php -pkgver=5.6.4 +pkgver=5.6.5 pkgrel=0 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" @@ -497,24 +497,24 @@ pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; } wddx() { _mv_ext wddx; } opcache() { _mv_ext opcache; } -md5sums="d31629e9c2fb5f438ab2dc0aa597cd82 php-5.6.4.tar.bz2 +md5sums="64d0debf42bfff537d891e1fe1a4b65c php-5.6.5.tar.bz2 2e86e55c29c81282474dea27cc97b873 php-fpm.initd 67719f428f44ec004da18705cbabe2ee php5-module.conf 483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch 162d8d079944387eab2bc80edab347ae gd-iconv.patch -36862b64aa9d2c527ef634610644aa66 php-fix-crypt.patch +b63ef63893c1c115d6dd63e8df1f17e3 php-fix-crypt.patch cb10034c525c6544890f1a1839837e38 fix-crypt-sha.patch" -sha256sums="576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1 php-5.6.4.tar.bz2 +sha256sums="adab4c0775512a5ca0ae74e08efdc941d92529b75283e0f44d3f53822cdfd06d php-5.6.5.tar.bz2 375892c6997f48659f7087ccb7fac039e4bb2f375453247295caa7858b9e15b9 php-fpm.initd ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f php5-module.conf f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab php-install-pear-xml.patch 6122bf279cdb7c387dd000761b2426969a73cf63a10a132aa98a79eb1dd259b2 gd-iconv.patch -bd44019db3c36d09502a4f869b4824364375df460aceef2d2b0a1956dc75e7cb php-fix-crypt.patch +817f6300cd0c4d97f24c3e883132d2cde0ef52d84f5c97073f9c9668d6275d6e php-fix-crypt.patch a5db307ad2638e7e609b450abce19c98c23de54be96619b46adb69f2c5e11fa2 fix-crypt-sha.patch" -sha512sums="855f885c2d8ad6393a8fb1bfacdb83f8eef910966e6ab50cb3fc4bcbd5800d4f69a6c866623b517a0163ab1984402206f7a32c54acddcd5f9bcdcf77eb04abdf php-5.6.4.tar.bz2 +sha512sums="078a6712fc920430f81716d102ca7343587757bc7e379574c572c8f19e5e1bc41e3f552055922c148227211a352c952caa3ad5e7685504c942b5932a9a0b992f php-5.6.5.tar.bz2 2d294022f2c45b2f3229655e5883b8ccab6852ed0378df682b9dd85a31038666ad3a622580861ce2d26dedf187326727ecf93694eb716271e9be25f79daddae9 php-fpm.initd 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 php5-module.conf f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 php-install-pear-xml.patch 59443fb464f49ff7d9b64739df982e7240f9d4792226d96ad1538286945125fc7eb6f0cab88b64d5c81ee3679fd89bffdca59ebd20eca2778ab801ee54529028 gd-iconv.patch -278b629ffd0796c85799e7a047c5d50c4186e81f68265247d1fb688431b303351feec519ef1b3318d7f1b15cf3e75e0f745aeb84218ada2a0a94777d57f4cf2c php-fix-crypt.patch +febe75305b19ca7c2b4f85ee8144d3a347530044223619b28fb754485f72fe3dd283ece341d77f2e0bff3881ed7fa2b89e6c95a8e4b077ab40b3f7a8d767a633 php-fix-crypt.patch d3b156dc7fca33c5634ace04bc7b7f27174d58d09455adf5bcdafd748a6aab1b1c97dce588d218b95d5fde3f6c2dd9202f4d7ea1c3b323be400f4d990c39290b fix-crypt-sha.patch" diff --git a/main/php/php-fix-crypt.patch b/main/php/php-fix-crypt.patch index 5fc4d346ff..caa6a2e22d 100644 --- a/main/php/php-fix-crypt.patch +++ b/main/php/php-fix-crypt.patch @@ -1,3 +1,6 @@ +Reported upstream: +https://bugs.php.net/bug.php?id=67512 + --- php-5.5.13/ext/standard/crypt.c.orig 2014-06-25 13:10:38.930010191 -0300 +++ php-5.5.13/ext/standard/crypt.c 2014-06-25 13:45:09.762124864 -0300 @@ -228,18 +228,20 @@ @@ -25,7 +28,7 @@ +# else + crypt_res = crypt(passwrd, salt); +#endif - if (!crypt_res) { + if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) { return FAILURE; } else { @@ -247,7 +249,6 @@ |