Attachment 227413 Details for Bug 258030 – php80-pecl-scrypt-1.4.2.patch

[patch] php80-pecl-scrypt-1.4.2.patch

php80-pecl-scrypt-1.4.2.patch (text/plain), 2.55 KB, created by clpo13 on 2021-08-24 20:15:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: clpo13

Created: 2021-08-24 20:15:09 UTC

Size: 2.55 KB

patch

obsolete

>diff --git a/security/pecl-scrypt/Makefile b/security/pecl-scrypt/Makefile
>index 77dd2af3e0cf..d78e4207a8e6 100644
>--- a/security/pecl-scrypt/Makefile
>+++ b/security/pecl-scrypt/Makefile
>@@ -11,7 +11,7 @@ LICENSE=      BSD2CLAUSE
> LICENSE_FILE=  ${WRKSRC}/LICENSE
>
> USES=          php:pecl
>-IGNORE_WITH_PHP=       80
>+#IGNORE_WITH_PHP=      80
> USE_PHP=       hash:build
>
> OPTIONS_DEFINE=        DOCS EXAMPLES
>diff --git a/security/pecl-scrypt/files/patch-crypto_crypto__scrypt-nosse.c b/security/pecl-scrypt/files/patch-crypto_crypto__scrypt-nosse.c
>new file mode 100644
>index 000000000000..57e03b86cbcb
>--- /dev/null
>+++ b/security/pecl-scrypt/files/patch-crypto_crypto__scrypt-nosse.c
>@@ -0,0 +1,10 @@
>+--- crypto/crypto_scrypt-nosse.c.orig  2021-08-24 19:31:37 UTC
>++++ crypto/crypto_scrypt-nosse.c
>+@@ -45,6 +45,7 @@
>+ #include "sysendian.h"
>+
>+ #include "crypto_scrypt.h"
>++#include "php_scrypt.h"
>+
>+ static void blkcpy(uint8_t *, uint8_t *, size_t);
>+ static void blkxor(uint8_t *, uint8_t *, size_t);
>diff --git a/security/pecl-scrypt/files/patch-crypto_crypto__scrypt-sse.c b/security/pecl-scrypt/files/patch-crypto_crypto__scrypt-sse.c
>new file mode 100644
>index 000000000000..e20fca17f745
>--- /dev/null
>+++ b/security/pecl-scrypt/files/patch-crypto_crypto__scrypt-sse.c
>@@ -0,0 +1,10 @@
>+--- crypto/crypto_scrypt-sse.c.orig    2021-08-24 19:22:03 UTC
>++++ 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/security/pecl-scrypt/files/patch-php__scrypt.h b/security/pecl-scrypt/files/patch-php__scrypt.h
>new file mode 100644
>index 000000000000..c9233b6f3bdb
>--- /dev/null
>+++ b/security/pecl-scrypt/files/patch-php__scrypt.h
>@@ -0,0 +1,12 @@
>+--- php_scrypt.h.orig  2021-08-24 19:22:03 UTC
>++++ 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/security/pecl-scrypt/files/patch-php__scrypt__utils.c b/security/pecl-scrypt/files/patch-php__scrypt__utils.c
>new file mode 100644
>index 000000000000..19440a83102b
>--- /dev/null
>+++ b/security/pecl-scrypt/files/patch-php__scrypt__utils.c
>@@ -0,0 +1,10 @@
>+--- php_scrypt_utils.c.orig    2021-08-24 19:22:03 UTC
>++++ php_scrypt_utils.c
>+@@ -25,6 +25,7 @@
>+  */
>+
>+ #include "php_scrypt_utils.h"
>++#include "php_scrypt.h"
>+
>+ /*
>+  * Casts a long into a uint64_t.

Actions: View | Diff

Attachments on bug 258030: 227413