- rel 3; use exim-4_86+fixes branch instead of master

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index 520dffd0602dec1e86cd2fde16319757e05fb464..ffaa40ea0043676f38b3c0de649c6e2c94ed268f 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -10,7 +10,6 @@
 %bcond_without srs     # without srs support
 %bcond_without dynamic # dynamic modules
 %bcond_without hiredis # without redis
-%bcond_without dsn     # DSN
 
 %if "%{pld_release}" == "ac"
 # hiredis build segfaults on ac-alpha
@@ -21,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.85
-Release:       4
+Version:       4.86
+Release:       3
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: ebae28762b6f125726283dc9434e8709
+# Source0-md5: 797f248ef3e0c0e2f178e915f88fc4e9
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: ac087bcf14337f152adfdf8b64145c37
+# Source1-md5: 64eae24e1f268fa843a9de77e1c4009a
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -46,6 +45,8 @@ Source14:     ftp://ftp.exim.org/pub/exim/exim4/old/config.samples.tar.bz2
 # Source14-md5:        4b93321938a800caa6127c48ad60a42b
 Source15:      %{name}4-smtp.pamd
 Source16:      %{name}on.png
+# git log -p exim-4_86..exim-4_86+fixes --reverse -- . ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" > exim-git.patch
+Patch100:      %{name}-git.patch
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch
@@ -53,10 +54,10 @@ 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:                exim-bug-1639.patch
+
 Patch8:                %{name}-spam-timeout.patch
 Patch10:       %{name}-force-sigalrm.patch
-Patch11:       openssl_build_fix.patch
+
 Patch20:       %{name}4-disableSSLv3.patch
 URL:           http://www.exim.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
@@ -166,16 +167,18 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
+%patch100 -p2
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p2
+
 %patch8 -p1
 %patch10 -p1
-%patch11 -p1
+
 install %{SOURCE4} exim4.conf
 install %{SOURCE14} doc/config.samples.tar.bz2
 %patch20 -p1
@@ -188,14 +191,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_EVENT=yes
 EXPERIMENTAL_PROXY=yes
-EXPERIMENTAL_CERTNAMES=yes
-%{?with_dsn:EXPERIMENTAL_DSN=yes}
 %if %{with spf}
 EXPERIMENTAL_SPF=yes
 LOOKUP_LIBS+=-lspf2
@@ -254,8 +254,6 @@ LOOKUP_LIBS+=-lldap -llber
 %endif
 EOF
 
-%{!?with_dsn:sed -i -e 's|dsn_advertise_hosts|#dsn_advertise_hosts|g exim4.conf}
-
 # have to be after Local/Makefile-Linux creation
 cp -f src/EDITME Local/Makefile
 cp -f exim_monitor/EDITME Local/eximon.conf