[gentoo-commits] repo/gentoo:master commit in: dev-php/scrypt/

2024-01-17 Thread Sam James 
commit: 16579d3dc61a0de4e8eddb977925f0a400812993
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 18 07:51:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 18 07:51:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16579d3d

dev-php/scrypt: cleanup php8-0

Signed-off-by: Sam James  gentoo.org>

 dev-php/scrypt/scrypt-2.0.0.ebuild | 4 ++--
 dev-php/scrypt/scrypt-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-php/scrypt/scrypt-2.0.0.ebuild 
b/dev-php/scrypt/scrypt-2.0.0.ebuild
index 49ae1df6dc8a..96d69de30aec 100644
--- a/dev-php/scrypt/scrypt-2.0.0.ebuild
+++ b/dev-php/scrypt/scrypt-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 

diff --git a/dev-php/scrypt/scrypt-.ebuild 
b/dev-php/scrypt/scrypt-.ebuild
index 16afe4e90e07..3bc00ea74e2d 100644
--- a/dev-php/scrypt/scrypt-.ebuild
+++ b/dev-php/scrypt/scrypt-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/DomBlack/php-scrypt.git;
 
 inherit git-r3 php-ext-pecl-r3

[gentoo-commits] repo/gentoo:master commit in: dev-php/scrypt/

2023-02-20 Thread Brian Evans 
commit: bdbaee4b01c055bf4ec879f26f180de62954e93f
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 20:38:54 2023 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 20:40:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbaee4b

dev-php/scrypt: Version bump for 2.0.0 and update live

Non-maintainer commit

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/scrypt/Manifest|  1 +
 dev-php/scrypt/scrypt-2.0.0.ebuild | 18 ++
 dev-php/scrypt/scrypt-.ebuild  |  6 +++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
index 2b70ca8e86eb..02e75d2c03b0 100644
--- a/dev-php/scrypt/Manifest
+++ b/dev-php/scrypt/Manifest
@@ -1 +1,2 @@
 DIST scrypt-1.4.2.tgz 21585 BLAKE2B 
6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab
 SHA512 
34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0
+DIST scrypt-2.0.0.tgz 23229 BLAKE2B 
71a40869004cbcb3fb6b303e1d59c0687b9817b89b38ebedc0001a732f4d4fba134ba124b09a6b4970da9892654631b41d0ce8e79d60eaccf788344972cb0760
 SHA512 
88b559f112f768eb1b61652ee5a6a75edbfd6133aca39c0d740dd083e3d2f718232a607a05a306cd40faeb4cab48f98de04f0799011d86543385583a99fb508f

diff --git a/dev-php/scrypt/scrypt-2.0.0.ebuild 
b/dev-php/scrypt/scrypt-2.0.0.ebuild
new file mode 100644
index ..3fc681c01f83
--- /dev/null
+++ b/dev-php/scrypt/scrypt-2.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_ECONF_ARGS="--enable-scrypt"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="A PHP wrapper for the scrypt hashing algorithm"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/re2c"

diff --git a/dev-php/scrypt/scrypt-.ebuild 
b/dev-php/scrypt/scrypt-.ebuild
index 900385d5cf23..16afe4e90e07 100644
--- a/dev-php/scrypt/scrypt-.ebuild
+++ b/dev-php/scrypt/scrypt-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php8-0 php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/DomBlack/php-scrypt.git;
 
 inherit git-r3 php-ext-pecl-r3

[gentoo-commits] repo/gentoo:master commit in: dev-php/scrypt/files/, dev-php/scrypt/

2023-02-20 Thread Brian Evans 
commit: c53a711a505f1387ff0aae51af2d42f599ba2ac9
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 20:39:45 2023 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 20:40:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53a711a

dev-php/scrypt: Drop old

Non-maintainer commit

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/scrypt/Manifest|  1 -
 dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch | 49 --
 dev-php/scrypt/scrypt-1.4.2.ebuild | 20 ---
 3 files changed, 70 deletions(-)

diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
index 02e75d2c03b0..00e5ed387f21 100644
--- a/dev-php/scrypt/Manifest
+++ b/dev-php/scrypt/Manifest
@@ -1,2 +1 @@
-DIST scrypt-1.4.2.tgz 21585 BLAKE2B 
6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab
 SHA512 
34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0
 DIST scrypt-2.0.0.tgz 23229 BLAKE2B 
71a40869004cbcb3fb6b303e1d59c0687b9817b89b38ebedc0001a732f4d4fba134ba124b09a6b4970da9892654631b41d0ce8e79d60eaccf788344972cb0760
 SHA512 
88b559f112f768eb1b61652ee5a6a75edbfd6133aca39c0d740dd083e3d2f718232a607a05a306cd40faeb4cab48f98de04f0799011d86543385583a99fb508f

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
deleted file mode 100644
index a5e1ea665897..
--- a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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 _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.

diff --git a/dev-php/scrypt/scrypt-1.4.2.ebuild 
b/dev-php/scrypt/scrypt-1.4.2.ebuild
deleted file mode 100644
index 026a54355943..
--- a/dev-php/scrypt/scrypt-1.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="A PHP wrapper fo the scrypt hashing algorithm"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/re2c"
-
-PATCHES=( "${FILESDIR}"/"${P}"-php8-0.patch )

[gentoo-commits] repo/gentoo:master commit in: dev-php/scrypt/, dev-php/scrypt/files/

2021-02-01 Thread Joonas Niilola 
commit: 755af4f2674d5d09a1ccf0d7b4a091a96a597dbb
Author: Vladimir Pavljuchenkov (SpiderX)  spiderx  dp 
 ua>
AuthorDate: Tue Dec 18 07:21:01 2018 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb  1 13:22:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755af4f2

dev-php/scrypt: new ebuild

This is a PHP library providing a wrapper
to Colin Percival's scrypt implementation.
Scrypt is a key derivation function designed
to be far more secure against hardware brute-force
attacks than alternative functions
such as PBKDF2 or bcrypt.

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Vladimir Pavljuchenkov  spiderx.dp.ua>
Closes: https://github.com/gentoo/gentoo/pull/10657
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-php/scrypt/Manifest|  1 +
 dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch | 49 ++
 dev-php/scrypt/metadata.xml| 22 
 dev-php/scrypt/scrypt-1.4.2.ebuild | 20 +++
 dev-php/scrypt/scrypt-.ebuild  | 20 +++
 5 files changed, 112 insertions(+)

diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
new file mode 100644
index 000..2b70ca8e86e
--- /dev/null
+++ b/dev-php/scrypt/Manifest
@@ -0,0 +1 @@
+DIST scrypt-1.4.2.tgz 21585 BLAKE2B 
6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab
 SHA512 
34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0

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 000..a5e1ea66589
--- /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 _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.

diff --git a/dev-php/scrypt/metadata.xml b/dev-php/scrypt/metadata.xml
new file mode 100644
index 000..7fd91a5b5f8
--- /dev/null
+++ b/dev-php/scrypt/metadata.xml
@@ -0,0 +1,22 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   spid...@spiderx.dp.ua
+   Vladimir Pavljuchenkov
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   A PHP library providing a wrapper to Colin Percival's scrypt
+   implementation. Scrypt is a key derivation function designed
+   to be far more secure against hardware brute-force attacks
+   than alternative functions such as PBKDF2 or bcrypt.
+   
+   
+   DomBlack/php-scrypt
+   scrypt
+   
+

diff --git a/dev-php/scrypt/scrypt-1.4.2.ebuild 
b/dev-php/scrypt/scrypt-1.4.2.ebuild
new file mode 100644
index 000..026a5435594
--- /dev/null
+++ b/dev-php/scrypt/scrypt-1.4.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_ECONF_ARGS="--enable-scrypt"
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="A PHP wrapper fo the scrypt hashing algorithm"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/re2c"
+
+PATCHES=( "${FILESDIR}"/"${P}"-php8-0.patch )

diff --git a/dev-php/scrypt/scrypt-.ebuild 
b/dev-php/scrypt/scrypt-.ebuild
new file mode 100644
index 000..900385d5cf2
--- /dev/null
+++ b/dev-php/scrypt/scrypt-.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_ECONF_ARGS="--enable-scrypt"
+USE_PHP="php7-3 php7-4 php8-0"