[pkgsrc/trunk]: pkgsrc/mail/sqwebmail Bump to nb1 for inclusion of patches to...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9df798c61ab2
branches:  trunk
changeset: 498662:9df798c61ab2
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Mon Aug 29 15:53:24 2005 +0000

description:
Bump to nb1 for inclusion of patches to address security issue.

diffstat:

 mail/sqwebmail/Makefile         |   3 +-
 mail/sqwebmail/distinfo         |   4 ++-
 mail/sqwebmail/patches/patch-ak |  25 +++++++++++++++++++
 mail/sqwebmail/patches/patch-al |  53 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 2 deletions(-)

diffs (113 lines):

diff -r 59388bfcdf74 -r 9df798c61ab2 mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile   Mon Aug 29 14:28:25 2005 +0000
+++ b/mail/sqwebmail/Makefile   Mon Aug 29 15:53:24 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2005/08/11 00:03:51 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/08/29 15:53:24 adrianp Exp $
 
 DISTNAME=      sqwebmail-5.0.4
+PKGREVISION=   1
 PKGBASE=       ${DISTNAME:C/-[^-]*$//}
 CATEGORIES=    mail www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
diff -r 59388bfcdf74 -r 9df798c61ab2 mail/sqwebmail/distinfo
--- a/mail/sqwebmail/distinfo   Mon Aug 29 14:28:25 2005 +0000
+++ b/mail/sqwebmail/distinfo   Mon Aug 29 15:53:24 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/08/11 00:03:51 jlam Exp $
+$NetBSD: distinfo,v 1.9 2005/08/29 15:53:24 adrianp Exp $
 
 SHA1 (sqwebmail-5.0.4.tar.bz2) = a796d3a72df2acdf5e37ba41db79d376ee4c5f29
 RMD160 (sqwebmail-5.0.4.tar.bz2) = 83377afd274f008cae7fb133577d6b2c6ec62ce5
@@ -8,3 +8,5 @@
 SHA1 (patch-ah) = 8624f6bc7453ee2544a18e0bd1d7d2e0044c083f
 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
 SHA1 (patch-aj) = d2164d3fad61f63062f88e489f4be7f1ff6bdea2
+SHA1 (patch-ak) = 78df6763a16aa9dbed96fbd02ff9ccf95b772a55
+SHA1 (patch-al) = f7fe75105acfb6a2158d9344cb131f536dd573cc
diff -r 59388bfcdf74 -r 9df798c61ab2 mail/sqwebmail/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/sqwebmail/patches/patch-ak   Mon Aug 29 15:53:24 2005 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ak,v 1.1 2005/08/29 15:53:24 adrianp Exp $
+
+--- sqwebmail/folder.c.orig    2005-07-16 23:20:28.000000000 +0100
++++ sqwebmail/folder.c
+@@ -2238,13 +2238,19 @@ const struct unicode_info *uiptr=unicode
+       if (strcmp(cgi("form"), "print") == 0)
+       {
+               showattname(getarg("ATTSTUB"), dummy, content_type);
++
++              printf("&nbsp;(");
++              output_attrencoded(content_type);
++              printf(")");
+       }
+       else
+       {
+               printf("<div align=\"center\"><span class=\"message-attachment-header\">");
+               showattname(getarg("ATTACHMENT"), dummy, content_type);
+ 
+-              printf("&nbsp;(%s)</span></div>",
++              printf("&nbsp;(");
++              output_attrencoded(content_type);
++              printf("; %s)</span></div>",
+                      showsize(end_pos - start_body));
+               printf("<br /><div align=\"center\">");
+ 
diff -r 59388bfcdf74 -r 9df798c61ab2 mail/sqwebmail/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/sqwebmail/patches/patch-al   Mon Aug 29 15:53:24 2005 +0000
@@ -0,0 +1,53 @@
+$NetBSD: patch-al,v 1.1 2005/08/29 15:53:24 adrianp Exp $
+
+--- sqwebmail/html.c.orig      2003-10-06 01:16:13.000000000 +0100
++++ sqwebmail/html.c
+@@ -187,9 +187,16 @@ char *p;
+                                       if (tai)        ++tai->tagvaluelen;
+                               }
+                               if (*p) p++;
++                              else
++                              {
++                                      memset(tagbuf, ' ', strlen(tagbuf));
++                              }
+                       }
+                       else
+                       {
++                              if (c == 0)
++                                      memset(tagbuf, ' ', strlen(tagbuf));
++
+                               if (tai)
+                               {
+                                       tai->tagvalue=p;
+@@ -222,6 +229,31 @@ static void parsetagbuf()
+       while ((p=strchr(tagbuf, '<')) != NULL)
+               *p=' ';
+ 
++      for (p=tagbuf; *p; p++)
++      {
++              char *q;
++
++              if (*p != '&')
++                      continue;
++
++              q=p;
++
++              ++p;
++
++              while (*p)
++              {
++                      if (strchr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", *p) == NULL)
++                              break;
++                      ++p;
++              }
++
++              if (*p != ';')
++              {
++                      *q=0;
++              }
++              --p;
++      }
++
+         tagattrlen=parseattr(0);
+         if ( tagattrlen > tagattrsize)
+         {