From eaa10c85c5fa2900f797ecb3238a190c1866dd37 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Wed, 8 Nov 2006 17:40:22 +0100
Subject: [PATCH] dovecot: update to 1.0.rc13

---
 dovecot/.md5sum              |  4 ++--
 dovecot/Pkgfile              |  2 +-
 dovecot/dovecot-config.patch | 37 ++++++++++++++----------------------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/dovecot/.md5sum b/dovecot/.md5sum
index 86832374f..1b4f6eba8 100644
--- a/dovecot/.md5sum
+++ b/dovecot/.md5sum
@@ -1,3 +1,3 @@
 1c37d911bc42fb40f0ef5a3f5822b170  dovecot
-0079a4531a1a93b933e4187cc361c019  dovecot-1.0.rc12.tar.gz
-40191abc64532951e58da70a4814422c  dovecot-config.patch
+47e86f3ee779e805ffca7b923dc50b19  dovecot-1.0.rc13.tar.gz
+53e438cf6f66ce45abdd8d9ebe005bf0  dovecot-config.patch
diff --git a/dovecot/Pkgfile b/dovecot/Pkgfile
index de9bfc96b..3b78470c1 100644
--- a/dovecot/Pkgfile
+++ b/dovecot/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  openssl
 
 name=dovecot
-version=1.0.rc12
+version=1.0.rc13
 release=1
 source=(http://dovecot.org/releases/$name-$version.tar.gz \
         dovecot-config.patch dovecot)
diff --git a/dovecot/dovecot-config.patch b/dovecot/dovecot-config.patch
index f8015e0da..3e3f7a4ea 100644
--- a/dovecot/dovecot-config.patch
+++ b/dovecot/dovecot-config.patch
@@ -1,6 +1,6 @@
-diff -Nru dovecot-1.0.rc11.orig/dovecot-example.conf dovecot-1.0.rc11/dovecot-example.conf
---- dovecot-1.0.rc11.orig/dovecot-example.conf	2006-11-05 11:03:48.000000000 +0100
-+++ dovecot-1.0.rc11/dovecot-example.conf	2006-11-05 11:06:09.000000000 +0100
+diff -Nru dovecot-1.0.rc13.orig/dovecot-example.conf dovecot-1.0.rc13/dovecot-example.conf
+--- dovecot-1.0.rc13.orig/dovecot-example.conf	2006-11-08 17:09:38.000000000 +0100
++++ dovecot-1.0.rc13/dovecot-example.conf	2006-11-08 17:14:42.000000000 +0100
 @@ -13,11 +13,11 @@
  # --with-ssldir=/etc/ssl
  
@@ -99,7 +99,7 @@ diff -Nru dovecot-1.0.rc11.orig/dovecot-example.conf dovecot-1.0.rc11/dovecot-ex
  
    # 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
-@@ -542,11 +542,11 @@
+@@ -545,11 +545,11 @@
  
  protocol pop3 {
    # Login executable location.
@@ -113,7 +113,7 @@ diff -Nru dovecot-1.0.rc11.orig/dovecot-example.conf dovecot-1.0.rc11/dovecot-ex
  
    # 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
-@@ -590,7 +590,7 @@
+@@ -593,7 +593,7 @@
    # installations. %08Xu%08Xv will be the new default, so use it for new
    # installations.
    #
@@ -122,7 +122,7 @@ diff -Nru dovecot-1.0.rc11.orig/dovecot-example.conf dovecot-1.0.rc11/dovecot-ex
  
    # POP3 logout format string:
    #  %t - number of TOP commands
-@@ -636,7 +636,7 @@
+@@ -639,7 +639,7 @@
    #mail_plugin_dir = /usr/lib/dovecot/lda
  
    # Binary to use for sending mails.
@@ -131,7 +131,7 @@ diff -Nru dovecot-1.0.rc11.orig/dovecot-example.conf dovecot-1.0.rc11/dovecot-ex
  
    # UNIX socket path to master authentication server to find users.
    #auth_socket_path = /var/run/dovecot/auth-master
-@@ -647,7 +647,7 @@
+@@ -650,7 +650,7 @@
  ##
  
  # Executable location
@@ -140,16 +140,16 @@ diff -Nru dovecot-1.0.rc11.orig/dovecot-example.conf dovecot-1.0.rc11/dovecot-ex
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -761,7 +761,7 @@
-   # database (passwd usually), you can use static userdb.
+@@ -765,7 +765,7 @@
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
    # authentication to actually work.
+   # http://wiki.dovecot.org/PasswordDatabase/PAM
 -  passdb pam {
 +  #passdb pam {
      #  [session=yes] [setcred=yes] [cache_key=<key>] [<service name>]
      #
      # session=yes makes Dovecot open and immediately close PAM session. Some
-@@ -789,7 +789,7 @@
+@@ -793,7 +793,7 @@
      #   args = session=yes *
      #   args = cache_key=%u dovecot
      #args = dovecot
@@ -158,23 +158,14 @@ diff -Nru dovecot-1.0.rc11.orig/dovecot-example.conf dovecot-1.0.rc11/dovecot-ex
  
    # /etc/passwd or similar, using getpwnam()
    # In many systems nowadays this uses Name Service Switch, which is
-@@ -799,8 +799,8 @@
-   #}
+@@ -804,8 +804,8 @@
  
    # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
+   # http://wiki.dovecot.org/PasswordDatabase/Shadow
 -  #passdb shadow {
 -  #}
 +  passdb shadow {
 +  }
  
-   # BSD authentication. Used by at least OpenBSD.
-   #passdb bsdauth {
-@@ -902,7 +902,7 @@
-   # 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
-+  #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.
+   # PAM-like authentication for OpenBSD.
+   # http://wiki.dovecot.org/PasswordDatabase/BSDAuth