From nobody Fri Mar 08 06:54:59 2024 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 4TrcNz4pLlz5D1r0; Fri, 8 Mar 2024 06:54:59 +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 4TrcNz2Wn0z4jmh; Fri, 8 Mar 2024 06:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709880899; 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=51qYvq9DgzU7J0Vq0M8l3c1vjMWC4tzNb19j313BnSw=; b=nQVsF8AzSInyQj/1p1BRlIyEi7vi1zM0jgpFNn3NgE2cp0y/EVjli5Z2Q3d5zzO30Dv3gX R1a6XT6H3+iY29psMJevCdfYUXQzULUH7NF1jDMNWKK4KDTLH8fRcrEKwUt6kivscquGti Oyk0j3OCJZX9363m1mT5APuzDervbcSntu8Wm33Vb3LMYUWNlC1CbfYBH/4tf8pGZWbmNX DVrYpyT4dK3rBeEo2cTrnWsRZCIfUqOCPOvsPLT6Gk+BdfHAUVt0/vrMEajZeJFxGuX91n lT3K5taHhRxeZ66k1BTUclBQNXyjQ4qB07mmy+fTRSq+ZlI/0QagPi5GLeZv2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709880899; a=rsa-sha256; cv=none; b=LxhLkpYemE8oFibOrEMgdPu5p4QEeH10euw+/MeOLwCt/Ph66B6lFGNbnnImWciHY/L1zF 1GKIVLtaYE/YeMiTY9cVyafpNnE7rDvIAtMp6pazMeGGXVJ2alMejTK2sU5gZxxwU4AV4Y Vyttf4jZhDvjq5EDBUWvWtkkWI7zexWLgAnF28A4qbmJpGUPO1z7aUN2stIligVQrfr+wu ACGsh0otSLS+QzzQ8pWXdkpqkLd9tbwGM21KKXp/TeJI4cxJk2JYv/xSDrF6QxJ9yw7hUr vTS1e5i9nqGNSvt0T2Xd9XITvWG3pwzMG2COvEp2Iw0VgGcytB92DnmVYaRHfA== 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=1709880899; 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=51qYvq9DgzU7J0Vq0M8l3c1vjMWC4tzNb19j313BnSw=; b=oL0hsEFNYEiZvCXVyGpCSkzgZdvk8nMqiUjY+HgqD58CJMROsU9OlK5zDpQ22U51DMtMIL jiyk8XwVwvdt/KFBP/ZqsB0VNFUKn35abm6RWsVPeifXtt1FtBXiUBU/fYDDHgdGZv9gIg fxWUa3gvkVvY1jdsPc+iQkdGVKcIjb1GUdTpmap+7VfKkHJjjTcLMXWZ0r+x6htgdlrWXu EqsY5enCGRXvgDk1jBloLtdy/nG/iLPU29RtIuAsfGPBr76Q6PwwI/bgk7bT1D4aUGJwSY myMw3ZoCW23iC84XTsJAWHy7Jg0Z9Kq6DU9l8kTAyE/9cfFR+6vuZRNhDYHkcQ== 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 4TrcNz1sVPz17Lx; Fri, 8 Mar 2024 06:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4286sxLh025178; Fri, 8 Mar 2024 06:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4286sxrT025175; Fri, 8 Mar 2024 06:54:59 GMT (envelope-from git) Date: Fri, 8 Mar 2024 06:54:59 GMT Message-Id: <202403080654.4286sxrT025175@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: f39e1ce64c05 - 2024Q1 - mail/snappymail: Fix error while accessing admin page 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: f39e1ce64c059afb686d4cd8fd4e76e1799345db Auto-Submitted: auto-generated The branch 2024Q1 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f39e1ce64c059afb686d4cd8fd4e76e1799345db commit f39e1ce64c059afb686d4cd8fd4e76e1799345db Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2024-03-08 05:16:19 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-03-08 06:54:16 +0000 mail/snappymail: Fix error while accessing admin page On a fresh installation, the admin page returns a 500 error, indicating a web server error. The logs reveal what the problem is, which is already fixed in upstream [1], but until a new version of snappymail is released, the user will see the following error: ``` RainLoop\Config\Application::SetPassword(): Argument #1 ($oPassword) must be of type SnappyMail\SensitiveString, string given, called in /usr/local/www/snappymail/snapp ymail/v/2.35.2/app/libraries/RainLoop/Actions.php on line 672 ``` Reference: https://github.com/the-djmaze/snappymail/issues/1472 [1] PR: 277571 MFH: 2024Q1 (cherry picked from commit 396010cb585aaaf9e3f87038f06760dece7e1fd7) --- mail/snappymail/Makefile | 2 +- ...tch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mail/snappymail/Makefile b/mail/snappymail/Makefile index 65ecf3ed20e7..c202afa3fb46 100644 --- a/mail/snappymail/Makefile +++ b/mail/snappymail/Makefile @@ -1,6 +1,6 @@ PORTNAME= snappymail DISTVERSION= 2.35.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www MASTER_SITES= https://github.com/the-djmaze/snappymail/releases/download/v${DISTVERSION}/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php b/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php new file mode 100644 index 000000000000..861cd117553e --- /dev/null +++ b/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php @@ -0,0 +1,11 @@ +--- snappymail/v/2.35.2/app/libraries/RainLoop/Actions.php.orig 2024-03-08 05:14:45 UTC ++++ snappymail/v/2.35.2/app/libraries/RainLoop/Actions.php +@@ -668,7 +668,7 @@ class Actions + $sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12); + Utils::saveFile($passfile, $sPassword . "\n"); + // \chmod($passfile, 0600); +- $oConfig->SetPassword($sPassword); ++ $oConfig->SetPassword(new \SnappyMail\SensitiveString($sPassword)); + $oConfig->Save(); + } + }