[105273] trunk/dports/mail

[pixilla at macports.org]

Revision: 105273
          https://trac.macports.org/changeset/105273
Author:   pixilla at macports.org
Date:     2013-04-15 12:20:35 -0700 (Mon, 15 Apr 2013)
Log Message:
-----------
mail/dovecot2:
- Add upstream patch.
mail/dovecot2-sieve:
- Update to version 0.3.4.
- No longer include hg.tag in version number.
- Add comment to revbump on hg.tag changes.

Modified Paths:
--------------
    trunk/dports/mail/dovecot2/Portfile
    trunk/dports/mail/dovecot2-sieve/Portfile

Added Paths:
-----------
    trunk/dports/mail/dovecot2/files/patch-src-lib-mail-message-parser.c.diff

Modified: trunk/dports/mail/dovecot2/Portfile
===================================================================
--- trunk/dports/mail/dovecot2/Portfile	2013-04-15 18:53:18 UTC (rev 105272)
+++ trunk/dports/mail/dovecot2/Portfile	2013-04-15 19:20:35 UTC (rev 105273)
@@ -8,6 +8,7 @@
 # Please revbump port:dovecot2-sieve and port:dovecot2-antispam
 # on port:dovecot2 version changes.
 version             2.2.0
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          mail
 maintainers         pixilla openmaintainer
@@ -44,6 +45,10 @@
 # http://hg.dovecot.org/dovecot-2.2/rev/a7d0bb66639f
 patchfiles-append   patch-src-doveadm-doveadm-mail.h.diff
 
+# Don't assert-crash when multipart doesn't actually have any parts.
+# http://hg.dovecot.org/dovecot-2.2/rev/b38d5ebacf25
+patchfiles-append   patch-src-lib-mail-message-parser.c.diff
+
 checksums           rmd160  24d2485aeaa4a88b4b2f976e9297b4d8cf2530a6 \
                     sha256  c457a3513f1087852686771505fe6d852c3c21a9353cece63f9efb097bc4750a
 

Added: trunk/dports/mail/dovecot2/files/patch-src-lib-mail-message-parser.c.diff
===================================================================
--- trunk/dports/mail/dovecot2/files/patch-src-lib-mail-message-parser.c.diff	                        (rev 0)
+++ trunk/dports/mail/dovecot2/files/patch-src-lib-mail-message-parser.c.diff	2013-04-15 19:20:35 UTC (rev 105273)
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Timo Sirainen <tss at iki.fi>
+# Date 1366035726 -10800
+# Node ID b38d5ebacf25379869b4d5119719f773a26fa077
+# Parent  fc9ef7d2251aec477d73bacfec82c0f66cc813b3
+lib-mail: Don't assert-crash when multipart doesn't actually have any parts.
+
+diff -r fc9ef7d2251a -r b38d5ebacf25 src/lib-mail/message-parser.c
+--- a/src/lib-mail/message-parser.c	Sun Apr 14 21:27:29 2013 +0300
++++ b/src/lib-mail/message-parser.c	Mon Apr 15 17:22:06 2013 +0300
+@@ -839,7 +839,10 @@
+ 	}
+ 	i_stream_skip(ctx->input, offset - ctx->input->v_offset);
+ 
+-	if ((ctx->part->flags & MESSAGE_PART_FLAG_MULTIPART) == 0)
++	/* multipart messages may begin with --boundary--, which makes them
++	   not have any children. */
++	if ((ctx->part->flags & MESSAGE_PART_FLAG_MULTIPART) == 0 ||
++	    ctx->part->children == NULL)
+ 		ctx->parse_next_block = preparsed_parse_body_more;
+ 	else
+ 		ctx->parse_next_block = preparsed_parse_prologue_more;

Modified: trunk/dports/mail/dovecot2-sieve/Portfile
===================================================================
--- trunk/dports/mail/dovecot2-sieve/Portfile	2013-04-15 18:53:18 UTC (rev 105272)
+++ trunk/dports/mail/dovecot2-sieve/Portfile	2013-04-15 19:20:35 UTC (rev 105273)
@@ -4,10 +4,16 @@
 PortSystem          1.0
 
 name                dovecot2-sieve
-version             0.3.1
+version             0.3.4
 
-# Please revbump port:dovecot2-sieve and port:dovecot2-antispam
+# set hg.tag to tag or rev.
+hg.tag              ${version}
+hg.tag              1751
+
+# Maintainers: Please revbump port:dovecot2-sieve and port:dovecot2-antispam
 # on port:dovecot2 version changes.
+# Maintainers: Please revbump port:dovecot2-sieve when hg.tag changes or reset to 0 on version
+# changes.
 revision            0
 
 # Please keep port:dovecot2 major.minor version in sync.
@@ -15,10 +21,6 @@
 # of port:dovecot2-sieve.
 set dovecot2        2.2
 
-# set hg.tag to tag or rev.
-hg.tag              ${version}
-hg.tag              1751
-
 categories          mail
 maintainers         pixilla openmaintainer
 platforms           darwin
@@ -34,13 +36,7 @@
 use_bzip2           yes
 
 if {${hg.tag} != ${version}} {
-    version             ${version}-${hg.tag}
 
-    depends_build       port:libtool port:autoconf
-    pre-configure {
-        system "cd ${worksrcpath} && ./autogen.sh"
-    }
-
     livecheck.url       [lindex ${master_sites} 0]
     livecheck.type      regex
     livecheck.url       http://hg.rename-it.nl/dovecot-${dovecot2}-pigeonhole/log
@@ -62,6 +58,14 @@
 
 depends_lib         port:dovecot2
 
+pre-configure {
+    if {![file exists "${worksrcpath}/configure"]} {
+
+        depends_build-append port:libtool port:autoconf
+        system "cd ${worksrcpath} && ./autogen.sh"
+    }
+}
+
 configure.ldflags-append \
                     -L${prefix}/lib/dovecot
 configure.args      --with-managesieve=yes \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130415/043dc5d7/attachment.html>