- rel 2; backport commandline_checks_require_admin option (workaround for holes like...

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index ad6928c9256624a01e2667acf65c251b08b8e3ee..f192f43d3bb6c7d23a19250f93158da901d8c1b5 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -10,6 +10,9 @@
 %bcond_without srs     # without srs support
 %bcond_without dynamic # dynamic modules
 %bcond_without hiredis # without redis
+# opendmarc.spec not ready, so off by default
+%bcond_with    dmarc   # DMARC support
+%bcond_without lmdb    # LMDB support
 
 %if "%{pld_release}" == "ac"
 # hiredis build segfaults on ac-alpha
@@ -20,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.86
-Release:       7
+Version:       4.89
+Release:       2
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 797f248ef3e0c0e2f178e915f88fc4e9
+# Source0-md5: ef78f2f669e429988c61d2dfb5a340b9
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 64eae24e1f268fa843a9de77e1c4009a
+# Source1-md5: 47382a69ca8beb441b8d017dffa00942
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -45,7 +48,7 @@ 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
+# git log -p exim-4_87..exim-4_87+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
@@ -54,17 +57,23 @@ 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-dkim.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}
 BuildRequires: db-devel
+%{?with_dmarc:BuildRequires:   opendmarc-devel}
 %{?with_hiredis:BuildRequires: hiredis-devel}
+BuildRequires: libidn-devel
+BuildRequires: libidn2-devel
 %{?with_spf:BuildRequires:     libspf2-devel >= 1.2.5-2}
 %{?with_srs:BuildRequires:     libsrs_alt-devel >= 1.0}
+%{?with_lmdb:BuildRequires:    lmdb-devel}
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 BuildRequires: openssl-devel >= 0.9.7d
@@ -167,7 +176,7 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
-%patch100 -p2
+#%patch100 -p2
 
 %patch0 -p1
 %patch1 -p1
@@ -178,6 +187,7 @@ Pliki nagłówkowe dla Exima.
 %patch6 -p2
 
 %patch8 -p1
+
 %patch10 -p1
 
 install %{SOURCE4} exim4.conf
@@ -195,8 +205,16 @@ X11_LD_LIB=%{_prefix}/X11R6/%{_lib}
 EXPERIMENTAL_DANE=yes
 EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
-EXPERIMENTAL_EVENT=yes
-EXPERIMENTAL_PROXY=yes
+EXPERIMENTAL_DSN_INFO=yes
+EXPERIMENTAL_QUEUEFILE=yes
+SUPPORT_I18N=yes
+SUPPORT_I18N_2008=yes
+LDFLAGS+= -lidn -lidn2
+SUPPORT_PROXY=yes
+%if %{with dmarc}
+EXPERIMENTAL_DMARC=yes
+LOOKUP_LIBS+=-lopendmarc
+%endif
 %if %{with spf}
 EXPERIMENTAL_SPF=yes
 LOOKUP_LIBS+=-lspf2
@@ -206,7 +224,7 @@ EXPERIMENTAL_SRS=yes
 LOOKUP_LIBS+=-lsrs_alt
 %endif
 %if %{with hiredis}
-EXPERIMENTAL_REDIS=yes
+LOOKUP_REDIS=yes
 LOOKUP_LIBS+=-lhiredis
 %endif
 %if %{with mysql}
@@ -253,6 +271,10 @@ LOOKUP_LDAP_LIBS=-lldap -llber
 # for static
 LOOKUP_LIBS+=-lldap -llber
 %endif
+%if %{with lmdb}
+EXPERIMENTAL_LMDB=yes
+LOOKUP_LIBS+=-llmdb
+%endif
 EOF
 
 # have to be after Local/Makefile-Linux creation