Hello,
Regarding https://dev.openwrt.org/cgi-bin/trac.fcgi/ticket/3785
I've been running dovecot 1.1.1 on my WL-500P (brcm-47xx) for a week and
recently updated to 1.1.2 and cleaned up the patches, see attached
dovecot-1.1.2.svn.patch
The updated configure.in.patch was inspired by optware and further
improved. Using inotify gave error messages in the logs, hence --with-
notify=dnotify
I've removed files/dovecot.conf and replaced it with a minimal patch on
dovecot-example.conf. This means that the installed /etc/dovecot.conf
needs SSL certificates to work, but I cannot bring myself to provide a
default config file which uses plaintext authentication.
Signed-off-by: Tomas Wilhelmsson <towil at towil.net>
---
Index: files/dovecot.init
===================================================================
--- files/dovecot.init (revision 11611)
+++ files/dovecot.init (working copy)
@@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common
-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
START=99
@@ -14,3 +14,7 @@
stop() {
[ -f $PID_F ] && kill $(cat $PID_F)
}
+
+reload() {
+ [ -f $PID_F ] && kill -HUP $(cat $PID_F)
+}
Index: files/dovecot.conf
===================================================================
--- files/dovecot.conf (revision 11611)
+++ files/dovecot.conf (working copy)
@@ -1,895 +0,0 @@
-## Dovecot configuration file
-
-# '#' character and everything after it is treated as comments. Extra
spaces
-# and tabs are ignored. If you want to use either of these explicitly,
put the
-# value inside quotes, eg.: key = "# char and trailing whitespace "
-
-# 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
-# with real defaults being based on configure options. The paths listed
here
-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-# --with-ssldir=/etc/ssl
-
-# Base directory where to store runtime data.
-#base_dir = /var/run/dovecot/
-
-# Protocols we want to be serving:
-# imap imaps pop3 pop3s
-#protocols = imap imaps
-protocols = imap
-
-# IP or host address where to listen in for connections. It's not currently
-# possible to specify multiple addresses. "*" listens in all IPv4
interfaces.
-# "[::]" listens in all IPv6 interfaces, but may also listen in all IPv4
-# interfaces depending on the operating system. If you want to specify
ports
-# for each service, you will need to configure these settings inside the
-# protocol imap/pop3 { ... } section, so you can specify different ports
-# for IMAP/POP3.
-#listen = *
-
-# IP or host address where to listen in for SSL connections. Defaults
-# to above if not specified.
-#ssl_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.
-#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem
-#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key
-
-# If key file is password protected, give the password here. Alternatively
-# give it when starting dovecot with -p parameter.
-#ssl_key_password =
-
-# File containing trusted SSL certificate authorities. Usually not needed.
-#ssl_ca_file =
-
-# Request client to send a certificate.
-#ssl_verify_client_cert = no
-
-# How often to regenerate the SSL parameters file. Generation is quite CPU
-# intensive operation. The value is in hours, 0 disables regeneration
-# entirely.
-#ssl_parameters_regenerate = 168
-
-# SSL ciphers to use
-#ssl_cipher_list = ALL:!LOW
-
-# Disable LOGIN command and all other plaintext authentications unless
-# SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and
-# IPv6 ::1 addresses are considered secure, this setting has no effect if
-# you connect from those addresses.
-disable_plaintext_auth = no
-
-# 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).
-#log_path =
-
-# For informational messages, use this logfile instead of the default
-#info_log_path =
-
-# Prefix for each line written to log file. % codes are in strftime(3)
-# format.
-log_timestamp = "%Y-%m-%d %H:%M:%S "
-
-# Syslog facility to use if you're logging to syslog. Usually if you don't
-# want to use "mail", you'll use local0..local7. Also other standard
-# facilities are supported.
-#syslog_facility = mail
-
-##
-## Login processes
-##
-
-# 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. Note that
-# everything in this directory is deleted when Dovecot is started.
-#login_dir = /var/run/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.
-# http://wiki.dovecot.org/Rootless
-#login_chroot = yes
-
-# 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.
-# Note that this user is NOT used to access mails.
-# http://wiki.dovecot.org/UserIds
-#login_user = dovecot
-
-# Set max. process size in megabytes. If you don't use
-# login_process_per_connection you might need to grow this.
-#login_process_size = 32
-
-# Should each login be processed in it's own process (yes), or should one
-# login process be allowed to process multiple connections (no)? Yes is
more
-# secure, espcially with SSL/TLS enabled. No is faster since there's no
need
-# to create processes all the time.
-#login_process_per_connection = yes
-
-# Number of login processes to create. If login_process_per_connection is
-# yes, this is the number of extra processes waiting for users to log in.
-#login_processes_count = 3
-
-# Maximum number of extra login processes to create. The extra process
count
-# usually stays at login_processes_count, but when multiple users start
logging
-# in at the same time more extra processes are created. To prevent
fork-bombing
-# we check only once in a second if new processes should be created -
if all
-# of them are used at the time, we double their amount until limit set
by this
-# setting is reached. This setting is used only if
login_process_per_use is yes.
-#login_max_processes_count = 128
-
-# Maximum number of connections allowed in login state. When this limit is
-# reached, the oldest connections are dropped. If
login_process_per_connection
-# is no, this is a per-process value, so the absolute maximum number of
users
-# logging in actually login_processes_count * max_logging_users.
-#login_max_logging_users = 256
-
-# Greeting message for clients.
-#login_greeting = Dovecot ready.
-
-# Space-separated list of elements we want to log. The elements which have
-# a non-empty variable value are joined together to form a comma-separated
-# string.
-#login_log_format_elements = user=<%u> method=%m rip=%r lip=%l %c
-
-# Login log format. %$ contains login_log_format_elements string, %s
contains
-# the data we want to log.
-#login_log_format = %$: %s
-
-##
-## Mail processes
-##
-
-# Maximum number of running mail processes. When this limit is reached,
-# new users aren't allowed to log in.
-#max_mail_processes = 1024
-
-# 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
-
-# Show protocol level SSL errors.
-#verbose_ssl = no
-
-# 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.
-# Note that denying root logins is hardcoded to dovecot binary and can't
-# be done even if first_valid_uid is set to 0.
-#first_valid_uid = 500
-#last_valid_uid = 0
-
-# Valid GID range for users, defaults to non-root/wheel. Users having
-# 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
-#last_valid_gid = 0
-
-# Grant access to these extra groups for mail processes. Typical use
would be
-# to give "mail" group write access to /var/mail to be able to create
dotlocks.
-mail_extra_groups = mail
-
-# ':' separated list of directories under which chrooting is allowed
for mail
-# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
-# This setting doesn't affect login_chroot or auth_chroot variables.
-# 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
-# /usr/share/doc/dovecot-common/configuration.txt for more information.
-#valid_chroot_dirs =
-
-# Default chroot directory for mail processes. This can be overridden for
-# specific users in user database by giving /./ in user's home directory
-# (eg. /home/./user chroots into /home). Note that usually there is no real
-# need to do chrooting, Dovecot doesn't allow users to access files outside
-# their mail directory anyway.
-#mail_chroot =
-
-# Enable mail process debugging. This can help you figure out why Dovecot
-# isn't finding your mails.
-#mail_debug = no
-
-# Default MAIL environment to use when it's not set. By leaving this empty
-# dovecot tries to do some automatic detection as described in
-# /usr/share/doc/dovecot-common/mail-storages.txt. There's a few special
-# variables you can use, eg.:
-#
-# %u - username
-# %n - user part in [EMAIL PROTECTED], same as %u if there's no domain
-# %d - domain part in [EMAIL PROTECTED], empty if there's no domain
-# %h - home directory
-#
-# See /usr/share/doc/dovecot-common/variables.txt for full list. Some
examples:
-#
-# default_mail_env = maildir:/var/mail/%1u/%u/Maildir
-# default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
-# default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
-#
-#default_mail_env =
-
-# If you need to set multiple mailbox locations or want to change default
-# namespace settings, you can do it by defining namespace sections:
-#
-# You can have private, shared and public namespaces. The only difference
-# between them is how Dovecot announces them to client via NAMESPACE
-# extension. Shared namespaces are meant for user-owned mailboxes which are
-# shared to other users, while public namespaces are for more globally
-# accessible mailboxes.
-#
-# REMEMBER: If you add any namespaces, the default namespace must be added
-# explicitly, ie. default_mail_env does nothing unless you have a namespace
-# without a location setting. Default namespace is simply done by having a
-# namespace with empty prefix.
-#namespace private {
- # Hierarchy separator to use. You should use the same separator for all
- # namespaces or some clients get confused. '/' is usually a good one.
- #separator = /
-
- # Prefix required to access this namespace. This needs to be
different for
- # all namespaces. For example "Public/".
- #prefix =
-
- # Physical location of the mailbox. This is in same format as
- # default_mail_env, which is also the default for it.
- #location =
-
- # There can be only one INBOX, and this setting defines which namespace
- # has it.
- #inbox = yes
-
- # If namespace is hidden, it's not advertised to clients via NAMESPACE
- # extension or shown in LIST replies. This is mostly useful when
converting
- # from another server with different namespaces which you want to
depricate
- # but still keep working. For example you can create hidden
namespaces with
- # prefixes "~/mail/", "~%u/mail/" and "mail/".
- #hidden = yes
-#}
-
-# Space-separated list of fields to initially save into cache file.
Currently
-# these fields are allowed:
-#
-# flags, date.sent, date.received, size.virtual, size.physical
-# mime.parts, imap.body, imap.bodystructure
-#
-# Different IMAP clients work in different ways, so they benefit from
-# different cached fields. Some do not benefit from them at all.
Caching more
-# than necessary generates useless disk I/O, so you don't want to do that
-# either.
-#
-# Dovecot attempts to automatically figure out what client wants and it
keeps
-# only that. However the first few times a mailbox is opened, Dovecot
hasn't
-# yet figured out what client needs, so it may not perform optimally.
If you
-# know what fields the majority of your clients need, it may be useful
to set
-# these fields by hand. If client doesn't actually use them, Dovecot will
-# eventually drop them.
-#
-# Usually you should just leave this field alone. The potential
benefits are
-# typically unnoticeable.
-#mail_cache_fields =
-
-# Space-separated list of fields that Dovecot should never save to
cache file.
-# Useful if you want to save disk space at the cost of more I/O when
the fields
-# needed.
-#mail_never_cache_fields =
-
-# The minimum number of mails in a mailbox before updates are done to cache
-# file. This allows optimizing Dovecot's behavior to do less disk writes at
-# the cost of more disk reads.
-#mail_cache_min_mail_count = 0
-
-# When IDLE command is running, mailbox is checked once in a while to
see if
-# there are any new mails or other changes. This setting defines the
minimum
-# time to wait between those checks. Dovecot is however able to use dnotify
-# and inotify with Linux to reply immediately after the change occurs.
-#mailbox_idle_check_interval = 30
-
-# Allow full filesystem access to clients. There's no access checks
other than
-# what the operating system does for the active UID/GID. It works with both
-# maildir and mboxes, allowing you to prefix mailboxes names with eg.
/path/
-# or ~user/.
-#mail_full_filesystem_access = no
-
-# Maximum allowed length for mail keyword name. It's only forced when
trying
-# to create new keywords.
-#mail_max_keyword_length = 50
-
-# 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.
-# Also note that if other software reads the mboxes/maildirs, they may
handle
-# the extra CRs wrong and cause problems.
-#mail_save_crlf = no
-
-# 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.
-# Note that OpenBSD 3.3 and older don't work right with
mail_read_mmaped = yes.
-#mail_read_mmaped = no
-
-# Don't use mmap() at all. This is required if you store indexes in remote
-# filesystems (NFS or clustered filesystem).
-#mmap_disable = no
-
-# Don't write() to mmaped files. This is required for some operating
systems
-# which use separate caches for them, such as OpenBSD.
-#mmap_no_write = no
-
-# 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
-# methods. NOTE: If you use NFS, remember to change also mmap_disable
setting!
-# Solaris doesn't support flock, so Solaris users need to change this
to fcntl.
-#lock_method = flock
-
-# By default LIST command returns all entries in maildir beginning with
dot.
-# Enabling this option makes Dovecot return only entries which are
directories.
-# This is done by stat()ing each entry, so it causes more disk I/O.
-# (For systems setting struct dirent->d_type, this check is free and it's
-# done always regardless of this setting)
-#maildir_stat_dirs = no
-
-# Copy mail to another folders using hard links. This is much faster than
-# actually copying the file. This is problematic only if something modifies
-# the mail in one folder but doesn't want it modified in the others. I
don't
-# 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
-
-# Which locking methods to use for locking mbox. There's four available:
-# dotlock: Create <mailbox>.lock file. This is the oldest and most
NFS-safe
-# solution. If you want to use /var/mail/ like directory, the
users
-# will need write access to that directory.
-# fcntl : Use this if possible. Works with NFS too if lockd is used.
-# flock : May not exist in all systems. Doesn't work with NFS.
-# lockf : May not exist in all systems. Doesn't work with NFS.
-#
-# You can use multiple locking methods; if you do the order they're
declared
-# in is important to avoid deadlocks if other MTAs/MUAs are using multiple
-# locking methods as well. Some operating systems don't allow using some of
-# them simultaneously.
-#mbox_read_locks = fcntl
-#mbox_write_locks = dotlock fcntl
-
-# Maximum time in seconds to wait for lock (all of them) before aborting.
-#mbox_lock_timeout = 300
-
-# If dotlock exists but the mailbox isn't modified in any way, override the
-# lock file after this many seconds.
-#mbox_dotlock_change_timeout = 30
-
-# When mbox changes unexpectedly we have to fully read it to find out what
-# changed. If the mbox is large this can take a long time. Since the change
-# is usually just a newly appended mail, it'd be faster to simply read the
-# new mails. If this setting is enabled, Dovecot does this but still safely
-# fallbacks to re-reading the whole mbox file whenever something in
mbox isn't
-# how it's expected to be. The only real downside to this setting is
that if
-# some other MUA changes message flags, Dovecot doesn't notice it
immediately.
-# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK
-# commands.
-#mbox_dirty_syncs = yes
-
-# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE,
-# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored.
-#mbox_very_dirty_syncs = no
-
-# Delay writing mbox headers until doing a full write sync (EXPUNGE and
CHECK
-# commands and when closing the mailbox). This is especially useful for
POP3
-# where clients often delete all mails. The downside is that our changes
-# aren't immediately visible to other MUAs.
-#mbox_lazy_writes = yes
-
-# If mbox size is smaller than this (in kilobytes), don't write index
files.
-# If an index file already exists it's still read, just not updated.
-#mbox_min_index_size = 0
-
-# Maximum dbox file size in kilobytes until it's rotated.
-#dbox_rotate_size = 2048
-
-# Minimum dbox file size in kilobytes before it's rotated
-# (overrides dbox_rotate_days)
-#dbox_rotate_min_size = 16
-
-# Maximum dbox file age in days until it's rotated. Day always begins from
-# midnight, so 1 = today, 2 = yesterday, etc. 0 = check disabled.
-#dbox_rotate_days = 0
-
-# umask to use for mail files and directories
-#umask = 0077
-
-# Drop all privileges before exec()ing the mail process. This is mostly
-# meant for debugging, otherwise you don't get core dumps. It could be
a small
-# security risk if you use single UID for multiple users, as the users
could
-# ptrace() each others processes then.
-#mail_drop_priv_before_exec = no
-
-# 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.
-#mail_process_size = 256
-
-# Log prefix for mail processes. See
-# /usr/share/doc/dovecot-common/variables.txt for list of possible
variables
-#you can use.
-#mail_log_prefix = "%Us(%u): "
-
-##
-## IMAP specific settings
-##
-
-protocol imap {
- # Login executable location.
- #login_executable = /usr/lib/dovecot/imap-login
-
- # 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/lib/dovecot/rawlog /usr/lib/dovecot/imap
- #
- # This would attach gdb into the imap process and write backtraces into
- # /tmp/gdbhelper.* files:
- # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap
- #
- #mail_executable = /usr/lib/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
- # "Too long argument" or "IMAP command line too large" errors often.
- #imap_max_line_length = 65536
-
- # Support for dynamically loadable modules.
- #mail_use_modules = no
- #mail_modules = /usr/lib/dovecot/modules/imap
-
- # Send IMAP capabilities in greeting message. This makes it
unnecessary for
- # clients to request it with CAPABILITY command, so it saves one
round-trip.
- # Many clients however don't understand it and ask the CAPABILITY anyway.
- #login_greeting_capability = no
-
- # Workarounds for various client bugs:
- # delay-newmail:
- # Send EXISTS/RECENT new mail notifications only when replying to
NOOP
- # and CHECK commands. Some clients ignore them otherwise, for example
- # OSX Mail. Outlook Express breaks more badly though, without this it
- # may show user "Message no longer in server" errors. Note that
OE6 still
- # breaks even with this workaround if synchronization is set to
- # "Headers Only".
- # outlook-idle:
- # Outlook and Outlook Express never abort IDLE command, so if no mail
- # 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.
- # netscape-eoh:
- # Netscape 4.x breaks if message headers don't end with the empty
"end of
- # headers" line. Normally all messages have this, but setting this
- # workaround makes sure that Netscape never breaks by adding the
line if
- # it doesn't exist. This is done only for FETCH BODY[HEADER.FIELDS..]
- # commands. Note that RFC says this shouldn't be done.
- # tb-extra-mailbox-sep:
- # With mbox storage a mailbox can contain either mails or
submailboxes,
- # but not both. Thunderbird separates these two by forcing server to
- # accept '/' suffix in mailbox names in subscriptions list.
- # The list is space-separated.
- #imap_client_workarounds = outlook-idle
-}
-
-##
-## POP3 specific settings
-##
-
-protocol pop3 {
- # Login executable location.
- #login_executable = /usr/lib/dovecot/pop3-login
-
- # POP3 executable location
- #mail_executable = /usr/lib/dovecot/pop3
-
- # 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
- # from new/ to cur/, with mbox it doesn't write Status-header.
- #pop3_no_flag_updates = no
-
- # Support LAST command which exists in old POP3 specs, but has been
removed
- # from new ones. Some clients still wish to use this though. Enabling
this
- # makes RSET command clear all \Seen flags from messages.
- #pop3_enable_last = no
-
- # POP3 UIDL format to use. You can use following variables:
- #
- # %v - Mailbox UIDVALIDITY
- # %u - Mail UID
- # %m - MD5 sum of the mailbox headers in hex (mbox only)
- # %f - filename (maildir only)
- #
- # If you want UIDL compatibility with other POP3 servers, use:
- # UW's ipop3d : %08Xv%08Xu
- # Courier version 0 : %f
- # Courier version 1 : %u
- # Courier version 2 : %v-%u
- # Cyrus (<= 2.1.3) : %u
- # Cyrus (>= 2.1.4) : %v.%u
- # Older Dovecots : %v.%u
- #
- # Note that Outlook 2003 seems to have problems with %v.%u format
which was
- # Dovecot's default, so if you're building a new server it would be a
good
- # idea to change this. %08Xu%08Xv should be pretty fail-safe.
- #
- # NOTE: Nowadays this is required to be set explicitly, since the old
- # default was bad but it couldn't be changed without breaking existing
- # installations. %08Xu%08Xv will be the new default, so use it for new
- # installations.
- #
- #pop3_uidl_format =
-
- # POP3 logout format string:
- # %t - number of TOP commands
- # %T - number of bytes sent to client as a result of TOP command
- # %r - number of RETR commands
- # %R - number of bytes sent to client as a result of RETR command
- # %d - number of deleted messages
- # %m - number of messages (before deletion)
- # %s - mailbox size in bytes (before deletion)
- #pop3_logout_format = top=%t/%T, retr=%r/%R, del=%d/%m, size=%s
-
- # Support for dynamically loadable modules.
- #mail_use_modules = no
- #mail_modules = /usr/lib/dovecot/modules/pop3
-
- # Workarounds for various client bugs:
- # outlook-no-nuls:
- # Outlook and Outlook Express hang if mails contain NUL characters.
- # This setting replaces them with 0x80 character.
- # oe-ns-eoh:
- # Outlook Express and Netscape Mail breaks if end of headers-line is
- # missing. This option simply sends it if it's missing.
- # The list is space-separated.
- #pop3_client_workarounds =
-}
-
-##
-## dovecot-lda specific settings
-##
-
-# protocol lda {
- # If you wish to use plugins you need to specify plugin directory
- # For example quota enforcing is implemented by plugin
- #module_dir = /usr/local/lib/dovecot/lda
-
- # Address from LDA should send MDNs like out of quota
- # postmaster_address = [EMAIL PROTECTED]
-
- # If there is no user-specific Sieve-script, global Sieve script is
- # executed if set.
- #global_script_path =
-
- # UNIX socket path to master authentication server to find users.
- #auth_socket_path = /var/run/dovecot-auth-master
-# }
-
-##
-## Authentication processes
-##
-
-# Executable location
-#auth_executable = /usr/lib/dovecot/dovecot-auth
-
-# Set max. process size in megabytes.
-#auth_process_size = 256
-
-# Authentication cache size in kilobytes. 0 means it's disabled.
-# Note that bsdauth, PAM and vpopmail require cache_key to be set for
caching
-# to be used. Also note that currently auth cache doesn't work very
well if
-# you're using multiple passdbs with same usernames in them.
-#auth_cache_size = 0
-# Time to live in seconds for cached data. After this many seconds the
cached
-# record is no longer used, *except* if the main database lookup returns
-# internal failure.
-#auth_cache_ttl = 3600
-
-# Space separated list of realms for SASL authentication mechanisms
that need
-# them. You can leave it empty if you don't want to support multiple
realms.
-# Many clients simply use the first one listed here, so keep the
default realm
-# first.
-#auth_realms =
-
-# Default realm/domain to use if none was specified. This is used for both
-# SASL realms and appending @domain to username in plaintext logins.
-#auth_default_realm =
-
-# List of allowed characters in username. If the user-given username
contains
-# a character not listed in here, the login automatically fails. This
is just
-# an extra check to make sure user can't exploit any potential quote
escaping
-# vulnerabilities with SQL/LDAP databases. If you want to allow all
characters,
-# set this value to empty.
-#auth_username_chars =
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@
-
-# Username character translations before it's looked up from databases. The
-# value contains series of from -> to characters. For example "#@/@" means
-# that '#' and '/' characters are translated to '@'.
-#auth_username_translation =
-
-# Username to use for users logging in with ANONYMOUS SASL mechanism
-#auth_anonymous_username = anonymous
-
-# More verbose logging. Useful for figuring out why authentication isn't
-# working.
-#auth_verbose = no
-
-# Even more verbose logging for debugging purposes. Shows for example SQL
-# queries.
-#auth_debug = no
-
-# In case of password mismatches, log the passwords and used scheme so the
-# problem can be debugged. Requires auth_debug=yes to be set.
-#auth_debug_passwords = no
-
-# Maximum number of dovecot-auth worker processes. They're used to execute
-# blocking passdb and userdb queries (eg. MySQL and PAM). They're
-# automatically created and destroyed as needed.
-#auth_worker_max_count = 30
-
-# Kerberos keytab to use for the GSSAPI mechanism. Will use the system
-# default (usually /etc/krb5.keytab) if not specified.
-#auth_krb5_keytab =
-
-auth default {
- # Space separated list of wanted authentication mechanisms:
- # plain digest-md5 cram-md5 apop anonymous gssapi
- mechanisms = plain
-
- ##
- ## dovecot-lda specific settings
- ##
- # socket listen {
- # master {
- # path = /var/run/dovecot-auth-master
- # mode = 0600
- # user = vmail # User running Dovecot LDA
- # #group = mail # Or alternatively mode 0660 + LDA user in this group
- # }
- # }
-
- #
- # Password database is used to verify user's password (and nothing more).
- # You can have multiple passdbs and userdbs. This is useful if you
want to
- # allow both system users (/etc/passwd) and virtual users to login
without
- # duplicating the system users into virtual database.
- #
- # http://wiki.dovecot.org/Authentication
- #
-
- # Users can be temporarily disabled by adding a passdb with deny=yes.
- # If the user is found from that database, authentication will fail.
- # The deny passdb should always be specified before others, so it gets
- # checked first. Here's an example:
- #passdb passwd-file {
- # File contains a list of usernames, one per line
- #args = /etc/dovecot.deny
- #deny = yes
- #}
-
- # PAM authentication. Preferred nowadays by most systems.
- # 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 {
- # [session=yes] [cache_key=<key>] [<service name>]
- #
- # session=yes makes Dovecot open and immediately close PAM session.
Some
- # PAM plugins need this to work, such as pam_mkhomedir.
- #
- # cache_key can be used to enable authentication caching for PAM
- # (auth_cache_size also needs to be set). It isn't enabled by default
- # because PAM modules can do all kinds of checks besides checking
password,
- # such as checking IP address. Dovecot can't know about these checks
- # without some help. cache_key is simply a list of variables (see
- # /usr/share/doc/dovecot-common/variables.txt) which must match for
the
- # cached data to be used.
- # Here are some examples:
- # %u - Username must match. Probably sufficient for most uses.
- # %u%r - Username and remote IP address must match.
- # %u%s - Username and service (ie. IMAP, POP3) must match.
- #
- # If service name is "*", it means the authenticating service name
- # is used, eg. pop3 or imap.
- #
- # Some examples:
- # args = session=yes *
- # args = cache_key=%u dovecot
- #args = dovecot
-# }
-
- # /etc/passwd or similar, using getpwnam()
- # In many systems nowadays this uses Name Service Switch, which is
- # configured in /etc/nsswitch.conf.
- passdb passwd {
- }
-
- # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
- #passdb shadow {
- #}
-
- # BSD authentication. Used by at least OpenBSD.
- #passdb bsdauth {
- # [cache_key=<key>] - See cache_key in PAM for explanation.
- #args =
- #}
-
- # passwd-like file with specified location
- #passdb passwd-file {
- # Path for passwd-file
- #args =
- #}
-
- # checkpassword executable authentication
- # NOTE: You will probably want to use "userdb prefetch" with this.
- #passdb checkpassword {
- # Path for checkpassword binary
- #args =
- #}
-
- # SQL database
- #passdb sql {
- # Path for SQL configuration file, see
/etc/dovecot/dovecot-sql.conf for
- # example
- #args =
- #}
-
- # LDAP database
- #passdb ldap {
- # Path for LDAP configuration file, see
/etc/dovecot/dovecot-ldap.conf for
- # example
- #args =
- #}
-
- # vpopmail authentication
- #passdb vpopmail {
- # [cache_key=<key>] - See cache_key in PAM for explanation.
- #args =
- #}
-
- #
- # User database specifies where mails are located and what user/group IDs
- # own them. For single-UID configuration use "static".
- #
- # http://wiki.dovecot.org/Authentication
- # http://wiki.dovecot.org/VirtualUsers
- #
-
- # /etc/passwd or similar, using getpwnam()
- # In many systems nowadays this uses Name Service Switch, which is
- # configured in /etc/nsswitch.conf.
- userdb passwd {
- }
-
- # passwd-like file with specified location
- #userdb passwd-file {
- # Path for passwd-file
- #args =
- #}
-
- # static settings generated from template
- #userdb static {
- # Template for settings. Can return anything a userdb could normally
- # return, eg.: uid, gid, home, mail, nice
- #
- # A few examples:
- #
- # args = uid=500 gid=500 home=/var/mail/%u
- # args = uid=500 gid=500 home=/home/%u mail=mbox:/home/%u/mail nice=10
- #
- #args =
- #}
-
- # SQL database
- #userdb sql {
- # Path for SQL configuration file, see
/etc/dovecot/dovecot-sql.conf for
- # example
- #args =
- #}
-
- # LDAP database
- #userdb ldap {
- # Path for LDAP configuration file, see
/etc/dovecot/dovecot-ldap.conf for
- # example
- #args =
- #}
-
- # vpopmail
- #userdb vpopmail {
- #}
-
- # "prefetch" user database means that the passdb already provided the
- # needed information and there's no need to do a separate userdb lookup.
- # This can be made to work with SQL and LDAP databases, see their example
- # configuration files for more information how to do it.
- # http://wiki.dovecot.org/AuthSpecials
- #userdb prefetch {
- #}
-
- # User to use for the process. This user needs access to only user and
- # password databases, nothing else. Only shadow and pam authentication
- # requires roots, so use something else if possible. Note that passwd
- # authentication with BSDs internally accesses shadow files, which also
- # requires roots. Note that this user is NOT used to access mails.
- # That user is specified by userdb above.
- user = root
-
- # Directory where to chroot the process. Most authentication backends
don't
- # work if this is set, and there's no point chrooting if auth_user is
root.
- # Note that valid_chroot_dirs isn't needed to use this setting.
- #chroot =
-
- # Number of authentication processes to create
- #count = 1
-
- # Require a valid SSL client certificate or the authentication fails.
- #ssl_require_client_cert = no
-
- # Take the username from client's SSL certificate, using
X509_NAME_oneline()
- # which typically uses subject's Distinguished Name.
- #ssl_username_from_cert = no
-}
-
-# It's possible to export the authentication interface to other programs,
-# for example SMTP server which supports talking to Dovecot. Client socket
-# handles the actual authentication - you give it a username and password
-# and it returns OK or failure. So it's pretty safe to allow anyone
access to
-# it. Master socket is used to a) query if given client was successfully
-# authenticated, b) userdb lookups.
-
-# listener sockets will be created by Dovecot's master process using the
-# settings given inside the auth section
-#auth default_with_listener {
-# mechanisms = plain
-# passdb pam {
-# }
-# userdb passwd {
-# }
-# socket listen {
-# master {
-# path = /var/run/dovecot-auth-master
-# # WARNING: Giving untrusted users access to master socket may be a
-# # security risk, don't give too wide permissions to it!
-# #mode = 0600
-# # Default user/group is the one who started dovecot-auth (root)
-# #user =
-# #group =
-# }
-# client {
-# path = /var/run/dovecot-auth-client
-# mode = 0660
-# }
-# }
-#}
-
-# connect sockets are assumed to be already running, Dovecot's master
-# process only tries to connect to them. They don't need any other settings
-# than path for the master socket, as the configuration is done elsewhere.
-# Note that the client sockets must exist in login_dir.
-#auth external {
-# socket connect {
-# master {
-# path = /var/run/dovecot-auth-master
-# }
-# }
-#}
-
-plugin {
- # Here you can give some extra environment variables to mail processes.
- # This is mostly meant for passing parameters to plugins. %variable
- # expansion is done for all values.
-
- # Quota plugin
- #quota = dirsize:%h/mail
-
- # Convert plugin. If set, specifies the source storage path which is
- # converted to destination storage (default_mail_env).
- #convert_mail = mbox:%h/mail
-}
Index: patches/configure.in.patch
===================================================================
--- patches/configure.in.patch (revision 11611)
+++ patches/configure.in.patch (working copy)
@@ -1,85 +1,351 @@
---- ./configure.in.dovecot 2005-07-30 23:44:48.571463846 +0100
-+++ ./configure.in 2005-07-31 00:22:17.564381142 +0100
-@@ -529,7 +529,22 @@
- echo "..ignoring as requested.."
- ],[
- AC_MSG_RESULT(no)
--],[])
-+],[
-+
-+ AC_MSG_RESULT(can't check)
-+
-+ echo
-+ echo "You are cross compiling so I can't tell if the destination
uses a signed"
-+ echo "size_t. Dovecot isn't designed to work with a signed size_t,
It probably"
-+ echo "works just fine, but it's less resistant to buffer overflows."
-+ echo "You may want to manually check what your target uses for size_t."
-+ echo "To compile Dovecot anyway, set ignore_signed_size=1 environment."
-+
-+ if test "$ignore_signed_size" = ""; then
-+ AC_MSG_ERROR([aborting])
-+ fi
-+ echo "..proceeding as requested.."
-+])
+--- dovecot-1.1.2-orig/configure.in 2008-07-24 01:46:52.000000000 +0200
++++ dovecot-1.1.2/configure.in 2008-07-29 15:46:47.000000000 +0200
+@@ -473,9 +473,9 @@
+ if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then
+ AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[
+- AC_TRY_RUN([
++ AC_TRY_LINK([
+ #include <sys/epoll.h>
+-
++ ], [
+ int main()
+ {
+ return epoll_create(5) < 1;
+@@ -525,13 +525,13 @@
+ if test "$notify" = "" || test "$notify" = "inotify" ; then
+ dnl * inotify?
+ AC_CACHE_CHECK([whether we can use inotify],i_cv_inotify_works,[
+- AC_TRY_RUN([
++ AC_TRY_LINK([
+ #define _GNU_SOURCE
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <sys/inotify.h>
+ #include <stdio.h>
+-
++ ], [
+ int main()
+ {
+ int wd, fd;
+@@ -848,30 +848,7 @@
+ dnl * make sure size_t isn't signed. we'd probably work fine with it, but
+ dnl * it's more likely vulnerable to buffer overflows. Anyway, C99
specifies
+ dnl * that it's unsigned and only some old systems define it as signed.
+-AC_CACHE_CHECK([whether size_t is signed],i_cv_signed_size_t,[
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+- #include <sys/types.h>
+- int main() {
+- /* return 0 if we're signed */
+- exit((size_t)(int)-1 <= 0 ? 0 : 1);
+- }
+- ]])],[
+- i_cv_signed_size_t=yes
+
+- echo
+- echo "Your system's size_t is a signed integer, Dovecot isn't
designed to"
+- echo "support it. It probably works just fine, but it's less
resistant to"
+- echo "buffer overflows. If you're not worried about this and still
want to"
+- echo "compile Dovecot, set ignore_signed_size=1 environment."
+-
+- if test "$ignore_signed_size" = ""; then
+- AC_MSG_ERROR([aborting])
+- fi
+- echo "..ignoring as requested.."
+- ],[
+- i_cv_signed_size_t=no
+- ],[])
+-])
dnl Note: we check size_t rather than ssize_t here, because on OSX 10.2
dnl ssize_t = int and size_t = unsigned long. We're mostly concerned
about
-@@ -659,7 +674,10 @@
- ], [
- AC_MSG_RESULT([check failed, assuming 31])
- max_bits=31
--],[])
-+],[
-+ AC_MSG_RESULT([cross compiling, assuming 31])
-+ max_bits=31
-+])
- AC_DEFINE_UNQUOTED(TIME_T_MAX_BITS, $max_bits, max. time_t bits
gmtime() can handle)
+ dnl printf format here, so check the size_t one.
+@@ -962,62 +939,8 @@
+ AC_MSG_RESULT($i_cv_field_tm_gmtoff)
- dnl * do we have struct iovec
-@@ -768,6 +786,8 @@
- ], [
- AC_MSG_RESULT(no)
- AC_DEFINE(MMAP_CONFLICTS_WRITE,, [Define if shared mmaps don't get
updated by write()s])
-+], [
-+ AC_MSG_RESULT(cross-compiling so target PROBABLY isn't the buggy
version of OpenBSD)
+ dnl * how large time_t values does gmtime() accept?
+-AC_CACHE_CHECK([how large time_t values gmtime()
accepts],i_cv_gmtime_max_time_t,[
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+- #include <stdio.h>
+- #include <time.h>
+- int main() {
+- FILE *f;
+- int bits;
+-
+- for (bits = 1; bits < sizeof(time_t)*8; bits++) {
+- time_t t = ((time_t)1 << bits) - 1;
+- if (gmtime(&t) == NULL) {
+- bits--;
+- break;
+- }
+- }
+- if (bits > 40) {
+- /* Solaris 9 breaks after 55 bits. Perhaps other systems break earlier.
+- Let's just do the same as Cyrus folks and limit it to 40 bits. */
+- bits = 40;
+- }
+-
+- f = fopen("conftest.temp", "w");
+- if (f == NULL) {
+- perror("fopen()");
+- return 1;
+- }
+- fprintf(f, "%d", bits);
+- fclose(f);
+- return 0;
+- }
+- ]])],[
+- i_cv_gmtime_max_time_t=`cat conftest.temp`
+- rm -f conftest.temp
+- ], [
+- printf "check failed, assuming "
+- i_cv_gmtime_max_time_t=31
+- ],[])
+-])
+-AC_DEFINE_UNQUOTED(TIME_T_MAX_BITS, $i_cv_gmtime_max_time_t, max.
time_t bits gmtime() can handle)
+-
+-AC_CACHE_CHECK([whether time_t is signed],i_cv_signed_time_t,[
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+- #include <sys/types.h>
+- int main() {
+- /* return 0 if we're signed */
+- exit((time_t)(int)-1 <= 0 ? 0 : 1);
+- }
+- ]])],[
+- i_cv_signed_time_t=yes
+- ], [
+- i_cv_signed_time_t=no
+- ])
+-])
+-if test $i_cv_signed_time_t = yes; then
+- AC_DEFINE(TIME_T_SIGNED,, Define if your time_t is signed)
+-fi
++dnl * Set to 32 because we can't calculate it if we are cross compiling.
++AC_DEFINE_UNQUOTED(TIME_T_MAX_BITS, 32, max. time_t bits gmtime() can
handle)
+
+ dnl Our implementation of AC_C_FLEXIBLE_ARRAY_MEMBER.
+ dnl Use it until autoconf 2.61+ becomes more widely used
+@@ -1108,114 +1031,8 @@
])
+ dnl * If mmap() plays nicely with write()
+-AC_CACHE_CHECK([whether shared mmaps get updated by
write()s],i_cv_mmap_plays_with_write,[
+- AC_TRY_RUN([
+- #include <stdio.h>
+- #include <sys/types.h>
+- #include <sys/stat.h>
+- #include <unistd.h>
+- #include <fcntl.h>
+- #include <sys/mman.h>
+- int main() {
+- /* return 0 if we're signed */
+- int f = open("conftest.mmap", O_RDWR|O_CREAT|O_TRUNC);
+- void *mem;
+- if (f == -1) {
+- perror("open()");
+- return 1;
+- }
+- unlink("conftest.mmap");
+-
+- write(f, "1", 2);
+- mem = mmap(NULL, 2, PROT_READ|PROT_WRITE, MAP_SHARED, f, 0);
+- if (mem == MAP_FAILED) {
+- perror("mmap()");
+- return 1;
+- }
+- strcpy(mem, "2");
+- msync(mem, 2, MS_SYNC);
+- lseek(f, 0, SEEK_SET);
+- write(f, "3", 2);
+-
+- return strcmp(mem, "3") == 0 ? 0 : 1;
+- }
+- ], [
+- i_cv_mmap_plays_with_write=yes
+- ], [
+- i_cv_mmap_plays_with_write=no
+- ])
+-])
+-if test $i_cv_mmap_plays_with_write = no; then
+- AC_DEFINE(MMAP_CONFLICTS_WRITE,, [Define if shared mmaps don't get
updated by write()s])
+-fi
+
dnl * see if fd passing works
-@@ -831,6 +851,9 @@
- if test $i = 2; then
- AC_MSG_RESULT(no)
- fi
-+ ], [
-+ CFLAGS=$old_cflags
-+ AC_MSG_RESULT(cross compiling so target probably isn't 64 bit)
- ])
- done
+-AC_CACHE_CHECK([whether fd passing works],i_cv_fd_passing,[
+- for i in 1 2; do
+- old_cflags="$CFLAGS"
+- CFLAGS="$CFLAGS -I$srcdir/src/lib $srcdir/src/lib/fdpass.c"
+- if test $i = 2; then
+- CFLAGS="$CFLAGS -DBUGGY_CMSG_MACROS"
+- fi
+-
+- AC_TRY_RUN([
+- #include <sys/types.h>
+- #include <sys/socket.h>
+- #include <sys/wait.h>
+- #include <sys/stat.h>
+- #include <unistd.h>
+- #include <fcntl.h>
+- #include "fdpass.h"
+-
+- int main(void)
+- {
+- int fd[2], send_fd, recv_fd, status;
+- struct stat st, st2;
+- char data;
+-
+- send_fd = open("conftest.fdpass", O_CREAT|O_WRONLY);
+- if (send_fd == -1) return 2;
+- unlink("conftest.fdpass");
+- if (fstat(send_fd, &st) < 0) return 2;
+- if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) return 2;
+-
+- switch (fork()) {
+- case -1:
+- return 2;
+- case 0:
+- alarm(1);
+- if (fd_send(fd[0], send_fd, &data, 1) != 1) return 2;
+- return 0;
+- default:
+- alarm(2);
+- if (wait(&status) == -1)
+- return 2;
+- if (status != 0)
+- return status;
+- if (fd_read(fd[1], &data, 1, &recv_fd) != 1) return 1;
+- if (fstat(recv_fd, &st2) < 0) return 2;
+- return st.st_ino == st2.st_ino ? 0 : 1;
+- }
+- }
+- ], [
+- CFLAGS=$old_cflags
+- if test $i = 2; then
+- i_cv_fd_passing=buggy_cmsg_macros
+- else
+- i_cv_fd_passing=yes
+- fi
+- break
+- ], [
+- dnl no, try with BUGGY_CMSG_MACROS
+- CFLAGS=$old_cflags
+- i_cv_fd_passing=no
+- ])
+- done
+-]);
+-
+-if test $i_cv_fd_passing = buggy_cmsg_macros; then
+- AC_DEFINE(BUGGY_CMSG_MACROS,, Define if you have buggy CMSG macros)
+-fi
-@@ -878,7 +901,7 @@
- dnl ***
+ dnl * Solaris compatible sendfile()
+ AC_CHECK_LIB(sendfile, sendfile, [
+@@ -1405,109 +1222,6 @@
+ AC_MSG_RESULT(no)
+ ])
- AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+-dnl ***
+-dnl *** C99 vsnprintf()?
+-dnl ***
+-
+-AC_CACHE_CHECK([for C99 vsnprintf()],i_cv_c99_vsnprintf,[
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+- #include <stdio.h>
+- #include <stdarg.h>
+- static int f(const char *fmt, ...) {
+- va_list args;
+- char buf[13];
+- int ret;
+-
+- va_start(args, fmt);
+- ret = vsnprintf(buf, 11, fmt, args) != 12 || buf[11-1] != '\0';
+- va_end(args);
+- return ret;
+- }
+- int main() {
+- return f("hello %s%d", "world", 1);
+- }]])],
+- [i_cv_c99_vsnprintf=yes],
+- [i_cv_c99_vsnprintf=no])
+-])
+-if test $i_cv_c99_vsnprintf = no; then
+- AC_DEFINE(HAVE_OLD_VSNPRINTF,, Define if you don't have C99
compatible vsnprintf() call)
+-fi
+-
+-dnl ***
+-dnl *** va_copy checks (from GLIB)
+-dnl ***
+-
+-AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
- #include <stdarg.h>
- void f (int i, ...) {
- va_list args1, args2;
-@@ -896,7 +919,7 @@
- [lib_cv_va_copy=no],[])
- ])
- AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
+- #include <stdarg.h>
+- void f (int i, ...) {
+- va_list args1, args2;
+- va_start (args1, i);
+- va_copy (args2, args1);
+- if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+- exit (1);
+- va_end (args1); va_end (args2);
+- }
+- int main() {
+- f (0, 42);
+- return 0;
+- }]])],
+- [lib_cv_va_copy=yes],
+- [lib_cv_va_copy=no],[])
+-])
+-AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
- #include <stdarg.h>
- void f (int i, ...) {
- va_list args1, args2;
-@@ -941,7 +964,8 @@
- return 0;
- }]])],
- [lib_cv_va_val_copy=yes],
+- #include <stdarg.h>
+- void f (int i, ...) {
+- va_list args1, args2;
+- va_start (args1, i);
+- __va_copy (args2, args1);
+- if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+- exit (1);
+- va_end (args1); va_end (args2);
+- }
+- int main() {
+- f (0, 42);
+- return 0;
+- }]])],
+- [lib_cv___va_copy=yes],
+- [lib_cv___va_copy=no],[])
+-])
+-
+-if test "x$lib_cv_va_copy" = "xyes"; then
+- va_copy_func=va_copy
+-else if test "x$lib_cv___va_copy" = "xyes"; then
+- va_copy_func=__va_copy
+-fi
+-fi
+-
+-if test -n "$va_copy_func"; then
+- AC_DEFINE_UNQUOTED(VA_COPY,$va_copy_func,[A 'va_copy' style function])
+-fi
+-
+-AC_CACHE_CHECK([whether va_lists can be copied by
value],lib_cv_va_val_copy,[
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+- #include <stdarg.h>
+- void f (int i, ...) {
+- va_list args1, args2;
+- va_start (args1, i);
+- args2 = args1;
+- if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+- exit (1);
+- va_end (args1); va_end (args2);
+- }
+- int main() {
+- f (0, 42);
+- return 0;
+- }]])],
+- [lib_cv_va_val_copy=yes],
- [lib_cv_va_val_copy=no],[])
-+ [lib_cv_va_val_copy=no],
-+ [lib_cv_va_val_copy=yes])
- ])
-
- if test "x$lib_cv_va_val_copy" = "xno"; then
+-])
+-
+-if test "x$lib_cv_va_val_copy" = "xno"; then
+- AC_DEFINE(VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copies as values])
+-fi
+-
+ dnl * dynamic modules?
+ have_modules=no
+ AC_CHECK_FUNC(dlopen, [
Index: Makefile
===================================================================
--- Makefile (revision 11611)
+++ Makefile (working copy)
@@ -9,19 +9,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot
-PKG_VERSION:=1.0.beta8
+PKG_VERSION:=1.1.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.dovecot.org/releases/
-PKG_MD5SUM:=6a87718a86ee1ae2334c75843dd9a7df
+PKG_SOURCE_URL:=http://www.dovecot.org/releases/1.1
+PKG_MD5SUM:=fcebb6c099421049632b2f1f019f55cd
include $(INCLUDE_DIR)/package.mk
define Package/dovecot
SECTION:=mail
CATEGORY:=Mail
- DEPENDS:=+libopenssl
+ DEPENDS:=+libopenssl +zlib
TITLE:=An IMAP and POP3 daemon
URL:=http://www.dovecot.org/
endef
@@ -37,8 +37,11 @@
$(call Build/Configure/Default, \
--without-gssapi \
--with-moduledir=/usr/lib/dovecot/modules \
+ --with-notify=dnotify \
, \
+ RPCGEN= \
ignore_signed_size=1 \
+ ignore_signed_time=1 \
)
endef
@@ -51,8 +54,7 @@
define Package/dovecot/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dovecot.init $(1)/etc/init.d/dovecot
- $(INSTALL_DIR) $(1)/etc/dovecot
- $(INSTALL_DATA) ./files/dovecot.conf $(1)/etc/dovecot.conf
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/dovecot-example.conf
$(1)/etc/dovecot.conf
$(INSTALL_DIR) $(1)/usr/lib/dovecot
$(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/
$(INSTALL_DIR) $(1)/usr/sbin
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
