From nobody Thu Feb 17 17:31:38 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 8321519DD273; Thu, 17 Feb 2022 17:31:38 +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 4K021k3LPYz4gPM; Thu, 17 Feb 2022 17:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645119098; 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=Kg4BzFWEQVWU3fYEyV8nu+jFI0IpaX2QAwmAQEIdO6w=; b=U6jF0dkZ3WnWXLSFlceOug8eWpsMl3gu9WH1Nzru1ASFHgYjUzAgN1YfGq782yNGi6jel0 G9J1ibhGeOrW2GmCtTpk7/w7SNZgQiuusQmOq6FP8t96q/LzIu/AH9qKZW86dz1zAYscGy 9q0iIoNExa9DmTDj4nRuBEaMVeu5zrZ/SafeBdcOs1wSVvV27kVE+yC7iaSWZUFRqXoMM/ KsrVfrfUJkS4q2gEswA9BbTQNAHbx1vLyZ1GxgS/wv/Tya5Oev+0H04OojzEsLpfifeT+K yZ4kQdeda6/BrUD5hHDd6qcViAC2ximWFGWOVlWcv8PQ39SHVcPLMzwcxh9a/w== 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 537676039; Thu, 17 Feb 2022 17:31:38 +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 21HHVc6H055405; Thu, 17 Feb 2022 17:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HHVccp055404; Thu, 17 Feb 2022 17:31:38 GMT (envelope-from git) Date: Thu, 17 Feb 2022 17:31:38 GMT Message-Id: <202202171731.21HHVccp055404@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: 75f7b98a01df - main - sysutils/pecl-proctitle: PHP8.X compatibility 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: 75f7b98a01df5cb152d16636b61282dd7becb765 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645119098; 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=Kg4BzFWEQVWU3fYEyV8nu+jFI0IpaX2QAwmAQEIdO6w=; b=Qm5Wrq25YaffQEvmmEMNIjMx12vWRLIg0K2gGEBDO2k1oF0lWMKmhtmQxLGMdxb4BxXX9E qXsiCbtgGsAHOdRMvPKtZRf75vnKSFXFV0123pI5LdVBo7ND7Cy6Z1Ew6jveqhbYOWgVvs DzFxKyM+Ln+UjFOstrhXuaEtALOL6gsxgUO/T3paTDlX6H51LlWCLBnWsvkxoxfq5sXHIf 3+SvrxwrRgzndBw8tW0ymOVQCbrif9TNbbzDsccrmG+yuoBjmzQHTUWx0BFpBQ/qBsDy1l PCH3/M5B44dHzZYmt2Z7yoHzCt8XKNYxvQTSouKEO5Y1l8JlOTyZSiXdtitYxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645119098; a=rsa-sha256; cv=none; b=lAO11moAiAbXjNOmMtaz/H+H6vPDuCNhz+H4KLsDAq6sUQsY9KMcrW8LO+iuUo4LTBW7PB Mfe6OMrME73kHyTsOiD5mMcN62FJQT5fOPNw4xZ/hzyRtXBvKygsnrWZPmavFN8RikomJt oZiwbQCcXf+6ErD1l6F0Pmu2zsHi8DkC4OsyfUsz/rj7BDcQc49BBs0VqYOvBAobNEc7Qf 8Bc9RAQ0/mH+Orv8WIcnwBC8+IO6skLvTd5x8FiZ+ZqYNh3Xdnptk/eZ+XZBq6mYzoRC9B ciUTGa2G4ItO9bqGs2U9eCPIBd3AKhaJg4uscwEelykxNTUXG5Y07rwYVBDWnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=75f7b98a01df5cb152d16636b61282dd7becb765 commit 75f7b98a01df5cb152d16636b61282dd7becb765 Author: Florian Smeets AuthorDate: 2022-02-17 17:30:27 +0000 Commit: Florian Smeets CommitDate: 2022-02-17 17:30:27 +0000 sysutils/pecl-proctitle: PHP8.X compatibility - add LICENSE - add patches to make this work with PHP8.X PR: 261621 Obtained from: https://github.com/mtorromeo/php-pecl-proctitle/commit/635dbe9a0289b196e53e6da18b3441fe3b3595aa --- sysutils/pecl-proctitle/Makefile | 5 ++-- .../pecl-proctitle/files/patch-php__proctitle.h | 18 +++++++++++++ sysutils/pecl-proctitle/files/patch-proctitle.c | 30 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/sysutils/pecl-proctitle/Makefile b/sysutils/pecl-proctitle/Makefile index 79f986698d6e..0d7d94c460cb 100644 --- a/sysutils/pecl-proctitle/Makefile +++ b/sysutils/pecl-proctitle/Makefile @@ -2,13 +2,14 @@ PORTNAME= proctitle PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils pear MAINTAINER= flo@FreeBSD.org COMMENT= PECL extension that allows changing the current process' name +LICENSE= PHP301 + USES= php:pecl -IGNORE_WITH_PHP= 80 81 .include diff --git a/sysutils/pecl-proctitle/files/patch-php__proctitle.h b/sysutils/pecl-proctitle/files/patch-php__proctitle.h new file mode 100644 index 000000000000..7d00c6c4feb4 --- /dev/null +++ b/sysutils/pecl-proctitle/files/patch-php__proctitle.h @@ -0,0 +1,18 @@ +--- php_proctitle.h.orig 2012-05-11 08:49:30 UTC ++++ php_proctitle.h +@@ -21,6 +21,15 @@ + #ifndef PHP_PROCTITLE_H + #define PHP_PROCTITLE_H + ++ ++#if PHP_MAJOR_VERSION >= 8 ++#define TSRMLS_CC ++#define TSRMLS_C ++#define TSRMLS_DC ++#define TSRMLS_D ++#define TSRMLS_FETCH() ++#endif ++ + #define PHP_PROCTITLE_VERSION "0.1.2" + + extern zend_module_entry proctitle_module_entry; diff --git a/sysutils/pecl-proctitle/files/patch-proctitle.c b/sysutils/pecl-proctitle/files/patch-proctitle.c new file mode 100644 index 000000000000..9def23082503 --- /dev/null +++ b/sysutils/pecl-proctitle/files/patch-proctitle.c @@ -0,0 +1,30 @@ +--- proctitle.c.orig 2012-05-11 08:49:30 UTC ++++ proctitle.c +@@ -23,6 +23,7 @@ + #endif + + #include ++#include "ext/standard/info.h" + #include + #include + #include +@@ -138,9 +139,7 @@ PHP_MINFO_FUNCTION(proctitle) + /* {{{ proctitle_module_entry + */ + 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 + }; + /* }}} */