packages: dovecot/dovecot-config.patch, dovecot/dovecot.spec - up to 2.0.0 ...

arekm arekm at pld-linux.org
Sat Aug 21 09:40:08 CEST 2010


Author: arekm                        Date: Sat Aug 21 07:40:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.0.0 (unfinished)

---- Files affected:
packages/dovecot:
   dovecot-config.patch (1.8 -> 1.9) , dovecot.spec (1.137 -> 1.138) 

---- Diffs:

================================================================
Index: packages/dovecot/dovecot-config.patch
diff -u packages/dovecot/dovecot-config.patch:1.8 packages/dovecot/dovecot-config.patch:1.9
--- packages/dovecot/dovecot-config.patch:1.8	Fri Jul  3 09:41:14 2009
+++ packages/dovecot/dovecot-config.patch	Sat Aug 21 09:40:03 2010
@@ -1,98 +1,26 @@
-diff -ur dovecot-1.0.0-o/dovecot-example.conf dovecot-1.0.0/dovecot-example.conf
---- dovecot-1.0.0-o/dovecot-example.conf	2007-03-30 05:36:18.000000000 -0600
-+++ dovecot-1.0.0/dovecot-example.conf	2007-04-13 23:20:41.000000000 -0600
-@@ -91,8 +91,8 @@
+diff -urN dovecot-2.0.0.org/doc/example-config/conf.d/10-master.conf dovecot-2.0.0/doc/example-config/conf.d/10-master.conf
+--- dovecot-2.0.0.org/doc/example-config/conf.d/10-master.conf	2010-06-16 20:56:26.000000000 +0200
++++ dovecot-2.0.0/doc/example-config/conf.d/10-master.conf	2010-08-21 09:37:39.567272532 +0200
+@@ -4,7 +4,7 @@
+ 
+ # Login user is internally used by login processes. This is the most untrusted
+ # user in Dovecot system. It shouldn't have access to anything at all.
+-#default_login_user = dovenull
++default_login_user = dovecot
+ 
+ # Internal user is used by unprivileged processes. It should be separate from
+ # login user, so that login processes can't disturb other processes.
+diff -urN dovecot-2.0.0.org/doc/example-config/conf.d/10-ssl.conf dovecot-2.0.0/doc/example-config/conf.d/10-ssl.conf
+--- dovecot-2.0.0.org/doc/example-config/conf.d/10-ssl.conf	2010-05-24 16:35:40.000000000 +0200
++++ dovecot-2.0.0/doc/example-config/conf.d/10-ssl.conf	2010-08-21 09:36:31.513101379 +0200
+@@ -9,8 +9,8 @@
  # 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 = /var/lib/openssl/certs/imap.pem
-+ssl_key_file = /var/lib/openssl/private/imap.pem
+-ssl_cert = </etc/ssl/certs/dovecot.pem
+-ssl_key = </etc/ssl/private/dovecot.pem
++ssl_cert = </var/lib/openssl/certs/imap.pem
++ssl_key = </var/lib/openssl/private/imap.pem
  
  # If key file is password protected, give the password here. Alternatively
- # give it when starting dovecot with -p parameter.
-@@ -138,7 +138,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>
--#login_user = dovecot
-+login_user = dovecot
- 
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
-@@ -537,20 +537,20 @@
- 
- protocol imap {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/imap-login
-+  #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 user's ~/dovecot.rawlog/, if it exists:
--  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+  #   mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap
-   # <doc/wiki/Debugging/Rawlog.txt>
-   #
-   # This would attach gdb into the imap process and write backtraces into
-   # /tmp/gdbhelper.* files:
--  #   mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
-+  #   mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap
-   #
--  #mail_executable = /usr/libexec/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
-@@ -520,7 +520,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 = /usr/lib/dovecot/plugins/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.
-@@ -563,11 +563,11 @@
- 
- protocol pop3 {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/pop3-login
-+  #login_executable = /usr/lib/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 = /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
-@@ -627,7 +627,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 = /usr/lib/dovecot/plugins/pop3
- 
-   # Workarounds for various client bugs:
-   #   outlook-no-nuls:
-@@ -655,7 +655,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 = /usr/lib/dovecot/plugins/lda
- 
-   # Binary to use for sending mails.
-   #sendmail_path = /usr/lib/sendmail
-@@ -669,7 +669,7 @@
- ##
- 
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = /usr/lib/dovecot/dovecot-auth
- 
- # Set max. process size in megabytes.
- #auth_process_size = 256
+ # give it when starting dovecot with -p parameter. Since this file is often

================================================================
Index: packages/dovecot/dovecot.spec
diff -u packages/dovecot/dovecot.spec:1.137 packages/dovecot/dovecot.spec:1.138
--- packages/dovecot/dovecot.spec:1.137	Sat Jul 24 10:20:57 2010
+++ packages/dovecot/dovecot.spec	Sat Aug 21 09:40:03 2010
@@ -11,13 +11,13 @@
 Summary:	IMAP and POP3 server written with security primarily in mind
 Summary(pl.UTF-8):	Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
 Name:		dovecot
-Version:	1.2.13
-Release:	1
+Version:	2.0.0
+Release:	0.1
 Epoch:		1
 License:	MIT (libraries), LGPL v2.1 (the rest)
 Group:		Networking/Daemons
-Source0:	http://dovecot.org/releases/1.2/%{name}-%{version}.tar.gz
-# Source0-md5:	aaee3b5fd59e01780305553248f686bc
+Source0:	http://dovecot.org/releases/2.0/%{name}-%{version}.tar.gz
+# Source0-md5:	2ca3cbd523cac1cbd53a904255dcd4f8
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -131,7 +131,7 @@
 %setup -q
 %patch0 -p1
 
-%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' dovecot-example.conf
+%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
 
 %build
 touch config.rpath
@@ -286,6 +286,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2010/08/21 07:40:03  arekm
+- up to 2.0.0 (unfinished)
+
 Revision 1.137  2010/07/24 08:20:57  dzeus
 - up to 1.2.13
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dovecot/dovecot-config.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dovecot/dovecot.spec?r1=1.137&r2=1.138&f=u



More information about the pld-cvs-commit mailing list