- rel 10; upstream fixes

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index 858fc65836df10da1c2de071a5e07450ee2396b6..e5694a6898d775b2c7b70f5453036443c040f629 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -8,7 +8,7 @@
 %bcond_without ldap    # without LDAP support
 %bcond_without spf     # without spf support
 %bcond_without srs     # without srs support
-%bcond_without dynamic # dynamic modules
+%bcond_with    dynamic # dynamic modules
 %bcond_without hiredis # without redis
 # opendmarc.spec not ready, so off by default
 %bcond_with    dmarc   # DMARC support
@@ -23,15 +23,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.89
-Release:       7
+Version:       4.94
+Release:       10
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: ef78f2f669e429988c61d2dfb5a340b9
+# Source0-md5: 5773e8a0379bd621d57bc66c36ffff17
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 47382a69ca8beb441b8d017dffa00942
+# Source1-md5: e840b2f90c08bdaa8c7a356c5cab79dd
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -48,9 +48,9 @@ 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_87..exim-4_87+fixes --reverse -- . ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" > exim-git.patch
+# sh branch.sh
 Patch100:      %{name}-git.patch
-# Patch100-md5:        ad76e3923517b1d9adeba813126325a0
+# Patch100-md5:        c1230b5b9e34fdafd71dd310bf53e461
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch
@@ -58,12 +58,9 @@ 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-commandline_checks_require_admin.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}
@@ -84,6 +81,7 @@ BuildRequires:        perl-devel >= 1:5.6.0
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: readline-devel
 BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.268
 %{?with_sqlite:BuildRequires:  sqlite3-devel}
 %{?with_whoson:BuildRequires:  whoson-devel}
@@ -178,19 +176,15 @@ 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
-
 install %{SOURCE4} exim4.conf
 install %{SOURCE14} doc/config.samples.tar.bz2
 %patch20 -p1
@@ -203,21 +197,23 @@ LOOKUP_CDB=yes
 XLFLAGS=-L%{_prefix}/X11R6/%{_lib}
 X11_LD_LIB=%{_prefix}/X11R6/%{_lib}
 %{?with_dynamic:LOOKUP_MODULE_DIR=%{_libdir}/%{name}/modules}
-EXPERIMENTAL_DANE=yes
+EXPERIMENTAL_ARC=yes
 EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
 EXPERIMENTAL_DSN_INFO=yes
 EXPERIMENTAL_QUEUEFILE=yes
+EXPERIMENTAL_QUEUE_RAMP=yes
+SUPPORT_DANE=yes
 SUPPORT_I18N=yes
 SUPPORT_I18N_2008=yes
 LDFLAGS+= -lidn -lidn2
 SUPPORT_PROXY=yes
 %if %{with dmarc}
-EXPERIMENTAL_DMARC=yes
+SUPPORT_DMARC=yes
 LOOKUP_LIBS+=-lopendmarc
 %endif
 %if %{with spf}
-EXPERIMENTAL_SPF=yes
+SUPPORT_SPF=yes
 LOOKUP_LIBS+=-lspf2
 %endif
 %if %{with srs}
@@ -276,6 +272,7 @@ LOOKUP_LIBS+=-lldap -llber
 EXPERIMENTAL_LMDB=yes
 LOOKUP_LIBS+=-llmdb
 %endif
+DLOPEN_LOCAL_SCAN=yes
 EOF
 
 # have to be after Local/Makefile-Linux creation
@@ -283,7 +280,7 @@ cp -f src/EDITME Local/Makefile
 cp -f exim_monitor/EDITME Local/eximon.conf
 
 %build
-%{__make} -e -j1 \
+%{__make} -e \
        FULLECHO=''
 
 %install
@@ -364,7 +361,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README* NOTICE LICENCE analyse-log-errors doc/{ChangeLog,NewStuff,dbm.discuss.txt,filter.txt,spec.txt,Exim*.upgrade,OptionLists.txt,experimental-spec.txt} build-Linux-*/transport-filter.pl
-%doc exim-html-*/doc/html
+%doc exim-html-*/exim-html-*/doc/html
 %dir %{_sysconfdir}/mail
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/exim.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/aliases