- update to 2.53

4 files changed, 7 insertions, 44 deletions

diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile
index e0534ce5026c..e4ab2e6a051e 100644
--- a/mail/openwebmail/Makefile
+++ b/mail/openwebmail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openwebmail
-PORTVERSION=	2.52
-PORTREVISION=	3
+PORTVERSION=	2.53
 CATEGORIES=	mail
 MASTER_SITES=	http://openwebmail.acatysmoof.com/download/%SUBDIR%/ \
 		http://openwebmail.org/openwebmail/download/%SUBDIR%/
@@ -179,6 +178,7 @@ pre-install:
 .if !exists(${PLIST})
 	@${ECHO} "@unexec if cmp -s %D/www/cgi-bin/openwebmail/etc/openwebmail.conf %D/www/cgi-bin/openwebmail/etc/openwebmail.conf-dist; then ${RM} -f %D/www/cgi-bin/openwebmail/etc/openwebmail.conf; fi" > ${PLIST}
 	@${FIND} ${WRKSRC}/*/openwebmail -type f -o -type l | \
+		${GREP} -v UTF-8 | \
 		${SED} -e 's,${WRKSRC},www,g' | ${SORT} -u >> ${PLIST}
 	@${ECHO} "www/cgi-bin/openwebmail/etc/dbm.conf" >> ${PLIST}
 .for f in b2g g2b lunar
@@ -190,7 +190,9 @@ pre-install:
 		-e 's,openwebmail/openwebmail,openwebmail/.openwebmail,g' \
 		>> ${PLIST}
 .endif
+	@${ECHO_CMD} "@unexec ${FIND} %D/www/*/openwebmail -name "*.UTF-8" | ${XARGS} ${RM} -fr" >> ${PLIST}
 	@${FIND} ${WRKSRC}/*/openwebmail -type d | ${SORT} -ur | \
+		${GREP} -v UTF-8 | \
 		${SED} -e 's,${WRKSRC},@dirrm www,g' >> ${PLIST}
 	@${ECHO_CMD} "@dirrmtry www/cgi-bin" >> ${PLIST}
 	@${ECHO_CMD} "@dirrmtry www/data" >> ${PLIST}
diff --git a/mail/openwebmail/distinfo b/mail/openwebmail/distinfo
index b6aa7a4208b6..a891e357204f 100644
--- a/mail/openwebmail/distinfo
+++ b/mail/openwebmail/distinfo
@@ -1,3 +1,3 @@
-MD5 (openwebmail-2.52.tar.gz) = 2d9897680dc5e607b2a1c06ca87d67f4
-SHA256 (openwebmail-2.52.tar.gz) = 28411bd6354fef0883972c2a682f9c48c1bc4619e5a9508ecf9fa1232ef583a6
-SIZE (openwebmail-2.52.tar.gz) = 7705209
+MD5 (openwebmail-2.53.tar.gz) = a7b6c55c5a9a437d003fbb6c74b0c468
+SHA256 (openwebmail-2.53.tar.gz) = d1c133ea0ef65c95e30217db5274104022df0b3877c6291ef23f09654b2fdca7
+SIZE (openwebmail-2.53.tar.gz) = 8887260
diff --git a/mail/openwebmail/files/patch-CVE-2006-3233 b/mail/openwebmail/files/patch-CVE-2006-3233
deleted file mode 100644
index 9773ce24004c..000000000000
--- a/mail/openwebmail/files/patch-CVE-2006-3233
+++ /dev/null
@@ -1,29 +0,0 @@
---- openwebmail-read.pl.orig	Sun May  1 20:00:00 2005
-+++ openwebmail-read.pl	Thu Sep 28 16:36:55 2006
-@@ -755,7 +755,8 @@
-       $temphtml .= "<BR>\n";
- 
-       my ($ename, $eaddr)=ow::tool::email2nameaddr($message{from});
--      $temphtml .= qq|<B>$lang_text{'from'}:</B> <a href="http://www.google.com/search?q=$eaddr" title="google $lang_text{'search'}..." target="_blank">$from</a>&nbsp; \n|;
-+      my $jseaddr = $eaddr; $jseaddr=~ s/'/\\'/g; # escape ' with \'
-+      $temphtml .= qq|<B>$lang_text{'from'}:</B> <a href="http://www.google.com/search?q=|.ow::tool::escapeURL($eaddr).qq|" title="google $lang_text{'search'}..." target="_blank">$from</a>&nbsp; \n|;
-       if ($printfriendly ne "yes") {
-          if ($config{'enable_addressbook'}) {
-             my $is_writableabook_found=0;
-@@ -774,13 +775,13 @@
-             if ($is_writableabook_found) {
-                my $fullname=(iconv($message{charset}, $prefs{charset}, $ename))[0];
-                my ($firstname, $lastname) = split(/\s+/, $fullname, 2);
--               $temphtml .= qq|&nbsp;|. iconlink("import.s.gif",  "$lang_text{'importadd'} $eaddr", qq|href="$config{'ow_cgiurl'}/openwebmail-abook.pl?action=addreditform&amp;sessionid=$thissession&amp;sort=$sort&amp;msgdatetype=$msgdatetype&amp;page=$page&amp;folder=$escapedfolder&amp;message_id=$escapedmessageid&amp;N.0.VALUE.GIVENNAME=|.ow::tool::escapeURL($firstname).qq|&amp;N.0.VALUE.FAMILYNAME=|.ow::tool::escapeURL($lastname).qq|&amp;FN.0.VALUE=|.ow::tool::escapeURL($fullname).qq|&amp;EMAIL.0.VALUE=|.ow::tool::escapeURL($eaddr).qq|&amp;formchange=1" onclick="return confirm('$lang_text{importadd} $eaddr ?');"|) . qq|\n|;
-+               $temphtml .= qq|&nbsp;|. iconlink("import.s.gif",  qq|$lang_text{'importadd'} |.ow::htmltext::str2html($eaddr), qq|href="$config{'ow_cgiurl'}/openwebmail-abook.pl?action=addreditform&amp;sessionid=$thissession&amp;sort=$sort&amp;msgdatetype=$msgdatetype&amp;page=$page&amp;folder=$escapedfolder&amp;message_id=$escapedmessageid&amp;N.0.VALUE.GIVENNAME=|.ow::tool::escapeURL($firstname).qq|&amp;N.0.VALUE.FAMILYNAME=|.ow::tool::escapeURL($lastname).qq|&amp;FN.0.VALUE=|.ow::tool::escapeURL($fullname).qq|&amp;EMAIL.0.VALUE=|.ow::tool::escapeURL($eaddr).qq|&amp;formchange=1" onclick="return confirm('$lang_text{importadd} |.ow::htmltext::str2html($jseaddr).qq| ?');"|) . qq|\n|;
-             } else {
--               $temphtml .= qq|&nbsp;|. iconlink("import.s.gif",  "$lang_text{'importadd'} $eaddr", qq|href="$config{'ow_cgiurl'}/openwebmail-abook.pl?action=addrbookedit&amp;sessionid=$thissession&amp;sort=$sort&amp;msgdatetype=$msgdatetype&amp;page=$page&amp;folder=$escapedfolder&amp;message_id=$escapedmessageid" onclick="return confirm('$lang_err{abook_all_readonly}');"|) . qq|\n|;
-+               $temphtml .= qq|&nbsp;|. iconlink("import.s.gif",  qq|$lang_text{'importadd'} |.ow::htmltext::str2html($eaddr), qq|href="$config{'ow_cgiurl'}/openwebmail-abook.pl?action=addrbookedit&amp;sessionid=$thissession&amp;sort=$sort&amp;msgdatetype=$msgdatetype&amp;page=$page&amp;folder=$escapedfolder&amp;message_id=$escapedmessageid" onclick="return confirm('$lang_err{abook_all_readonly}');"|) . qq|\n|;
-             }
-          }
-          if ($config{'enable_userfilter'}) {
--            $temphtml .= qq|&nbsp;|. iconlink("blockemail.gif", "$lang_text{'blockemail'} $eaddr", qq|href="$config{'ow_cgiurl'}/openwebmail-prefs.pl?action=addfilter&amp;sessionid=$thissession&amp;sort=$sort&amp;msgdatetype=$msgdatetype&amp;page=$page&amp;folder=$escapedfolder&amp;message_id=$escapedmessageid&amp;priority=20&amp;ruletype=from&amp;include=include&amp;text=$eaddr&amp;destination=mail-trash&amp;enable=1" onclick="return confirm('$lang_text{blockemail} $eaddr ?');"|) . qq|\n|;
-+            $temphtml .= qq|&nbsp;|. iconlink("blockemail.gif", qq|$lang_text{'blockemail'} |.ow::htmltext::str2html($eaddr), qq|href="$config{'ow_cgiurl'}/openwebmail-prefs.pl?action=addfilter&amp;sessionid=$thissession&amp;sort=$sort&amp;msgdatetype=$msgdatetype&amp;page=$page&amp;folder=$escapedfolder&amp;message_id=$escapedmessageid&amp;priority=20&amp;ruletype=from&amp;include=include&amp;text=|.ow::tool::escapeURL($eaddr).qq|&amp;destination=mail-trash&amp;enable=1" onclick="return confirm('$lang_text{blockemail} |.ow::htmltext::str2html($jseaddr).qq| ?');"|) . qq|\n|;
-             if ($message{smtprelay} !~ /^\s*$/) {
-                $temphtml .= qq|&nbsp; |.iconlink("blockrelay.gif", "$lang_text{'blockrelay'} $message{smtprelay}", qq|href="$config{'ow_cgiurl'}/openwebmail-prefs.pl?action=addfilter&amp;sessionid=$thissession&amp;sort=$sort&amp;msgdatetype=$msgdatetype&amp;page=$page&amp;folder=$escapedfolder&amp;message_id=$escapedmessageid&amp;priority=20&amp;ruletype=smtprelay&amp;include=include&amp;text=$message{smtprelay}&amp;destination=mail-trash&amp;enable=1" onclick="return confirm('$lang_text{blockrelay} $message{smtprelay} ?');"|) . qq|\n|;
-             }
diff --git a/mail/openwebmail/files/patch-openwebmail.pl b/mail/openwebmail/files/patch-openwebmail.pl
deleted file mode 100644
index e3cea9ab5826..000000000000
--- a/mail/openwebmail/files/patch-openwebmail.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- openwebmail.pl.orig	Fri May 12 22:08:14 2006
-+++ openwebmail.pl	Fri May 12 22:08:38 2006
-@@ -41,6 +41,7 @@
- require "modules/datetime.pl";
- require "modules/lang.pl";
- require "modules/mime.pl";
-+require "modules/htmltext.pl";
- require "auth/auth.pl";
- require "quota/quota.pl";
- require "shares/ow-shared.pl";