From nobody Tue Jul 30 14:13:04 2024 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 4WYHJ11v1fz5S2tD; Tue, 30 Jul 2024 14:13:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WYHJ10Q3bz4vrB; Tue, 30 Jul 2024 14:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722348785; 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=bkTMb4MNhbn1LGom6q16/b0Sn5Eis1hnnb8lK6fc390=; b=l8MDoWh4DwG/roaPzTAPZ6+0p46P3nmjO9wNPVQFjv39ZjrJ1SfmHZGQ5kloY9Df91gEHk tWeZwMKVRmW619g2FGtG3tK4I044Z8VW6kjJvJmJqjdQFooFwCV3/ZPur5LqfwvBjx5Bv4 lrQKBBOUF2edHtIrgy3HRQTyGodYJ/0nOkG9cYJ5AIIC3yXqls95Solcui41G9g0f8B0K7 KCI1E5OfF+rndoyUUXsXnTJrFydvxoNEzjHCuhHi++hvCPzOrnTHbYcJrRcG4PkAH6hAB3 nRTFT360Q0g/vHQJU+vXCk0HFkCw335j2CXVTyZNqwm62xBb6Z/dB+BbCTTzOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722348785; a=rsa-sha256; cv=none; b=bNDZWaUYdZBxHJZAjjYd/wY02STfSaIbhf54YgtO3ZdoHtt1SC09WcvFplaUqTut2LY2qI YxOvk4+Fe3PDNf2bpo2B242x239tYil75yuyV08azBfa9Df8AZYYMKh2d7Nn+0pFtRx1DW ebkNwQeapkgC8IkY2rGFLH4PvlX/HXIP2l13Qf3vZUXIS/ljtxbEbN8afRbauTKR2qya13 DF8acvyg9xpSYAkxi9libDgGg6y55aABRx5IELtTus1hOp2eQHEMkgJzbtetZaOGiGO6fZ VpUjIC6ZhP02VxyBC1jga0SZl8S5kmxumJZ9/aKdqqQp0wf9g/xI7pXGB86Pvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722348785; 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=bkTMb4MNhbn1LGom6q16/b0Sn5Eis1hnnb8lK6fc390=; b=WpgO2KUXXxKMD47H3R7OSYexMFJGRVEXP67ZJDKtIQPDrwR8pOvKJFpzS8cRUWJWAh4THv RBdgI3CsJCv8qSSu8zdqOdC6/1vkaKjCZlpivPzqyD7DvFZJC17AYSP31F/dLX7AsjTgTv MFKfN4sFDcAQXu7E0JFvv/SKmMNja2BsPlyR8NBvSQIpHVXKFGRjVo3educTLQHO/qa/MO u6XxIvrP3asoyyJ/4mzeZq5jE3CnNfccuKGOtanxuKWPSdqthNH4fKfsTDS58p+nqgDgPr KoryvXE9q+k8CFsE2hUqtg+WhuibwWeP12/8d4ovc8XGo2muFXOYlfbi3DaZxA== 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 4WYHJ101hvzLKX; Tue, 30 Jul 2024 14:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46UED4lV011362; Tue, 30 Jul 2024 14:13:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46UED4Kw011359; Tue, 30 Jul 2024 14:13:04 GMT (envelope-from git) Date: Tue, 30 Jul 2024 14:13:04 GMT Message-Id: <202407301413.46UED4Kw011359@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: f8d7720ab3c0 - main - security/pecl-mcrypt: Fix build with php84 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8d7720ab3c06ec583f6bde03af2f4fa8b83271e Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8d7720ab3c06ec583f6bde03af2f4fa8b83271e commit f8d7720ab3c06ec583f6bde03af2f4fa8b83271e Author: Po-Chuan Hsieh AuthorDate: 2024-07-30 14:07:37 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-07-30 14:07:37 +0000 security/pecl-mcrypt: Fix build with php84 - While I'm here: - Fix indent - Remove outdated post-patch: Approved by: portmgr (blanket) --- security/pecl-mcrypt/Makefile | 7 +------ security/pecl-mcrypt/files/patch-php84 | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/security/pecl-mcrypt/Makefile b/security/pecl-mcrypt/Makefile index 8c661d2758de..f85fd42af54c 100644 --- a/security/pecl-mcrypt/Makefile +++ b/security/pecl-mcrypt/Makefile @@ -12,11 +12,6 @@ LICENSE= PHP301 LIB_DEPENDS= libltdl.so:devel/libltdl \ libmcrypt.so:security/libmcrypt -USES= php:pecl -IGNORE_WITH_PHP= 84 - -post-patch: - ${REINPLACE_CMD} -e 's/RETURN_FALSE$$/RETURN_FALSE;/g' ${WRKSRC}/mcrypt.c - ${REINPLACE_CMD} -e 's/RETURN_TRUE$$/RETURN_TRUE;/g' ${WRKSRC}/mcrypt.c +USES= php:pecl .include diff --git a/security/pecl-mcrypt/files/patch-php84 b/security/pecl-mcrypt/files/patch-php84 new file mode 100644 index 000000000000..9d7ac9def9e6 --- /dev/null +++ b/security/pecl-mcrypt/files/patch-php84 @@ -0,0 +1,14 @@ +--- mcrypt.c.orig 2023-12-19 10:55:02 UTC ++++ mcrypt.c +@@ -38,7 +38,11 @@ + #include "php_ini.h" + #include "php_globals.h" + #include "ext/standard/info.h" ++#if PHP_VERSION_ID >= 80400 ++#include "ext/random/php_random.h" ++#else + #include "ext/standard/php_rand.h" ++#endif + #include "zend_smart_str.h" + #include "php_mcrypt_filter.h" +