X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexim.git;a=blobdiff_plain;f=exim.spec;h=cb041156934fea3771ce4d6db9e86980d4852492;hp=6480801e05eb7b4461dccee56b6361f73b6af8f7;hb=0c83653;hpb=3cad492a2d32f15e5be36963e36306a3f8f06cec

diff --git a/exim.spec b/exim.spec
index 6480801..cb04115 100644
--- a/exim.spec
+++ b/exim.spec
@@ -7,7 +7,6 @@
 %bcond_without	sasl	# without SASL
 %bcond_without	ldap	# without LDAP support
 %bcond_without	spf	# without spf support
-%bcond_without	srs	# without srs support
 %bcond_with	dynamic # dynamic modules
 %bcond_without	hiredis # without redis
 # opendmarc.spec not ready, so off by default
@@ -23,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.94
-Release:	15
+Version:	4.96
+Release:	3
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5:	5773e8a0379bd621d57bc66c36ffff17
+# Source0-md5:	e04a7a2a3456facba0b86dcec0ef4865
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	e840b2f90c08bdaa8c7a356c5cab79dd
+# Source1-md5:	786f30ba262d34dfd47a10387f845d60
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -50,15 +49,16 @@ Source15:	%{name}4-smtp.pamd
 Source16:	%{name}on.png
 # sh branch.sh
 Patch100:	%{name}-git.patch
-# Patch100-md5:	1be8972e4317bb1bf33c0ec49ee90b20
+# Patch100-md5:	740ae0b0e536781a04fd566d8e523fe9
 Patch0:		%{name}4-EDITME.patch
 Patch1:		%{name}4-monitor-EDITME.patch
 Patch2:		%{name}4-cflags.patch
 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
+# dlopen patch from debian
+Patch5:		90_localscan_dlopen.dpatch
 
+Patch7:		linelength-show.patch
 Patch8:		%{name}-spam-timeout.patch
 
 Patch20:	%{name}4-disableSSLv3.patch
@@ -69,14 +69,13 @@ BuildRequires:	db-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_dmarc:BuildRequires:	opendmarc-devel}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
-BuildRequires:	pcre-devel
+BuildRequires:	pcre2-8-devel
 BuildRequires:	perl-devel >= 1:5.6.0
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
@@ -183,6 +182,7 @@ Pliki nagłówkowe dla Exima.
 %patch4 -p1
 %patch5 -p1
 
+%patch7 -p1
 %patch8 -p1
 
 install %{SOURCE4} exim4.conf
@@ -202,7 +202,6 @@ EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
 EXPERIMENTAL_DSN_INFO=yes
 EXPERIMENTAL_QUEUEFILE=yes
-EXPERIMENTAL_QUEUE_RAMP=yes
 SUPPORT_DANE=yes
 SUPPORT_I18N=yes
 SUPPORT_I18N_2008=yes
@@ -216,10 +215,6 @@ LOOKUP_LIBS+=-lopendmarc
 SUPPORT_SPF=yes
 LOOKUP_LIBS+=-lspf2
 %endif
-%if %{with srs}
-EXPERIMENTAL_SRS=yes
-LOOKUP_LIBS+=-lsrs_alt
-%endif
 %if %{with hiredis}
 LOOKUP_REDIS=yes
 LOOKUP_LIBS+=-lhiredis