cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to Dovecot 1.0beta9

Browse Source
This commit is contained in:
brad 2006-06-16 21:03:44 +00:00
parent 9b5b22a0ae
commit 0b46706cd8
7 changed files with 66 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/dovecot/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.43 2006/05/18 01:59:21 brad Exp $ # $OpenBSD: Makefile,v 1.44 2006/06/16 21:03:44 brad Exp $
COMMENT= "compact IMAP/POP3 server" COMMENT= "compact IMAP/POP3 server"
DISTNAME= dovecot-1.0.beta8 DISTNAME= dovecot-1.0.beta9
PKGNAME= ${DISTNAME}p1
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}releases/ MASTER_SITES= ${HOMEPAGE}releases/

8
mail/dovecot/distinfo
View File

@ -1,4 +1,4 @@
MD5 (dovecot-1.0.beta8.tar.gz) = 6a87718a86ee1ae2334c75843dd9a7df MD5 (dovecot-1.0.beta9.tar.gz) = 5c19a21afb8a02c95f3f62fa37d8e1ed
RMD160 (dovecot-1.0.beta8.tar.gz) = 101a7011467691ba5f4a6f48e21d6d1dc5626c16 RMD160 (dovecot-1.0.beta9.tar.gz) = 30d423b9fd2056fd8d898bc4bc630d3806cc64c4
SHA1 (dovecot-1.0.beta8.tar.gz) = fedd38c29a2bc396df386636ed5d8b65ecab0ff6 SHA1 (dovecot-1.0.beta9.tar.gz) = c3f5014e67cd993206373915ee622ed1f68b4b14
SIZE (dovecot-1.0.beta8.tar.gz) = 1392106 SIZE (dovecot-1.0.beta9.tar.gz) = 1245601

8
mail/dovecot/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.8 2006/05/12 19:10:11 brad Exp $ $OpenBSD: patch-Makefile_in,v 1.9 2006/06/16 21:03:44 brad Exp $
--- Makefile.in.orig Fri May 12 05:11:23 2006 --- Makefile.in.orig Tue Jun 13 08:20:33 2006
+++ Makefile.in Fri May 12 14:24:54 2006 +++ Makefile.in Tue Jun 13 17:10:21 2006
@@ -582,7 +582,7 @@ install-data: install-data-recursive @@ -597,7 +597,7 @@ install-data: install-data-recursive
uninstall: uninstall-recursive uninstall: uninstall-recursive
install-am: all-am install-am: all-am

25
mail/dovecot/patches/patch-doc_mkcert_sh
View File

@ -1,23 +1,24 @@
$OpenBSD: patch-doc_mkcert_sh,v 1.3 2005/09/04 18:22:30 brad Exp $ $OpenBSD: patch-doc_mkcert_sh,v 1.4 2006/06/16 21:03:44 brad Exp $
--- doc/mkcert.sh.orig Thu Jul 22 20:05:00 2004 --- doc/mkcert.sh.orig Fri Jun 9 07:01:10 2006
+++ doc/mkcert.sh Wed Nov 3 21:59:54 2004 +++ doc/mkcert.sh Tue Jun 13 20:42:58 2006
@@ -5,14 +5,14 @@ @@ -5,18 +5,12 @@
OPENSSL=${OPENSSL-openssl} OPENSSL=${OPENSSL-openssl}
SSLDIR=${SSLDIR-/etc/ssl} SSLDIR=${SSLDIR-/etc/ssl}
-OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf} -OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}
+OPENSSLCONFIG=${OPENSSLCONFIG-${SSLDIR}/dovecot-openssl.cnf} +OPENSSLCONFIG=${OPENSSLCONFIG-${SSLDIR}/dovecot-openssl.cnf}
-CERTFILE=$SSLDIR/certs/dovecot.pem -CERTDIR=$SSLDIR/certs
KEYDIR=$SSLDIR/private
-CERTFILE=$CERTDIR/dovecot.pem
+CERTFILE=$SSLDIR/dovecotcert.pem +CERTFILE=$SSLDIR/dovecotcert.pem
KEYFILE=$SSLDIR/private/dovecot.pem KEYFILE=$KEYDIR/dovecot.pem
-
-if [ ! -d $SSLDIR/certs ]; then -if [ ! -d $CERTDIR ]; then
- echo "$SSLDIR/certs directory doesn't exist" - echo "$SSLDIR/certs directory doesn't exist"
- exit 1
-fi -fi
+#if [ ! -d $SSLDIR/certs ]; then
+# echo "$SSLDIR/certs directory doesn't exist"
+#fi
if [ ! -d $SSLDIR/private ]; then if [ ! -d $KEYDIR ]; then
echo "$SSLDIR/private directory doesn't exist" echo "$SSLDIR/private directory doesn't exist"

54
mail/dovecot/patches/patch-dovecot-example_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $ $OpenBSD: patch-dovecot-example_conf,v 1.18 2006/06/16 21:03:44 brad Exp $
--- dovecot-example.conf.orig Thu Apr 20 22:01:27 2006 --- dovecot-example.conf.orig Mon Jun 12 12:01:37 2006
+++ dovecot-example.conf Fri May 12 14:24:17 2006 +++ dovecot-example.conf Tue Jun 13 20:44:16 2006
@@ -7,13 +7,12 @@ @@ -7,13 +7,12 @@
# value inside quotes, eg.: key = "# char and trailing whitespace " # value inside quotes, eg.: key = "# char and trailing whitespace "
@ -17,18 +17,9 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
-#base_dir = /var/run/dovecot/ -#base_dir = /var/run/dovecot/
+base_dir = /var/dovecot/ +base_dir = /var/dovecot/
# Protocols we want to be serving: # Protocols we want to be serving: imap imaps pop3 pop3s
# imap imaps pop3 pop3s #protocols = imap imaps
@@ -49,7 +48,7 @@ @@ -41,7 +40,7 @@
# dropping root privileges, so keep the key file unreadable by anyone but
# root. Included doc/mkcert.sh can be used to easily generate self-signed
# certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
+ssl_cert_file = /etc/ssl/dovecotcert.pem
#ssl_key_file = /etc/ssl/private/dovecot.pem
# If key file is password protected, give the password here. Alternatively
@@ -74,7 +73,7 @@
# SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and # SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and
# IPv6 ::1 addresses are considered secure, this setting has no effect if # IPv6 ::1 addresses are considered secure, this setting has no effect if
# you connect from those addresses. # you connect from those addresses.
@ -37,7 +28,16 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
# Should all IMAP and POP3 processes be killed when Dovecot master process # Should all IMAP and POP3 processes be killed when Dovecot master process
# shuts down. Setting this to "no" means that Dovecot can be upgraded without # shuts down. Setting this to "no" means that Dovecot can be upgraded without
@@ -108,7 +107,7 @@ @@ -86,7 +85,7 @@
# dropping root privileges, so keep the key file unreadable by anyone but
# root. Included doc/mkcert.sh can be used to easily generate self-signed
# certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
+ssl_cert_file = /etc/ssl/dovecotcert.pem
#ssl_key_file = /etc/ssl/private/dovecot.pem
# If key file is password protected, give the password here. Alternatively
@@ -118,7 +117,7 @@
# which login needs to be able to connect to. The sockets are created when # 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 # running as root, so you don't have to worry about permissions. Note that
# everything in this directory is deleted when Dovecot is started. # everything in this directory is deleted when Dovecot is started.
@ -46,7 +46,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
# chroot login process to the login_dir. Only reason not to do this is if you # chroot login process to the login_dir. Only reason not to do this is if you
# wish to run the whole Dovecot without roots. # wish to run the whole Dovecot without roots.
@@ -120,7 +119,7 @@ @@ -130,7 +129,7 @@
# only it has access, it's used to control access for authentication process. # only it has access, it's used to control access for authentication process.
# Note that this user is NOT used to access mails. # Note that this user is NOT used to access mails.
# http://wiki.dovecot.org/UserIds # http://wiki.dovecot.org/UserIds
@ -55,7 +55,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
# Set max. process size in megabytes. If you don't use # Set max. process size in megabytes. If you don't use
# login_process_per_connection you might need to grow this. # login_process_per_connection you might need to grow this.
@@ -336,7 +335,7 @@ @@ -265,7 +264,7 @@
# Don't write() to mmaped files. This is required for some operating systems # Don't write() to mmaped files. This is required for some operating systems
# which use separate caches for them, such as OpenBSD. # which use separate caches for them, such as OpenBSD.
@ -64,7 +64,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
# Locking method for index files. Alternatives are fcntl, flock and dotlock. # 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 # Dotlocking uses some tricks which may create more disk I/O than other locking
@@ -439,19 +438,19 @@ @@ -467,19 +466,19 @@
protocol imap { protocol imap {
# Login executable location. # Login executable location.
@ -88,7 +88,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
# Maximum IMAP command line length in bytes. Some clients generate very long # 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 # command lines with huge mailboxes, so you may need to raise this if you get
@@ -492,7 +491,7 @@ protocol imap { @@ -520,7 +519,7 @@ protocol imap {
# but not both. Thunderbird separates these two by forcing server to # but not both. Thunderbird separates these two by forcing server to
# accept '/' suffix in mailbox names in subscriptions list. # accept '/' suffix in mailbox names in subscriptions list.
# The list is space-separated. # The list is space-separated.
@ -97,7 +97,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
} }
## ##
@@ -501,10 +500,10 @@ protocol imap { @@ -529,10 +528,10 @@ protocol imap {
protocol pop3 { protocol pop3 {
# Login executable location. # Login executable location.
@ -110,7 +110,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
# Don't try to set mails non-recent or seen with POP3 sessions. This is # 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 # mostly intended to reduce disk I/O. With maildir it doesn't move files
@@ -547,7 +546,7 @@ protocol pop3 { @@ -575,7 +574,7 @@ protocol pop3 {
# installations. %08Xu%08Xv will be the new default, so use it for new # installations. %08Xu%08Xv will be the new default, so use it for new
# installations. # installations.
# #
@ -119,7 +119,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
# POP3 logout format string: # POP3 logout format string:
# %t - number of TOP commands # %t - number of TOP commands
@@ -572,7 +571,7 @@ protocol pop3 { @@ -600,7 +599,7 @@ protocol pop3 {
# Outlook Express and Netscape Mail breaks if end of headers-line is # Outlook Express and Netscape Mail breaks if end of headers-line is
# missing. This option simply sends it if it's missing. # missing. This option simply sends it if it's missing.
# The list is space-separated. # The list is space-separated.
@ -128,7 +128,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
} }
## ##
@@ -580,7 +579,7 @@ protocol pop3 { @@ -632,7 +631,7 @@ protocol lda {
## ##
# Executable location # Executable location
@ -137,16 +137,16 @@ $OpenBSD: patch-dovecot-example_conf,v 1.17 2006/05/12 19:10:11 brad Exp $
# Set max. process size in megabytes. # Set max. process size in megabytes.
#auth_process_size = 256 #auth_process_size = 256
@@ -691,7 +690,7 @@ auth default { @@ -744,7 +743,7 @@ auth default {
# database (passwd usually), you can use static userdb. # database (passwd usually), you can use static userdb.
# REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
# authentication to actually work. # authentication to actually work.
- passdb pam { - passdb pam {
+ #passdb pam { + #passdb pam {
# [session=yes] [cache_key=<key>] [<service name>] # [session=yes] [setcred=yes] [cache_key=<key>] [<service name>]
# #
# session=yes makes Dovecot open and immediately close PAM session. Some # session=yes makes Dovecot open and immediately close PAM session. Some
@@ -715,13 +714,13 @@ auth default { @@ -772,13 +771,13 @@ auth default {
# args = session=yes * # args = session=yes *
# args = cache_key=%u dovecot # args = cache_key=%u dovecot
#args = dovecot #args = dovecot

14
mail/dovecot/patches/patch-src_master_main_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_master_main_c,v 1.1 2006/06/16 21:03:44 brad Exp $
--- src/master/main.c.orig Fri Jun 16 16:37:07 2006
+++ src/master/main.c Fri Jun 16 16:37:49 2006
@@ -355,7 +355,9 @@ static void listen_protocols(struct sett
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 */

3
mail/dovecot/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2006/04/16 06:59:29 brad Exp $ @comment $OpenBSD: PLIST,v 1.16 2006/06/16 21:03:44 brad Exp $
@newgroup _dovecot:518 @newgroup _dovecot:518
@newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin @newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin
%%SHARED%% %%SHARED%%
@ -20,6 +20,7 @@ lib/dovecot/lda/
lib/dovecot/pop3/ lib/dovecot/pop3/
libexec/dovecot/ libexec/dovecot/
libexec/dovecot/checkpassword-reply libexec/dovecot/checkpassword-reply
libexec/dovecot/deliver
libexec/dovecot/dict libexec/dovecot/dict
libexec/dovecot/dovecot-auth libexec/dovecot/dovecot-auth
libexec/dovecot/gdbhelper libexec/dovecot/gdbhelper