From nobody Mon Feb 03 18:33:32 2025 X-Original-To: dev-commits-ports-branches@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 4Ymw9m32sRz5mLB9; Mon, 03 Feb 2025 18:33:32 +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 4Ymw9m2Wldz3dKf; Mon, 03 Feb 2025 18:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738607612; 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=DFBBsEKCDufroAhM92dCFxFjTGYJPo/RDqM0FEbVMPw=; b=WRLudmHBJNINkPKzyAsWiJ0eAJa4z0aMijNrvdTZDxBL0+G/5YpIPCHhek2zNng/3Z51ea bgYK0DlCOj5i/4YweinlgQS4dcufghrIo8i8Pw8du262b0vO7NthJ0uGluHvFnwCDBFRPi Xm16+FsbdKjfRcarWzvm7Y7FfyA4Zw38p1YQE9zGFJ5ie/2D6si6CaS3ZwsvqQIfEhe7ny YuOqBqNKfhhnNYLNiIGVI+rkJ3/FTIGcpSnlBW0GVzH+ek6p4MeBv0nVw+LKbPWZ/Bv2zU oycqKvgUVZrKSbvYz8Af4aDT2gC2MmpRntsSpeFn/dFdBKRrLhPs/vF2loOpVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738607612; 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=DFBBsEKCDufroAhM92dCFxFjTGYJPo/RDqM0FEbVMPw=; b=uVzyTu/uw7cqU2o83wxexn34OBcG70GwmBUEmOTCkGGUp+MUbNMRw+wkb/AiHVUyk8kDae 41Ad2rs/a1NJo3D0C82qTiYZ+A0eJD5e8k0ktIqepasajuZrXWY0kdgXYukQ/t0YpKGxfh tURnwrIzdo2ULsjoxDY3MxD5UXlHJzqMfW/VsJfDUsPsTAGQrGbupLyXeBiR8WO80wQngF aeByZqdG/77ITSzBV1tswtafWAtKtggLDrqbeb9MBDoRP1FcWVvchomCkNt/Ai9IieCzli qQBCAqnGDjK/LVJ22yXbhWq5pn9wz1iZplpE3WupUyFTRJTCKo/cgVPakDaEMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738607612; a=rsa-sha256; cv=none; b=ZBMy7dShLlX/SDgHEPmvMtjMtQmvmuQx65biDbv6PlX4ylE27lwygnDXrrdJazXl/Ny3BX KEdd8ySlJr57PW0/A9/5xrO+jQAWDOVvTknerjmKF9UEHVFavt4gjMG+SBJr9Rhs7v8zXt klT9jpeIFBRO9bietERidgejbidV89aplK5cZLAxzNzZS6UIJiYjwu2K2Vq8LB6U5xPcSD /fXDbDUuBOn9k0mQv8YdKPviItNULGNPbX5d7Agc5uREak/Y5otfe0fNM2lwYvRO/RlWM1 83LvAJLEUYT11UIBVplS77lq6aLyFd90BKu4Ckl3gr11ItFk0d14tOI6KogoVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ymw9m2391znbc; Mon, 03 Feb 2025 18:33:32 +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 513IXWFt040213; Mon, 3 Feb 2025 18:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513IXWjU040210; Mon, 3 Feb 2025 18:33:32 GMT (envelope-from git) Date: Mon, 3 Feb 2025 18:33:32 GMT Message-Id: <202502031833.513IXWjU040210@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 515051c82ccb - 2025Q1 - security/mailzu: Fix support php83 and minor patches List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 515051c82ccbc69fa40b35797d2bc6eefa6932a8 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=515051c82ccbc69fa40b35797d2bc6eefa6932a8 commit 515051c82ccbc69fa40b35797d2bc6eefa6932a8 Author: Krzysztof AuthorDate: 2025-02-03 18:22:24 +0000 Commit: Vladimir Druzenko CommitDate: 2025-02-03 18:32:02 +0000 security/mailzu: Fix support php83 and minor patches PR: 284535 MFH: 2025Q1 (cherry picked from commit af1aff8f87166d72ddefcbbcbc8c464573d7a291) --- security/mailzu/Makefile | 3 +-- security/mailzu/files/patch-messagesPendingAdmin.php | 11 +++++++++++ .../mailzu/files/patch-templates_viewmail.template.php | 16 +++++++++++++--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile index c80c527092e2..7a2c9271de78 100644 --- a/security/mailzu/Makefile +++ b/security/mailzu/Makefile @@ -1,6 +1,6 @@ PORTNAME= mailzu DISTVERSION= 0.8rc3 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3 PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -21,7 +21,6 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/amavisd:security/amavisd-new \ USES= php:flavors,web USE_PHP= sockets -IGNORE_WITH_PHP= 83 NO_ARCH= yes NO_BUILD= yes diff --git a/security/mailzu/files/patch-messagesPendingAdmin.php b/security/mailzu/files/patch-messagesPendingAdmin.php new file mode 100644 index 000000000000..c17e1fbe9d12 --- /dev/null +++ b/security/mailzu/files/patch-messagesPendingAdmin.php @@ -0,0 +1,11 @@ +--- messagesPendingAdmin.php.orig 2007-06-14 19:00:15 UTC ++++ messagesPendingAdmin.php +@@ -36,6 +36,8 @@ $_SESSION['sessionNav'] = "Site Pending Requests"; + // Get current page number + $requestedPage = CmnFns::getGlobalVar('page', GET); + ++global $content_type; ++ + $db = new DBEngine(); + + $t = new Template(translate('Site Quarantine')); diff --git a/security/mailzu/files/patch-templates_viewmail.template.php b/security/mailzu/files/patch-templates_viewmail.template.php index 64f4c1e50b21..612560763fdc 100644 --- a/security/mailzu/files/patch-templates_viewmail.template.php +++ b/security/mailzu/files/patch-templates_viewmail.template.php @@ -27,7 +27,17 @@ } /** -@@ -81,7 +81,9 @@ function MsgPrintHeader($struct,$hdr_list) { +@@ -50,7 +50,8 @@ function endMessage() { + * $param The mime structure object and the specific header name + */ + function MsgPrintHeader($struct,$hdr_list) { +- ++ global $header_value; ++ + foreach ($hdr_list as $hdr) { + $header_value = $struct->headers[strtolower($hdr)]; + if (is_array($header_value)) { +@@ -81,7 +82,9 @@ function MsgPrintHeader($struct,$hdr_list) { function MsgPrintHeaderFull($struct,$hdr_list) { foreach ($hdr_list as $hdr) { @@ -38,7 +48,7 @@ if (!$header_value) continue; if (is_array($header_value)) { $value_array = $header_value; -@@ -116,17 +118,17 @@ function MsgDisplayOptions($mail_id, $recip_email) { +@@ -116,17 +119,17 @@ function MsgDisplayOptions($mail_id, $recip_email) {
@@ -60,7 +70,7 @@ } /** -@@ -138,14 +140,14 @@ function MsgOriginalOptions() { +@@ -138,14 +141,14 @@ function MsgOriginalOptions() {