From nobody Fri Mar 08 06:52:57 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 4TrcLd5Ps4z5D1n9; Fri, 8 Mar 2024 06:52:57 +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 4TrcLd37jRz4jJl; Fri, 8 Mar 2024 06:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709880777; 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=ObLGOLPNvs+l0jd+nmsMdIIeOmHhzOHMH95jWPuWXsY=; b=SYM+ZZ/kpAQ93Mm4hLIwe4nY3qGJITtSjYwd1M4LrSGSNr4Ase8h3bPrdAfY3r544lYKuD ndnApVDTjJrM4f+1To4cO4JrDlMjeJyQpevw6WzRw0bcKu+FeF4IKa410BP4iNP2oGVutQ hAdsUS8r4JfTMYhcGMOUrxOdJTqqTcCFE7xGNuF+rLa5Bd88LknPzUliEFvt/+UyA0OXkq c/i6gW8xPCCGRs4TKoljHgJ3y4AS84UhBrNZCQAh5c4bkEzAaphPWd4UfmkWRj1ehM28X5 vETJfdhMnkaEb59CGWyQ/c/UKPV9ISbG5F0S19807QTze4H6V05KKXvmQ3gMbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709880777; a=rsa-sha256; cv=none; b=qOZ6rZ18uIepD0PE56InBr78L2So9ZhcZYnKdysoqn3ilpENCXzUgj9qAqSd9Y7lS8SCUi 5n2vK5PZVkT8b5HB3CpMPwOSPnU4uhGI/60OsKNv1ii4zxK0CHL709XBNGCnr7IIfEdW+I eHspnpT6AuF4NmekF0gVFekBV4KG2nQ0Jwt5FsbL9BFBQSMv/xyKLRMXGqmWHIQrgxUmOv 1coBb4YPQ643xoFgHqYKNEWSZArSDOBRlm4IXy3EeAIt5mPq6vaDVNrDnm0GtzLEyQ7wJT ctRXZEOneYUyuiQhqaHMUow4WkkHNaVuaW0KbQDAHfVy3vmhgt1WWr5Kq43hag== 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=1709880777; 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=ObLGOLPNvs+l0jd+nmsMdIIeOmHhzOHMH95jWPuWXsY=; b=woteu35jWpvWWbLucDT3ARDIU8oTGijq8KfWudM+5R/BPGrdNbMHJu8oYcfs7eqoosXFIQ e2p7NOP4HxW8z8Kbey07VMdyW4wOzfiOXhxAW99ybSur76VWRK4upaik38JYNtMo+C7g82 OeP63lnvxylCChsXsa8Gu75/YMUn4hgoUMyN+uuAMfGI5LPUlP0oceRxU32D+V+Y+wgF9G keTA7ZsVkinLbcH/p8WhQNpeKXtJlzFdB/C2ob687o1RM2nBRH2/nbru4ScK9f6OCr2vml AklcVIzQtJOTTk93Ok26dxRYvrTlu1ECd7sVKS2Arrxi5cdGQAUrXZssa3Cx8w== 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 4TrcLd2l7pz17KX; Fri, 8 Mar 2024 06:52:57 +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 4286qvpa024620; Fri, 8 Mar 2024 06:52:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4286qv2X024617; Fri, 8 Mar 2024 06:52:57 GMT (envelope-from git) Date: Fri, 8 Mar 2024 06:52:57 GMT Message-Id: <202403080652.4286qv2X024617@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 396010cb585a - main - mail/snappymail: Fix error while accessing admin page 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 396010cb585aaaf9e3f87038f06760dece7e1fd7 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=396010cb585aaaf9e3f87038f06760dece7e1fd7 commit 396010cb585aaaf9e3f87038f06760dece7e1fd7 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2024-03-08 05:16:19 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-03-08 06:51:21 +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 --- 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(); + } + }