- up to 4.80

Changed files:
    exim-force-sigalrm.patch -> 1.2
    exim.spec -> 1.337
    exim4-EDITME.patch -> 1.19

diff --git a/exim-force-sigalrm.patch b/exim-force-sigalrm.patch
index c9e93f866fe150d85c77e7ca2931b87739cdf31b..c211cf0f21ada3cffab198c0367c74d95bec121a 100644 (file)
--- a/exim-force-sigalrm.patch
+++ b/exim-force-sigalrm.patch
@@ -18,15 +18,15 @@
  /* Enter the never-ending loop... */
  
  for (;;)
-@@ -1624,6 +1626,8 @@
-     {
-     DEBUG(D_any) debug_printf("SIGALRM received\n");
+@@ -1753,6 +1753,8 @@
+       {
+       DEBUG(D_any) debug_printf("SIGALRM received\n");
  
-+    time(&sigalrm_seen_last);
++      time(&sigalrm_seen_last);
 +
-     /* Do a full queue run in a child process, if required, unless we already
-     have enough queue runners on the go. If we are not running as root, a
-     re-exec is required. */
+       /* Do a full queue run in a child process, if required, unless we already
+       have enough queue runners on the go. If we are not running as root, a
+       re-exec is required. */
 @@ -1885,11 +1889,19 @@
  
    else

diff --git a/exim.spec b/exim.spec
index 9b020d1baeb863cbc9bdf7eb96ca51d7b934f444..baf8e7673c1a4874c841efc68f7fc8ceebfce9d1 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -14,15 +14,15 @@ Summary:    University of Cambridge Mail Transfer Agent
 Summary(pl.UTF-8):     Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR.UTF-8):  Servidor de correio eletrônico exim
 Name:          exim
-Version:       4.77
-Release:       5
+Version:       4.80
+Release:       1
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 5d746275f2cc85845567f9d5eb84a57a
+# Source0-md5: de93a242e9e148de28d67056e5c1b34f
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 5af01cdfe2f938bbac5d7a65cb3a7290
+# Source1-md5: 88a5d4a43c4ef2c96e31ce6ec4185e47
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf

diff --git a/exim4-EDITME.patch b/exim4-EDITME.patch
index e2ffec7a937bb2f64c7954e83de8bde2e97bb72d..729c9b6862a0ade1879a43882a67472f2dd2888d 100644 (file)
--- a/exim4-EDITME.patch
+++ b/exim4-EDITME.patch
@@ -96,7 +96,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
  
  #------------------------------------------------------------------------------
  # Compiling Exim with experimental features. These are documented in
-@@ -473,11 +474,11 @@
+@@ -579,15 +579,15 @@
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -104,27 +104,33 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
 +AUTH_CRAM_MD5=yes
  # AUTH_CYRUS_SASL=yes
 -# AUTH_DOVECOT=yes
++AUTH_DOVECOT=yes
+ # AUTH_GSASL=yes
+ # AUTH_GSASL_PC=libgsasl
+ # AUTH_HEIMDAL_GSSAPI=yes
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
 -# AUTH_PLAINTEXT=yes
 -# AUTH_SPA=yes
-+AUTH_DOVECOT=yes
 +AUTH_PLAINTEXT=yes
 +AUTH_SPA=yes
  
  
  #------------------------------------------------------------------------------
-@@ -576,10 +577,10 @@
+@@ -690,11 +690,11 @@
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
 -# SUPPORT_TLS=yes
 +SUPPORT_TLS=yes
  
- # Uncomment this setting if you are using OpenSSL
+ # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
+-# USE_OPENSSL_PC=openssl
 -# TLS_LIBS=-lssl -lcrypto
++USE_OPENSSL_PC=openssl
 +TLS_LIBS=-lssl -lcrypto
  
- # Uncomment these settings if you are using GnuTLS
- # USE_GNUTLS=yes
+ # Uncomment the first and either the second or the third of these if you
+ # are using GnuTLS.  If you have pkg-config, then the second, else the third.
 @@ -630,7 +631,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.