From nobody Tue Dec 13 18:54:25 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 4NWnjF412Sz4kVXD; Tue, 13 Dec 2022 18:54:25 +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 4NWnjF3VyMz4Hnw; Tue, 13 Dec 2022 18:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670957665; 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=4MdNGDzkcPwGHhG1Nl3zDextEmxxH2TCg5GsouEx1Wo=; b=Ni/XpzfC6TXkRvklnugtMWm9daLcJKl92/q47OvaAAB/y12ifUazX8TOzTuqxMcwH/yy85 11N9+b8P39hXw1RZeB9M3zx25DrfqqqbkdMypITLmrQKDI8PB97daBUivYzDI0iZjoHXza 4+ril7npM2buqIhoAlr2vEIyrPKM7GtW/OM9P8YT0G+0UpEUyVeaOtCY2WB+ZlnCViOscD ghdIYgmv/m3faCW6wyYWPVY/r9/BDRH3XmhVo3S/uj81/1MaEIK/tEPz5KkMN7K0DpPu64 Kl+CvguOP2ZIxb2KiFyt438zu8auRwqClVvT4rLjVyUuSAWg3bI7Nn6rMmAgLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670957665; 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=4MdNGDzkcPwGHhG1Nl3zDextEmxxH2TCg5GsouEx1Wo=; b=bPW2y2SEWoiQoNvJ7/yyZUkOL3Aq0r+0EocHms4cJj8wU9Jpjunrp6vpIu6PZv4bznAOf5 FaY1IAhHvRAHZeb3BOzxUbDdeumFgVjTrVWctF1cJqDJR2RzCs/sDZuzrPMO4FO49eqWea 3cQ4GUpNcoGNGtXm03IauN33LX7myNqGQGYKEZ6lo6qYIQavW2TEy8oZc0nxbxf2ovX1ZW /+V0mrW2qyXTkJEpo+HEVqX6dYRn4gTXAaVzYyLKwpDBnQtEXGd1WjdyRafbx/XworeG9I 7Wq4gxUAlGf4l2PY+V7/NUV+BPqPWaBX5Ryrg7mWBDwNcvtRzTuyR6e5Cyxxgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670957665; a=rsa-sha256; cv=none; b=EIjpZ0NtTui7NLvhZt9vZvJLGXbimm/iX3o+xKdvAhBAzj5PAwzkgHeZkLmMu6HIZWmtTG jepgbvLFXGVcRkZZIx0xvJ83i436uohnUnktVZGPKjIsjHKFji7g4InNoe7a+/G3EcpGMK sU8Bj5HaAf+x8T47yr/eostNjuRcHi1QdG1qfZ2c8ATZTTw6TzqkZ3PthxvCJTVbl9WIy0 VeVu0MZ5VB7GlS5Jygr1KPTS97Y03KymoqAXa+9mR95Ujmk9x+6TcVhVkU8oGw7t8KTqHF 1dBGio+roWozqAwJU11tkGnA4EK92Mk78/6uID/pLsbLyE2HmehF/2OH09RLJQ== 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 4NWnjF2V1FzPql; Tue, 13 Dec 2022 18:54:25 +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 2BDIsPUG007115; Tue, 13 Dec 2022 18:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BDIsPit007114; Tue, 13 Dec 2022 18:54:25 GMT (envelope-from git) Date: Tue, 13 Dec 2022 18:54:25 GMT Message-Id: <202212131854.2BDIsPit007114@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: 3d14040d7bc8 - main - sysutils/pecl-proctitle: Fix warnings with php8.2 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: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d14040d7bc8b4556c32609a02b4d403ab6561f8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d14040d7bc8b4556c32609a02b4d403ab6561f8 commit 3d14040d7bc8b4556c32609a02b4d403ab6561f8 Author: Florian Smeets AuthorDate: 2022-12-13 18:51:42 +0000 Commit: Florian Smeets CommitDate: 2022-12-13 18:51:42 +0000 sysutils/pecl-proctitle: Fix warnings with php8.2 Obtained from: https://github.com/mtorromeo/php-pecl-proctitle/commit/05e7c3e368fae981f6132c1f2979ef9a42b56d78 --- sysutils/pecl-proctitle/Makefile | 2 +- .../pecl-proctitle/files/patch-php__proctitle.h | 5 +-- sysutils/pecl-proctitle/files/patch-proctitle.c | 49 +++++++++++----------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/sysutils/pecl-proctitle/Makefile b/sysutils/pecl-proctitle/Makefile index 978071c96307..6089aeba85a8 100644 --- a/sysutils/pecl-proctitle/Makefile +++ b/sysutils/pecl-proctitle/Makefile @@ -1,6 +1,6 @@ PORTNAME= proctitle PORTVERSION= 0.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils pear MAINTAINER= flo@FreeBSD.org diff --git a/sysutils/pecl-proctitle/files/patch-php__proctitle.h b/sysutils/pecl-proctitle/files/patch-php__proctitle.h index 7d00c6c4feb4..ce3608746f87 100644 --- a/sysutils/pecl-proctitle/files/patch-php__proctitle.h +++ b/sysutils/pecl-proctitle/files/patch-php__proctitle.h @@ -1,10 +1,9 @@ ---- php_proctitle.h.orig 2012-05-11 08:49:30 UTC +--- php_proctitle.h.orig 2022-12-11 12:46:56 UTC +++ php_proctitle.h -@@ -21,6 +21,15 @@ +@@ -21,6 +21,14 @@ #ifndef PHP_PROCTITLE_H #define PHP_PROCTITLE_H -+ +#if PHP_MAJOR_VERSION >= 8 +#define TSRMLS_CC +#define TSRMLS_C diff --git a/sysutils/pecl-proctitle/files/patch-proctitle.c b/sysutils/pecl-proctitle/files/patch-proctitle.c index 9def23082503..774288650ecd 100644 --- a/sysutils/pecl-proctitle/files/patch-proctitle.c +++ b/sysutils/pecl-proctitle/files/patch-proctitle.c @@ -1,30 +1,29 @@ ---- proctitle.c.orig 2012-05-11 08:49:30 UTC +--- proctitle.c.orig 2022-12-11 12:38:30 UTC +++ proctitle.c -@@ -23,6 +23,7 @@ +@@ -69,7 +69,11 @@ PHP_MINIT_FUNCTION(proctitle) + } #endif - #include -+#include "ext/standard/info.h" - #include - #include - #include -@@ -138,9 +139,7 @@ PHP_MINFO_FUNCTION(proctitle) - /* {{{ proctitle_module_entry +-/* {{{ proto void setproctitle(string title) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_title, 0, 0, 1) ++ ZEND_ARG_INFO(0, title) ++ZEND_END_ARG_INFO() ++ ++/* + * Changes the current process' title in system's list of processes */ - zend_module_entry proctitle_module_entry = { --#if ZEND_MODULE_API_NO >= 20010901 - STANDARD_MODULE_HEADER, --#endif - "proctitle", - proctitle_functions, - #ifndef PHP_SYSTEM_PROVIDES_SETPROCTITLE -@@ -152,9 +151,7 @@ zend_module_entry proctitle_module_entry = { - NULL, - NULL, - PHP_MINFO(proctitle), --#if ZEND_MODULE_API_NO >= 20010901 - PHP_PROCTITLE_VERSION, --#endif - STANDARD_MODULE_PROPERTIES + PHP_FUNCTION(setproctitle) +@@ -117,10 +121,10 @@ PHP_FUNCTION(setthreadtitle) + * + * Every user visible function must have an entry in proctitle_functions[]. + */ +-static zend_function_entry proctitle_functions[] = { +- PHP_FE(setproctitle, NULL) ++static const zend_function_entry proctitle_functions[] = { ++ PHP_FE(setproctitle, arginfo_title) + #if HAVE_PRCTL +- PHP_FE(setthreadtitle, NULL) ++ PHP_FE(setthreadtitle, arginfo_title) + #endif + {NULL, NULL, NULL} /* Must be the last line in proctitle_functions[] */ }; - /* }}} */