X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fexim.git;a=blobdiff_plain;f=exim.spec;h=c7b1f7f60bc185c53f398c4b5a87b1efa78b0637;hp=62f9e3481a374bd56f29e0e870dde864afac0e8f;hb=0a68dc9b4f0ba098ff041dbbfe2102676cdc75c7;hpb=5d89b078e7ab525f65b16d1f2277577363937eaf

diff --git a/exim.spec b/exim.spec
index 62f9e34..c7b1f7f 100644
--- a/exim.spec
+++ b/exim.spec
@@ -10,29 +10,29 @@
 %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
+# 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
 
+%include	/usr/lib/rpm/macros.perl
 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.90.1
+Release:	10
 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:	4b909bf15acfd59ef65ded43d7f38820
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	18835729357264ecff7c5468b05ccc80
+# Source1-md5:	4337888fc994f878c904f3e4a2defa68
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -45,11 +45,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:	45ee8c56f68415ea9e0f5015bf1c413d
 Patch0:		%{name}4-EDITME.patch
 Patch1:		%{name}4-monitor-EDITME.patch
 Patch2:		%{name}4-cflags.patch
@@ -57,17 +59,22 @@ 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
+%{?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
@@ -77,6 +84,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}
@@ -170,20 +178,22 @@ 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
 install -d Local
 cat << 'EOF' >> Local/Makefile-Linux
 CC=%{__cc}
@@ -193,14 +203,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
-EXPERIMENTAL_PROXY=yes
-EXPERIMENTAL_CERTNAMES=yes
-%{?with_dsn:EXPERIMENTAL_DSN=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
@@ -210,7 +225,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}
@@ -257,6 +272,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
@@ -289,8 +308,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