From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch (limited to 'dev-php/scrypt/files') diff --git a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch b/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch new file mode 100644 index 000000000000..a5e1ea665897 --- /dev/null +++ b/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch @@ -0,0 +1,49 @@ +From 5010f9fa0743518d149d994728ca930503adde1e Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 22 Sep 2020 14:55:32 +0200 +Subject: [PATCH] trivial fix for PHP 8 + +--- + crypto/crypto_scrypt-sse.c | 1 + + php_scrypt.h | 5 +++++ + php_scrypt_utils.c | 1 + + 3 files changed, 7 insertions(+) + +diff --git a/crypto/crypto_scrypt-sse.c b/crypto/crypto_scrypt-sse.c +index a52ce81..709a04f 100644 +--- a/crypto/crypto_scrypt-sse.c ++++ b/crypto/crypto_scrypt-sse.c +@@ -44,6 +44,7 @@ + #include "sysendian.h" + + #include "crypto_scrypt.h" ++#include "php_scrypt.h" + + static void blkcpy(void *, void *, size_t); + static void blkxor(void *, void *, size_t); +diff --git a/php_scrypt.h b/php_scrypt.h +index a1117c8..6cc1c4c 100644 +--- a/php_scrypt.h ++++ b/php_scrypt.h +@@ -35,4 +35,9 @@ PHP_FUNCTION(scrypt_pickparams); + extern zend_module_entry scrypt_module_entry; + #define phpext_scrypt_ptr &scrypt_module_entry + ++#ifndef TSRMLS_CC ++#define TSRMLS_CC ++#define TSRMLS_FETCH() ++#endif ++ + #endif +diff --git a/php_scrypt_utils.c b/php_scrypt_utils.c +index 797e2c7..34fe347 100644 +--- a/php_scrypt_utils.c ++++ b/php_scrypt_utils.c +@@ -25,6 +25,7 @@ + */ + + #include "php_scrypt_utils.h" ++#include "php_scrypt.h" + + /* + * Casts a long into a uint64_t. -- cgit v1.2.3