From nobody Thu Dec 1 23:49:44 2022 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 4NNXqX66ssz4jjQj; Thu, 1 Dec 2022 23:49:44 +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 4NNXqX5cJ4z3vqy; Thu, 1 Dec 2022 23:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669938584; 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=RtLnslSR75PzbMMO/mKsSI8Ddd1RAYaY8M0t176+yPc=; b=amt0k6LrTb+5y/6sb0zadKFq+XlJpeT5kpjYn7hv8PuGdrETfYgnkhs/xd2et++vae1wK5 SYsMCtEEgWUTPqAHD83JlWxiM6p3YtIELM/SDnAYKurmy94mZtnfqzCOUQN9XmAvYB36gb Jt8TZCgWw13bvvRoLJz/hDurxWT7hxv8QoqF/0Qil88ejVc1rHjm9t4nJLkT5unXB+fM/S HMXP8f+6eaSUkelx8d1U972H1Q1sMwJIvs6hBvEG2UKZBEGjFQU17bMyAUCe1wpLXUnI0S ymt7QD9OVQblAGaint6hpNEr1dwX5ir8vV68z6w3stNQn0cup3q9U4Or2l30og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669938584; 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=RtLnslSR75PzbMMO/mKsSI8Ddd1RAYaY8M0t176+yPc=; b=rdS0SDh4qtFfrj16d6Km/YIJtWr+m2v8AgI/RzWnQpVNKvEWX4J+4kONCz33YqOtXKBBrb 5vbpKf6Bl+CASe22nfRICmzHHQX4UVXgYF6BWThYWE/3QyKLEPrIhOEs4nCf726lnUOQTu 9ZxvZrjpntQe0KQlVdCWwa5+NNC4dZigdSJ9Oj9ZRs92Kpwuvgys74/RgnMsrqd3atf0zP IsFc5Jh+ljpaE1zJuW+coaQZniXgpa6GINjqTQ9C4ZHepLEf7+0Tvy8wRexRhiWFPD+ND6 KbWESfH2YLf+rC/dK+Gcxbl/l6RzTELnhvnFP87W4d5QeNh3bxaULeU2zrYyIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669938584; a=rsa-sha256; cv=none; b=WUC8R5iAepfca1+FXpt07z+XJeWKePCjTyfQPDbkNpKMpbJEFSp4G0LDCD3LnvX0zVONvo BWkQRVTXzT3B3epNSt3gJqsSOcS6mib5z//k6d8ta5pwQUFVC3Lj1pqodykOJUoASoAnUV soJDLiB6W1Vry8G0aHoL/iQq1R6KQ30Wzs9F/1LBmZ/ur0GAd1coFDTGHEELcyV7aJZsKt iYSbMxlYGcUZJDk+48TMyUhgLNtmM/KLPX6VtqaGaIWceee66Md4X1iMVJDfbTF8NJBDA5 hU8/dReoebzJHsPOJ2h6OliR5gSb/kRuXV2qiEHaUVzHZW+W7V1eXIadXi+TpA== 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 4NNXqX4QYHztvp; Thu, 1 Dec 2022 23:49:44 +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 2B1NnioU074986; Thu, 1 Dec 2022 23:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1NnixT074985; Thu, 1 Dec 2022 23:49:44 GMT (envelope-from git) Date: Thu, 1 Dec 2022 23:49:44 GMT Message-Id: <202212012349.2B1NnixT074985@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 8aa12b7bb4ba - main - security/maia: Update to patch upstream code for UTF-8 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aa12b7bb4ba0282b310958b9897d95bc1c3e5db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=8aa12b7bb4ba0282b310958b9897d95bc1c3e5db commit 8aa12b7bb4ba0282b310958b9897d95bc1c3e5db Author: EK AuthorDate: 2022-12-01 23:44:43 +0000 Commit: Nuno Teixeira CommitDate: 2022-12-01 23:49:08 +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) --- 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 996471ae9fe5..611c4fed77e6 100644 --- a/security/maia/Makefile +++ b/security/maia/Makefile @@ -1,6 +1,6 @@ PORTNAME= maia DISTVERSION= 1.0.4 -PORTREVISION= 10 +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