[exim] New version

[Jaroslav Škarvada]

commit dcac391434c3a3a6785a191476331d74baba9205
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Jun 4 12:08:07 2012 +0200

    New version
    
      Resolves: rhbz#827963

 exim-4.73-config.patch => exim-4.80-config.patch |   28 +++++++++++++++------
 exim.spec                                        |   12 ++++++---
 sources                                          |    2 +-
 3 files changed, 29 insertions(+), 13 deletions(-)
---
diff --git a/exim-4.73-config.patch b/exim-4.80-config.patch
similarity index 93%
rename from exim-4.73-config.patch
rename to exim-4.80-config.patch
index 40d16cd..94a0dc1 100644
--- a/exim-4.73-config.patch
+++ b/exim-4.80-config.patch
@@ -69,7 +69,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -261,17 +261,20 @@ LOOKUP_DBM=yes
+@@ -261,18 +261,20 @@ LOOKUP_DBM=yes
  LOOKUP_LSEARCH=yes
  LOOKUP_DNSDB=yes
  
@@ -93,6 +93,7 @@
 -# LOOKUP_PASSWD=yes
 -# LOOKUP_PGSQL=yes
 -# LOOKUP_SQLITE=yes
+-# LOOKUP_SQLITE_PC=sqlite3
 +LOOKUP_PASSWD=yes
 +LOOKUP_PGSQL=yes
 +LOOKUP_SQLITE=yes
@@ -125,18 +126,24 @@
  
  
  #------------------------------------------------------------------------------
-@@ -527,11 +530,11 @@ FIXED_NEVER_USERS=root
+@@ -527,15 +530,13 @@ FIXED_NEVER_USERS=root
  # 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_CYRUS_SASL=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_CRAM_MD5=yes
 +AUTH_CYRUS_SASL=yes
 +AUTH_DOVECOT=yes
++AUTH_GSASL=yes
++AUTH_GSASL_PC=libgsasl
 +AUTH_PLAINTEXT=yes
 +AUTH_SPA=yes
  
@@ -160,20 +167,21 @@
  #
  # If you are not using one of those systems, but have installed iconv(), you
  # need to uncomment that line above. In some cases, you may find that iconv()
-@@ -630,10 +633,11 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -630,11 +633,11 @@ HEADERS_CHARSET="ISO-8859-1"
  # 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
 +TLS_INCLUDE=-I/usr/kerberos/include
 +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.
 @@ -684,7 +688,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
@@ -259,7 +267,7 @@
  #
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -918,13 +922,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -918,17 +922,17 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # is "yes", as well as supporting line editing, a history of input lines in the
  # current run is maintained.
  
@@ -270,7 +278,11 @@
  # Note that this option adds to the size of the Exim binary, because the
  # dynamic loading library is not otherwise included.
  
--
+ 
+ #------------------------------------------------------------------------------
+ # Uncomment this setting to include IPv6 support.
+ 
+-# HAVE_IPV6=yes
 +HAVE_IPV6=yes
  
  ###############################################################################
diff --git a/exim.spec b/exim.spec
index c7a8cb0..caae1ea 100644
--- a/exim.spec
+++ b/exim.spec
@@ -13,8 +13,8 @@
 
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.77
-Release: 2%{?dist}
+Version: 4.80
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -50,7 +50,7 @@ Source25: exim-gen-cert
 Source26: clamd.exim.service
 
 Patch4: exim-rhl.patch
-Patch6: exim-4.73-config.patch
+Patch6: exim-4.80-config.patch
 Patch8: exim-4.24-libdir.patch
 Patch12: exim-4.33-cyrus.patch
 Patch13: exim-4.43-pamconfig.patch
@@ -74,7 +74,7 @@ BuildRequires: pcre-devel sqlite-devel tcp_wrappers-devel cyrus-sasl-devel
 BuildRequires: openldap-devel openssl-devel mysql-devel postgresql-devel
 BuildRequires: libXaw-devel libXmu-devel libXext-devel libX11-devel libSM-devel
 BuildRequires: libICE-devel libXpm-devel libXt-devel perl(ExtUtils::Embed)
-BuildRequires: systemd-units
+BuildRequires: systemd-units libgsasl-devel
 
 %description
 Exim is a message transfer agent (MTA) developed at the University of
@@ -604,6 +604,10 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Mon Jun  4 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 4.80-1
+- New version
+  Resolves: rhbz#827963
+
 * Fri Apr  6 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 4.77-2
 - Rebuilt with libdb-5.2
 
diff --git a/sources b/sources
index bde3674..4110246 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d746275f2cc85845567f9d5eb84a57a  exim-4.77.tar.bz2
+de93a242e9e148de28d67056e5c1b34f  exim-4.80.tar.bz2