X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexim.git;a=blobdiff_plain;f=exim.spec;h=6700a651baf7c889fb4dc7ca18a948a160d1f6f1;hp=4eac0683ca3248fdb4dd3c4f9df569eb01926833;hb=HEAD;hpb=2b858f19d7ba821cb8ca1fc2c084258c85684706

diff --git a/exim.spec b/exim.spec
index 4eac068..76cac2f 100644
--- a/exim.spec
+++ b/exim.spec
@@ -22,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.96
-Release:	6
+Version:	4.97
+Release:	16
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5:	e04a7a2a3456facba0b86dcec0ef4865
+# Source0-md5:	c970646b913b3a414d5c7a3725da7018
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	786f30ba262d34dfd47a10387f845d60
+# Source1-md5:	e1ba08655a1c045384244ecd9129f14d
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -49,19 +49,20 @@ Source15:	%{name}4-smtp.pamd
 Source16:	%{name}on.png
 # sh branch.sh
 Patch100:	%{name}-git.patch
-# Patch100-md5:	393b8bbf42e4e25abc4ce32857ca6e95
+# Patch100-md5:	24d2d79be6c50da350058ea04a305d69
 Patch0:		%{name}4-EDITME.patch
 Patch1:		%{name}4-monitor-EDITME.patch
 Patch2:		%{name}4-cflags.patch
-Patch3:		exim-defs.patch
+Patch3:		%{name}-defs.patch
 Patch4:		%{name}4-Makefile-Default.patch
 # dlopen patch from debian
 Patch5:		90_localscan_dlopen.dpatch
-
+# local fixes for debian patch
+Patch6:		90_localscan_dlopen-fixes.dpatch
 Patch7:		linelength-show.patch
 Patch8:		%{name}-spam-timeout.patch
-
-Patch20:	%{name}4-disableSSLv3.patch
+Patch9:		autoreply-return-path.patch
+Patch10:        unofficial-hotfix.patch
 URL:		http://www.exim.org/
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
 BuildRequires:	db-devel
@@ -76,6 +77,7 @@ BuildRequires:	libidn2-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 BuildRequires:	pcre2-8-devel
+BuildRequires:	perl-File-FcntlLock
 BuildRequires:	perl-devel >= 1:5.6.0
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
@@ -174,20 +176,21 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
-#%patch100 -p2
+%patch100 -p2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p2
+%patch10 -p2
 
 install %{SOURCE4} exim4.conf
 install %{SOURCE14} doc/config.samples.tar.bz2
-%patch20 -p1
 install -d Local
 cat << 'EOF' >> Local/Makefile-Linux
 CC=%{__cc}
@@ -202,9 +205,11 @@ EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
 EXPERIMENTAL_DSN_INFO=yes
 EXPERIMENTAL_QUEUEFILE=yes
+EXPERIMENTAL_XCLIENT=yes
 SUPPORT_DANE=yes
 SUPPORT_I18N=yes
 SUPPORT_I18N_2008=yes
+SUPPORT_MOVE_FROZEN_MESSAGES=yes
 LDFLAGS+= -lidn -lidn2
 SUPPORT_PROXY=yes
 %if %{with dmarc}
@@ -289,7 +294,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
 
 install build-Linux-*/exim{,_fixdb,_tidydb,_dbmbuild,on.bin,_dumpdb,_lock} \
 	build-Linux-*/exi{cyclog,next,what} %{SOURCE10} \
-	build-Linux-*/{exigrep,exiqgrep,exipick,eximstats,exiqsumm,convert4r4} \
+	build-Linux-*/{exigrep,exiqgrep,exipick,eximstats,exim_msgdate,exiqsumm,convert4r4} \
 	util/unknownuser.sh \
 	$RPM_BUILD_ROOT%{_bindir}
 install build-Linux-*/eximon.bin $RPM_BUILD_ROOT%{_bindir}