commit: 4d04f0aa8d4506ab763b065100a185ce818db800
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 01:58:43 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 01:58:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d04f0aa
dev-php/pecl-crack: treeclean
last-riting directly package, which needs php8-0, which has been already
removed from tree, so this package cannot be installe danymore.
Upstream dead since 2005.
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-php/pecl-crack/Manifest | 1 -
dev-php/pecl-crack/files/0.4-php7.patch | 356 -------------------
dev-php/pecl-crack/files/0.4-php8.patch | 394 ---------------------
dev-php/pecl-crack/files/fix-pecl-bug-5765.patch | 11 -
dev-php/pecl-crack/files/fix-php-5-4-support.patch | 30 --
dev-php/pecl-crack/metadata.xml | 8 -
dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild | 29 --
7 files changed, 829 deletions(-)
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
deleted file mode 100644
index f8ff5a2a592d..000000000000
--- a/dev-php/pecl-crack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crack-0.4.tgz 25524 BLAKE2B
99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc
SHA512
0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f
diff --git a/dev-php/pecl-crack/files/0.4-php7.patch
b/dev-php/pecl-crack/files/0.4-php7.patch
deleted file mode 100644
index 5a00c9121810..000000000000
--- a/dev-php/pecl-crack/files/0.4-php7.patch
+++ /dev/null
@@ -1,356 +0,0 @@
---- a/crack.c 2016-12-19 16:04:09.244782234 -0500
-+++ b/crack.c 2016-12-20 09:20:11.903140742 -0500
-@@ -36,13 +36,31 @@
- /* True global resources - no need for thread safety here */
- static int le_crack;
-
-+ZEND_BEGIN_ARG_INFO_EX(crack_opendict_args, 0, ZEND_RETURN_VALUE, 1)
-+ ZEND_ARG_INFO(0, dictionary)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(crack_closedict_args, 0, ZEND_RETURN_VALUE, 0)
-+ ZEND_ARG_INFO(0, dictionary)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(crack_check_args, 0, ZEND_RETURN_VALUE, 1)
-+ ZEND_ARG_INFO(0, password)
-+ ZEND_ARG_INFO(0, username)
-+ ZEND_ARG_INFO(0, gecos)
-+ ZEND_ARG_INFO(0, dictionary)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(crack_getlastmessage_args, 0, ZEND_RETURN_VALUE, 0)
-+ZEND_END_ARG_INFO()
-+
- /* {{{ crack_functions[]
- */
- zend_function_entry crack_functions[] = {
-- PHP_FE(crack_opendict, NULL)
-- PHP_FE(crack_closedict, NULL)
-- PHP_FE(crack_check, NULL)
-- PHP_FE(crack_getlastmessage, NULL)
-+ ZEND_FE(crack_opendict, crack_opendict_args)
-+ ZEND_FE(crack_closedict, crack_closedict_args)
-+ ZEND_FE(crack_check, crack_check_args)
-+ ZEND_FE(crack_getlastmessage, crack_getlastmessage_args)
- {NULL, NULL, NULL}
- };
- /* }}} */
-@@ -55,7 +73,7 @@
- #endif
- "crack",
- crack_functions,
-- PHP_MINIT(crack),
-+ PHP_MINIT(crack),
- PHP_MSHUTDOWN(crack),
- PHP_RINIT(crack),
- PHP_RSHUTDOWN(crack),
-@@ -84,7 +102,11 @@
- static void php_crack_init_globals(zend_crack_globals *crack_globals)
- {
- crack_globals->last_message = NULL;
-+#if PHP_VERSION_ID >= 70000
-+ crack_globals->default_dict = NULL;
-+#else
- crack_globals->default_dict = -1;
-+#endif
- }
- /* }}} */
-
-@@ -95,7 +117,7 @@
- char *filename;
- int filename_len;
- int result = SUCCESS;
--
-+
- #if PHP_VERSION_ID < 50400
- if (PG(safe_mode)) {
- filename_len = strlen(path) + 10;
-@@ -103,7 +125,7 @@
- if (NULL == filename) {
- return FAILURE;
- }
--
-+
- memset(filename, '\0', filename_len);
- strcpy(filename, path);
- strcat(filename, ".pwd");
-@@ -111,7 +133,7 @@
- efree(filename);
- return FAILURE;
- }
--
-+
- memset(filename, '\0', filename_len);
- strcpy(filename, path);
- strcat(filename, ".pwi");
-@@ -119,7 +141,7 @@
- efree(filename);
- return FAILURE;
- }
--
-+
- memset(filename, '\0', filename_len);
- strcpy(filename, path);
- strcat(filename, ".hwm");
-@@ -129,39 +151,64 @@
- }
- }
- #endif
--
-+
- if (php_check_open_basedir(path TSRMLS_CC)) {
- return FAILURE;
- }
--
-+
- return SUCCESS;
- }
- /* }}} */
-
- /* {{{ php_crack_set_default_dict
- */
-+#if PHP_VERSION_ID >= 70000
-+static void php_crack_set_default_dict(zend_resource *id)
-+{
-+ if (CRACKG(default_dict) != NULL) {
-+ zend_list_close(CRACKG(default_dict));
-+ }
-+
-+ CRACKG(default_dict) = id;
-+ id->gc.refcount++;
-+}
-+#else
- static void php_crack_set_default_dict(int id TSRMLS_DC)
- {
- if (CRACKG(default_dict) != -1) {
- zend_list_delete(CRACKG(default_dict));
- }
--
-+
- CRACKG(default_dict) = id;
- zend_list_addref(id);
- }
-+#endif
- /* }}} */
-
- /* {{{ php_crack_get_default_dict
- */
-+#if PHP_VERSION_ID >= 70000
-+static zend_resource *
php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
-+#else
- static int php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
-+#endif
- {
-+#if PHP_VERSION_ID >= 70000
-+ if ((NULL == CRACKG(default_dict)) && (NULL !=
CRACKG(default_dictionary))) {
-+#else
- if ((-1 == CRACKG(default_dict)) && (NULL !=
CRACKG(default_dictionary))) {
-+#endif
- CRACKLIB_PWDICT *pwdict;
- printf("trying to open: %s\n", CRACKG(default_dictionary));
- pwdict = cracklib_pw_open(CRACKG(default_dictionary), "r");
- if (NULL != pwdict) {
-+#if PHP_VERSION_ID >= 70000
-+ ZVAL_RES(return_value, zend_register_resource(pwdict,
le_crack));
-+ php_crack_set_default_dict(Z_RES_P(return_value));
-+#else
- ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
- php_crack_set_default_dict(Z_LVAL_P(return_value)
TSRMLS_CC);
-+#endif
- }
- }
-
-@@ -171,7 +218,11 @@
-
- /* {{{ php_crack_module_dtor
- */
-+#if PHP_VERSION_ID >= 70000
-+static void php_crack_module_dtor(zend_resource *rsrc)
-+#else
- static void php_crack_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-+#endif
- {
- CRACKLIB_PWDICT *pwdict = (CRACKLIB_PWDICT *) rsrc->ptr;
-
-@@ -191,7 +242,9 @@
-
- REGISTER_INI_ENTRIES();
- le_crack = zend_register_list_destructors_ex(php_crack_module_dtor,
NULL, "crack dictionary", module_number);
-+#if PHP_VERSION_ID < 70000
- Z_TYPE(crack_module_entry) = type;
-+#endif
-
- return SUCCESS;
- }
-@@ -210,7 +263,11 @@
- PHP_RINIT_FUNCTION(crack)
- {
- CRACKG(last_message) = NULL;
-+#if PHP_VERSION_ID >= 70000
-+ CRACKG(default_dict) = NULL;
-+#else
- CRACKG(default_dict) = -1;
-+#endif
-
- return SUCCESS;
- }
-@@ -245,7 +302,7 @@
- PHP_FUNCTION(crack_opendict)
- {
- char *path;
-- int path_len;
-+ size_t path_len;
- CRACKLIB_PWDICT *pwdict;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path,
&path_len) == FAILURE) {
-@@ -265,9 +322,14 @@
- #endif
- RETURN_FALSE;
- }
--
-+
-+#if PHP_VERSION_ID >= 70000
-+ RETURN_RES(zend_register_resource(pwdict, le_crack));
-+ php_crack_set_default_dict(Z_RES_P(return_value));
-+#else
- ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
- php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC);
-+#endif
- }
- /* }}} */
-
-@@ -276,7 +338,11 @@
- PHP_FUNCTION(crack_closedict)
- {
- zval *dictionary = NULL;
-+#if PHP_VERSION_ID >= 70000
-+ zend_resource *id;
-+#else
- int id = -1;
-+#endif
- CRACKLIB_PWDICT *pwdict;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r",
&dictionary)) {
-@@ -285,7 +351,11 @@
-
- if (NULL == dictionary) {
- id =
php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-+#if PHP_VERSION_ID >= 70000
-+ if (id == NULL) {
-+#else
- if (id == -1) {
-+#endif
- #if ZEND_MODULE_API_NO >= 20021010
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
open default crack dicionary");
- #else
-@@ -294,8 +364,21 @@
- RETURN_FALSE;
- }
- }
-+#if PHP_VERSION_ID >= 70000
-+ if((pwdict = (CRACKLIB_PWDICT
*)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) ==
NULL)
-+ {
-+ RETURN_FALSE;
-+ }
-+ if (NULL == dictionary) {
-+ zend_list_close(CRACKG(default_dict));
-+ CRACKG(default_dict) = NULL;
-+ }
-+ else {
-+ zend_list_close(Z_RES_P(dictionary));
-+ }
-+#else
- ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack
dictionary", le_crack);
--
-+
- if (NULL == dictionary) {
- zend_list_delete(CRACKG(default_dict));
- CRACKG(default_dict) = -1;
-@@ -303,7 +386,7 @@
- else {
- zend_list_delete(Z_RESVAL_P(dictionary));
- }
--
-+#endif
- RETURN_TRUE;
- }
- /* }}} */
-@@ -314,14 +397,18 @@
- {
- zval *dictionary = NULL;
- char *password = NULL;
-- int password_len;
-+ size_t password_len;
- char *username = NULL;
-- int username_len;
-+ size_t username_len;
- char *gecos = NULL;
-- int gecos_len;
-+ size_t gecos_len;
- char *message;
- CRACKLIB_PWDICT *pwdict;
-+#if PHP_VERSION_ID >= 70000
-+ zend_resource *crack_res;
-+#else
- int id = -1;
-+#endif
-
- if (NULL != CRACKG(last_message)) {
- efree(CRACKG(last_message));
-@@ -335,6 +422,21 @@
- }
-
- if (NULL == dictionary) {
-+#if PHP_VERSION_ID >= 70000
-+ crack_res =
php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-+ if (crack_res == NULL || crack_res->ptr == NULL) {
-+ php_error(E_WARNING, "Could not open default crack
dicionary");
-+ RETURN_FALSE;
-+ }
-+
-+ }
-+ else {
-+ if((pwdict = (CRACKLIB_PWDICT
*)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) ==
NULL) {
-+ php_error(E_WARNING, "Could not open crack dicionary
resource");
-+ RETURN_FALSE;
-+ }
-+ }
-+#else
- id =
php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
- if (id == -1) {
- #if ZEND_MODULE_API_NO >= 20021010
-@@ -346,6 +448,7 @@
- }
- }
- ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack
dictionary", le_crack);
-+#endif
-
- message = cracklib_fascist_look_ex(pwdict, password, username, gecos);
-
-@@ -377,7 +480,11 @@
- RETURN_FALSE;
- }
-
-+#if PHP_VERSION_ID >= 70000
-+ RETURN_STRING(CRACKG(last_message));
-+#else
- RETURN_STRING(CRACKG(last_message), 1);
-+#endif
- }
- /* }}} */
-
---- a/php_crack.h 2005-09-21 05:00:06.000000000 -0400
-+++ b/php_crack.h 2016-12-19 16:51:22.449321851 -0500
-@@ -52,7 +52,11 @@
- ZEND_BEGIN_MODULE_GLOBALS(crack)
- char *default_dictionary;
- char *last_message;
-+#if PHP_VERSION_ID >= 70000
-+ zend_resource *default_dict;
-+#else
- int default_dict;
-+#endif
- ZEND_END_MODULE_GLOBALS(crack)
-
- #ifdef ZTS
diff --git a/dev-php/pecl-crack/files/0.4-php8.patch
b/dev-php/pecl-crack/files/0.4-php8.patch
deleted file mode 100644
index ce5f36f11738..000000000000
--- a/dev-php/pecl-crack/files/0.4-php8.patch
+++ /dev/null
@@ -1,394 +0,0 @@
-diff -aurN a/crack.c b/crack.c
---- a/crack.c 2021-04-15 13:57:12.174874906 -0400
-+++ b/crack.c 2021-04-15 14:10:21.203314001 -0400
-@@ -68,9 +68,7 @@
- /* {{{ crack_module_entry
- */
- zend_module_entry crack_module_entry = {
--#if ZEND_MODULE_API_NO >= 20010901
- STANDARD_MODULE_HEADER,
--#endif
- "crack",
- crack_functions,
- PHP_MINIT(crack),
-@@ -78,9 +76,7 @@
- PHP_RINIT(crack),
- PHP_RSHUTDOWN(crack),
- PHP_MINFO(crack),
--#if ZEND_MODULE_API_NO >= 20010901
-- "0.3",
--#endif
-+ "0.4",
- STANDARD_MODULE_PROPERTIES,
- };
- /* }}} */
-@@ -102,57 +98,19 @@
- static void php_crack_init_globals(zend_crack_globals *crack_globals)
- {
- crack_globals->last_message = NULL;
--#if PHP_VERSION_ID >= 70000
- crack_globals->default_dict = NULL;
--#else
-- crack_globals->default_dict = -1;
--#endif
- }
- /* }}} */
-
- /* {{{ php_crack_checkpath
- */
--static int php_crack_checkpath(char* path TSRMLS_DC)
-+static int php_crack_checkpath(char* path)
- {
- char *filename;
- int filename_len;
- int result = SUCCESS;
-
--#if PHP_VERSION_ID < 50400
-- if (PG(safe_mode)) {
-- filename_len = strlen(path) + 10;
-- filename = (char *) emalloc(filename_len);
-- if (NULL == filename) {
-- return FAILURE;
-- }
--
-- memset(filename, '\0', filename_len);
-- strcpy(filename, path);
-- strcat(filename, ".pwd");
-- if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) {
-- efree(filename);
-- return FAILURE;
-- }
--
-- memset(filename, '\0', filename_len);
-- strcpy(filename, path);
-- strcat(filename, ".pwi");
-- if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) {
-- efree(filename);
-- return FAILURE;
-- }
--
-- memset(filename, '\0', filename_len);
-- strcpy(filename, path);
-- strcat(filename, ".hwm");
-- if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) {
-- efree(filename);
-- return FAILURE;
-- }
-- }
--#endif
--
-- if (php_check_open_basedir(path TSRMLS_CC)) {
-+ if (php_check_open_basedir(path)) {
- return FAILURE;
- }
-
-@@ -162,7 +120,6 @@
-
- /* {{{ php_crack_set_default_dict
- */
--#if PHP_VERSION_ID >= 70000
- static void php_crack_set_default_dict(zend_resource *id)
- {
- if (CRACKG(default_dict) != NULL) {
-@@ -172,60 +129,32 @@
- CRACKG(default_dict) = id;
- id->gc.refcount++;
- }
--#else
--static void php_crack_set_default_dict(int id TSRMLS_DC)
--{
-- if (CRACKG(default_dict) != -1) {
-- zend_list_delete(CRACKG(default_dict));
-- }
--
-- CRACKG(default_dict) = id;
-- zend_list_addref(id);
--}
--#endif
- /* }}} */
-
- /* {{{ php_crack_get_default_dict
- */
--#if PHP_VERSION_ID >= 70000
- static zend_resource *
php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
--#else
--static int php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
--#endif
- {
--#if PHP_VERSION_ID >= 70000
- if ((NULL == CRACKG(default_dict)) && (NULL !=
CRACKG(default_dictionary))) {
--#else
-- if ((-1 == CRACKG(default_dict)) && (NULL !=
CRACKG(default_dictionary))) {
--#endif
- CRACKLIB_PWDICT *pwdict;
- printf("trying to open: %s\n", CRACKG(default_dictionary));
- pwdict = cracklib_pw_open(CRACKG(default_dictionary), "r");
- if (NULL != pwdict) {
--#if PHP_VERSION_ID >= 70000
- ZVAL_RES(return_value, zend_register_resource(pwdict,
le_crack));
- php_crack_set_default_dict(Z_RES_P(return_value));
--#else
-- ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
-- php_crack_set_default_dict(Z_LVAL_P(return_value)
TSRMLS_CC);
--#endif
- }
- }
--
-+
- return CRACKG(default_dict);
- }
- /* }}} */
-
- /* {{{ php_crack_module_dtor
- */
--#if PHP_VERSION_ID >= 70000
- static void php_crack_module_dtor(zend_resource *rsrc)
--#else
--static void php_crack_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
--#endif
- {
- CRACKLIB_PWDICT *pwdict = (CRACKLIB_PWDICT *) rsrc->ptr;
--
-+
- if (pwdict != NULL) {
- cracklib_pw_close(pwdict);
- }
-@@ -239,13 +168,10 @@
- #ifdef ZTS
- ZEND_INIT_MODULE_GLOBALS(crack, php_crack_init_globals, NULL);
- #endif
--
-+
- REGISTER_INI_ENTRIES();
- le_crack = zend_register_list_destructors_ex(php_crack_module_dtor,
NULL, "crack dictionary", module_number);
--#if PHP_VERSION_ID < 70000
-- Z_TYPE(crack_module_entry) = type;
--#endif
--
-+
- return SUCCESS;
- }
-
-@@ -263,12 +189,8 @@
- PHP_RINIT_FUNCTION(crack)
- {
- CRACKG(last_message) = NULL;
--#if PHP_VERSION_ID >= 70000
- CRACKG(default_dict) = NULL;
--#else
-- CRACKG(default_dict) = -1;
--#endif
--
-+
- return SUCCESS;
- }
- /* }}} */
-@@ -280,7 +202,7 @@
- if (NULL != CRACKG(last_message)) {
- efree(CRACKG(last_message));
- }
--
-+
- return SUCCESS;
- }
- /* }}} */
-@@ -292,7 +214,7 @@
- php_info_print_table_start();
- php_info_print_table_header(2, "crack support", "enabled");
- php_info_print_table_end();
--
-+
- DISPLAY_INI_ENTRIES();
- }
- /* }}} */
-@@ -304,32 +226,23 @@
- char *path;
- size_t path_len;
- CRACKLIB_PWDICT *pwdict;
--
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path,
&path_len) == FAILURE) {
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &path_len) ==
FAILURE) {
- RETURN_FALSE;
- }
--
-- if (php_crack_checkpath(path TSRMLS_CC) == FAILURE) {
-+
-+ if (php_crack_checkpath(path) == FAILURE) {
- RETURN_FALSE;
- }
--
-+
- pwdict = cracklib_pw_open(path, "r");
- if (NULL == pwdict) {
--#if ZEND_MODULE_API_NO >= 20021010
-- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open
crack dictionary: %s", path);
--#else
-- php_error(E_WARNING, "Could not open crack dictionary: %s",
path);
--#endif
-+ php_error_docref(NULL, E_WARNING, "Could not open crack
dictionary: %s", path);
- RETURN_FALSE;
- }
-
--#if PHP_VERSION_ID >= 70000
- RETURN_RES(zend_register_resource(pwdict, le_crack));
- php_crack_set_default_dict(Z_RES_P(return_value));
--#else
-- ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
-- php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC);
--#endif
- }
- /* }}} */
-
-@@ -338,33 +251,20 @@
- PHP_FUNCTION(crack_closedict)
- {
- zval *dictionary = NULL;
--#if PHP_VERSION_ID >= 70000
- zend_resource *id;
--#else
-- int id = -1;
--#endif
- CRACKLIB_PWDICT *pwdict;
--
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r",
&dictionary)) {
-+
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &dictionary)) {
- RETURN_FALSE;
- }
--
-+
- if (NULL == dictionary) {
- id =
php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
--#if PHP_VERSION_ID >= 70000
- if (id == NULL) {
--#else
-- if (id == -1) {
--#endif
--#if ZEND_MODULE_API_NO >= 20021010
-- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
open default crack dicionary");
--#else
-- php_error(E_WARNING, "Could not open default crack
dicionary");
--#endif
-+ php_error_docref(NULL, E_WARNING, "Could not open
default crack dicionary");
- RETURN_FALSE;
- }
- }
--#if PHP_VERSION_ID >= 70000
- if((pwdict = (CRACKLIB_PWDICT
*)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) ==
NULL)
- {
- RETURN_FALSE;
-@@ -376,17 +276,6 @@
- else {
- zend_list_close(Z_RES_P(dictionary));
- }
--#else
-- ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack
dictionary", le_crack);
--
-- if (NULL == dictionary) {
-- zend_list_delete(CRACKG(default_dict));
-- CRACKG(default_dict) = -1;
-- }
-- else {
-- zend_list_delete(Z_RESVAL_P(dictionary));
-- }
--#endif
- RETURN_TRUE;
- }
- /* }}} */
-@@ -404,25 +293,20 @@
- size_t gecos_len;
- char *message;
- CRACKLIB_PWDICT *pwdict;
--#if PHP_VERSION_ID >= 70000
- zend_resource *crack_res;
--#else
-- int id = -1;
--#endif
--
-+
- if (NULL != CRACKG(last_message)) {
- efree(CRACKG(last_message));
- CRACKG(last_message) = NULL;
- }
--
-- if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "rs", &dictionary, &password, &password_len) == FAILURE) {
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ssr",
&password, &password_len, &username, &username_len, &gecos, &gecos_len,
&dictionary) == FAILURE) {
-+
-+ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
"rs", &dictionary, &password, &password_len) == FAILURE) {
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ssr", &password,
&password_len, &username, &username_len, &gecos, &gecos_len, &dictionary) ==
FAILURE) {
- RETURN_FALSE;
- }
- }
--
-+
- if (NULL == dictionary) {
--#if PHP_VERSION_ID >= 70000
- crack_res =
php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
- if (crack_res == NULL || crack_res->ptr == NULL) {
- php_error(E_WARNING, "Could not open default crack
dicionary");
-@@ -436,22 +320,9 @@
- RETURN_FALSE;
- }
- }
--#else
-- id =
php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-- if (id == -1) {
--#if ZEND_MODULE_API_NO >= 20021010
-- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
open default crack dicionary");
--#else
-- php_error(E_WARNING, "Could not open default crack
dicionary");
--#endif
-- RETURN_FALSE;
-- }
-- }
-- ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack
dictionary", le_crack);
--#endif
--
-+
- message = cracklib_fascist_look_ex(pwdict, password, username, gecos);
--
-+
- if (NULL == message) {
- CRACKG(last_message) = estrdup("strong password");
- RETURN_TRUE;
-@@ -470,21 +341,13 @@
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
- }
--
-+
- if (NULL == CRACKG(last_message)) {
--#if ZEND_MODULE_API_NO >= 20021010
-- php_error_docref(NULL TSRMLS_CC, E_WARNING, "No obscure checks
in this session");
--#else
-- php_error(E_WARNING, "No obscure checks in this session");
--#endif
-+ php_error_docref(NULL, E_WARNING, "No obscure checks in this
session");
- RETURN_FALSE;
- }
--
--#if PHP_VERSION_ID >= 70000
-+
- RETURN_STRING(CRACKG(last_message));
--#else
-- RETURN_STRING(CRACKG(last_message), 1);
--#endif
- }
- /* }}} */
-
-diff -aurN a/php_crack.h b/php_crack.h
---- a/php_crack.h 2021-04-15 13:57:12.174874906 -0400
-+++ b/php_crack.h 2021-04-15 14:10:28.853298881 -0400
-@@ -52,11 +52,7 @@
- ZEND_BEGIN_MODULE_GLOBALS(crack)
- char *default_dictionary;
- char *last_message;
--#if PHP_VERSION_ID >= 70000
- zend_resource *default_dict;
--#else
-- int default_dict;
--#endif
- ZEND_END_MODULE_GLOBALS(crack)
-
- #ifdef ZTS
diff --git a/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch
b/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch
deleted file mode 100644
index c180d5310b1b..000000000000
--- a/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crack-0.4/libcrack/src/cracklib.h 2005-09-21 11:00:06.000000000 +0200
-+++ crack-0.4-new/libcrack/src/cracklib.h 2006-10-08 20:44:00.618783250
+0200
-@@ -46,7 +46,7 @@
-
- typedef unsigned char int8;
- typedef unsigned short int int16;
--typedef unsigned long int int32;
-+typedef unsigned int int32;
-
- #ifndef NUMWORDS
- # define NUMWORDS 16
diff --git a/dev-php/pecl-crack/files/fix-php-5-4-support.patch
b/dev-php/pecl-crack/files/fix-php-5-4-support.patch
deleted file mode 100644
index 7fddadfabbbd..000000000000
--- a/dev-php/pecl-crack/files/fix-php-5-4-support.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Gentoo bug: 423869
-Thanks to hanno
-
---- a/crack.c 2008/07/17 10:02:47 262854
-+++ b/crack.c 2012/06/07 16:13:34 326013
-@@ -38,7 +38,7 @@
-
- /* {{{ crack_functions[]
- */
--function_entry crack_functions[] = {
-+zend_function_entry crack_functions[] = {
- PHP_FE(crack_opendict, NULL)
- PHP_FE(crack_closedict, NULL)
- PHP_FE(crack_check, NULL)
-@@ -94,6 +94,7 @@
- int filename_len;
- int result = SUCCESS;
-
-+#if PHP_VERSION_ID < 50400
- if (PG(safe_mode)) {
- filename_len = strlen(path) + 10;
- filename = (char *) emalloc(filename_len);
-@@ -125,6 +126,7 @@
- return FAILURE;
- }
- }
-+#endif
-
- if (php_check_open_basedir(path TSRMLS_CC)) {
- return FAILURE;
diff --git a/dev-php/pecl-crack/metadata.xml b/dev-php/pecl-crack/metadata.xml
deleted file mode 100644
index 222c77f3742a..000000000000
--- a/dev-php/pecl-crack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>PHP</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
b/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
deleted file mode 100644
index c5211d5881c8..000000000000
--- a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="crack"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( EXPERIMENTAL )
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP interface to the cracklib libraries"
-LICENSE="PHP-3 CRACKLIB"
-SLOT="0"
-IUSE=""
-
-# Patch for http://pecl.php.net/bugs/bug.php?id=5765
-PATCHES=(
- "${FILESDIR}/fix-php-5-4-support.patch"
- "${FILESDIR}/fix-pecl-bug-5765.patch"
- "${FILESDIR}/${PV}-php7.patch"
- "${FILESDIR}/0.4-php8.patch"
-)
