* daemon-heavy includes dovecot authentication

svn path=/exim/branches/4.63-3-experimental/; revision=1648

3 files changed, 26 insertions, 21 deletions

diff --git a/debian/EDITME.exim4-heavy.diff b/debian/EDITME.exim4-heavy.diff
index 2e586ec..9d73a63 100644
--- a/debian/EDITME.exim4-heavy.diff
+++ b/debian/EDITME.exim4-heavy.diff
@@ -1,5 +1,5 @@
---- EDITME.exim4-light	2006-01-14 00:26:10.000000000 +0000
-+++ EDITME.exim4-heavy	2006-01-14 00:26:10.000000000 +0000
+--- EDITME.exim4-light	2006-10-10 16:06:58.000000000 +0000
++++ EDITME.exim4-heavy	2006-10-10 16:07:19.000000000 +0000
 @@ -215,7 +215,7 @@
  
  # This one is very special-purpose, so is not included by default.
@@ -84,19 +84,21 @@
  
  #------------------------------------------------------------------------------
  # Compiling Exim with experimental features. These are documented in
-@@ -475,9 +478,9 @@
+@@ -475,10 +478,10 @@
  # configuration to make use of the mechanism(s) selected.
  
  AUTH_CRAM_MD5=yes
 -# AUTH_CYRUS_SASL=yes
+-# AUTH_DOVECOT=yes
 +AUTH_CYRUS_SASL=yes
++AUTH_DOVECOT=yes
  AUTH_PLAINTEXT=yes
 -# AUTH_SPA=yes
 +AUTH_SPA=yes
  
  
  #------------------------------------------------------------------------------
-@@ -485,7 +488,7 @@
+@@ -486,7 +489,7 @@
  # Cyrus SASL library installed before trying to build Exim, and you probably
  # want to uncomment the following line:
  
@@ -105,7 +107,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -711,7 +714,7 @@
+@@ -712,7 +715,7 @@
  # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
  # Perl costs quite a lot of resources. Only do this if you really need it.
  
@@ -114,7 +116,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -731,11 +734,11 @@
+@@ -732,11 +735,11 @@
  # support, which is intended for use in conjunction with the SMTP AUTH
  # facilities, is included only when requested by the following setting:
  
@@ -128,7 +130,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -1042,7 +1045,7 @@
+@@ -1043,7 +1046,7 @@
  # local part) can be increased by changing this value. It should be set to
  # a multiple of 16.
  
diff --git a/debian/EDITME.exim4-light.diff b/debian/EDITME.exim4-light.diff
index d934500..81e7470 100644
--- a/debian/EDITME.exim4-light.diff
+++ b/debian/EDITME.exim4-light.diff
@@ -1,5 +1,5 @@
---- src/EDITME	2006-01-14 00:26:09.000000000 +0000
-+++ EDITME.exim4-light	2006-01-14 00:26:10.000000000 +0000
+--- src/EDITME	2006-10-10 16:05:51.000000000 +0000
++++ EDITME.exim4-light	2006-10-10 16:06:58.000000000 +0000
 @@ -100,7 +100,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
@@ -85,19 +85,20 @@
  # LOOKUP_PGSQL=yes
  # LOOKUP_SQLITE=yes
  # LOOKUP_WHOSON=yes
-@@ -473,9 +474,9 @@
+@@ -473,10 +474,10 @@
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
 -# AUTH_CRAM_MD5=yes
 +AUTH_CRAM_MD5=yes
  # AUTH_CYRUS_SASL=yes
+ # AUTH_DOVECOT=yes
 -# AUTH_PLAINTEXT=yes
 +AUTH_PLAINTEXT=yes
  # AUTH_SPA=yes
  
  
-@@ -493,7 +494,7 @@
+@@ -494,7 +495,7 @@
  # one that is set in the headers_charset option. The default setting is
  # defined by this setting:
  
@@ -106,7 +107,7 @@
  
  # If you are going to make use of $header_xxx expansions in your configuration
  # file, or if your users are going to use them in filter files, and the normal
-@@ -562,14 +563,14 @@
+@@ -563,14 +564,14 @@
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -124,7 +125,7 @@
  
  # If you are running Exim as a server, note that just building it with TLS
  # support is not all you need to do. You also need to set up a suitable
-@@ -644,6 +645,7 @@
+@@ -645,6 +646,7 @@
  # to form the final file names. Some installations may want something like this:
  
  # LOG_FILE_PATH=/var/log/exim_%slog
@@ -132,7 +133,7 @@
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -692,7 +694,7 @@
+@@ -693,7 +695,7 @@
  # files. Both the name of the command and the suffix that it adds to files
  # need to be defined here. See also the EXICYCLOG_MAX configuration.
  
@@ -141,7 +142,7 @@
  COMPRESS_SUFFIX=gz
  
  
-@@ -700,7 +702,7 @@
+@@ -701,7 +703,7 @@
  # If the exigrep utility is fed compressed log files, it tries to uncompress
  # them using this command.
  
@@ -150,7 +151,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -733,6 +735,7 @@
+@@ -734,6 +736,7 @@
  
  # You probably need to add -lpam to EXTRALIBS, and in some releases of
  # GNU/Linux -ldl is also needed.
@@ -158,7 +159,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -799,6 +802,8 @@
+@@ -800,6 +803,8 @@
  
  # CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
  
@@ -167,7 +168,7 @@
  
  #------------------------------------------------------------------------------
  # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
-@@ -884,8 +889,8 @@
+@@ -885,8 +890,8 @@
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -178,7 +179,7 @@
  # MV_COMMAND=/bin/mv
  # RM_COMMAND=/bin/rm
  # PERL_COMMAND=/usr/bin/perl
-@@ -1083,6 +1088,7 @@
+@@ -1084,6 +1089,7 @@
  # file can be specified here. Some installations may want something like this:
  
  # PID_FILE_PATH=/var/lock/exim.pid
@@ -186,7 +187,7 @@
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -1115,6 +1121,9 @@
+@@ -1116,6 +1122,9 @@
  # run time option is required to cause the moving actually to occur. Such
  # messages become "invisible" to the normal management tools.
  
diff --git a/debian/changelog b/debian/changelog
index b18acd7..e73eb0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,13 @@ exim4 (4.63.20061010-1) experimental; urgency=low
   * includes suggested upstream fix to properly expand host names in
     verification, see
     http://www.exim.org/mail-archives/exim-users/Week-of-Mon-20061009/msg00037.html
+  * daemon-heavy includes dovecot authentication
   * this package is missing upstream docs as upstream snapshots do not
     contain them
   * adapt packaging appropriately
+  * adapt EDITME.diff files
 
- -- Marc Haber <mh+debian-packages@zugschlus.de>  Tue, 10 Oct 2006 15:04:44 +0000
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Tue, 10 Oct 2006 16:09:05 +0000
 
 exim4 (4.63-4.0) UNRELEASED; urgency=low