head 1.11; access; symbols; locks; strict; comment @# @; 1.11 date 2009.07.27.15.23.04; author rse; state Exp; branches; next 1.10; commitid FX9EfPPnHF9hzmXt; 1.10 date 2009.07.05.16.12.21; author rse; state Exp; branches; next 1.9; commitid nbIo6jfWxGP1yxUt; 1.9 date 2009.05.18.20.47.37; author rse; state Exp; branches; next 1.8; commitid YXqhkXuYxpr7CoOt; 1.8 date 2009.03.14.08.19.14; author rse; state Exp; branches; next 1.7; commitid 7PAfRESjrsSUyYFt; 1.7 date 2009.01.24.11.49.34; author rse; state Exp; branches; next 1.6; commitid ZDslIV8gsALIiHzt; 1.6 date 2009.01.08.20.14.31; author rse; state Exp; branches; next 1.5; commitid i3EQgR3SirnQBGxt; 1.5 date 2008.12.22.18.32.33; author rse; state Exp; branches; next 1.4; commitid HkMQZ2SKdjyJAuvt; 1.4 date 2008.07.04.07.41.02; author rse; state Exp; branches; next 1.3; commitid cWkU2nPzDp91us9t; 1.3 date 2008.06.03.09.19.58; author cs; state Exp; branches; next 1.2; commitid ojM0P6yUI1yJ1u5t; 1.2 date 2008.05.15.15.05.56; author cs; state Exp; branches; next 1.1; commitid yLigWHzyp61iy43t; 1.1 date 2008.03.14.12.11.48; author cs; state Exp; branches; next ; commitid 5eJVIokecgN6A5Vs; desc @@ 1.11 log @upgrading package: dovecot 1.2.1 -> 1.2.2 @ text @Index: configure.in --- configure.in.orig 2009-07-27 07:26:10 +0200 +++ configure.in 2009-07-27 16:49:17 +0200 @@@@ -1970,14 +1970,14 @@@@ AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) if test $PG_CONFIG = NO; then # based on code from PHP - for i in /usr /usr/local /usr/local/pgsql; do - for j in include include/pgsql include/postgres include/postgresql ""; do + for i in @@l_prefix@@; do + for j in include/postgresql; do if test -r "$i/$j/libpq-fe.h"; then PGSQL_INCLUDE=$i/$j fi done - for lib in lib lib64; do - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do + for lib in lib; do + for j in $lib; do if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi Index: configure --- configure.orig 2009-07-27 07:26:28 +0200 +++ configure 2009-07-27 16:50:02 +0200 @@@@ -29424,14 +29424,14 @@@@ if test $PG_CONFIG = NO; then # based on code from PHP - for i in /usr /usr/local /usr/local/pgsql; do - for j in include include/pgsql include/postgres include/postgresql ""; do + for i in @@l_prefix@@; do + for j in include/postgresql; do if test -r "$i/$j/libpq-fe.h"; then PGSQL_INCLUDE=$i/$j fi done - for lib in lib lib64; do - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do + for lib in lib; do + for j in $lib; do if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi Index: src/deliver/deliver.c --- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 +++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 @@@@ -46,7 +46,7 @@@@ #include #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail" +#define DEFAULT_SENDMAIL_PATH "@@l_prefix@@/sbin/sendmail" #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" /* After buffer grows larger than this, create a temporary file to /tmp @ 1.10 log @upgrade to Dovecot 1.2 @ text @d2 21 a22 21 --- configure.in.orig 2009-05-18 03:39:35 +0200 +++ configure.in 2009-05-18 22:39:30 +0200 @@@@ -1962,14 +1962,14 @@@@ if test $want_pgsql != no; then # based on code from PHP - for i in /usr /usr/local /usr/local/pgsql; do - for j in include include/pgsql include/postgres include/postgresql ""; do + for i in @@l_prefix@@; do + for j in include/postgresql; do if test -r "$i/$j/libpq-fe.h"; then PGSQL_INCLUDE=$i/$j fi done - for lib in lib lib64; do - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do + for lib in lib; do + for j in $lib; do if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi d24 3 a26 3 --- configure.orig 2009-05-18 03:39:51 +0200 +++ configure 2009-05-18 22:39:30 +0200 @@@@ -28482,14 +28482,14 @@@@ d28 17 a44 17 if test $want_pgsql != no; then # based on code from PHP - for i in /usr /usr/local /usr/local/pgsql; do - for j in include include/pgsql include/postgres include/postgresql ""; do + for i in @@l_prefix@@; do + for j in include/postgresql; do if test -r "$i/$j/libpq-fe.h"; then PGSQL_INCLUDE=$i/$j fi done - for lib in lib lib64; do - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do + for lib in lib; do + for j in $lib; do if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi d46 3 a48 3 --- src/deliver/deliver.c.orig 2009-02-27 00:31:13 +0100 +++ src/deliver/deliver.c 2009-05-18 22:39:30 +0200 @@@@ -41,7 +41,7 @@@@ @ 1.9 log @upgrading package: dovecot 1.1.14 -> 1.1.15 @ text @a44 288 Index: doc/dovecot-sql-example.conf --- doc/dovecot-sql-example.conf.orig 2009-01-05 21:49:58 +0100 +++ doc/dovecot-sql-example.conf 2009-05-18 22:39:30 +0200 @@@@ -47,7 +47,8 @@@@ # the default my.cnf location # option_group - Read options from the given group (default: client) # -# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock +# You can connect to UNIX sockets by using host: +# host=@@l_prefix@@/var/mysql/mysql.sock # Note that currently you can't use spaces in parameters. # # MySQL supports multiple host parameters for load balancing / HA. @@@@ -58,7 +59,7 @@@@ # Examples: # connect = host=192.168.1.1 dbname=users # connect = host=sql.example.com dbname=virtual user=virtual password=blarg -# connect = /etc/dovecot/authdb.sqlite +# connect = @@l_prefix@@/etc/dovecot/authdb.sqlite # #connect = Index: dovecot-example.conf --- dovecot-example.conf.orig 2009-05-13 18:41:46 +0200 +++ dovecot-example.conf 2009-05-18 22:42:42 +0200 @@@@ -17,11 +17,11 @@@@ # --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl # Base directory where to store runtime data. -#base_dir = /var/run/dovecot/ +#base_dir = @@l_prefix@@/var/dovecot/run # Protocols we want to be serving: imap imaps pop3 pop3s # If you only want to use dovecot-auth, you can set this to "none". -#protocols = imap imaps +#protocols = imap # A space separated list of IP or host addresses where to listen in for # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6 @@@@ -39,7 +39,7 @@@@ # listen = *:10100 # .. # } -#listen = * +#listen = 127.0.0.1 # Disable LOGIN command and all other plaintext authentications unless # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP @@@@ -83,17 +83,17 @@@@ # IP or host address where to listen in for SSL connections. Remember to also # add imaps and/or pop3s to protocols setting. Defaults to same as "listen" # setting if not specified. -#ssl_listen = +#ssl_listen = 127.0.0.1 # 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 = @@l_prefix@@/etc/dovecot/ssl/dovecot.crt +#ssl_key_file = @@l_prefix@@/etc/dovecot/ssl/dovecot.key # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. Since this file is often @@@@ -136,7 +136,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. -#login_dir = /var/run/dovecot/login +#login_dir = @@l_prefix@@/var/dovecot/run/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. @@@@ -146,7 +146,7 @@@@ # 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. -#login_user = dovecot +#login_user = @@l_musr@@ # Set max. process size in megabytes. If you don't use # login_process_per_connection you might need to grow this. @@@@ -504,7 +504,7 @@@@ protocol imap { # Login executable location. - #login_executable = /usr/libexec/dovecot/imap-login + #login_executable = @@l_prefix@@/libexec/dovecot/imap-login # IMAP executable location. Changing this allows you to execute other # binaries before the imap process is executed. @@@@ -516,7 +516,7 @@@@ # /tmp/gdbhelper.* files: # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap # - #mail_executable = /usr/libexec/dovecot/imap + #mail_executable = @@l_prefix@@/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 @@@@ -530,7 +530,7 @@@@ # 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 = @@l_prefix@@/lib/dovecot/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. @@@@ -573,11 +573,11 @@@@ protocol pop3 { # Login executable location. - #login_executable = /usr/libexec/dovecot/pop3-login + #login_executable = @@l_prefix@@/libexec/dovecot/pop3-login # POP3 executable location. See IMAP's mail_executable above for examples # how this could be changed. - #mail_executable = /usr/libexec/dovecot/pop3 + #mail_executable = @@l_prefix@@/libexec/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 @@@@ -637,7 +637,7 @@@@ # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = - #mail_plugin_dir = /usr/lib/dovecot/pop3 + #mail_plugin_dir = @@l_prefix@@/lib/dovecot/pop3 # Workarounds for various client bugs: # outlook-no-nuls: @@@@ -665,7 +665,7 @@@@ # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = - #mail_plugin_dir = /usr/lib/dovecot/lda + #mail_plugin_dir = @@l_prefix@@/lib/dovecot/lda # If user is over quota, return with temporary failure instead of # bouncing the mail. @@@@ -679,7 +679,7 @@@@ #deliver_log_format = msgid=%m: %$ # Binary to use for sending mails. - #sendmail_path = /usr/lib/sendmail + #sendmail_path = @@l_prefix@@/sbin/sendmail # Subject: header to use for rejection mails. You can use the same variables # as for rejection_reason below. @@@@ -690,7 +690,7 @@@@ #rejection_reason = Your message to <%t> was automatically rejected:%n%r # UNIX socket path to master authentication server to find users. - #auth_socket_path = /var/run/dovecot/auth-master + #auth_socket_path = @@l_prefix@@/var/dovecot/run/auth-master } ## @@@@ -698,7 +698,7 @@@@ ## # Executable location -#auth_executable = /usr/libexec/dovecot/dovecot-auth +#auth_executable = @@l_prefix@@/libexec/dovecot/dovecot-auth # Set max. process size in megabytes. #auth_process_size = 256 @@@@ -788,7 +788,7 @@@@ #auth_ntlm_use_winbind = no # Path for Samba's ntlm_auth helper binary. -#auth_winbind_helper_path = /usr/bin/ntlm_auth +#auth_winbind_helper_path = @@l_prefix@@/bin/ntlm_auth # Number of seconds to delay before replying to failed authentications. #auth_failure_delay = 2 @@@@ -821,7 +821,7 @@@@ #passdb passwd-file { # File contains a list of usernames, one per line - #args = /etc/dovecot.deny + #args = @@l_prefix@@/etc/dovecot/dovecot.deny #deny = yes #} @@@@ -904,13 +904,13 @@@@ # SQL database #passdb sql { # Path for SQL configuration file, see doc/dovecot-sql-example.conf - #args = + #args = @@l_prefix@@/etc/dovecot/dovecot-sql.conf #} # LDAP database #passdb ldap { # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf - #args = + #args = @@l_prefix@@/etc/dovecot/dovecot-ldap.conf #} # vpopmail authentication @@@@ -975,13 +975,13 @@@@ # SQL database #userdb sql { # Path for SQL configuration file, see doc/dovecot-sql-example.conf - #args = + #args = @@l_prefix@@/etc/dovecot/dovecot-sql.conf #} # LDAP database #userdb ldap { # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf - #args = + #args = @@l_prefix@@/etc/dovecot/dovecot-ldap.conf #} # vpopmail @@@@ -1018,7 +1018,7 @@@@ # Master socket provides access to userdb information. It's typically # used to give Dovecot's local delivery agent access to userdb so it # can find mailbox locations. - #path = /var/run/dovecot/auth-master + #path = @@l_prefix@@/dovecot/run/auth-master #mode = 0600 # Default user/group is the one who started dovecot-auth (root) #user = @@@@ -1028,7 +1028,7 @@@@ # The client socket is generally safe to export to everyone. Typical use # is to export it to your SMTP server so it can do SMTP AUTH lookups # using it. - #path = /var/run/dovecot/auth-client + #path = @@l_prefix@@/dovecot/run/auth-client #mode = 0660 #} #} @@@@ -1042,7 +1042,7 @@@@ #auth external { # socket connect { # master { -# path = /var/run/dovecot/auth-master +# path = @@l_prefix@@/dovecot/run/auth-master # } # } #} @@@@ -1058,8 +1058,8 @@@@ # referenced using URIs in format "proxy::". dict { - #quota = mysql:/etc/dovecot-dict-quota.conf - #expire = db:/var/lib/dovecot/expire.db + #quota = mysql:@@l_prefix@@/etc/dovecot/dovecot-dict-quota.conf + #expire = db:@@l_prefix@@/var/dovecot/lib/expire.db } # Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf @@@@ -1110,7 +1110,7 @@@@ # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter # specifies how many seconds to wait between stat()ing dovecot-acl file # to see if it changed. - #acl = vfile:/etc/dovecot-acls:cache_secs=300 + #acl = vfile:@@l_prefix@@/etc/dovecot/dovecot-acls:cache_secs=300 # Convert plugin. If set, specifies the source storage path which is # converted to destination storage (mail_location) when the user logs in. @@@@ -1129,14 +1129,14 @@@@ # until the message can be saved within quota limits. The configuration file # is a text file where each line is in format: # Mails are first deleted in lowest -> highest priority number order - #trash = /etc/dovecot-trash.conf + #trash = @@l_prefix@@/etc/dovecot/dovecot-trash.conf # Expire plugin. Mails are expunged from mailboxes after being there the # configurable time. The first expiration date for each mailbox is stored in # a dictionary so it can be quickly determined which mailboxes contain # expired mails. The actual expunging is done in a nightly cronjob, which # you must set up: - # dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool + # dovecot --exec-mail ext @@l_prefix@@/libexec/dovecot/expire-tool #expire = Trash 7 Spam 30 #expire_dict = proxy::expire a56 42 Index: src/master/master-settings.c --- src/master/master-settings.c.orig 2009-05-13 19:32:34 +0200 +++ src/master/master-settings.c 2009-05-18 22:39:30 +0200 @@@@ -178,14 +178,14 @@@@ MEMBER(syslog_facility) "mail", /* general */ - MEMBER(protocols) "imap imaps", - MEMBER(listen) "*", - MEMBER(ssl_listen) "", + MEMBER(protocols) "imap", + MEMBER(listen) "127.0.0.1", + MEMBER(ssl_listen) "127.0.0.1", - MEMBER(ssl_disable) FALSE, + MEMBER(ssl_disable) TRUE, MEMBER(ssl_ca_file) "", - MEMBER(ssl_cert_file) SSLDIR"/certs/dovecot.pem", - MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem", + MEMBER(ssl_cert_file) "@@l_prefix@@/etc/dovecot/ssl/dovecot.crt", + MEMBER(ssl_key_file) "@@l_prefix@@/etc/dovecot/ssl/dovecot.key", MEMBER(ssl_key_password) "", MEMBER(ssl_parameters_regenerate) 168, MEMBER(ssl_cipher_list) "", @@@@ -200,7 +200,7 @@@@ /* login */ MEMBER(login_dir) "login", MEMBER(login_executable) NULL, - MEMBER(login_user) "dovecot", + MEMBER(login_user) "@@l_musr@@", MEMBER(login_greeting) "Dovecot ready.", MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", MEMBER(login_log_format) "%$: %s", @@@@ -317,7 +317,7 @@@@ MEMBER(anonymous_username) "anonymous", MEMBER(krb5_keytab) "", MEMBER(gssapi_hostname) "", - MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth", + MEMBER(winbind_helper_path) "@@l_prefix@@/bin/ntlm_auth", MEMBER(failure_delay) 2, MEMBER(verbose) FALSE, @ 1.8 log @upgrading package: dovecot 1.1.11 -> 1.1.12 @ text @d2 2 a3 2 --- configure.in.orig 2009-03-13 23:06:16 +0100 +++ configure.in 2009-03-14 09:11:12 +0100 d24 3 a26 3 --- configure.orig 2009-03-13 23:06:32 +0100 +++ configure 2009-03-14 09:11:12 +0100 @@@@ -27966,14 +27966,14 @@@@ d47 1 a47 1 +++ doc/dovecot-sql-example.conf 2009-03-14 09:11:12 +0100 d68 4 a71 10 --- dovecot-example.conf.orig 2009-03-13 22:23:14 +0100 +++ dovecot-example.conf 2009-03-14 09:12:40 +0100 @@@@ -11,16 +11,14 @@@@ # Default values are shown for each setting, it's not required to uncomment # any of the lines. Exception to this are paths, they're just examples with -# the real defaults being based on configure options. The paths listed here -# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -# --with-ssldir=/etc/ssl +# the real defaults being based on configure options. d84 1 a84 1 @@@@ -38,7 +36,7 @@@@ d93 1 a93 1 @@@@ -82,17 +80,17 @@@@ d100 1 a100 1 # Disable SSL/TLS support. d115 1 a115 1 @@@@ -135,7 +133,7 @@@@ d124 1 a124 1 @@@@ -145,7 +143,7 @@@@ d133 1 a133 1 @@@@ -503,7 +501,7 @@@@ d142 1 a142 1 @@@@ -515,7 +513,7 @@@@ d151 1 a151 1 @@@@ -529,7 +527,7 @@@@ d160 1 a160 1 @@@@ -572,11 +570,11 @@@@ d174 1 a174 1 @@@@ -636,7 +634,7 @@@@ d183 1 a183 1 @@@@ -664,7 +662,7 @@@@ d192 1 a192 1 @@@@ -678,7 +676,7 @@@@ d201 1 a201 1 @@@@ -689,7 +687,7 @@@@ d210 1 a210 1 @@@@ -697,7 +695,7 @@@@ d219 1 a219 1 @@@@ -787,7 +785,7 @@@@ d228 1 a228 1 @@@@ -820,7 +818,7 @@@@ d237 1 a237 1 @@@@ -903,13 +901,13 @@@@ d253 1 a253 1 @@@@ -974,13 +972,13 @@@@ d269 1 a269 1 @@@@ -1017,7 +1015,7 @@@@ d278 1 a278 1 @@@@ -1027,7 +1025,7 @@@@ d287 1 a287 1 @@@@ -1041,7 +1039,7 @@@@ d296 1 a296 1 @@@@ -1057,8 +1055,8 @@@@ d307 1 a307 1 @@@@ -1109,7 +1107,7 @@@@ d316 1 a316 1 @@@@ -1128,14 +1126,14 @@@@ d335 1 a335 1 +++ src/deliver/deliver.c 2009-03-14 09:11:12 +0100 d346 2 a347 2 --- src/master/master-settings.c.orig 2009-03-13 20:11:53 +0100 +++ src/master/master-settings.c 2009-03-14 09:11:12 +0100 @ 1.7 log @upgrading package: dovecot 1.1.8 -> 1.1.9 @ text @d2 3 a4 3 --- configure.in.orig 2009-01-16 00:02:47 +0100 +++ configure.in 2009-01-24 12:43:24 +0100 @@@@ -1950,14 +1950,14 @@@@ d24 3 a26 3 --- configure.orig 2009-01-16 00:03:03 +0100 +++ configure 2009-01-24 12:43:25 +0100 @@@@ -27905,14 +27905,14 @@@@ d47 1 a47 1 +++ doc/dovecot-sql-example.conf 2009-01-24 12:43:25 +0100 d68 2 a69 2 --- dovecot-example.conf.orig 2009-01-13 22:51:40 +0100 +++ dovecot-example.conf 2009-01-24 12:43:46 +0100 d259 1 a259 1 @@@@ -966,13 +964,13 @@@@ d302 1 a302 1 @@@@ -1057,7 +1055,7 @@@@ d307 1 d309 1 d313 1 a313 1 @@@@ -1108,7 +1106,7 @@@@ d322 1 a322 1 @@@@ -1127,16 +1125,16 @@@@ d337 1 a337 2 - #expire_dict = db:/var/lib/dovecot/expire.db + #expire_dict = db:@@l_prefix@@/var/dovecot/lib/expire.db a338 2 # Lazy expunge plugin. Currently works only with maildirs. When a user # expunges mails, the mails are moved to a mailbox in another namespace d340 2 a341 2 --- src/deliver/deliver.c.orig 2009-01-13 22:53:53 +0100 +++ src/deliver/deliver.c 2009-01-24 12:43:25 +0100 d352 2 a353 2 --- src/master/master-settings.c.orig 2009-01-20 23:36:57 +0100 +++ src/master/master-settings.c 2009-01-24 12:43:25 +0100 @ 1.6 log @upgrading package: dovecot 1.1.7 -> 1.1.8 @ text @d2 3 a4 3 --- configure.in.orig 2009-01-06 14:53:19 +0100 +++ configure.in 2009-01-08 08:26:14 +0100 @@@@ -1937,14 +1937,14 @@@@ d24 3 a26 3 --- configure.orig 2009-01-06 14:53:38 +0100 +++ configure 2009-01-08 08:26:14 +0100 @@@@ -27845,14 +27845,14 @@@@ d47 1 a47 1 +++ doc/dovecot-sql-example.conf 2009-01-08 08:26:14 +0100 d68 2 a69 2 --- dovecot-example.conf.orig 2009-01-05 21:49:58 +0100 +++ dovecot-example.conf 2009-01-08 20:50:55 +0100 d198 1 a198 1 @@@@ -678,14 +676,14 @@@@ d205 3 a207 2 # Human readable error message for rejection mails. Use can use variables: # %n = CRLF, %r = reason, %s = subject, %t = recipient d216 1 a216 1 @@@@ -693,7 +691,7 @@@@ d225 1 a225 1 @@@@ -783,7 +781,7 @@@@ d234 1 a234 1 @@@@ -816,7 +814,7 @@@@ d243 1 a243 1 @@@@ -899,13 +897,13 @@@@ d259 1 a259 1 @@@@ -962,13 +960,13 @@@@ d275 1 a275 1 @@@@ -1013,7 +1011,7 @@@@ d284 1 a284 1 @@@@ -1023,7 +1021,7 @@@@ d293 1 a293 1 @@@@ -1037,7 +1035,7 @@@@ d302 1 a302 1 @@@@ -1053,7 +1051,7 @@@@ d311 1 a311 1 @@@@ -1104,7 +1102,7 @@@@ d320 1 a320 1 @@@@ -1123,16 +1121,16 @@@@ d341 2 a342 2 --- src/deliver/deliver.c.orig 2009-01-07 19:31:34 +0100 +++ src/deliver/deliver.c 2009-01-08 08:26:14 +0100 d353 2 a354 2 --- src/master/master-settings.c.orig 2009-01-06 15:33:51 +0100 +++ src/master/master-settings.c 2009-01-08 08:26:14 +0100 @ 1.5 log @modifying package: dovecot-1.1.7 20081125 -> 20081222 @ text @d2 3 a4 3 --- configure.in.orig 2008-11-23 23:16:26 +0100 +++ configure.in 2008-12-22 19:24:15 +0100 @@@@ -1917,14 +1917,14 @@@@ d24 3 a26 3 --- configure.orig 2008-11-23 23:16:38 +0100 +++ configure 2008-12-22 19:24:15 +0100 @@@@ -32681,14 +32681,14 @@@@ d46 2 a47 2 --- doc/dovecot-sql-example.conf.orig 2008-10-26 16:00:45 +0100 +++ doc/dovecot-sql-example.conf 2008-12-22 19:24:15 +0100 d68 2 a69 2 --- dovecot-example.conf.orig 2008-11-23 22:53:53 +0100 +++ dovecot-example.conf 2008-12-22 19:24:15 +0100 d99 4 a102 4 @@@@ -81,17 +79,17 @@@@ # IP or host address where to listen in for SSL connections. Defaults # to above if not specified. d106 1 a106 1 # Disable SSL/TLS support. d121 1 a121 1 @@@@ -134,7 +132,7 @@@@ d130 1 a130 1 @@@@ -144,7 +142,7 @@@@ d139 1 a139 1 @@@@ -504,7 +502,7 @@@@ d148 1 a148 1 @@@@ -516,7 +514,7 @@@@ d157 1 a157 1 @@@@ -530,7 +528,7 @@@@ d166 1 a166 1 @@@@ -573,11 +571,11 @@@@ d180 1 a180 1 @@@@ -637,7 +635,7 @@@@ d189 1 a189 1 @@@@ -665,7 +663,7 @@@@ d198 1 a198 1 @@@@ -679,14 +677,14 @@@@ d215 1 a215 1 @@@@ -694,7 +692,7 @@@@ d224 1 a224 1 @@@@ -784,7 +782,7 @@@@ d233 1 a233 1 @@@@ -817,7 +815,7 @@@@ d242 1 a242 1 @@@@ -900,13 +898,13 @@@@ d258 1 a258 1 @@@@ -963,13 +961,13 @@@@ d274 1 a274 1 @@@@ -1014,7 +1012,7 @@@@ d283 1 a283 1 @@@@ -1024,7 +1022,7 @@@@ d292 1 a292 1 @@@@ -1038,7 +1036,7 @@@@ d301 1 a301 1 @@@@ -1054,7 +1052,7 @@@@ d310 1 a310 1 @@@@ -1105,7 +1103,7 @@@@ d319 1 a319 1 @@@@ -1124,16 +1122,16 @@@@ d340 2 a341 2 --- src/deliver/deliver.c.orig 2008-11-19 18:43:13 +0100 +++ src/deliver/deliver.c 2008-12-22 19:24:15 +0100 d352 2 a353 2 --- src/master/master-settings.c.orig 2008-11-15 18:13:18 +0100 +++ src/master/master-settings.c 2008-12-22 19:24:15 +0100 @ 1.4 log @upgrading package: dovecot 1.0.15 -> 1.1.1 @ text @d1 4 a4 4 Index: configure --- configure.orig 2008-05-05 00:02:24.000000000 +0200 +++ configure 2008-05-16 12:09:26.000000000 +0200 @@@@ -31919,14 +31919,14 @@@@ d10 1 a10 1 + for i in @@l_prefix@@; do d23 4 a26 4 Index: configure.in --- configure.in.orig 2008-05-05 00:01:52.000000000 +0200 +++ configure.in 2008-05-16 12:09:26.000000000 +0200 @@@@ -1753,14 +1753,14 @@@@ d32 1 a32 1 + for i in @@l_prefix@@; do d46 2 a47 2 --- doc/dovecot-sql-example.conf.orig 2008-05-05 00:01:52.000000000 +0200 +++ doc/dovecot-sql-example.conf 2008-05-16 12:09:26.000000000 +0200 d57 2 a58 2 # sqlite: @@@@ -56,7 +57,7 @@@@ d68 2 a69 2 --- dovecot-example.conf.orig 2008-05-05 00:01:52.000000000 +0200 +++ dovecot-example.conf 2008-05-16 12:11:39.000000000 +0200 d90 1 a90 1 @@@@ -39,7 +37,7 @@@@ d99 1 a99 1 @@@@ -82,17 +80,17 @@@@ d120 2 a121 2 # give it when starting dovecot with -p parameter. @@@@ -133,7 +131,7 @@@@ d130 1 a130 1 @@@@ -143,7 +141,7 @@@@ d139 1 a139 1 @@@@ -503,7 +501,7 @@@@ d148 1 a148 1 @@@@ -515,7 +513,7 @@@@ d157 1 a157 1 @@@@ -529,7 +527,7 @@@@ d166 1 a166 1 @@@@ -572,11 +570,11 @@@@ d180 1 a180 1 @@@@ -636,7 +634,7 @@@@ d189 1 a189 1 @@@@ -664,7 +662,7 @@@@ d198 1 a198 1 @@@@ -678,14 +676,14 @@@@ d215 1 a215 1 @@@@ -693,7 +691,7 @@@@ d224 1 a224 1 @@@@ -783,7 +781,7 @@@@ d233 1 a233 1 @@@@ -816,7 +814,7 @@@@ d242 1 a242 1 @@@@ -899,13 +897,13 @@@@ d258 1 a258 1 @@@@ -962,13 +960,13 @@@@ d274 1 a274 1 @@@@ -1013,7 +1011,7 @@@@ d283 1 a283 1 @@@@ -1023,7 +1021,7 @@@@ d292 1 a292 1 @@@@ -1037,7 +1035,7 @@@@ d301 2 a302 2 @@@@ -1053,7 +1051,7 @@@@ # referenced using URIs in format "proxy:". d309 1 a309 1 # Path to Berkeley DB's configuration file. See doc/dovecot-db.conf for an d340 2 a341 2 --- src/deliver/deliver.c.orig 2008-05-05 00:01:52.000000000 +0200 +++ src/deliver/deliver.c 2008-05-16 12:09:26.000000000 +0200 d352 2 a353 2 --- src/master/master-settings.c.orig 2008-05-05 00:01:54.000000000 +0200 +++ src/master/master-settings.c 2008-05-16 12:09:26.000000000 +0200 @ 1.3 log @upgrading package: dovecot 1.0.13 -> 1.0.14 @ text @d1 4 a4 4 Index: configure.in --- configure.in.orig 2008-03-09 11:45:25.000000000 +0100 +++ configure.in 2008-03-11 12:46:18.000000000 +0100 @@@@ -1529,14 +1529,14 @@@@ d6 1 a6 1 if test $want_pgsql = yes; then d10 1 a10 1 + for i in @@l_prefix@@; do d23 4 a26 4 Index: configure --- configure.orig 2008-03-09 11:45:36.000000000 +0100 +++ configure 2008-03-11 11:35:24.000000000 +0100 @@@@ -30183,14 +30183,14 @@@@ d28 1 a28 1 if test $want_pgsql = yes; then a44 23 Index: doc/Makefile.am --- doc/Makefile.am.orig 2007-12-11 19:52:08.000000000 +0100 +++ doc/Makefile.am 2008-03-11 12:47:20.000000000 +0100 @@@@ -1,6 +1,6 @@@@ SUBDIRS = wiki -docdir = $(datadir)/doc/dovecot +docdir = $(datadir)/doc confdir = $(sysconfdir) conf_DATA = \ Index: doc/Makefile.in --- doc/Makefile.in.orig 2008-03-09 11:45:36.000000000 +0100 +++ doc/Makefile.in 2008-03-11 11:35:24.000000000 +0100 @@@@ -168,7 +168,7 @@@@ build_vendor = @@build_vendor@@ datadir = @@datadir@@ datarootdir = @@datarootdir@@ -docdir = $(datadir)/doc/dovecot +docdir = $(datadir)/doc dvidir = @@dvidir@@ exec_prefix = @@exec_prefix@@ host = @@host@@ d46 13 a58 3 --- doc/dovecot-sql-example.conf.orig 2007-12-11 19:52:08.000000000 +0100 +++ doc/dovecot-sql-example.conf 2008-03-11 11:35:24.000000000 +0100 @@@@ -52,7 +52,7 @@@@ d65 1 a65 1 #connect = dbname=virtual user=virtual a66 21 Index: doc/wiki/Makefile.am --- doc/wiki/Makefile.am.orig 2007-12-29 07:06:37.000000000 +0100 +++ doc/wiki/Makefile.am 2008-03-11 12:48:40.000000000 +0100 @@@@ -1,4 +1,4 @@@@ -docdir = $(datadir)/doc/dovecot +docdir = $(datadir) wikidir = $(docdir)/wiki EXTRA_DIST = \ Index: doc/wiki/Makefile.in --- doc/wiki/Makefile.in.orig 2008-03-09 11:45:36.000000000 +0100 +++ doc/wiki/Makefile.in 2008-03-11 11:35:24.000000000 +0100 @@@@ -158,7 +158,7 @@@@ build_vendor = @@build_vendor@@ datadir = @@datadir@@ datarootdir = @@datarootdir@@ -docdir = $(datadir)/doc/dovecot +docdir = $(datadir) dvidir = @@dvidir@@ exec_prefix = @@exec_prefix@@ host = @@host@@ d68 3 a70 3 --- dovecot-example.conf.orig 2008-03-04 06:48:12.000000000 +0100 +++ dovecot-example.conf 2008-03-11 11:35:24.000000000 +0100 @@@@ -11,12 +11,10 @@@@ d85 5 d99 6 a104 2 @@@@ -85,14 +83,14 @@@@ #ssl_listen = d121 1 a121 1 @@@@ -128,7 +126,7 @@@@ d130 1 a130 1 @@@@ -138,7 +136,7 @@@@ d139 1 a139 1 @@@@ -506,7 +504,7 @@@@ d148 1 a148 1 @@@@ -518,7 +516,7 @@@@ d157 1 a157 1 @@@@ -528,7 +526,7 @@@@ d166 1 a166 1 @@@@ -571,11 +569,11 @@@@ d180 1 a180 1 @@@@ -635,7 +633,7 @@@@ d189 1 a189 1 @@@@ -663,13 +661,13 @@@@ d196 5 d205 4 d215 1 a215 1 @@@@ -677,7 +675,7 @@@@ d225 9 d242 1 a242 1 @@@@ -869,13 +867,13 @@@@ d258 17 a274 1 @@@@ -981,7 +979,7 @@@@ d283 1 a283 1 @@@@ -991,7 +989,7 @@@@ d288 1 a288 1 + #path = @@l_prefix@@/var/dovecot/run/auth-client d292 1 a292 1 @@@@ -1005,7 +1003,7 @@@@ d301 1 a301 1 @@@@ -1021,7 +1019,7 @@@@ d306 1 a306 1 + #quota = mysql:@@l_prefix@@/etc/dovecot/dovecot-dict-quota.conf d309 7 a315 7 ## @@@@ -1045,7 +1043,7 @@@@ # directory. You can also optionally give a global ACL directory path where # ACLs are applied to all users' mailboxes. The global ACL directory contains # one file for each mailbox, eg. INBOX or sub.mailbox. - #acl = vfile:/etc/dovecot-acls + #acl = vfile:@@l_prefix@@/etc/dovecot/dovecot-acls d319 1 a319 1 @@@@ -1059,7 +1057,7 @@@@ d326 11 d340 4 a343 3 --- src/deliver/deliver.c.orig 2008-02-29 10:17:05.000000000 +0100 +++ src/deliver/deliver.c 2008-03-11 11:35:24.000000000 +0100 @@@@ -38,7 +38,7 @@@@ a345 1 #define DEFAULT_AUTH_SOCKET_PATH PKG_RUNDIR"/auth-master" d352 4 a355 3 --- src/master/master-settings.c.orig 2008-03-04 06:50:37.000000000 +0100 +++ src/master/master-settings.c 2008-03-11 11:35:24.000000000 +0100 @@@@ -163,13 +163,13 @@@@ d358 1 a358 1 MEMBER(protocols) "imap imaps", d361 1 d375 1 a375 1 @@@@ -183,7 +183,7 @@@@ d384 9 @ 1.2 log @typos @ text @d297 1 a297 1 + #quota = mysql:@@l_prefix@@//etc/dovecot-dict-quota.conf @ 1.1 log @revamp Dovecot package from scratch, sponsored by Ciao GmbH @ text @d1 1 a1 1 #Index: configure.in d178 1 a178 1 + #mail_executable = @@l_prefix@@/libexec/dovecot/imap-login @