From nobody Tue Nov 29 20:19:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NMDFt1wphz4jgLH; Tue, 29 Nov 2022 20:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NMDFt1Kk8z3L0h; Tue, 29 Nov 2022 20:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669753170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rTMkQl6+fha8pmJBwCr0fn/2PR6/C9lcLoZB7wAQmjI=; b=dWmnthDiNg8AuqTXC6T4fZQBNGtmOC+xYGNRTlRk5OOiW7iJajO8Dd1bPL0jS2rtrsxiX6 kymMD9bDnnEqkqcC/AJp02i2Crq6EoPEf0bihh/p+GeHPMqQFjRxDsOymiGoso4gAI7oTa YpUHxzxUqSUJAJCipcjJDWwvsm8VMmT364OvpbiNP28MgXG451XNT6dVXEoIBb4bStSQTX d5wAJAnPwC1Op5Zp5HY68RgpIVnX4E9yr+IOsvSNsUy7LcEyWyPqEVR5wrqOK75uw9WuZg mdWYxkl4o1DO/8XKl1BbWeiu2dSu2C1a4tp5XbOJQsCpkOU/M5ZIeeAAEqbthg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669753170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rTMkQl6+fha8pmJBwCr0fn/2PR6/C9lcLoZB7wAQmjI=; b=r0pjNSSXqqRbBSYHUbMe+b/bFI/h/tYEqQSzpet8ENpjWe+ui3d9L3VLJV7VZnwm8EcMe8 qRnI6n7GO836XU6p3dEp8yAmB5zwKgxHsHKJww63sYw9QGrhVeVLRjyarFHp2Egbsh+6SR 21aJBQbDGcdSMkpwY3Kqh69LajrRTkk18BiWG37/uTH+Vtc8Ot3X+yo3XxDuQArBD2BUT3 /p1j2lUpID2kWr0rhjLf7rA+BLVckUZwjtPjbgKmL5qq2F76IhjXnJrV+182SEZrVOS5/u agtCtRH76d7ZTMaf6KqXFxBlhg1Sd9vnEHkHyAwzGZTCS442tX4IDZ7MB/aDeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669753170; a=rsa-sha256; cv=none; b=lk1s6oFzaOc/9XGuKewKRODHrNu+KMqdcXMT14rbij0x/TqtVzMqy2K5z5o24oSBZcSAuS fVSs8di+IY/4bzHKlZxHcuO5/6J2g/fLF2q4cNmnLNYTih5Q7sZDP0mpnTzaGHXRygeAUi c/Q9vvnI5i6BFZ94+DuUawxd2qkUv5zywps7HHu8Ti3cCJSJqoS1xoOKFpEQVbcmxqtKzt 5Dvx73SOoaasdUFapDJjx47eTt9wBkgDCeBZc/X4b3FvR6Y0uOmu2bJLLKymHxlwVkUuI9 Z+M8m0LECKAmFYnVONyVKCpVDxPtxhjL8XtAA/XiV1p7ZiYDKLfToItgrRHO9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NMDFt0MPwzVRl; Tue, 29 Nov 2022 20:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ATKJTWo070700; Tue, 29 Nov 2022 20:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATKJTVW070699; Tue, 29 Nov 2022 20:19:29 GMT (envelope-from git) Date: Tue, 29 Nov 2022 20:19:29 GMT Message-Id: <202211292019.2ATKJTVW070699@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 4bd2bd55ab37 - main - net/pecl-zmq: Cleanup List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bd2bd55ab379c789527b6a16abb501ff8fa7bec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=4bd2bd55ab379c789527b6a16abb501ff8fa7bec commit 4bd2bd55ab379c789527b6a16abb501ff8fa7bec Author: Muhammad Moinur Rahman AuthorDate: 2022-11-29 20:17:37 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-11-29 20:19:21 +0000 net/pecl-zmq: Cleanup - Requires php74 which was EOL on 2022-11-28 Approved by: portmgr (blanket infrastructure) Sponsored by: Bounce Experts --- MOVED | 1 + net/Makefile | 1 - net/pecl-zmq/Makefile | 20 ---- net/pecl-zmq/distinfo | 2 - net/pecl-zmq/files/patch-zmq.c | 26 ----- net/pecl-zmq/files/patch-zmq__helpers.c | 18 ---- net/pecl-zmq/files/patch-zmq__pollset.c | 173 -------------------------------- net/pecl-zmq/pkg-descr | 1 - 8 files changed, 1 insertion(+), 241 deletions(-) diff --git a/MOVED b/MOVED index 271ed04623a8..920a7516d7b8 100644 --- a/MOVED +++ b/MOVED @@ -17620,3 +17620,4 @@ graphics/giblib||2022-11-27|Has expired: Last release in 2004, abandoned upstrea www/typo3-10||2022-11-29|Requires php74 which was EOL on 2022-11-28 www/phalcon4||2022-11-29|Requires php74 which was EOL on 2022-11-28 www/ilias6||2022-11-29|Requires php74 which was EOL on 2022-11-28 +net/pecl-zmq||2022-11-29|Requires php74 which was EOL on 2022-11-28 diff --git a/net/Makefile b/net/Makefile index 30101bad33b8..62a5276971c9 100644 --- a/net/Makefile +++ b/net/Makefile @@ -983,7 +983,6 @@ SUBDIR += pecl-rdkafka SUBDIR += pecl-smbclient SUBDIR += pecl-xmlrpc - SUBDIR += pecl-zmq SUBDIR += pen SUBDIR += php74-ldap SUBDIR += php74-soap diff --git a/net/pecl-zmq/Makefile b/net/pecl-zmq/Makefile deleted file mode 100644 index 3f41067e8eff..000000000000 --- a/net/pecl-zmq/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME= zmq -PORTVERSION= 1.1.3 -PORTREVISION= 3 -CATEGORIES= net pear - -MAINTAINER= garga@FreeBSD.org -COMMENT= PHP bindings for ZeroMQ -WWW= https://pecl.php.net/package/zmq - -LICENSE= BSD3CLAUSE - -DEPRECATED= Requires php 7.4 which is set to expire on 2022-11-29 -EXPIRATION_DATE=2022-11-28 - -LIB_DEPENDS= libzmq.so:net/libzmq4 - -USES= php:pecl pkgconfig -IGNORE_WITH_PHP= 80 81 82 - -.include diff --git a/net/pecl-zmq/distinfo b/net/pecl-zmq/distinfo deleted file mode 100644 index 01570436e3ca..000000000000 --- a/net/pecl-zmq/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (PECL/zmq-1.1.3.tgz) = c492375818bd51b355352798fb94f04d6828c6aeda41ba813849624af74144ce -SIZE (PECL/zmq-1.1.3.tgz) = 82397 diff --git a/net/pecl-zmq/files/patch-zmq.c b/net/pecl-zmq/files/patch-zmq.c deleted file mode 100644 index cd88f3993180..000000000000 --- a/net/pecl-zmq/files/patch-zmq.c +++ /dev/null @@ -1,26 +0,0 @@ ---- zmq.c.orig 2016-02-01 01:50:43 UTC -+++ zmq.c -@@ -235,7 +235,11 @@ php_zmq_context *php_zmq_context_get(zend_long io_thre - le.type = php_zmq_context_list_entry(); - le.ptr = context; - -+#if PHP_VERSION_ID < 70300 - GC_REFCOUNT(&le) = 1; -+#else -+ GC_SET_REFCOUNT(&le, 1); -+#endif - - /* plist_key is not a persistent allocated key, thus we use str_update here */ - if (zend_hash_str_update_mem(&EG(persistent_list), plist_key->val, plist_key->len, &le, sizeof(le)) == NULL) { -@@ -535,7 +539,11 @@ void php_zmq_socket_store(php_zmq_socket *zmq_sock_p, - le.type = php_zmq_socket_list_entry(); - le.ptr = zmq_sock_p; - -+#if PHP_VERSION_ID < 70300 - GC_REFCOUNT(&le) = 1; -+#else -+ GC_SET_REFCOUNT(&le, 1); -+#endif - - plist_key = php_zmq_socket_plist_key(type, persistent_id, use_shared_ctx); - diff --git a/net/pecl-zmq/files/patch-zmq__helpers.c b/net/pecl-zmq/files/patch-zmq__helpers.c deleted file mode 100644 index 1052311ba1f4..000000000000 --- a/net/pecl-zmq/files/patch-zmq__helpers.c +++ /dev/null @@ -1,18 +0,0 @@ ---- zmq_helpers.c.orig 2016-02-01 01:50:43 UTC -+++ zmq_helpers.c -@@ -63,7 +63,7 @@ char *php_zmq_printable_func (zend_fcall_info *fci, ze - char *buffer = NULL; - - if (fci->object) { -- spprintf (&buffer, 0, "%s::%s", fci->object->ce->name->val, fci_cache->function_handler->common.function_name); -+ spprintf (&buffer, 0, "%s::%s", fci->object->ce->name->val, ZSTR_VAL(fci_cache->function_handler->common.function_name)); - } else { - if (Z_TYPE (fci->function_name) == IS_OBJECT) { - spprintf (&buffer, 0, "%s", Z_OBJCE (fci->function_name)->name->val); -@@ -74,4 +74,4 @@ char *php_zmq_printable_func (zend_fcall_info *fci, ze - } - return buffer; - } --/* }}} */ -\ No newline at end of file -+/* }}} */ diff --git a/net/pecl-zmq/files/patch-zmq__pollset.c b/net/pecl-zmq/files/patch-zmq__pollset.c deleted file mode 100644 index 0abd622a7b72..000000000000 --- a/net/pecl-zmq/files/patch-zmq__pollset.c +++ /dev/null @@ -1,173 +0,0 @@ ---- zmq_pollset.c.orig 2018-10-16 14:37:44 UTC -+++ zmq_pollset.c -@@ -38,7 +38,7 @@ - - /* {{{ typedef struct _php_zmq_pollset - */ --typedef struct _php_zmq_pollset { -+struct _php_zmq_pollset { - - zmq_pollitem_t *items; - zend_string **keys; -@@ -49,11 +49,11 @@ typedef struct _php_zmq_pollset { - size_t alloc_size; - - zval errors; --} php_zmq_pollset; -+}; - /* }}} */ - - static --void s_pollset_clear(php_zmq_pollset *set, zend_bool reinit) -+void s_pollset_clear(struct _php_zmq_pollset *set, zend_bool reinit) - { - size_t i; - -@@ -85,7 +85,7 @@ void s_pollset_clear(php_zmq_pollset *set, zend_bool r - } - - static --size_t s_pollset_append(php_zmq_pollset *set, zmq_pollitem_t *item, zend_string *key, zval *entry) -+size_t s_pollset_append(struct _php_zmq_pollset *set, zmq_pollitem_t *item, zend_string *key, zval *entry) - { - size_t index = set->num_items; - -@@ -109,7 +109,7 @@ size_t s_pollset_append(php_zmq_pollset *set, zmq_poll - } - - static --void s_pollset_delete(php_zmq_pollset *set, size_t index) -+void s_pollset_delete(struct _php_zmq_pollset *set, size_t index) - { - zend_string_release(set->keys[index]); - zval_ptr_dtor(&set->zv[index]); -@@ -144,7 +144,7 @@ void s_pollset_delete(php_zmq_pollset *set, size_t ind - } - - static --zend_bool s_index_for_key(php_zmq_pollset *set, zend_string *key, size_t *index) -+zend_bool s_index_for_key(struct _php_zmq_pollset *set, zend_string *key, size_t *index) - { - zend_bool retval = 0; - size_t i; -@@ -160,7 +160,7 @@ zend_bool s_index_for_key(php_zmq_pollset *set, zend_s - } - - static --zval *s_zval_for_index(php_zmq_pollset *set, size_t index) -+zval *s_zval_for_index(struct _php_zmq_pollset *set, size_t index) - { - return &set->zv[index]; - } -@@ -169,7 +169,7 @@ static - zend_string *s_create_key(zval *entry) - { - if (Z_TYPE_P(entry) == IS_RESOURCE) { -- return strpprintf(0, "r:%ld", Z_RES_P(entry)->handle); -+ return strpprintf(0, "r:%d", Z_RES_P(entry)->handle); - } - else { - zend_string *hash = php_spl_object_hash(entry); -@@ -179,9 +179,9 @@ zend_string *s_create_key(zval *entry) - } - } - --php_zmq_pollset *php_zmq_pollset_init() -+struct _php_zmq_pollset *_php_zmq_pollset_init() - { -- php_zmq_pollset *set = ecalloc (1, sizeof(php_zmq_pollset)); -+ struct _php_zmq_pollset *set = ecalloc (1, sizeof(struct _php_zmq_pollset)); - - array_init(&set->errors); - -@@ -195,7 +195,7 @@ php_zmq_pollset *php_zmq_pollset_init() - return set; - } - --zend_bool php_zmq_pollset_items(php_zmq_pollset *set, zval *return_value) -+zend_bool php_zmq_pollset_items(struct _php_zmq_pollset *set, zval *return_value) - { - size_t i; - -@@ -214,15 +214,15 @@ zend_bool php_zmq_pollset_items(php_zmq_pollset *set, - return 1; - } - --size_t php_zmq_pollset_num_items(php_zmq_pollset *set) -+size_t php_zmq_pollset_num_items(struct _php_zmq_pollset *set) - { - return set->num_items; - } - --zend_string *php_zmq_pollset_add(php_zmq_pollset *set, zval *entry, int events, int *error) -+zend_string *php_zmq_pollset_add(struct _php_zmq_pollset *set, zval *entry, int events, int *error) - { - zend_string *key; -- size_t num_items, index; -+ size_t index; - zmq_pollitem_t item; - - *error = 0; -@@ -233,7 +233,7 @@ zend_string *php_zmq_pollset_add(php_zmq_pollset *set, - return key; - } - -- num_items = php_zmq_pollset_num_items(set); -+ php_zmq_pollset_num_items(set); - memset(&item, 0, sizeof(zmq_pollitem_t)); - - if (Z_TYPE_P(entry) == IS_RESOURCE) { -@@ -273,7 +273,7 @@ zend_string *php_zmq_pollset_add(php_zmq_pollset *set, - return key; - } - --zend_bool php_zmq_pollset_delete_by_key(php_zmq_pollset *set, zend_string *key) -+zend_bool php_zmq_pollset_delete_by_key(struct _php_zmq_pollset *set, zend_string *key) - { - size_t index; - -@@ -285,7 +285,7 @@ zend_bool php_zmq_pollset_delete_by_key(php_zmq_pollse - return 1; - } - --zend_bool php_zmq_pollset_delete(php_zmq_pollset *set, zval *entry) -+zend_bool php_zmq_pollset_delete(struct _php_zmq_pollset *set, zval *entry) - { - zend_bool retval; - zend_string *key = s_create_key(entry); -@@ -296,7 +296,7 @@ zend_bool php_zmq_pollset_delete(php_zmq_pollset *set, - return retval; - } - --int php_zmq_pollset_poll(php_zmq_pollset *set, int timeout, zval *r_array, zval *w_array) -+int php_zmq_pollset_poll(struct _php_zmq_pollset *set, int timeout, zval *r_array, zval *w_array) - { - int rc, i; - zend_bool readable = 0, writable = 0; -@@ -354,7 +354,7 @@ int php_zmq_pollset_poll(php_zmq_pollset *set, int tim - return rc; - } - --void php_zmq_pollset_clear(php_zmq_pollset *set) -+void php_zmq_pollset_clear(struct _php_zmq_pollset *set) - { - // Clear errors - zend_hash_clean(Z_ARRVAL(set->errors)); -@@ -363,14 +363,14 @@ void php_zmq_pollset_clear(php_zmq_pollset *set) - s_pollset_clear(set, 1); - } - --zval *php_zmq_pollset_errors(php_zmq_pollset *set) -+zval *php_zmq_pollset_errors(struct _php_zmq_pollset *set) - { - return &set->errors; - } - --void php_zmq_pollset_destroy(php_zmq_pollset **ptr) -+void php_zmq_pollset_destroy(struct _php_zmq_pollset **ptr) - { -- php_zmq_pollset *set = *ptr; -+ struct _php_zmq_pollset *set = *ptr; - - // clear the pollset - s_pollset_clear(set, 0); diff --git a/net/pecl-zmq/pkg-descr b/net/pecl-zmq/pkg-descr deleted file mode 100644 index 5939a78cfda3..000000000000 --- a/net/pecl-zmq/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -PHP bindings for ZeroMQ