X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=exim.spec;h=3fa65dc1298b2fec8a35842ead293d009e519101;hb=5604fcd3d28951c07b2d41252bc8a3ced7d364c8;hp=1910b704b171ba6782820bc4ce4ca51be86708e8;hpb=7c020333ee66027a6754d22958e4a0a096c479b8;p=packages%2Fexim.git

diff --git a/exim.spec b/exim.spec
index 1910b70..3fa65dc 100644
--- a/exim.spec
+++ b/exim.spec
@@ -10,12 +10,10 @@
 %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
 
 %if "%{pld_release}" == "ac"
-# requires openssl SNI
-%undefine	with_ocsp
 # hiredis build segfaults on ac-alpha
 %undefine	with_hiredis
 %endif
@@ -24,15 +22,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.84
-Release:	1
+Version:	4.87
+Release:	2
 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:	2effc2bd47ad2dc010f655c11a1b1173
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	18835729357264ecff7c5468b05ccc80
+# Source1-md5:	f6ee36fd8d024912c053d113970938f5
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -45,11 +43,12 @@ 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
+# 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
 Patch2:		%{name}4-cflags.patch
@@ -61,9 +60,12 @@ Patch5:		localscan_dlopen_%{name}_4.20_or_better.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}
 %{?with_spf:BuildRequires:	libspf2-devel >= 1.2.5-2}
 %{?with_srs:BuildRequires:	libsrs_alt-devel >= 1.0}
@@ -169,6 +171,8 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
+#%patch100 -p2
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -180,8 +184,9 @@ Pliki nagłówkowe dla Exima.
 
 %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}
@@ -191,14 +196,15 @@ 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
+SUPPORT_PROXY=yes
+%if %{with dmarc}
+EXPERIMENTAL_DMARC=yes
+LOOKUP_LIBS+=-lopendmarc
+%endif
 %if %{with spf}
 EXPERIMENTAL_SPF=yes
 LOOKUP_LIBS+=-lspf2
@@ -208,7 +214,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}
@@ -287,8 +293,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