OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 22-Dec-2008 19:32:34 Branch: HEAD Handle: 2008122218323300 Modified files: openpkg-src/dovecot dovecot.patch dovecot.spec Log: modifying package: dovecot-1.1.7 20081125 -> 20081222 Summary: Revision Changes Path 1.5 +43 -43 openpkg-src/dovecot/dovecot.patch 1.20 +2 -2 openpkg-src/dovecot/dovecot.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/dovecot/dovecot.patch ============================================================================ $ cvs diff -u -r1.4 -r1.5 dovecot.patch --- openpkg-src/dovecot/dovecot.patch 4 Jul 2008 07:41:02 -0000 1.4 +++ openpkg-src/dovecot/dovecot.patch 22 Dec 2008 18:32:33 -0000 1.5 @@ -1,13 +1,13 @@ -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 @@ +Index: configure.in +--- configure.in.orig 2008-11-23 23:16:26 +0100 ++++ configure.in 2008-12-22 19:24:15 +0100 +@@ -1917,14 +1917,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 i in @l_prefix@; do + for j in include/postgresql; do if test -r "$i/$j/libpq-fe.h"; then PGSQL_INCLUDE=$i/$j @@ -20,16 +20,16 @@ if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi -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 @@ +Index: configure +--- configure.orig 2008-11-23 23:16:38 +0100 ++++ configure 2008-12-22 19:24:15 +0100 +@@ -32681,14 +32681,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 i in @l_prefix@; do + for j in include/postgresql; do if test -r "$i/$j/libpq-fe.h"; then PGSQL_INCLUDE=$i/$j @@ -43,8 +43,8 @@ PGSQL_LIBDIR=$i/$j fi Index: doc/dovecot-sql-example.conf ---- 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 +--- 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 @@ -47,7 +47,8 @@ # the default my.cnf location # option_group - Read options from the given group (default: client) @@ -54,8 +54,8 @@ +# ho...@l_prefix@/var/mysql/mysql.sock # Note that currently you can't use spaces in parameters. # - # sqlite: -@@ -56,7 +57,7 @@ + # 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 @@ -65,8 +65,8 @@ #connect = Index: dovecot-example.conf ---- dovecot-example.conf.orig 2008-05-05 00:01:52.000000000 +0200 -+++ dovecot-example.conf 2008-05-16 12:11:39.000000000 +0200 +--- dovecot-example.conf.orig 2008-11-23 22:53:53 +0100 ++++ dovecot-example.conf 2008-12-22 19:24:15 +0100 @@ -11,16 +11,14 @@ # Default values are shown for each setting, it's not required to uncomment @@ -87,7 +87,7 @@ # 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 +37,7 @@ +@@ -38,7 +36,7 @@ # listen = *:10100 # .. # } @@ -96,7 +96,7 @@ # Disable LOGIN command and all other plaintext authentications unless # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP -@@ -82,17 +80,17 @@ +@@ -81,17 +79,17 @@ # IP or host address where to listen in for SSL connections. Defaults # to above if not specified. @@ -117,8 +117,8 @@ +#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. -@@ -133,7 +131,7 @@ + # give it when starting dovecot with -p parameter. Since this file is often +@@ -134,7 +132,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. @@ -127,7 +127,7 @@ # chroot login process to the login_dir. Only reason not to do this is if you # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt> -@@ -143,7 +141,7 @@ +@@ -144,7 +142,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. <doc/wiki/UserIds.txt> @@ -136,7 +136,7 @@ # Set max. process size in megabytes. If you don't use # login_process_per_connection you might need to grow this. -@@ -503,7 +501,7 @@ +@@ -504,7 +502,7 @@ protocol imap { # Login executable location. @@ -145,7 +145,7 @@ # IMAP executable location. Changing this allows you to execute other # binaries before the imap process is executed. -@@ -515,7 +513,7 @@ +@@ -516,7 +514,7 @@ # /tmp/gdbhelper.* files: # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap # @@ -154,7 +154,7 @@ # 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 -@@ -529,7 +527,7 @@ +@@ -530,7 +528,7 @@ # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -163,7 +163,7 @@ # Send IMAP capabilities in greeting message. This makes it unnecessary for # clients to request it with CAPABILITY command, so it saves one round-trip. -@@ -572,11 +570,11 @@ +@@ -573,11 +571,11 @@ protocol pop3 { # Login executable location. @@ -177,7 +177,7 @@ # 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 -@@ -636,7 +634,7 @@ +@@ -637,7 +635,7 @@ # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -186,7 +186,7 @@ # Workarounds for various client bugs: # outlook-no-nuls: -@@ -664,7 +662,7 @@ +@@ -665,7 +663,7 @@ # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -195,7 +195,7 @@ # If user is over quota, return with temporary failure instead of # bouncing the mail. -@@ -678,14 +676,14 @@ +@@ -679,14 +677,14 @@ #deliver_log_format = msgid=%m: %$ # Binary to use for sending mails. @@ -212,7 +212,7 @@ } ## -@@ -693,7 +691,7 @@ +@@ -694,7 +692,7 @@ ## # Executable location @@ -221,7 +221,7 @@ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -783,7 +781,7 @@ +@@ -784,7 +782,7 @@ #auth_ntlm_use_winbind = no # Path for Samba's ntlm_auth helper binary. @@ -230,7 +230,7 @@ # Number of seconds to delay before replying to failed authentications. #auth_failure_delay = 2 -@@ -816,7 +814,7 @@ +@@ -817,7 +815,7 @@ #passdb passwd-file { # File contains a list of usernames, one per line @@ -239,7 +239,7 @@ #deny = yes #} -@@ -899,13 +897,13 @@ +@@ -900,13 +898,13 @@ # SQL database <doc/wiki/AuthDatabase.SQL.txt> #passdb sql { # Path for SQL configuration file, see doc/dovecot-sql-example.conf @@ -255,7 +255,7 @@ #} # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt> -@@ -962,13 +960,13 @@ +@@ -963,13 +961,13 @@ # SQL database <doc/wiki/AuthDatabase.SQL.txt> #userdb sql { # Path for SQL configuration file, see doc/dovecot-sql-example.conf @@ -271,7 +271,7 @@ #} # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt> -@@ -1013,7 +1011,7 @@ +@@ -1014,7 +1012,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. @@ -280,7 +280,7 @@ #mode = 0600 # Default user/group is the one who started dovecot-auth (root) #user = -@@ -1023,7 +1021,7 @@ +@@ -1024,7 +1022,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. @@ -289,7 +289,7 @@ #mode = 0660 #} #} -@@ -1037,7 +1035,7 @@ +@@ -1038,7 +1036,7 @@ #auth external { # socket connect { # master { @@ -298,15 +298,15 @@ # } # } #} -@@ -1053,7 +1051,7 @@ - # referenced using URIs in format "proxy:<name>". +@@ -1054,7 +1052,7 @@ + # referenced using URIs in format "proxy::<name>". dict { - #quota = mysql:/etc/dovecot-dict-quota.conf + #quota = mysql:@l_prefix@/etc/dovecot/dovecot-dict-quota.conf } - # Path to Berkeley DB's configuration file. See doc/dovecot-db.conf for an + # Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf @@ -1105,7 +1103,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 @@ -337,8 +337,8 @@ # Lazy expunge plugin. Currently works only with maildirs. When a user # expunges mails, the mails are moved to a mailbox in another namespace Index: src/deliver/deliver.c ---- 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 +--- src/deliver/deliver.c.orig 2008-11-19 18:43:13 +0100 ++++ src/deliver/deliver.c 2008-12-22 19:24:15 +0100 @@ -41,7 +41,7 @@ #include <syslog.h> @@ -349,8 +349,8 @@ /* After buffer grows larger than this, create a temporary file to /tmp Index: src/master/master-settings.c ---- 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 +--- 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 @@ -178,14 +178,14 @@ MEMBER(syslog_facility) "mail", @@ . patch -p0 <<'@@ .' Index: openpkg-src/dovecot/dovecot.spec ============================================================================ $ cvs diff -u -r1.19 -r1.20 dovecot.spec --- openpkg-src/dovecot/dovecot.spec 25 Nov 2008 20:18:30 -0000 1.19 +++ openpkg-src/dovecot/dovecot.spec 22 Dec 2008 18:32:33 -0000 1.20 @@ -24,7 +24,7 @@ # package version %define V_major 1.1 %define V_minor 7 -%define V_minor_sieve 5 +%define V_minor_sieve 6 %define V_minor_managesieve 1 %define V_managesieve 0.10.3 @@ -39,7 +39,7 @@ Group: Mail License: MIT+LGPL Version: %{V_major}.%{V_minor} -Release: 20081125 +Release: 20081222 # package options %option with_fsl yes @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
