ports/99849: [PATCH] mail/dovecot: update to 1.0rc2
Mike Sturdee
sturdee at pathwaynet.com
Thu Jul 6 18:40:19 UTC 2006
>Number: 99849
>Category: ports
>Synopsis: [PATCH] mail/dovecot: update to 1.0rc2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 06 18:40:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Mike Sturdee
>Release: 6.1-STABLE
>Organization:
Pathway Internet
>Environment:
FreeBSD oz.pathwaynet.com 6.1-STABLE FreeBSD 6.1-STABLE #0: Thu Jul 6 11:12:25 EDT 2006 sturdee at oz.pathwaynet.com:/usr/obj/usr/src/sys/OZ i386
>Description:
Update to 1.0 rc2
- Removed 2 patches that have been put in dovecot src
- Updated dovecot-example.conf
Also added IPV6 option for easy disable
>How-To-Repeat:
>Fix:
--- dovecot.orig/Makefile Mon Jun 19 12:19:24 2006
+++ dovecot/Makefile Thu Jul 6 14:03:50 2006
@@ -7,7 +7,7 @@
#
PORTNAME= dovecot
-DISTVERSION= 1.0.beta9
+DISTVERSION= 1.0.rc2
CATEGORIES= mail ipv6
MASTER_SITES= http://www.dovecot.org/releases/
@@ -41,7 +41,8 @@
LDAP "OpenLDAP support" off \
PGSQL "PostgreSQL support" off \
MYSQL "MySQL support" off \
- SQLITE "SQLite support" off
+ SQLITE "SQLite support" off \
+ IPV6 "Enable ipv6 support" on
.include <bsd.port.pre.mk>
@@ -102,6 +103,10 @@
.if defined(WITH_SQLITE)
USE_SQLITE= 3
CONFIGURE_ARGS+= --with-sqlite
+.endif
+
+.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
.endif
post-build:
diff -ruN dovecot.orig/distinfo dovecot/distinfo
--- dovecot.orig/distinfo Mon Jun 19 12:19:24 2006
+++ dovecot/distinfo Thu Jul 6 13:59:36 2006
@@ -1,3 +1,3 @@
-MD5 (dovecot-1.0.beta9.tar.gz) = 5c19a21afb8a02c95f3f62fa37d8e1ed
-SHA256 (dovecot-1.0.beta9.tar.gz) = 1bc44e2ab23ac8863aea42ce4ea5045d5f6ee2375804e432d8e7f918c14379b8
-SIZE (dovecot-1.0.beta9.tar.gz) = 1245601
+MD5 (dovecot-1.0.rc2.tar.gz) = e27a248b2ee224e4618aa2f020150041
+SHA256 (dovecot-1.0.rc2.tar.gz) = 594b38c099a4576e22d8a33673fd1461332c09a1e2c715792f6c2ff656b1bf6e
+SIZE (dovecot-1.0.rc2.ar.gz) = 1257435
diff -ruN dovecot.orig/files/patch-dovecot-example.conf dovecot/files/patch-dovecot-example.conf
--- dovecot.orig/files/patch-dovecot-example.conf Mon Jun 19 12:19:25 2006
+++ dovecot/files/patch-dovecot-example.conf Thu Jul 6 14:16:31 2006
@@ -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 Thu Jul 6 14:10:50 2006
++++ dovecot-example.conf Thu Jul 6 14:14:54 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
@@ -111,7 +111,7 @@
# 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
-@@ -576,6 +583,7 @@
+@@ -577,6 +584,7 @@
# installations.
#
#pop3_uidl_format =
@@ -119,7 +119,7 @@
# POP3 logout format string:
# %t - number of TOP commands
-@@ -590,7 +598,7 @@
+@@ -591,7 +599,7 @@
# Support for dynamically loadable plugins. mail_plugins is a space separated
# list of plugins to load.
#mail_plugins =
@@ -128,7 +128,7 @@
# Workarounds for various client bugs:
# outlook-no-nuls:
-@@ -601,6 +609,7 @@
+@@ -602,6 +610,7 @@
# missing. This option simply sends it if it's missing.
# The list is space-separated.
#pop3_client_workarounds =
@@ -136,12 +136,12 @@
}
##
-@@ -618,10 +627,11 @@
+@@ -619,10 +628,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
+- #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
@@ -149,7 +149,7 @@
# UNIX socket path to master authentication server to find users.
#auth_socket_path = /var/run/dovecot/auth-master
-@@ -632,7 +642,7 @@
+@@ -633,7 +643,7 @@
##
# Executable location
diff -ruN dovecot.orig/files/patch-src_lib_module-dir.c dovecot/files/patch-src_lib_module-dir.c
--- dovecot.orig/files/patch-src_lib_module-dir.c Mon Jun 19 12:19:25 2006
+++ dovecot/files/patch-src_lib_module-dir.c Wed Dec 31 19:00:00 1969
@@ -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 -ruN dovecot.orig/files/patch-src_master_main.c dovecot/files/patch-src_master_main.c
--- dovecot.orig/files/patch-src_master_main.c Mon Jun 19 12:19:25 2006
+++ dovecot/files/patch-src_master_main.c Wed Dec 31 19:00:00 1969
@@ -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 */
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list