pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/sqwebmail Update mail/sqwebmail to 5.0.6. Change...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d7a3cb3bdc5c
branches: trunk
changeset: 501357:d7a3cb3bdc5c
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Oct 20 20:26:32 2005 +0000
description:
Update mail/sqwebmail to 5.0.6. Changes from version 5.0.4 include:
* Use PCRE for pattern-matching
* When autopurging messages from a folder based on their
timestamp, scan 'new' in addition to 'cur', otherwise mail
delivered to the folder directly never gets purged, unless
the folder is open.
* Filter out <!-- > constructs, they are parsed by MSIE.
* Remove attributes with imbalanced quotes, to prevent
cross-side scripting vulnerabilities with some browsers.
* Show each attachment's MIME content type.
diffstat:
mail/sqwebmail/Makefile | 7 +-
mail/sqwebmail/distinfo | 12 +--
mail/sqwebmail/patches/patch-aj | 6 +-
mail/sqwebmail/patches/patch-ak | 25 -------
mail/sqwebmail/patches/patch-al | 131 ----------------------------------------
5 files changed, 11 insertions(+), 170 deletions(-)
diffs (222 lines):
diff -r 996f9ee75ce7 -r d7a3cb3bdc5c mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile Thu Oct 20 20:26:23 2005 +0000
+++ b/mail/sqwebmail/Makefile Thu Oct 20 20:26:32 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2005/09/11 19:58:46 adrianp Exp $
+# $NetBSD: Makefile,v 1.39 2005/10/20 20:26:32 jlam Exp $
-DISTNAME= sqwebmail-5.0.4
-PKGREVISION= 2
+DISTNAME= sqwebmail-5.0.6
PKGBASE= ${DISTNAME:C/-[^-]*$//}
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
@@ -11,7 +10,7 @@
COMMENT= webmail CGI for access to maildir-style mailboxes
HOMEPAGE= http://www.courier-mta.org/sqwebmail/
-DEPENDS+= courier-maildir>=0.51.0:../../mail/courier-maildir
+DEPENDS+= courier-maildir>=0.52.1:../../mail/courier-maildir
DEPENDS+= maildrop>=1.8.1:../../mail/maildrop
USE_TOOLS+= env gmake perl:run
diff -r 996f9ee75ce7 -r d7a3cb3bdc5c mail/sqwebmail/distinfo
--- a/mail/sqwebmail/distinfo Thu Oct 20 20:26:23 2005 +0000
+++ b/mail/sqwebmail/distinfo Thu Oct 20 20:26:32 2005 +0000
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.11 2005/09/30 13:02:28 salo Exp $
+$NetBSD: distinfo,v 1.12 2005/10/20 20:26:32 jlam Exp $
-SHA1 (sqwebmail-5.0.4.tar.bz2) = a796d3a72df2acdf5e37ba41db79d376ee4c5f29
-RMD160 (sqwebmail-5.0.4.tar.bz2) = 83377afd274f008cae7fb133577d6b2c6ec62ce5
-Size (sqwebmail-5.0.4.tar.bz2) = 3567522 bytes
+SHA1 (sqwebmail-5.0.6.tar.bz2) = 7d95d8a39da47b038cd101ac6cb8e33e116400bc
+RMD160 (sqwebmail-5.0.6.tar.bz2) = fdfd26f1bb3ef5f859e4a2ddcb5a40a0bf517def
+Size (sqwebmail-5.0.6.tar.bz2) = 3558357 bytes
SHA1 (patch-aa) = 88cc780caf78aa86a17962a7ca93709c8254bf8c
SHA1 (patch-ad) = 5207b327b2e88bc75a820fcd7467a8ddf207bfb3
SHA1 (patch-ah) = 8624f6bc7453ee2544a18e0bd1d7d2e0044c083f
SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = d2164d3fad61f63062f88e489f4be7f1ff6bdea2
-SHA1 (patch-ak) = 78df6763a16aa9dbed96fbd02ff9ccf95b772a55
-SHA1 (patch-al) = 85fbd1830e77727b300447343352c8a2d9cf513e
+SHA1 (patch-aj) = 6bc3feccfb1c4fc91b7944383b6e9813b474e7ac
diff -r 996f9ee75ce7 -r d7a3cb3bdc5c mail/sqwebmail/patches/patch-aj
--- a/mail/sqwebmail/patches/patch-aj Thu Oct 20 20:26:23 2005 +0000
+++ b/mail/sqwebmail/patches/patch-aj Thu Oct 20 20:26:32 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2005/08/11 00:03:51 jlam Exp $
+$NetBSD: patch-aj,v 1.3 2005/10/20 20:26:32 jlam Exp $
---- INSTALL.html.orig 2005-04-03 12:15:07.000000000 -0400
+--- INSTALL.html.orig 2005-08-31 21:37:02.000000000 -0400
+++ INSTALL.html
-@@ -685,7 +685,7 @@ Qmail, and it implements DSNs.</p>
+@@ -701,7 +701,7 @@ Qmail, and it implements DSNs.</p>
installation. The following presumes that SqWebMail's configuration files are
installed in <code>/usr/lib/sqwebmail</code> (the default).</p>
diff -r 996f9ee75ce7 -r d7a3cb3bdc5c mail/sqwebmail/patches/patch-ak
--- a/mail/sqwebmail/patches/patch-ak Thu Oct 20 20:26:23 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$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(" (");
-+ output_attrencoded(content_type);
-+ printf(")");
- }
- else
- {
- printf("<div align=\"center\"><span class=\"message-attachment-header\">");
- showattname(getarg("ATTACHMENT"), dummy, content_type);
-
-- printf(" (%s)</span></div>",
-+ printf(" (");
-+ output_attrencoded(content_type);
-+ printf("; %s)</span></div>",
- showsize(end_pos - start_body));
- printf("<br /><div align=\"center\">");
-
diff -r 996f9ee75ce7 -r d7a3cb3bdc5c mail/sqwebmail/patches/patch-al
--- a/mail/sqwebmail/patches/patch-al Thu Oct 20 20:26:23 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-$NetBSD: patch-al,v 1.3 2005/09/30 13:02:28 salo Exp $
-
---- sqwebmail/html.c.orig 2003-10-06 01:16:13.000000000 +0100
-+++ sqwebmail/html.c 2005-09-05 18:05:59.000000000 +0100
-@@ -187,9 +187,16 @@
- 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 @@
- 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)
- {
-@@ -285,7 +317,9 @@
- incomment, /* <!--, in a comment, have not seen any
- dashes */
- incommentseendash, /* In a comment, seen - */
-- incommentseendashdash /* In a comment, seen -- */
-+ incommentseendashdash, /* In a comment, seen -- */
-+
-+ skiptag /* Ignore <!tag> */
- } ;
-
- static enum htmlstate cur_state;
-@@ -385,7 +419,7 @@
- case intag:
- /* We're in a tag (not a <!-- comment)
- collect the contents in tagbuf, until > is seen */
--do_intag:
-+
- cur_state=intag;
- if (p[l] == '>')
- {
-@@ -397,9 +431,21 @@
- addtagbuf(p[l]);
- continue;
-
-+ case skiptag:
-+ if (p[l] == '>')
-+ {
-+ start=l+1;
-+ cur_state=intext;
-+ }
-+ continue;
- case seenltbang:
- /* We have <!. If - is not here, this is a SGML tag */
-- if (p[l] != '-') goto do_intag;
-+ if (p[l] != '-')
-+ {
-+ cur_state=skiptag;
-+ continue;
-+ }
-+
- addtagbuf(p[l]);
- cur_state=seenltbangdash;
- continue;
-@@ -410,9 +456,12 @@
- otherweise we're in a comment, which we can pass
- along */
-
-- if (p[l] != '-') goto do_intag;
-- if (!skipping())
-- (*htmlfiltered_func)("<!--", 4);
-+ if (p[l] != '-')
-+ {
-+ cur_state=skiptag;
-+ continue;
-+ }
-+
- start=l+1;
- cur_state=incomment;
- continue;
-@@ -433,8 +482,6 @@
- cur_state=incomment;
- continue;
- }
-- if (!skipping())
-- (*htmlfiltered_func)(p+start, l+1-start);
- cur_state=intext;
- start=l+1;
- continue;
-@@ -446,9 +493,6 @@
-
- switch (cur_state) {
- case intext:
-- case incomment:
-- case incommentseendash:
-- case incommentseendashdash:
- if (!skipping())
- (*htmlfiltered_func)(p+start, l-start);
- default:
Home |
Main Index |
Thread Index |
Old Index