upgrade to Dovecot 1.0beta1

This commit is contained in:
brad 2006-01-16 21:32:59 +00:00
parent 7fb09e2d69
commit 4f9ba0333a
7 changed files with 70 additions and 64 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.26 2005/11/11 14:53:27 bernd Exp $
# $OpenBSD: Makefile,v 1.27 2006/01/16 21:32:59 brad Exp $
COMMENT= "compact IMAP/POP3 server"
DISTNAME= dovecot-1.0.alpha4
PKGNAME= ${DISTNAME}p1
DISTNAME= dovecot-1.0.beta1
CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}releases/
@ -40,9 +39,12 @@ CONFIGURE_ARGS+= --with-pgsql
LIB_DEPENDS+= pq.4::databases/postgresql
.endif
USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS+=--localstatedir=/var \
--with-ioloop=kqueue \
--with-notify=kqueue \
--with-ssl=openssl \
--with-ssldir=/etc/ssl \
--without-pam \

View File

@ -1,4 +1,4 @@
MD5 (dovecot-1.0.alpha4.tar.gz) = 65f8e2cd097e80b536a75c31a974b5de
RMD160 (dovecot-1.0.alpha4.tar.gz) = c05cac3700ba538da19881e21e42f9500387767d
SHA1 (dovecot-1.0.alpha4.tar.gz) = cfd4b298630b4e6abced182edfa28568bde0c96a
SIZE (dovecot-1.0.alpha4.tar.gz) = 1203714
MD5 (dovecot-1.0.beta1.tar.gz) = 8472078e61859bfc27fdfece8190875d
RMD160 (dovecot-1.0.beta1.tar.gz) = 169751b91d6923ff4a612320d73535fadaf13d31
SHA1 (dovecot-1.0.beta1.tar.gz) = cbb28a8d9e0ac45f0efee0c7ac1e3296308bb093
SIZE (dovecot-1.0.beta1.tar.gz) = 1335528

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2005/09/04 18:22:30 brad Exp $
--- Makefile.in.orig Thu Aug 18 12:45:08 2005
+++ Makefile.in Thu Aug 18 15:26:48 2005
@@ -589,7 +589,7 @@ install-data: install-data-recursive
$OpenBSD: patch-Makefile_in,v 1.5 2006/01/16 21:32:59 brad Exp $
--- Makefile.in.orig Mon Jan 16 14:39:37 2006
+++ Makefile.in Mon Jan 16 16:06:06 2006
@@ -596,7 +596,7 @@ install-data: install-data-recursive
uninstall: uninstall-recursive
install-am: all-am

View File

@ -1,19 +1,11 @@
$OpenBSD: patch-configure_in,v 1.8 2005/11/11 14:53:27 bernd Exp $
--- configure.in.orig Thu Oct 20 11:12:19 2005
+++ configure.in Fri Nov 11 14:17:19 2005
$OpenBSD: patch-configure_in,v 1.9 2006/01/16 21:32:59 brad Exp $
--- configure.in.orig Sun Jan 15 14:47:43 2006
+++ configure.in Sun Jan 15 17:09:45 2006
@@ -12,6 +12,7 @@ AC_PROG_CPP
AC_HEADER_STDC
AC_C_INLINE
AM_PROG_LIBTOOL
AC_PROG_LIBTOOL
+LIBS="${LIBS} -liconv"
AM_ICONV
AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h inttypes.h \
@@ -1193,6 +1194,7 @@ if test $want_bsdauth = yes; then
fi
if test $want_ldap = yes; then
+ LIBS="$LIBS -lsasl2"
AC_CHECK_LIB(ldap, ldap_init, [
AC_CHECK_HEADER(ldap.h, [
AC_CHECK_LIB(ldap, ldap_initialize, [
AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $
--- dovecot-example.conf.orig Sun Oct 16 11:48:53 2005
+++ dovecot-example.conf Thu Oct 20 14:02:48 2005
$OpenBSD: patch-dovecot-example_conf,v 1.12 2006/01/16 21:32:59 brad Exp $
--- dovecot-example.conf.orig Sun Jan 15 22:00:08 2006
+++ dovecot-example.conf Mon Jan 16 15:29:53 2006
@@ -5,13 +5,12 @@
# value inside quotes, eg.: key = "# char and trailing whitespace "
@ -27,16 +27,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $
+ssl_cert_file = /etc/ssl/dovecotcert.pem
#ssl_key_file = /etc/ssl/private/dovecot.pem
# File containing trusted SSL certificate authorities. Usually not needed.
@@ -48,7 +47,7 @@
# SSL parameter file. Master process generates this file for login processes.
# It contains Diffie Hellman and RSA parameters.
-#ssl_parameters_file = /var/run/dovecot/ssl-parameters.dat
+ssl_parameters_file = /var/dovecot/ssl-parameters.dat
# How often to regenerate the SSL parameters file. Generation is quite CPU
# intensive operation. The value is in hours, 0 disables regeneration
# If key file is password protected, give the password here. Alternatively
@@ -62,7 +61,7 @@
# SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and
# IPv6 ::1 addresses are considered secure, this setting has no effect if
@ -46,7 +37,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $
# Use this logfile instead of syslog(). /dev/stderr can be used if you want to
# use stderr for logging (ONLY /dev/stderr - otherwise it is closed).
@@ -83,7 +82,7 @@
@@ -88,7 +87,7 @@
# which login needs to be able to connect to. The sockets are created when
# running as root, so you don't have to worry about permissions. Note that
# everything in this directory is deleted when Dovecot is started.
@ -55,7 +46,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $
# chroot login process to the login_dir. Only reason not to do this is if you
# wish to run the whole Dovecot without roots.
@@ -95,7 +94,7 @@
@@ -100,7 +99,7 @@
# only it has access, it's used to control access for authentication process.
# Note that this user is NOT used to access mails.
# http://wiki.dovecot.org/UserIds
@ -64,7 +55,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $
# Set max. process size in megabytes. If you don't use
# login_process_per_connection you might need to grow this.
@@ -303,7 +302,7 @@
@@ -311,7 +310,7 @@
# Don't write() to mmaped files. This is required for some operating systems
# which use separate caches for them, such as OpenBSD.
@ -73,23 +64,31 @@ $OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $
# Locking method for index files. Alternatives are fcntl, flock and dotlock.
# Dotlocking uses some tricks which may create more disk I/O than other locking
@@ -391,12 +390,12 @@
@@ -411,19 +410,19 @@
protocol imap {
# Login executable location.
- #login_executable = /usr/libexec/dovecot/imap-login
+ #login_executable = /usr/local/libexec/dovecot/imap-login
# IMAP executable location
# IMAP executable location. Changing this allows you to execute other
# binaries before the imap process is executed.
#
# This would write rawlogs into ~/dovecot.rawlog/ directory:
- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
+ # mail_executable = /usr/local/libexec/dovecot/rawlog /usr/local/libexec/dovecot/imap
#
# This would attach gdb into the imap process and write backtraces into
# /tmp/gdbhelper.* files:
- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
+ # mail_executable = /usr/local/libexec/dovecot/gdbhelper /usr/local/libexec/dovecot/imap
#
- #mail_executable = /usr/libexec/dovecot/imap
+ #mail_executable = /usr/local/libexec/dovecot/imap
# This would write rawlogs into ~/dovecot.rawlog/ directory:
- #mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
+ #mail_executable = /usr/local/libexec/dovecot/rawlog /usr/local/libexec/dovecot/imap
# 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
@@ -444,10 +443,10 @@ protocol imap {
@@ -472,10 +471,10 @@ protocol imap {
protocol pop3 {
# Login executable location.
@ -102,16 +101,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $
# 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
@@ -484,7 +483,7 @@ protocol pop3 {
# installations. %08Xu%08Xv will be the new default, so use it for new
# installations.
#
- #pop3_uidl_format =
+ pop3_uidl_format = %08Xv%08Xu
# POP3 logout format string:
# %t - number of TOP commands
@@ -515,7 +514,7 @@ protocol pop3 {
@@ -544,7 +543,7 @@ protocol pop3 {
##
# Executable location
@ -120,18 +110,18 @@ $OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $
# Set max. process size in megabytes.
#auth_process_size = 256
@@ -596,7 +595,7 @@ auth default {
@@ -629,7 +628,7 @@ auth default {
# Note that PAM can only be used to verify if user's password is correct,
# so it can't be used as userdb. If you don't want to use a separate user
# database (passwd usually), you can use static userdb.
- passdb pam {
+ #passdb pam {
# [-session] [cache_key=<key>] [<service name>]
# [session=yes] [cache_key=<key>] [<service name>]
#
# -session makes Dovecot open and immediately close PAM session. Some
@@ -616,13 +615,13 @@ auth default {
# If service name is "*", it means the authenticating service name
# is used, eg. pop3 or imap.
# session=yes makes Dovecot open and immediately close PAM session. Some
@@ -653,13 +652,13 @@ auth default {
# args = session=yes *
# args = cache_key=%u dovecot
#args = dovecot
- }
+ #}

View File

@ -0,0 +1,9 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2006/01/16 21:32:59 brad Exp $
lib/dovecot/imap/lib01_quota_plugin.so
lib/dovecot/imap/lib01_zlib_plugin.so
lib/dovecot/imap/lib02_imap_quota_plugin.so
lib/dovecot/imap/lib02_trash_plugin.so
lib/dovecot/lda/lib01_quota_plugin.so
lib/dovecot/lda/lib02_trash_plugin.so
lib/dovecot/lib01_quota_plugin.so
lib/dovecot/lib02_trash_plugin.so

View File

@ -1,10 +1,23 @@
@comment $OpenBSD: PLIST,v 1.11 2005/10/06 17:03:22 brad Exp $
@comment $OpenBSD: PLIST,v 1.12 2006/01/16 21:32:59 brad Exp $
@newgroup _dovecot:518
@newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin
%%SHARED%%
lib/dovecot/
lib/dovecot/imap/
@comment lib/dovecot/imap/lib01_zlib_plugin.a
@comment lib/dovecot/imap/lib01_zlib_plugin.la
@comment lib/dovecot/imap/lib02_imap_quota_plugin.a
@comment lib/dovecot/imap/lib02_imap_quota_plugin.la
lib/dovecot/lda/
@comment lib/dovecot/lib01_quota_plugin.a
@comment lib/dovecot/lib01_quota_plugin.la
@comment lib/dovecot/lib02_trash_plugin.a
@comment lib/dovecot/lib02_trash_plugin.la
libexec/dovecot/
libexec/dovecot/checkpassword-reply
libexec/dovecot/deliver
libexec/dovecot/dict
libexec/dovecot/dovecot-auth
libexec/dovecot/gdbhelper
libexec/dovecot/imap
libexec/dovecot/imap-login
libexec/dovecot/pop3