From nobody Thu Dec 1 23:58:20 2022 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 4NNY1T2GPlz4jk9Y; Thu, 1 Dec 2022 23:58:21 +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 4NNY1T1hW9z3wXY; Thu, 1 Dec 2022 23:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669939101; 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=WpoExsU9HnnrZT8OI7f+ygp50ZfUAkdC/P9QzCBhzA4=; b=azQrj71QMMyIm9VU3xhGxAJMk1bMsC9UudW9PLYVFVYbl4HqWz1qXBsAEaXwrs+bOrhkVI 2e/P/XfGY7W6CZ2fWxezy+kM4AcaBxyKE524LZTkV5BDqytivuRXrWgfnoQc2uzWUZVkD3 Awlw8sdS2Q3pOWEecMffEp9lDMt6jKpduTr22AQKjIwXlxVHPUKy+VlnlSp7hutGocDlW4 QBHjHI9ssuh2iX7Z2bTRCS3h9U4AW7gaCx41p2LBanFtsfT0k+hI3Xv4v5oW4mO8uFHrUY yng7De9IvO7A7RswnlbTrvGCsw9UTaKrBYD/KSyf6pF/sDzJQpAfNesU4xeYwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669939101; 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=WpoExsU9HnnrZT8OI7f+ygp50ZfUAkdC/P9QzCBhzA4=; b=S1uGsJCBjvVUzptAbRbL/VZr6jQprqVtoDRYyZo8gG6KAZbaAIPLLAZ8pPOOB1krcYinv1 A2d4So0TOtLG8U82zTvmsZAc7aVDuESZLmtSpyzz1URvX3IK5oJ1LABJVsf6PK9YbGr1v5 yIBUN8q09ng0O/jAlJHctBBnl/JXrqLgf5bgf3JZ3d6vEDcYblI/7pomyCav4iQZBKLFRZ I8Wy897GHiP7wYPyqALGGh+1CL4NuB9Pf/yv/UlfV3G5WzXOgxCkitay9bMOmf4jBXqcRO rgk6NkAOFutaVKfLX9vfVD3htrfGCopFilhYSP78DKh9g/Qh0Pfq4/y3QpRzRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669939101; a=rsa-sha256; cv=none; b=Gh/oLd1KrQJQgET/c1PDFSv6zdkRQ1gGbS4Z1K4y7ZPJOjJATIrE/s9xMlEwF5Gotd5Wa2 cshaeRC6rGpiMyvrYw1OdJjlqyS88FQ1m69mt1fsNyEc2Y+nvQZi0QLNxxGGEq/8eJsOf8 hqe+zTx9CrPaozmsT6HKYxK2PLhT7x1tSBqvkFKbKDgk6w3+OkOh2ZUroh2wfZ58+If/yp Q7P8P74tpve+3v2LJMcfqQMRfn586CZl/XgZv46DxPM/wesw+vu1On+hQmD+HUvrn1f70W tdC6K8CEfHcA9RQbVFj95RekSf2vRVokc/Z/J5r6iHzb5DrKDgA3bbyCnhz55w== 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 4NNY1T0V1Czw99; Thu, 1 Dec 2022 23:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B1NwKkh088713; Thu, 1 Dec 2022 23:58:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1NwK5H088712; Thu, 1 Dec 2022 23:58:20 GMT (envelope-from git) Date: Thu, 1 Dec 2022 23:58:20 GMT Message-Id: <202212012358.2B1NwK5H088712@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 5c49b434dbdb - 2022Q4 - security/maia: Update to patch upstream code for UTF-8 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 5c49b434dbdbf0e5546334f7f806e499f8c33195 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c49b434dbdbf0e5546334f7f806e499f8c33195 commit 5c49b434dbdbf0e5546334f7f806e499f8c33195 Author: EK AuthorDate: 2022-12-01 23:44:43 +0000 Commit: Nuno Teixeira CommitDate: 2022-12-01 23:52:44 +0000 security/maia: Update to patch upstream code for UTF-8 - This update includes a patch to fix upstream code that breaks UTF-8 identification and/or conversion. - Fix WEBHOST option symlink. PR: 268087 MFH: 2022Q4 (bug fixes) (cherry picked from commit 8aa12b7bb4ba0282b310958b9897d95bc1c3e5db) --- security/maia/Makefile | 4 +++- security/maia/files/patch-maiad | 12 ++++++++++++ security/maia/pkg-plist | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/security/maia/Makefile b/security/maia/Makefile index 3e109079405a..611c4fed77e6 100644 --- a/security/maia/Makefile +++ b/security/maia/Makefile @@ -1,6 +1,6 @@ PORTNAME= maia DISTVERSION= 1.0.4 -PORTREVISION= 9 +PORTREVISION= 11 CATEGORIES= security MAINTAINER= ek@purplehat.org @@ -317,7 +317,9 @@ post-patch: do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web @cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} +.if ${PORT_OPTIONS:MWEBHOST} ${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty +.endif ${MKDIR} ${STAGEDIR}${DATADIR} @cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts ${MKDIR} ${STAGEDIR}${ETCDIR}/templates diff --git a/security/maia/files/patch-maiad b/security/maia/files/patch-maiad new file mode 100644 index 000000000000..7c31a2b346e1 --- /dev/null +++ b/security/maia/files/patch-maiad @@ -0,0 +1,12 @@ +--- maiad.orig 2022-12-01 19:36:50 UTC ++++ maiad +@@ -3833,9 +3833,6 @@ sub maia_store_mail($$$$$@) { + $subject = substr($subject, 0, 255) if length($subject) > 255; + $subject = untaint($subject); + $sender = substr($sender, 0, 255) if length($sender) > 255; +- if ($document_charset ne "") { +- from_to($contents, $document_charset, 'UTF-8'); +- } + + if (!$oversized) { + if ($dbtype =~ /^mysql$/si) { # MySQL diff --git a/security/maia/pkg-plist b/security/maia/pkg-plist index f82341a228c9..a349917f4709 100644 --- a/security/maia/pkg-plist +++ b/security/maia/pkg-plist @@ -72,7 +72,7 @@ sbin/maiad %%WWWDIR%%/images/view-raw.png %%WWWDIR%%/images/white-black-list.png %%WWWDIR%%/index.php -%%WWWDIR%%/libs/Smarty +%%WEBHOST%%%%WWWDIR%%/libs/Smarty %%WWWDIR%%/libs/jquery/images/arrowdown.gif %%WWWDIR%%/libs/jquery/images/arrowleft.gif %%WWWDIR%%/libs/jquery/images/arrowright.gif