Attachment #238482 for bug #268087

Lines 1-6 Link Here

(-)maia/Makefile (-1 / +3 lines)
1	PORTNAME= maia	1	PORTNAME= maia
2	DISTVERSION= 1.0.4	2	DISTVERSION= 1.0.4
3	PORTREVISION= 10	3	PORTREVISION= 11
4	CATEGORIES= security	4	CATEGORIES= security
5		5
6	MAINTAINER= ek@purplehat.org	6	MAINTAINER= ek@purplehat.org
Lines 317-323 Link Here
317	do-install:	317	do-install:
318	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web	318	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web
319	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}	319	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
		320	.if ${PORT_OPTIONS:MWEBHOST}
320	${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty	321	${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty
		322	.endif
321	${MKDIR} ${STAGEDIR}${DATADIR}	323	${MKDIR} ${STAGEDIR}${DATADIR}
322	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts	324	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
323	${MKDIR} ${STAGEDIR}${ETCDIR}/templates	325	${MKDIR} ${STAGEDIR}${ETCDIR}/templates




--- 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

Lines 72-78 Link Here

(-)maia/pkg-plist (-1 / +1 lines)
72	%%WWWDIR%%/images/view-raw.png	72	%%WWWDIR%%/images/view-raw.png
73	%%WWWDIR%%/images/white-black-list.png	73	%%WWWDIR%%/images/white-black-list.png
74	%%WWWDIR%%/index.php	74	%%WWWDIR%%/index.php
75	%%WWWDIR%%/libs/Smarty	75	%%WEBHOST%%%%WWWDIR%%/libs/Smarty
76	%%WWWDIR%%/libs/jquery/images/arrowdown.gif	76	%%WWWDIR%%/libs/jquery/images/arrowdown.gif
77	%%WWWDIR%%/libs/jquery/images/arrowleft.gif	77	%%WWWDIR%%/libs/jquery/images/arrowleft.gif
78	%%WWWDIR%%/libs/jquery/images/arrowright.gif	78	%%WWWDIR%%/libs/jquery/images/arrowright.gif

Return to bug 268087

Line 0 Link Here

(-)maia/files/patch-maiad (+12 lines)
	1	--- maiad.orig 2022-12-01 19:36:50 UTC
	2	+++ maiad
	3	@@ -3833,9 +3833,6 @@ sub maia_store_mail($$$$$@) {
	4	$subject = substr($subject, 0, 255) if length($subject) > 255;
	5	$subject = untaint($subject);
	6	$sender = substr($sender, 0, 255) if length($sender) > 255;
	7	- if ($document_charset ne "") {
	8	- from_to($contents, $document_charset, 'UTF-8');
	9	- }
	10
	11	if (!$oversized) {
	12	if ($dbtype =~ /^mysql$/si) { # MySQL