Update to dovecot-1.0.rc2, see

http://www.dovecot.org/list/dovecot-news/2006-July/000010.html.

PR:		100037
Submitted by:	maintainer
Approved by:	arved

4 files changed, 4 insertions, 62 deletions

diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index ef3ca464d221..591d5617c709 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,5 +1,5 @@
---- dovecot-example.conf.orig	Sun Jun 18 20:56:27 2006
-+++ dovecot-example.conf	Sun Jun 18 21:15:43 2006
+--- dovecot-example.conf.orig	Tue Jul  4 23:44:02 2006
++++ dovecot-example.conf	Tue Jul  4 23:47:52 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
@@ -140,8 +140,8 @@
    # 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
+-  #mail_plugin_dir = /usr/lib/dovecot/lda
++  #mail_plugin_dir = %%PREFIX%%/lib/dovecot/lda
  
    # Binary to use for sending mails.
    #sendmail_path = /usr/lib/sendmail
diff --git a/mail/dovecot/files/patch-src_lib_module-dir.c b/mail/dovecot/files/patch-src_lib_module-dir.c
deleted file mode 100644
index 4badfa261402..000000000000
--- a/mail/dovecot/files/patch-src_lib_module-dir.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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/files/patch-src_master_main.c b/mail/dovecot/files/patch-src_master_main.c
deleted file mode 100644
index 4c556da4f1d4..000000000000
--- a/mail/dovecot/files/patch-src_master_main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/files/pkg-message.in b/mail/dovecot/files/pkg-message.in
deleted file mode 100644
index 7169bd0bfa6f..000000000000
--- a/mail/dovecot/files/pkg-message.in
+++ /dev/null
@@ -1,18 +0,0 @@
----------------------------------------------------------------------
- 
- You can get default configured IMAP and POP3 services running by
- copying the sample configuration file to the given location and then
- enabling dovecot in /etc/rc.conf.
- In this simple configuration Dovecot will authenticate users against
- the systems passwd file and use the default /var/mail/$USER mbox
- files.
-
-  cd %%PREFIX%%/etc; cp dovecot-example.conf dovecot.conf
-  
-  echo dovecot_enable="YES" >> /etc/rc.conf
- 
- Further information on configuration can be found in:
-
-  %%DOCSDIR%%
-
----------------------------------------------------------------------