FreeBSD Bugzilla – Attachment 238482 Details for
Bug 268087
security/maia: Update to patch upstream code for UTF-8 and other local patch cleanup.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
security/maia Upstream code change and WEBHOST Smarty symlink fix.
maia-1.0.4_11_4-port.diff (text/plain), 1.81 KB, created by
ek
on 2022-12-01 23:14:13 UTC
(
hide
)
Description:
security/maia Upstream code change and WEBHOST Smarty symlink fix.
Filename:
MIME Type:
Creator:
ek
Created:
2022-12-01 23:14:13 UTC
Size:
1.81 KB
patch
obsolete
>diff -Naur maia.orig/Makefile maia/Makefile >--- maia.orig/Makefile 2022-12-01 15:20:59.894662000 -0700 >+++ maia/Makefile 2022-12-01 16:06:32.002646000 -0700 >@@ -1,6 +1,6 @@ > PORTNAME= maia > DISTVERSION= 1.0.4 >-PORTREVISION= 10 >+PORTREVISION= 11 > CATEGORIES= security > > MAINTAINER= ek@purplehat.org >@@ -317,7 +317,9 @@ > 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 -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 15:21:25.913092000 -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 >diff -Naur maia.orig/pkg-plist maia/pkg-plist >--- maia.orig/pkg-plist 2022-04-25 11:25:49.940212000 -0600 >+++ maia/pkg-plist 2022-12-01 16:06:12.126675000 -0700 >@@ -72,7 +72,7 @@ > %%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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 268087
:
238459
|
238476
|
238477
| 238482