Attachment 43362 Details for Bug 67351 – dovecot-0.99.10.5.diff

[patch] dovecot-0.99.10.5.diff

dovecot-0.99.10.5.diff (text/plain), 13.68 KB, created by Robin Breathe on 2004-05-29 18:40:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robin Breathe

Created: 2004-05-29 18:40:24 UTC

Size: 13.68 KB

patch

obsolete

>diff -ruN dovecot-0.99.10.4_2/Makefile dovecot/Makefile
>--- dovecot-0.99.10.4_2/Makefile	Sat May 29 17:17:07 2004
>+++ dovecot/Makefile	Sat May 29 16:51:58 2004
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	dovecot
>-PORTVERSION=	0.99.10.4
>-PORTREVISION=	2
>+PORTVERSION=	0.99.10.5
> CATEGORIES=	mail ipv6
> MASTER_SITES=	http://www.dovecot.org/
> 
>@@ -17,6 +16,8 @@
> 
> USE_ICONV=	yes
> USE_REINPLACE=	yes
>+USE_RC_SUBR=	yes
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_ARGS=	--without-shadow --enable-ipv6 \
>@@ -33,10 +34,14 @@
> 		nfs.txt dovecot-ldap.conf dovecot-pgsql.conf \
> 		dovecot-openssl.cnf securecoding.txt
> 
>+OPTIONS=	SASL2		"SASL2 support"		off \
>+		VPOPMAIL	"VPopMail support"	off \
>+		LDAP		"OpenLDAP support"	off \
>+		PGSQL		"PostgreSQL support"	off
>+
> .include <bsd.port.pre.mk>
> 
> ## SASL2 support
>-OPTIONS+=	SASL2 "SASL2 support" off
> #
> # SASL provides authentication support to
> # session-based protocols. This is can be
>@@ -48,7 +53,6 @@
> .endif
> 
> ## VPopMail Support
>-OPTIONS+=	VPOPMAIL  "VPopMail support" off
> #
> # vpopmail provides easy authentication and
> # multi-domain features. It was originally
>@@ -61,7 +65,6 @@
> .endif
> 
> ## OpenLDAP Support
>-OPTIONS+=	LDAP  "OpenLDAP support" off
> #
> # LDAP is the light-weight directory access
> # protocol and can be used by Dovecot for its
>@@ -73,7 +76,6 @@
> .endif
> 
> ## PostgreSQL Support
>-OPTIONS+=	PGSQL  "PostgreSQL support" off
> #
> # PostgreSQL is a powerful SQL database that
> # can be used to store user tables.
>@@ -81,12 +83,6 @@
> .if defined(WITH_PGSQL)
> LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql7
> CONFIGURE_ARGS+=	--with-pgsql
>-.endif
>-
>-.if ${OSVERSION} >= 500038
>-RC_SUBR?=	/etc/rc.subr
>-.else
>-USE_RC_SUBR=	yes
> .endif
> 
> pre-build:
>diff -ruN dovecot-0.99.10.4_2/distinfo dovecot/distinfo
>--- dovecot-0.99.10.4_2/distinfo	Sun Feb  1 23:01:59 2004
>+++ dovecot/distinfo	Sat May 29 16:53:45 2004
>@@ -1,2 +1,2 @@
>-MD5 (dovecot-0.99.10.4.tar.gz) = 81eda7985e99d28acd6d286aa0e13e07
>-SIZE (dovecot-0.99.10.4.tar.gz) = 859856
>+MD5 (dovecot-0.99.10.5.tar.gz) = acda02c8bdcff5e194a8b9227ccb74b5
>+SIZE (dovecot-0.99.10.5.tar.gz) = 863825
>diff -ruN dovecot-0.99.10.4_2/files/patch-dovecot-example.conf dovecot/files/patch-dovecot-example.conf
>--- dovecot-0.99.10.4_2/files/patch-dovecot-example.conf	Sun Jan 11 10:35:54 2004
>+++ dovecot/files/patch-dovecot-example.conf	Sat May 29 17:16:06 2004
>@@ -1,11 +1,11 @@
>---- dovecot-example.conf.orig	Sun Nov  9 00:21:22 2003
>-+++ dovecot-example.conf	Sun Nov 16 16:14:35 2003
>+--- dovecot-example.conf.orig	Sat May 29 16:56:16 2004
>++++ dovecot-example.conf	Sat May 29 17:08:35 2004
> @@ -7,11 +7,11 @@
>  # --with-ssldir=/etc/ssl
>  
>  # Base directory where to store runtime data.
> -#base_dir = /var/run/dovecot/
>-+base_dir = /var/dovecot/
>++base_dir = /var/dovecot
>  
>  # Protocols we want to be serving:
>  #  imap imaps pop3 pop3s
>@@ -27,13 +27,13 @@
>  # certificate, just make sure to update the domains in dovecot-openssl.cnf
> -#ssl_cert_file = /etc/ssl/certs/dovecot.pem
> -#ssl_key_file = /etc/ssl/private/dovecot.pem
>-+ssl_cert_file = %%SSLDIR%%/certs/imapd.pem
>-+ssl_key_file = %%SSLDIR%%/private/imapd.pem
>++ssl_cert_file = %%SSLDIR%%/certs/dovecot.pem
>++ssl_key_file = %%SSLDIR%%/private/dovecot.pem
>  
>  # 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 = %%SSLDIR%%/parameters.dat
>++ssl_parameters_file = %%SSLDIR%%/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
>@@ -66,15 +66,6 @@
>  
>  # Set max. process size in megabytes. If you don't use
>  # login_process_per_connection you might need to grow this.
>-@@ -100,7 +100,7 @@
>- 
>- # Number of login processes to create. If login_process_per_user is
>- # yes, this is the number of extra processes waiting for users to log in.
>--#login_processes_count = 3
>-+#login_processes_count = 1
>- 
>- # Maximum number of extra login processes to create. The extra process count
>- # usually stays at login_processes_count, but when multiple users start logging
> @@ -126,7 +126,7 @@
>  login = pop3
>  
>@@ -182,7 +173,7 @@
>  
>  # Executable location
> -#pop3_executable = /usr/libexec/dovecot/pop3
>-+pop3_executable = %%PREFIX%%/libexec/dovecot/pop3
>++#pop3_executable = %%PREFIX%%/libexec/dovecot/pop3
>  
>  # Set max. process size in megabytes. Most of the memory goes to mmap()ing
>  # files, so it shouldn't harm much even if this limit is set pretty high.
>@@ -195,18 +186,7 @@
>  
>  ##
>  ## Authentication processes
>-@@ -380,8 +380,8 @@
>- #   vpopmail: vpopmail library
>- #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
>- #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
>--#auth_userdb = passwd
>--auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf
>-+#auth_userdb = pgsql %%PREFIX%%/etc/dovecot-pgsql.conf
>-+auth_userdb = passwd
>- 
>- # Where password database is kept:
>- #   passwd: /etc/passwd or similiar, using getpwnam()
>-@@ -391,9 +391,9 @@
>+@@ -390,9 +390,9 @@
>  #   vpopmail: vpopmail authentication
>  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
>  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
>@@ -218,7 +198,7 @@
>  
>  # Set max. process size in megabytes.
>  #auth_process_size = 256
>-@@ -422,7 +422,7 @@
>+@@ -421,7 +421,7 @@
>  
>  # More verbose logging. Useful for figuring out why authentication isn't
>  # working.
>diff -ruN dovecot-0.99.10.4_2/files/patch-dovecot-example.conf~ dovecot/files/patch-dovecot-example.conf~
>--- dovecot-0.99.10.4_2/files/patch-dovecot-example.conf~	Thu Jan  1 00:00:00 1970
>+++ dovecot/files/patch-dovecot-example.conf~	Sat May 29 17:09:14 2004
>@@ -0,0 +1,209 @@
>+--- dovecot-example.conf.ori	Sat May 29 16:56:16 2004
>++++ dovecot-example.conf	Sat May 29 17:08:35 2004
>+@@ -7,11 +7,11 @@
>+ # --with-ssldir=/etc/ssl
>+ 
>+ # Base directory where to store runtime data.
>+-#base_dir = /var/run/dovecot/
>++base_dir = /var/dovecot
>+ 
>+ # Protocols we want to be serving:
>+ #  imap imaps pop3 pop3s
>+-#protocols = imap imaps
>++protocols = imap pop3
>+ 
>+ # IP or host address where to listen in for connections. It's not currently
>+ # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
>+@@ -27,18 +27,18 @@
>+ #pop3s_listen = 
>+ 
>+ # Disable SSL/TLS support.
>+-#ssl_disable = no
>++ssl_disable = yes
>+ 
>+ # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
>+ # 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_key_file = /etc/ssl/private/dovecot.pem
>++ssl_cert_file = %%SSLDIR%%/certs/dovecot.pem
>++ssl_key_file = %%SSLDIR%%/private/dovecot.pem
>+ 
>+ # 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 = %%SSLDIR%%/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
>+@@ -67,11 +67,11 @@
>+ # Directory where authentication process places authentication UNIX sockets
>+ # 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.
>+-#login_dir = /var/run/dovecot/login
>++login_dir = /var/dovecot/login
>+ 
>+ # chroot login process to the login_dir. Only reason not to do this is if you
>+ # wish to run the whole Dovecot without roots.
>+-#login_chroot = yes
>++login_chroot = yes
>+ 
>+ 
>+ ##
>+@@ -81,12 +81,12 @@
>+ login = imap
>+ 
>+ # Executable location.
>+-#login_executable = /usr/libexec/dovecot/imap-login
>++login_executable = %%PREFIX%%/libexec/dovecot/imap-login
>+ 
>+ # User to use for the login process. Create a completely new user for this,
>+ # and don't use it anywhere else. The user must also belong to a group where
>+ # only it has access, it's used to control access for authentication process.
>+-#login_user = dovecot
>++login_user = dovecot
>+ 
>+ # Set max. process size in megabytes. If you don't use
>+ # login_process_per_connection you might need to grow this.
>+@@ -126,7 +126,7 @@
>+ login = pop3
>+ 
>+ # Exception to above rule being the executable location.
>+-#login_executable = /usr/libexec/dovecot/pop3-login
>++login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
>+ 
>+ ##
>+ ## Mail processes
>+@@ -139,10 +139,10 @@
>+ # Show more verbose process titles (in ps). Currently shows user name and
>+ # IP address. Useful for seeing who are actually using the IMAP processes
>+ # (eg. shared mailboxes or if same uid is used for multiple accounts).
>+-#verbose_proctitle = no
>++verbose_proctitle = yes
>+ 
>+ # Show protocol level SSL errors.
>+-#verbose_ssl = no
>++verbose_ssl = yes
>+ 
>+ # Valid UID range for users, defaults to 500 and above. This is mostly
>+ # to make sure that users can't log in as daemons or other system users.
>+@@ -155,7 +155,7 @@
>+ # non-valid GID as primary group ID aren't allowed to log in. If user
>+ # belongs to supplementary groups with non-valid GIDs, those groups are
>+ # not set.
>+-#first_valid_gid = 1
>++first_valid_gid = 0
>+ #last_valid_gid = 0
>+ 
>+ # ':' separated list of directories under which chrooting is allowed for mail
>+@@ -164,7 +164,7 @@
>+ # WARNING: Never add directories here which local users can modify, that
>+ # may lead to root exploit. Usually this should be done only if you don't
>+ # allow shell access for users. See doc/configuration.txt for more information.
>+-#valid_chroot_dirs = 
>++valid_chroot_dirs = /var/mail
>+ 
>+ # Default chroot directory for mail processes. This can be overridden by
>+ # giving /./ in user's home directory (eg. /home/./user chroots into /home).
>+@@ -187,7 +187,7 @@
>+ #   mbox:~/mail/:INBOX=/var/mail/%u
>+ #   mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
>+ #
>+-#default_mail_env = 
>++default_mail_env = mbox:/var/mail/%u
>+ 
>+ # Space-separated list of fields to cache for all mails. Currently these
>+ # fields are allowed followed by a list of commands they speed up:
>+@@ -232,7 +232,7 @@
>+ #     arrives in half a hour, Dovecot closes the connection. This is still
>+ #     fine, except Outlook doesn't connect back so you don't see if new mail
>+ #     arrives.
>+-#client_workarounds = 
>++client_workarounds = oe6-fetch-no-newmail outlook-idle
>+ 
>+ # Dovecot can notify client of new mail in selected mailbox soon after it's
>+ # received. This setting specifies the minimum interval in seconds between
>+@@ -257,7 +257,7 @@
>+ # Save mails with CR+LF instead of plain LF. This makes sending those mails
>+ # take less CPU, especially with sendfile() syscall with Linux and FreeBSD.
>+ # But it also creates a bit more disk I/O which may just make it slower.
>+-#mail_save_crlf = no
>++mail_save_crlf = yes
>+ 
>+ # Use mmap() instead of read() to read mail files. read() seems to be a bit
>+ # faster with my Linux/x86 and it's better with NFS, so that's the default.
>+@@ -269,7 +269,7 @@
>+ # know any MUA which would modify mail files directly. IMAP protocol also
>+ # requires that the mails don't change, so it would be problematic in any case.
>+ # If you care about performance, enable it.
>+-#maildir_copy_with_hardlinks = no
>++maildir_copy_with_hardlinks = yes
>+ 
>+ # Check if mails' content has been changed by external programs. This slows
>+ # down things as extra stat() needs to be called for each file. If changes are
>+@@ -288,7 +288,7 @@
>+ # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
>+ # and flock. Some operating systems don't allow using both of them
>+ # simultaneously, eg. BSDs. If dotlock is used, it's always created first.
>+-#mbox_locks = dotlock fcntl
>++mbox_locks = fcntl
>+ 
>+ # Should we create dotlock file even when we want only a read-lock? Setting
>+ # this to yes hurts the performance when the mailbox is accessed simultaneously
>+@@ -318,7 +318,7 @@
>+ ##
>+ 
>+ # Executable location
>+-#imap_executable = /usr/libexec/dovecot/imap
>++imap_executable = %%PREFIX%%/libexec/dovecot/imap
>+ 
>+ # Set max. process size in megabytes. Most of the memory goes to mmap()ing
>+ # files, so it shouldn't harm much even if this limit is set pretty high.
>+@@ -326,14 +326,14 @@
>+ 
>+ # Support for dynamically loadable modules.
>+ #imap_use_modules = no
>+-#imap_modules = /usr/lib/dovecot/imap
>++#imap_modules = %%PREFIX%%/lib/dovecot/imap
>+ 
>+ ##
>+ ## POP3 process
>+ ##
>+ 
>+ # Executable location
>+-#pop3_executable = /usr/libexec/dovecot/pop3
>++#pop3_executable = %%PREFIX%%/libexec/dovecot/pop3
>+ 
>+ # Set max. process size in megabytes. Most of the memory goes to mmap()ing
>+ # files, so it shouldn't harm much even if this limit is set pretty high.
>+@@ -341,7 +341,7 @@
>+ 
>+ # Support for dynamically loadable modules.
>+ #pop3_use_modules = no
>+-#pop3_modules = /usr/lib/dovecot/pop3
>++#pop3_modules = %%PREFIX%%/lib/dovecot/pop3
>+ 
>+ ##
>+ ## Authentication processes
>+@@ -390,9 +390,9 @@
>+ #   vpopmail: vpopmail authentication
>+ #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
>+ #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
>+-auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
>++auth_passdb = passwd
>+ 
>+-#auth_executable = /usr/libexec/dovecot/dovecot-auth
>++auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
>+ 
>+ # Set max. process size in megabytes.
>+ #auth_process_size = 256
>+@@ -421,7 +421,7 @@
>+ 
>+ # More verbose logging. Useful for figuring out why authentication isn't
>+ # working.
>+-#auth_verbose = no
>++auth_verbose = yes
>+ 
>+ # digest-md5 authentication process. It requires special MD5 passwords which
>+ # /etc/shadow and PAM doesn't support, so we never need roots to handle it.

Actions: View | Diff

Attachments on bug 67351: 43362