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/php-fix-crypt.patch | |
| parent | 4f883135004a3c584b2a9c05f5631875fd56c730 (diff) | |
| download | aports-bc7a651405864891312f3556d8f87c6bcb822c7b.tar.bz2 aports-bc7a651405864891312f3556d8f87c6bcb822c7b.tar.xz | |
main/php: upgrade to 5.6.5
Diffstat (limited to 'main/php/php-fix-crypt.patch')
| -rw-r--r-- | main/php/php-fix-crypt.patch | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ |