Attachment 238477 Details for Bug 268087 – security/maia Upstream code change and WEBHOST copy/symlink fix.

[patch] security/maia Upstream code change and WEBHOST copy/symlink fix.

maia-1.0.4_11_3-port.diff (text/plain), 1.41 KB, created by ek on 2022-12-01 21:16:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ek

Created: 2022-12-01 21:16:03 UTC

Size: 1.41 KB

patch

obsolete

>diff -Naur maia.orig/Makefile maia/Makefile
>--- maia.orig/Makefile	2022-12-01 14:06:19.575826000 -0700
>+++ maia/Makefile	2022-12-01 14:08:44.983583000 -0700
>@@ -1,6 +1,6 @@
> PORTNAME=	maia
> DISTVERSION=	1.0.4
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	security
> 
> MAINTAINER=	ek@purplehat.org
>@@ -315,9 +315,11 @@
> 	@${FIND} -E ${WRKSRC} -iregex '.*(gitkeep|~)$$' -delete
> 
> do-install:
>+.if ${PORT_OPTIONS:MWEBHOST}
> 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web
> 	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
> 	${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 -Naur maia.orig/files/patch-maiad maia/files/patch-maiad
>--- maia.orig/files/patch-maiad	1969-12-31 17:00:00.000000000 -0700
>+++ maia/files/patch-maiad	2022-12-01 14:07:17.671530000 -0700
>@@ -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

Flags:

ek: maintainer-approval+

Actions: View | Diff

Attachments on bug 268087: 238459 | 238476 | 238477 | 238482