diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-05-02 18:54:21 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-05-02 18:54:21 +0300 |
| commit | eb35135e39609692fc3326b768b9a402ecfa78cc (patch) | |
| tree | 70ba3bb3b5771c8137f1ccca125d73f0dd9f127f /main/php/fix-crypt.patch | |
| parent | 693349646ea024a789592a07972bc27e5eabac1f (diff) | |
| download | aports-eb35135e39609692fc3326b768b9a402ecfa78cc.tar.bz2 aports-eb35135e39609692fc3326b768b9a402ecfa78cc.tar.xz | |
main/php: upgrade to 5.6.21
Diffstat (limited to 'main/php/fix-crypt.patch')
| -rw-r--r-- | main/php/fix-crypt.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/main/php/fix-crypt.patch b/main/php/fix-crypt.patch deleted file mode 100644 index 2b6b1d3011..0000000000 --- a/main/php/fix-crypt.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://bugs.php.net/bug.php?id=67512 - ---- php-5.6.19.orig/ext/standard/crypt.c -+++ php-5.6.19/ext/standard/crypt.c -@@ -58,6 +58,7 @@ - #include "php_lcg.h" - #include "php_crypt.h" - #include "php_rand.h" -+#include "php_config.h" - - /* The capabilities of the crypt() function is determined by the test programs - * run by configure from aclocal.m4. They will set PHP_STD_DES_CRYPT, -@@ -227,18 +228,20 @@ - } - } - #else -- --# if defined(HAVE_CRYPT_R) && (defined(_REENTRANT) || defined(_THREAD_SAFE)) - { --# if defined(CRYPT_R_STRUCT_CRYPT_DATA) -+# if defined(HAVE_CRYPT_R) -+# if defined(CRYPT_R_STRUCT_CRYPT_DATA) - struct crypt_data buffer; - memset(&buffer, 0, sizeof(buffer)); --# elif defined(CRYPT_R_CRYPTD) -+# elif defined(CRYPT_R_CRYPTD) - CRYPTD buffer; --# else --# error Data struct used by crypt_r() is unknown. Please report. --# endif -+# else -+# error Data struct used by crypt_r() is unknown. Please report. -+# endif - crypt_res = crypt_r(password, salt, &buffer); -+# else -+ crypt_res = crypt(passwrd, salt); -+#endif - if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) { - return FAILURE; - } else { -@@ -246,7 +249,6 @@ - return SUCCESS; - } - } --# endif - #endif - } - /* }}} */ |