From nobody Sat Aug 03 17:58:56 2024 X-Original-To: dev-commits-ports-all@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 4Wbr6m66hkz5Snx4; Sat, 03 Aug 2024 17:58:56 +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 4Wbr6m55S2z4j7w; Sat, 3 Aug 2024 17:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722707936; 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=T66S5efgGTmdBf+cVVkujE85YiAHhxJNJ8JXhwBPorI=; b=bMUhviaPG9ko+Uq9VuzWHynPte81X9ER7XYpJsuS+y39qnup6QvjD9yMmlan1OJuKQqM/a 4z+L/I/SuR+81zTjLWgXMf9SpFW8EmvFzPCaVCwwoL2VefHFDyMa7OcLtsKZT4EacrpU02 pQYpbMdL6S9IVomleUj9Zi4dQ5TlkAMlZRWHYrh+KmCZnvC0O4dyxmsg4qH+N43bkrqtll i6t7n7sVZCW5MfBYD2K+T3S9VjIG2cWevuy8XxlrBHVcC5sxM50qe643wRda0n9S6xoM0n 1Rcwj9ia7EfT/4B8mvq8t8qRljzW468fgedEn3Hsb2dgHmxRhop6PyDuARl04A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722707936; a=rsa-sha256; cv=none; b=D9p+SVvlm6+nqZHOYKTUzIZCONHoDkoA4hb8LEbT3kBeNdtYUaTEtEz50R0ZDIY/kujI1z GDvHnCs6Ifz/byo6wvJwTxKoQhS0xeSmqxJkHza/5RTBmgS28tdhlG7eV3pp0XPMEBCloC zC+yAZ5zHvgBYBuOFlzKJyVLw1QKWq51eU02cEIRnk8xxW9zv2N5W4HXvWesHFTvADVY3L qTjmdXU51C6RTzgfOQoG+hjR2JDiXH/EcoS6Ps+MbrKv5AvafN2yXOOOvWHiV3jwdQU+YH CMCNPA1fNp5HRaxN/R2/Amw3h1x6TDS9YR07+9BkU269yMTM3H4xexZFy5RoJA== 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=1722707936; 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=T66S5efgGTmdBf+cVVkujE85YiAHhxJNJ8JXhwBPorI=; b=yNYLMICNt2MNTjYfdZ1kBWpBfJBZDlbbS5q2rTuV8RfDMRNSmYyGSBtVvRgSu8ux6v8NjF l/mdP7wBZrk4rC3F8QdoJUgc/By3oqCX5oLd3/lox6BlsTPOmL02g2WWxtw4MVoobTuFWe YiEH1ecf9/xJFseQVHm4UuJ+0gcCICfW2ECFS6RdEBiY6G93SJXoXu3E6/JOzDYNF0Uogs 8VeTovw8xeGA1S/yia3AFHvU1RXCFgywSHqA5OlJs1PkL1D4VZ7Daivl8kcmOI7TnkqegZ Mt+XFxHVPkSLOuiJg3pyqecu/ru1ckaJfxELkNfEvv6uoEdbVhgBTaRY7esN3w== 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 4Wbr6m4dmpzLxq; Sat, 3 Aug 2024 17:58:56 +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 473HwuBV064617; Sat, 3 Aug 2024 17:58:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473HwuMn064614; Sat, 3 Aug 2024 17:58:56 GMT (envelope-from git) Date: Sat, 3 Aug 2024 17:58:56 GMT Message-Id: <202408031758.473HwuMn064614@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: 13e83b088b6d - main - databases/pecl-redis: Unbreak for php84 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 13e83b088b6d0c288a82e7acdbf41aa83b9be27c Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=13e83b088b6d0c288a82e7acdbf41aa83b9be27c commit 13e83b088b6d0c288a82e7acdbf41aa83b9be27c Author: Muhammad Moinur Rahman AuthorDate: 2024-08-03 17:54:29 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-08-03 17:55:44 +0000 databases/pecl-redis: Unbreak for php84 Approved by: portmgr (blanket) --- databases/pecl-redis/Makefile | 1 - databases/pecl-redis/files/patch-backoff.c | 20 ++++++++++++++++++++ databases/pecl-redis/files/patch-library.c | 14 ++++++++++++++ databases/pecl-redis/files/patch-redis.c | 14 +++++++++++++- 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile index 415f007e722a..57d9a2dba39e 100644 --- a/databases/pecl-redis/Makefile +++ b/databases/pecl-redis/Makefile @@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= php:build,pecl USE_PHP= session:build -IGNORE_WITH_PHP= 84 OPTIONS_DEFINE= IGBINARY IGBINARY_DESC= Build with Igbinary serializer diff --git a/databases/pecl-redis/files/patch-backoff.c b/databases/pecl-redis/files/patch-backoff.c new file mode 100644 index 000000000000..4534ef9c8013 --- /dev/null +++ b/databases/pecl-redis/files/patch-backoff.c @@ -0,0 +1,20 @@ +--- backoff.c.orig 2024-08-03 17:49:28 UTC ++++ backoff.c +@@ -1,9 +1,17 @@ + #include "common.h" + ++#if PHP_VERSION_ID <= 80300 + #include ++#else ++#include ++#endif + + #if PHP_VERSION_ID >= 70100 ++#if PHP_VERSION_ID <= 80300 + #include ++#else ++#include ++#endif + #else + static zend_long php_mt_rand_range(zend_long min, zend_long max) { + zend_long number = php_rand(); diff --git a/databases/pecl-redis/files/patch-library.c b/databases/pecl-redis/files/patch-library.c new file mode 100644 index 000000000000..df1d2d13fe76 --- /dev/null +++ b/databases/pecl-redis/files/patch-library.c @@ -0,0 +1,14 @@ +--- library.c.orig 2024-08-03 17:50:52 UTC ++++ library.c +@@ -56,7 +56,11 @@ + #include + #endif + ++#if PHP_VERSION_ID <= 80300 + #include ++#else ++#include ++#endif + #include + + #define UNSERIALIZE_NONE 0 diff --git a/databases/pecl-redis/files/patch-redis.c b/databases/pecl-redis/files/patch-redis.c index 68a2dc1488f4..3678e522cf9a 100644 --- a/databases/pecl-redis/files/patch-redis.c +++ b/databases/pecl-redis/files/patch-redis.c @@ -1,6 +1,18 @@ --- redis.c.orig 2022-02-15 18:25:22 UTC +++ redis.c -@@ -154,6 +154,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pconnect, 0, 0, 1) +@@ -27,7 +27,11 @@ + #include "redis_cluster.h" + #include "redis_commands.h" + #include "redis_sentinel.h" ++#if PHP_VERSION_ID <= 80300 + #include ++#else ++#include ++#endif + #include + #include + #include +@@ -154,6 +158,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pconnect, 0, 0, 1) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(0, timeout)