[pkgsrc/trunk]: pkgsrc/mail/dovecot 1.0beta9 didn't start when ssl_listen was...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b33a1a2fe42d
branches:  trunk
changeset: 514855:b33a1a2fe42d
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Jun 19 08:28:05 2006 +0000

description:
1.0beta9 didn't start when ssl_listen wasn't explicitly set in the config file.
Add a fix from Dovecot's CVS, and bump PKGREVISION.

diffstat:

 mail/dovecot/Makefile         |   4 ++--
 mail/dovecot/distinfo         |   3 ++-
 mail/dovecot/patches/patch-ah |  18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 7a14c3785da8 -r b33a1a2fe42d mail/dovecot/Makefile
--- a/mail/dovecot/Makefile     Mon Jun 19 07:54:22 2006 +0000
+++ b/mail/dovecot/Makefile     Mon Jun 19 08:28:05 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2006/06/15 15:14:59 tv Exp $
+# $NetBSD: Makefile,v 1.55 2006/06/19 08:28:05 ghen Exp $
 
 DISTNAME=              dovecot-1.0.beta9
 PKGNAME=               ${DISTNAME:S/.beta/beta/}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          http://www.dovecot.org/releases/
 
diff -r 7a14c3785da8 -r b33a1a2fe42d mail/dovecot/distinfo
--- a/mail/dovecot/distinfo     Mon Jun 19 07:54:22 2006 +0000
+++ b/mail/dovecot/distinfo     Mon Jun 19 08:28:05 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2006/06/13 16:51:40 ghen Exp $
+$NetBSD: distinfo,v 1.32 2006/06/19 08:28:05 ghen Exp $
 
 SHA1 (dovecot-1.0.beta9.tar.gz) = c3f5014e67cd993206373915ee622ed1f68b4b14
 RMD160 (dovecot-1.0.beta9.tar.gz) = 30d423b9fd2056fd8d898bc4bc630d3806cc64c4
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = b2d48d991cb57f1ae99617d26a5d9f30fcdc4700
 SHA1 (patch-ab) = 987747a6fa0abc19c28935b7c86a2adc568e14f0
 SHA1 (patch-ag) = ffb66cf054c0377245f3b400f65eabd975a225aa
+SHA1 (patch-ah) = 4da22e1c515c9c6bd9256d85b74919353fd4b9a1
diff -r 7a14c3785da8 -r b33a1a2fe42d mail/dovecot/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot/patches/patch-ah     Mon Jun 19 08:28:05 2006 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.1 2006/06/19 08:28:05 ghen Exp $
+
+1.0beta9 didn't start when ssl_listen wasn't explicitly set in the config file.
+This fix is from Dovecot's CVS so it will be in the next release.
+
+--- src/master/main.c.orig     2006-06-11 19:43:41.000000000 +0200
++++ src/master/main.c
+@@ -355,7 +355,9 @@ static void listen_protocols(struct sett
+       resolve_ip(set->listen, &set->listen_ip, &set->listen_port);
+       resolve_ip(set->ssl_listen, &set->ssl_listen_ip, &set->ssl_listen_port);
+ 
+-      if (set->ssl_listen_ip.family == 0 && set->ssl_listen == NULL)
++      /* if ssl_listen wasn't explicitly set in the config file,
++         use the non-ssl IP settings for the ssl listener, too. */
++      if (set->ssl_listen_ip.family == 0 && *set->ssl_listen == '\0')
+               set->ssl_listen_ip = set->listen_ip;
+ 
+       /* register wanted protocols */