From nobody Thu Sep 05 06:20:29 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 4Wzq3d6bDBz5VHtZ; Thu, 05 Sep 2024 06:20:29 +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 4Wzq3d2f4Sz42cp; Thu, 5 Sep 2024 06:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725517229; 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=iNWHR8Y1GvLdczsWZhvT9fGdqi2bm9Ou6vGNURrtGyE=; b=NIIyZ8fR7beGj3lTQi9HuNsd7SxAM6IIsmGUZCG8F5GLdd8Mn7ZDVAr/Q8W5tV5MbPxGmt 5+udLjQBmOLzygDtBHKbOp1fIl8xwxKipZVIb3ujsCrWrY8mosMPRSkYk8lCvjZZsZ1Yjv EsifaOMhJTYNve+kOmoKmocGaRdthRC/K6+yXPYvxPMdwIcjr6EybYoRyBkQwGKxH7AjsU q+ukNOcxXeNYj3NEzAWxKCJ7KN7Hh/9FJoms760hDSyWEBi1dxxabs/+6ka6vpcKUy5JJQ QWHj5L+1IL8awQN+pVECk1RjpBz2n+LUvfDtFi8nNYYxjhUvfQa8mYGkrAGYCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725517229; a=rsa-sha256; cv=none; b=EHOpax9Sa+Fu394yNjWnVeXA23oeNML7m02ABNSrv4wRiiCh6hAQ1toI4cjrbBDviG0LSh XvWTeMyeft1v5g4okzy8rttesxhRxTQVgrushgoqS7Z2+ySmQ0m/k1SpDrJBK+sTRXX4G5 HoMq0qc/Rpo+HQhMcUOX59Y4qBJg9XqPT9UKZ/T7mXSbVJxAv30GE1Oc8LursjDNmoB3nD zDqqfNQa1c0sqAl8YrRySQ49rqyqF5tvR83YTnwD13o1sXv28El+RWWQtsXj7RFvqFIGvL Ft9D7nUpTC7IH/hueEIKFIrIlZgwFN1vLacRl3muKP/0xgcuJynnWb4ezbp7xA== 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=1725517229; 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=iNWHR8Y1GvLdczsWZhvT9fGdqi2bm9Ou6vGNURrtGyE=; b=lEYzIYsMzAbv2b/S6KC8oyUVQZ7G1Qf8dh1R6M31JAVkJkZ8Ug0eqRaX38GWCYjBkMZiGa UOf+o4v5TdCjxItR9oWZ2QkdVKkBblxWVRHNjokXjxK2V25bi92FDbEyDLRXUJboawXDrL IW13VZWOmRwGDMPEoYRUm9XafGgL6yPvb1iz6uW9E1jdUM8+aYhXwg59u0m3rISEmWppbt d0IWvtl2Vo6cLfGR5W0cCuHKvdqW/u+4tvhc6H5asYwmhum8+FTxyGrhYX1QXWVbV2ARQe DO0siVkZXZsULvi86+axJIxtVzX75tF45yVSDu5uV2sf1lfyoKAwvogRkaf/8A== 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 4Wzq3d2C6jzwws; Thu, 5 Sep 2024 06:20:29 +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 4856KTNu002429; Thu, 5 Sep 2024 06:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4856KTkD002426; Thu, 5 Sep 2024 06:20:29 GMT (envelope-from git) Date: Thu, 5 Sep 2024 06:20:29 GMT Message-Id: <202409050620.4856KTkD002426@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: 8ea18beb7250 - main - net/pecl-radius: Fix build with php84 (8.4.0beta4+) 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: 8ea18beb725038e8eabd7fbdd73aed7c34ffbfd5 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ea18beb725038e8eabd7fbdd73aed7c34ffbfd5 commit 8ea18beb725038e8eabd7fbdd73aed7c34ffbfd5 Author: Po-Chuan Hsieh AuthorDate: 2024-09-05 05:25:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-05 06:17:53 +0000 net/pecl-radius: Fix build with php84 (8.4.0beta4+) Reference: https://github.com/php/php-src/commit/8cf8751533aa37479f8f2e229e407e9bf6025237 https://github.com/php/php-src/commit/3e05c86c35e23d97a29f3f1ba0070df73fdf914f https://pkg-status.freebsd.org/beefy16/data/133amd64-default/94b089c7ad30/logs/php84-pecl-radius-1.4.0b1_2.log https://pkg-status.freebsd.org/beefy22/data/140amd64-default/94b089c7ad30/logs/php84-pecl-radius-1.4.0b1_2.log https://pkg-status.freebsd.org/beefy18/data/main-amd64-default/p94b089c7ad30_sb162fc3f309/logs/php84-pecl-radius-1.4.0b1_2.log --- net/pecl-radius/files/patch-php84 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/net/pecl-radius/files/patch-php84 b/net/pecl-radius/files/patch-php84 index c9aaa61bc046..4fcd64570cbd 100644 --- a/net/pecl-radius/files/patch-php84 +++ b/net/pecl-radius/files/patch-php84 @@ -1,3 +1,41 @@ +--- radlib.c.orig 2016-02-15 15:11:50 UTC ++++ radlib.c +@@ -582,7 +582,7 @@ rad_create_request(struct rad_handle *h, int code) + /* Create a random authenticator */ + for (i = 0; i < LEN_AUTH; i += 2) { + long r; +- r = php_rand(); ++ r = (zend_long) php_mt_rand(); + h->request[POS_AUTH+i] = (unsigned char) r; + h->request[POS_AUTH+i+1] = (unsigned char) (r >> 8); + } +@@ -753,7 +753,7 @@ rad_auth_open(void) + php_srand(time(NULL) * getpid() * (unsigned long) (php_combined_lcg(TSRMLS_C) * 10000.0) TSRMLS_CC); + h->fd = -1; + h->num_servers = 0; +- h->ident = php_rand(); ++ h->ident = (zend_long) php_mt_rand(); + h->errmsg[0] = '\0'; + memset(h->request, 0, sizeof h->request); + h->req_len = 0; +@@ -1239,7 +1239,7 @@ int rad_salt_value(struct rad_handle *h, const char *i + const char *in_pos; + MD5_CTX md5; + char *out_pos; +- php_uint32 random; ++ uint32_t random; + size_t salted_len; + const char *secret; + TSRMLS_FETCH(); +@@ -1289,7 +1289,7 @@ int rad_salt_value(struct rad_handle *h, const char *i + } + + /* Generate a random number to use as the salt. */ +- random = php_rand(); ++ random = (zend_long) php_mt_rand(); + + /* The RFC requires that the high bit of the salt be 1. Otherwise, + * let's set up the header. */ --- radlib_compat.h.orig 2016-02-15 15:11:50 UTC +++ radlib_compat.h @@ -39,7 +39,11 @@ any other GPL-like (LGPL, GPL2) License.