8 files changed, 100 insertions, 75 deletions

diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
index db1f7e6445de..13277fd5936e 100644
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	dovecot
-DISTVERSION=	1.0.beta8
-PORTREVISION=	1
+DISTVERSION=	1.0.beta9
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/
 
@@ -35,7 +34,7 @@ PORTDOCS=	USE-WIKI-INSTEAD \
 CONFIGURE_ARGS+=	--without-docs
 .endif
 
-OPTIONS=	KQUEUE		"kqueue(2) support"	off  \
+OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
 		SASL2		"SASL2 support"		off \
 		GSSAPI		"GSSAPI support"	off \
 		VPOPMAIL	"VPopMail support"	off \
diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo
index 99b739edd237..251726845c4a 100644
--- a/mail/dovecot-devel/distinfo
+++ b/mail/dovecot-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dovecot-1.0.beta8.tar.gz) = 6a87718a86ee1ae2334c75843dd9a7df
-SHA256 (dovecot-1.0.beta8.tar.gz) = b43bb6ea5426b0d78ae260b53be035d1b5371b76a342870b2d56a6aba1ad82d2
-SIZE (dovecot-1.0.beta8.tar.gz) = 1392106
+MD5 (dovecot-1.0.beta9.tar.gz) = 5c19a21afb8a02c95f3f62fa37d8e1ed
+SHA256 (dovecot-1.0.beta9.tar.gz) = 1bc44e2ab23ac8863aea42ce4ea5045d5f6ee2375804e432d8e7f918c14379b8
+SIZE (dovecot-1.0.beta9.tar.gz) = 1245601
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
index 2ef8f943ca78..ef3ca464d221 100644
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ b/mail/dovecot-devel/files/patch-dovecot-example.conf
@@ -1,5 +1,5 @@
---- dovecot-example.conf.orig	Wed Apr 12 11:37:30 2006
-+++ dovecot-example.conf	Fri Apr 28 23:23:22 2006
+--- dovecot-example.conf.orig	Sun Jun 18 20:56:27 2006
++++ dovecot-example.conf	Sun Jun 18 21:15:43 2006
 @@ -9,7 +9,7 @@
  # Default values are shown after each value, it's not required to uncomment
  # any of the lines. Exception to this are paths, they're just examples
@@ -9,58 +9,55 @@
  # --with-ssldir=/etc/ssl
  
  # Base directory where to store runtime data.
-@@ -17,7 +17,7 @@
+@@ -17,6 +17,7 @@
  
- # Protocols we want to be serving:
- #  imap imaps pop3 pop3s
--#protocols = imap imaps
+ # Protocols we want to be serving: imap imaps pop3 pop3s
+ #protocols = imap imaps
 +protocols = imap pop3
  
  # IP or host address where to listen in for connections. It's not currently
  # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -124,7 +124,7 @@
- 
+@@ -135,6 +136,7 @@
  # Set max. process size in megabytes. If you don't use
  # login_process_per_connection you might need to grow this.
--#login_process_size = 32
+ #login_process_size = 32
 +login_process_size = 64
  
  # Should each login be processed in it's own process (yes), or should one
  # login process be allowed to process multiple connections (no)? Yes is more
-@@ -173,7 +173,7 @@
- # Show more verbose process titles (in ps). Currently shows user name and
+@@ -193,6 +195,7 @@
+ #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
+ #
+ #default_mail_env = 
++default_mail_env = mbox:/var/mail/%u
+ 
+ # If you need to set multiple mailbox locations or want to change default
+ # namespace settings, you can do it by defining namespace sections:
+@@ -235,6 +238,7 @@
+ # Grant access to these extra groups for mail processes. Typical use would be
+ # to give "mail" group write access to /var/mail to be able to create dotlocks.
+ #mail_extra_groups =
++mail_extra_groups = mail
+ 
+ # Allow full filesystem access to clients. There's no access checks other than
+ # what the operating system does for the active UID/GID. It works with both
+@@ -282,6 +286,7 @@
  # IP address. Useful for seeing who are actually using the IMAP processes
  # (eg. shared mailboxes or if same uid is used for multiple accounts).
--#verbose_proctitle = no
+ #verbose_proctitle = no
 +verbose_proctitle = yes
  
- # Show protocol level SSL errors.
- #verbose_ssl = no
-@@ -189,12 +189,12 @@
- # non-valid GID as primary group ID aren't allowed to log in. If user
+ # Valid UID range for users, defaults to 500 and above. This is mostly
+ # to make sure that users can't log in as daemons or other system users.
+@@ -295,6 +300,7 @@
  # belongs to supplementary groups with non-valid GIDs, those groups are
  # not set.
--#first_valid_gid = 1
+ #first_valid_gid = 1
 +first_valid_gid = 0
  #last_valid_gid = 0
  
- # Grant access to these extra groups for mail processes. Typical use would be
- # to give "mail" group write access to /var/mail to be able to create dotlocks.
--#mail_extra_groups =
-+mail_extra_groups = mail
- 
- # ':' separated list of directories under which chrooting is allowed for mail
- # processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
-@@ -230,7 +230,7 @@
- #   default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
- #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
- #
--#default_mail_env = 
-+default_mail_env = mbox:/var/mail/%u
- 
- # If you need to set multiple mailbox locations or want to change default
- # namespace settings, you can do it by defining namespace sections:
-@@ -439,19 +439,19 @@
+ # Maximum number of running mail processes. When this limit is reached,
+@@ -467,19 +473,19 @@
  
  protocol imap {
    # Login executable location.
@@ -84,7 +81,7 @@
  
    # Maximum IMAP command line length in bytes. Some clients generate very long
    # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -461,7 +461,7 @@
+@@ -489,7 +495,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -93,16 +90,15 @@
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -492,7 +492,7 @@
-   #     but not both. Thunderbird separates these two by forcing server to
+@@ -521,6 +527,7 @@
    #     accept '/' suffix in mailbox names in subscriptions list.
    # The list is space-separated.
--  #imap_client_workarounds = outlook-idle
+   #imap_client_workarounds = outlook-idle
 +  imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
  }
    
  ##
-@@ -501,10 +501,10 @@
+@@ -529,10 +536,10 @@
  
  protocol pop3 {
    # Login executable location.
@@ -115,16 +111,15 @@
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -547,7 +547,7 @@
-   # installations. %08Xu%08Xv will be the new default, so use it for new
+@@ -576,6 +583,7 @@
    # installations.
    #
--  #pop3_uidl_format = 
+   #pop3_uidl_format = 
 +  pop3_uidl_format = %08Xu%08Xv
  
    # POP3 logout format string:
    #  %t - number of TOP commands
-@@ -562,7 +562,7 @@
+@@ -590,7 +598,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -133,16 +128,28 @@
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -572,7 +572,7 @@
-   #     Outlook Express and Netscape Mail breaks if end of headers-line is
+@@ -601,6 +609,7 @@
    #     missing. This option simply sends it if it's missing.
    # The list is space-separated.
--  #pop3_client_workarounds = 
+   #pop3_client_workarounds = 
 +  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
  }
  
  ##
-@@ -580,7 +580,7 @@
+@@ -618,10 +627,11 @@
+   # Support for dynamically loadable plugins. mail_plugins is a space separated
+   # list of plugins to load.
+   #mail_plugins = 
+-  #mail_plugin_dir = /usr/lib/dovecot/imap
++  #mail_plugin_dir = %%PREFIX%%/lib/dovecot/imap
+ 
+   # Binary to use for sending mails.
+   #sendmail_path = /usr/lib/sendmail
++  sendmail_path = /usr/sbin/sendmail
+ 
+   # UNIX socket path to master authentication server to find users.
+   #auth_socket_path = /var/run/dovecot/auth-master
+@@ -632,7 +642,7 @@
  ##
  
  # Executable location
diff --git a/mail/dovecot-devel/files/patch-master-settings.c b/mail/dovecot-devel/files/patch-master-settings.c
deleted file mode 100644
index dcf9fcab82bf..000000000000
--- a/mail/dovecot-devel/files/patch-master-settings.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/master/master-settings.c.orig	Tue Apr 25 10:00:07 2006
-+++ src/master/master-settings.c	Sun May 28 06:19:01 2006
-@@ -367,6 +367,7 @@
- 
- 	/* .. */
- 	MEMBER(login_uid) 0,
-+	MEMBER(imap_generated_capability) NULL,
- 	MEMBER(listen_fd) -1,
- 	MEMBER(ssl_listen_fd) -1
- };
diff --git a/mail/dovecot-devel/files/patch-module-dir.c b/mail/dovecot-devel/files/patch-module-dir.c
deleted file mode 100644
index 2673e4964a8b..000000000000
--- a/mail/dovecot-devel/files/patch-module-dir.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lib/module-dir.c.orig	Sat May  6 10:00:05 2006
-+++ src/lib/module-dir.c	Sun May 28 06:22:06 2006
-@@ -24,6 +24,9 @@
- 	const char *error;
- 	void *ret;
- 
-+	/* reset dlerror */
-+	(void)dlerror();
-+
- 	/* get our init func */
- 	ret = dlsym(module->handle, symbol);
- 
diff --git a/mail/dovecot-devel/files/patch-src_lib_module-dir.c b/mail/dovecot-devel/files/patch-src_lib_module-dir.c
new file mode 100644
index 000000000000..4badfa261402
--- /dev/null
+++ b/mail/dovecot-devel/files/patch-src_lib_module-dir.c
@@ -0,0 +1,27 @@
+--- src/lib/module-dir.c.orig	5 May 2006 14:21:22 -0000	1.19
++++ src/lib/module-dir.c	16 Jun 2006 10:15:56 -0000	1.20
+@@ -24,14 +24,18 @@
+ 	const char *error;
+ 	void *ret;
+ 
++	/* clear out old errors */
++	(void)dlerror();
++
+ 	/* get our init func */
+ 	ret = dlsym(module->handle, symbol);
+-
+-	error = dlerror();
+-	if (error != NULL) {
+-		i_error("module %s: dlsym(%s) failed: %s",
+-			module->path, symbol, error);
+-		ret = NULL;
++	if (ret == NULL) {
++		error = dlerror();
++		if (error != NULL) {
++			i_error("module %s: dlsym(%s) failed: %s",
++				module->path, symbol, error);
++			ret = NULL;
++		}
+ 	}
+ 
+ 	return ret;
diff --git a/mail/dovecot-devel/files/patch-src_master_main.c b/mail/dovecot-devel/files/patch-src_master_main.c
new file mode 100644
index 000000000000..4c556da4f1d4
--- /dev/null
+++ b/mail/dovecot-devel/files/patch-src_master_main.c
@@ -0,0 +1,13 @@
+--- src/master/main.c	11 Jun 2006 17:44:25 -0000	1.80.2.2
++++ src/master/main.c	16 Jun 2006 10:11:07 -0000	1.80.2.3
+@@ -355,7 +355,9 @@
+ 	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 */
diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist
index 64549959837e..c683693a159d 100644
--- a/mail/dovecot-devel/pkg-plist
+++ b/mail/dovecot-devel/pkg-plist
@@ -33,6 +33,7 @@ lib/dovecot/lib02_trash_plugin.la
 lib/dovecot/lib02_trash_plugin.so
 @dirrm lib/dovecot
 libexec/dovecot/checkpassword-reply
+libexec/dovecot/deliver
 libexec/dovecot/dict
 libexec/dovecot/dovecot-auth
 libexec/dovecot/gdbhelper