Follow upstream (where rfc1413 calls are disabled by default)

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index 62f9e3481a374bd56f29e0e870dde864afac0e8f..6067837a91bd2e094aa80baea827473310a04f46 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -10,12 +10,8 @@
 %bcond_without srs     # without srs support
 %bcond_without dynamic # dynamic modules
 %bcond_without hiredis # without redis
-%bcond_without ocsp    # without experimental OCSP
-%bcond_without dsn     # DSN
 
 %if "%{pld_release}" == "ac"
-# requires openssl SNI
-%undefine      with_ocsp
 # hiredis build segfaults on ac-alpha
 %undefine      with_hiredis
 %endif
@@ -24,15 +20,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.84
-Release:       3
+Version:       4.86
+Release:       1
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 3d14522e604b687b9e515f5aa739b2c0
+# Source0-md5: 797f248ef3e0c0e2f178e915f88fc4e9
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 18835729357264ecff7c5468b05ccc80
+# Source1-md5: 64eae24e1f268fa843a9de77e1c4009a
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -45,7 +41,6 @@ Source9:      %{name}.aliases
 Source10:      newaliases
 Source11:      %{name}.logrotate
 Source12:      %{name}.sysconfig
-
 Source14:      ftp://ftp.exim.org/pub/exim/exim4/old/config.samples.tar.bz2
 # Source14-md5:        4b93321938a800caa6127c48ad60a42b
 Source15:      %{name}4-smtp.pamd
@@ -57,11 +52,11 @@ Patch3:             exim-defs.patch
 Patch4:                %{name}4-Makefile-Default.patch
 # http://marc.merlins.org/linux/exim/files/sa-exim-cvs/localscan_dlopen_exim_4.20_or_better.patch
 Patch5:                localscan_dlopen_%{name}_4.20_or_better.patch
-Patch6:                %{name}-exigrep.patch
 
 Patch8:                %{name}-spam-timeout.patch
-
 Patch10:       %{name}-force-sigalrm.patch
+
+Patch20:       %{name}4-disableSSLv3.patch
 URL:           http://www.exim.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
 BuildRequires: db-devel
@@ -176,14 +171,13 @@ Pliki nagłówkowe dla Exima.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p2
 
 %patch8 -p1
-
 %patch10 -p1
 
+install %{SOURCE4} exim4.conf
 install %{SOURCE14} doc/config.samples.tar.bz2
-
+%patch20 -p1
 install -d Local
 cat << 'EOF' >> Local/Makefile-Linux
 CC=%{__cc}
@@ -193,14 +187,11 @@ LOOKUP_CDB=yes
 XLFLAGS=-L%{_prefix}/X11R6/%{_lib}
 X11_LD_LIB=%{_prefix}/X11R6/%{_lib}
 %{?with_dynamic:LOOKUP_MODULE_DIR=%{_libdir}/%{name}/modules}
-SUPPORT_DSN=yes
+EXPERIMENTAL_DANE=yes
 EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
-EXPERIMENTAL_TPDA=yes
+EXPERIMENTAL_EVENT=yes
 EXPERIMENTAL_PROXY=yes
-EXPERIMENTAL_CERTNAMES=yes
-%{?with_dsn:EXPERIMENTAL_DSN=yes}
-%{?with_ocsp:EXPERIMENTAL_OCSP=yes}
 %if %{with spf}
 EXPERIMENTAL_SPF=yes
 LOOKUP_LIBS+=-lspf2
@@ -289,8 +280,8 @@ install %{SOURCE5} .
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.daily
 install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install        %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/mail/exim.conf
+install %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+install exim4.conf $RPM_BUILD_ROOT%{_sysconfdir}/mail/exim.conf
 install {doc,man}/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
 install %{SOURCE15} $RPM_BUILD_ROOT/etc/pam.d/smtp