- rel 3; one more dkim fix

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index 19a7ec150afa94d29d8307f39f1622a9f7444837..27fd4e8867ec946e9d44f3adc8b1bade030c3cd1 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -10,12 +10,11 @@
 %bcond_without srs     # without srs support
 %bcond_without dynamic # dynamic modules
 %bcond_without hiredis # without redis
-%bcond_without ocsp    # without experimental OCSP
-%bcond_with    dsn     # DSN
+# opendmarc.spec not ready, so off by default
+%bcond_with    dmarc   # DMARC support
+%bcond_without lmdb    # LMDB support
 
 %if "%{pld_release}" == "ac"
-# requires openssl SNI
-%undefine      with_ocsp
 # hiredis build segfaults on ac-alpha
 %undefine      with_hiredis
 %endif
@@ -24,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.82.1
-Release:       1
+Version:       4.90
+Release:       3
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 4544696ce6689ba9141a0697f25a74cb
+# Source0-md5: 29a14c4bd29b553c0dfc13036225ebdd
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: a4aa8645868e54944c6540b3f8b798ea
+# Source1-md5: a728618fb641f4b9eb56deeefdb0cf67
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -45,11 +44,13 @@ 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
 Source16:      %{name}on.png
+# sh branch.sh
+Patch100:      %{name}-git.patch
+# Patch100-md5:        0fa27560685543eb8b13cb68f5a7d1ef
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch
@@ -58,17 +59,21 @@ 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
 
-# http://sourceforge.net/projects/eximdsn/
-Patch7:                %{name}_463_dsn_1_3.patch
 Patch8:                %{name}-spam-timeout.patch
-Patch9:                exim-bug-659.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
@@ -171,6 +176,8 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
+%patch100 -p2
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -178,13 +185,13 @@ Pliki nagłówkowe dla Exima.
 %patch4 -p1
 %patch5 -p1
 
-%{?with_dsn:%patch7 -p1}
 %patch8 -p1
-%patch9 -p2
+
 %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}
@@ -194,11 +201,19 @@ 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
-%{?with_ocsp:EXPERIMENTAL_OCSP=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
@@ -208,7 +223,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}
@@ -255,6 +270,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
@@ -287,8 +306,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