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
This commit is contained in:
Stefan Walter 2006-07-24 16:29:10 +00:00
parent d67251b584
commit e4656bbaa3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=168643
18 changed files with 72 additions and 142 deletions

View file

@ -7,7 +7,7 @@
#
PORTNAME= dovecot
DISTVERSION= 1.0.beta9
DISTVERSION= 1.0.rc2
CATEGORIES= mail ipv6
MASTER_SITES= http://www.dovecot.org/releases/
@ -23,8 +23,6 @@ CONFIGURE_ARGS= --without-shadow --localstatedir=/var
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
SUB_FILES= pkg-message
.if !defined(NOPORTDOCS)
PORTDOCS= USE-WIKI-INSTEAD \
auth-protocol.txt auth.txt configuration.txt design.txt \
@ -41,13 +39,14 @@ OPTIONS= KQUEUE "kqueue(2) support" on \
LDAP "OpenLDAP support" off \
PGSQL "PostgreSQL support" off \
MYSQL "MySQL support" off \
SQLITE "SQLite support" off
SQLITE "SQLite support" off \
IPV6 "IPv6 support" on
.include <bsd.port.pre.mk>
## kqueue(2) support
#
.if defined(WITH_KQUEUE)
.if !defined(WITHOUT_KQUEUE)
CONFIGURE_ARGS+= --with-ioloop=kqueue --with-notify=kqueue
.endif
@ -104,6 +103,12 @@ USE_SQLITE= 3
CONFIGURE_ARGS+= --with-sqlite
.endif
## IPv6 support
#
.if defined(WITHOUT_IPV6) || $(OSVERSION) <= 400014
CONFIGURE_ARGS+= --disable-ipv6
.endif
post-build:
@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
${WRKSRC}/dovecot-example.conf

View file

@ -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.tar.gz) = 1257435

View file

@ -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

View file

@ -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;

View file

@ -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 */

View file

@ -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%%
---------------------------------------------------------------------

View file

@ -83,7 +83,7 @@ POST-INSTALL)
fi
done
chown -R root:wheel ${base}
chmod -R 0700 ${base}
chmod -R 0755 ${base}
chown -R root:dovecot ${base}/login
chmod -R 0750 ${base}/login
;;

View file

@ -0,0 +1,16 @@
---------------------------------------------------------------------
You can get basic IMAP and POP3 services running by enabling
dovecot in /etc/rc.conf.
In this basic configuration Dovecot will authenticate users against
the system's passwd file and use the default /var/mail/$USER mbox
files.
echo dovecot_enable="YES" >> /etc/rc.conf
Further information on configuration can be found at:
http://wiki.dovecot.org/
---------------------------------------------------------------------

View file

@ -1,5 +1,7 @@
@comment $FreeBSD$
@unexec if cmp -s %D/etc/dovecot-example.conf %D/etc/dovecot.conf; then rm -f %D/etc/dovecot.conf; fi
etc/dovecot-example.conf
@exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi
lib/dovecot/imap/lib01_acl_plugin.so
lib/dovecot/imap/lib01_convert_plugin.so
lib/dovecot/imap/lib01_quota_plugin.so

View file

@ -7,7 +7,7 @@
#
PORTNAME= dovecot
DISTVERSION= 1.0.beta9
DISTVERSION= 1.0.rc2
CATEGORIES= mail ipv6
MASTER_SITES= http://www.dovecot.org/releases/
@ -23,8 +23,6 @@ CONFIGURE_ARGS= --without-shadow --localstatedir=/var
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
SUB_FILES= pkg-message
.if !defined(NOPORTDOCS)
PORTDOCS= USE-WIKI-INSTEAD \
auth-protocol.txt auth.txt configuration.txt design.txt \
@ -41,13 +39,14 @@ OPTIONS= KQUEUE "kqueue(2) support" on \
LDAP "OpenLDAP support" off \
PGSQL "PostgreSQL support" off \
MYSQL "MySQL support" off \
SQLITE "SQLite support" off
SQLITE "SQLite support" off \
IPV6 "IPv6 support" on
.include <bsd.port.pre.mk>
## kqueue(2) support
#
.if defined(WITH_KQUEUE)
.if !defined(WITHOUT_KQUEUE)
CONFIGURE_ARGS+= --with-ioloop=kqueue --with-notify=kqueue
.endif
@ -104,6 +103,12 @@ USE_SQLITE= 3
CONFIGURE_ARGS+= --with-sqlite
.endif
## IPv6 support
#
.if defined(WITHOUT_IPV6) || $(OSVERSION) <= 400014
CONFIGURE_ARGS+= --disable-ipv6
.endif
post-build:
@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
${WRKSRC}/dovecot-example.conf

View file

@ -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.tar.gz) = 1257435

View file

@ -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

View file

@ -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;

View file

@ -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 */

View file

@ -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%%
---------------------------------------------------------------------

View file

@ -83,7 +83,7 @@ POST-INSTALL)
fi
done
chown -R root:wheel ${base}
chmod -R 0700 ${base}
chmod -R 0755 ${base}
chown -R root:dovecot ${base}/login
chmod -R 0750 ${base}/login
;;

16
mail/dovecot/pkg-message Normal file
View file

@ -0,0 +1,16 @@
---------------------------------------------------------------------
You can get basic IMAP and POP3 services running by enabling
dovecot in /etc/rc.conf.
In this basic configuration Dovecot will authenticate users against
the system's passwd file and use the default /var/mail/$USER mbox
files.
echo dovecot_enable="YES" >> /etc/rc.conf
Further information on configuration can be found at:
http://wiki.dovecot.org/
---------------------------------------------------------------------

View file

@ -1,5 +1,7 @@
@comment $FreeBSD$
@unexec if cmp -s %D/etc/dovecot-example.conf %D/etc/dovecot.conf; then rm -f %D/etc/dovecot.conf; fi
etc/dovecot-example.conf
@exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi
lib/dovecot/imap/lib01_acl_plugin.so
lib/dovecot/imap/lib01_convert_plugin.so
lib/dovecot/imap/lib01_quota_plugin.so