X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=exim.spec;h=86bbcb9224a556a9acf011ed4b512e4274b49300;hb=0f70f0efef13677e4fd78a57dc255221a421de21;hp=b6310f4ea0e96d55772ce23014e12dcdc426b6e7;hpb=bbb9de3e9e3bdd4eaf492bf37442e00c4dc429f2;p=packages%2Fexim.git

diff --git a/exim.spec b/exim.spec
index b6310f4..86bbcb9 100644
--- a/exim.spec
+++ b/exim.spec
@@ -10,25 +10,29 @@
 %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
 %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.86
-Release:	8
+Version:	4.91
+Release:	14
 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:	e4db1e9013227539acfd662c3cf816d9
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	64eae24e1f268fa843a9de77e1c4009a
+# Source1-md5:	587e1e9018b593f5c0a19a8205235db9
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -45,8 +49,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_86..exim-4_86+fixes --reverse -- . ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" > exim-git.patch
+# sh branch.sh
 Patch100:	%{name}-git.patch
+# Patch100-md5:	c36747c3de1b402ad4f361114f7be5fb
 Patch0:		%{name}4-EDITME.patch
 Patch1:		%{name}4-monitor-EDITME.patch
 Patch2:		%{name}4-cflags.patch
@@ -54,18 +59,20 @@ 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
+
 Patch8:		%{name}-spam-timeout.patch
-Patch9:		%{name}-callout-address.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
@@ -75,6 +82,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}
@@ -176,11 +184,8 @@ Pliki nagłówkowe dla Exima.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p2
 
 %patch8 -p1
-%patch9 -p2
-%patch10 -p1
 
 install %{SOURCE4} exim4.conf
 install %{SOURCE14} doc/config.samples.tar.bz2
@@ -194,13 +199,22 @@ 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_EVENT=yes
-EXPERIMENTAL_PROXY=yes
+EXPERIMENTAL_DSN_INFO=yes
+EXPERIMENTAL_QUEUEFILE=yes
+SUPPORT_DANE=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
+SUPPORT_SPF=yes
 LOOKUP_LIBS+=-lspf2
 %endif
 %if %{with srs}
@@ -208,7 +222,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 +269,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