2 files changed, 28 insertions, 29 deletions

diff --git a/mail/dovecot-devel/files/patch-aa b/mail/dovecot-devel/files/patch-aa
deleted file mode 100644
index b9fb6fe42327..000000000000
--- a/mail/dovecot-devel/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/auth/userinfo-pam.c	Thu Aug  1 05:16:44 2002
-+++ src/auth/userinfo-pam.c	Mon Aug 12 23:41:48 2002
-@@ -21,7 +21,6 @@
- 
- #include <stdlib.h>
- #include <unistd.h>
--#include <shadow.h>
- 
- #include <security/pam_appl.h>
- 
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
index a78d0c468700..b31c37f16458 100644
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ b/mail/dovecot-devel/files/patch-dovecot-example.conf
@@ -1,42 +1,51 @@
---- dovecot-example.conf.orig	Thu Aug 29 07:59:26 2002
-+++ dovecot-example.conf	Sun Sep  1 22:07:55 2002
-@@ -38,7 +38,7 @@
+--- dovecot-example.conf	Thu Jan  2 10:33:53 2003
++++ dovecot-example.conf.new	Sat Jan  4 21:40:34 2003
+@@ -64,7 +64,7 @@
  ##
  
  # Executable location
--#login_executable = /usr/lib/dovecot/imap-login
-+#login_executable = %%PREFIX%%/lib/dovecot/imap-login
+-#login_executable = /usr/libexec/dovecot/imap-login
++login_executable = %%PREFIX%%/dovecot/imap-login
  
  # User to use for imap-login process
  #login_user = imapd
-@@ -46,7 +46,7 @@
+@@ -76,7 +76,7 @@
  # Directory where imap-auth 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 need to give imap-auth any access for it.
 -#login_dir = /var/run/dovecot/login
-+#login_dir = /var/dovecot/login
++login_dir = /var/dovecot/login
  
- # chroot() imap-login process to the login_dir. Only reason not to do this
+ # chroot imap-login process to the login_dir. Only reason not to do this
  # is if you wish to run the whole imapd without roots.
-@@ -64,7 +64,7 @@
+@@ -111,7 +111,7 @@
  ##
  
  # Executable location
--#imap_executable = /usr/lib/dovecot/imap
-+#imap_executable = %%PREFIX%%/lib/dovecot/imap
+-#imap_executable = /usr/libexec/dovecot/imap
++imap_executable = %%PREFIX%%/dovecot/imap
  
- # Maximum number of running imap processes. When this limit is reached,
- # new users aren't allowed to log in.
-@@ -139,7 +139,7 @@
+ # 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.
+@@ -292,7 +292,7 @@
  auth_userinfo = pam
  
  # Executable location
--#auth_executable = /var/lib/dovecot/imap-auth
-+#auth_executable = %%PREFIX%%/lib/dovecot/imap-auth
+-#auth_executable = /usr/libexec/dovecot/imap-auth
++auth_executable = %%PREFIX%%/dovecot/imap-auth
+ 
+ # Set max. process size in megabytes.
+ #auth_process_size = 256
+@@ -303,7 +303,7 @@
+ 
+ # 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.
+-#auth_chroot = 
++auth_chroot = /var/dovecot/auth
  
- # User to use for the process. Only shadow and pam authentication requires
- # roots, so use something else if possible.
-@@ -162,7 +162,7 @@
+ # Number of authentication processes to create
+ #auth_count = 1
+@@ -319,7 +319,7 @@
  #auth_realms = 
  #auth_userinfo = passwd-file /etc/passwd.imap
  #auth_user = imapauth