X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=exim.spec;h=711ccc717ff58f89d734a44128d4782ebe240624;hb=060f6153fb672557b54d50860ebad9452edc3d65;hp=c9f5e74d11bbcf664cfa0f62952058890e183261;hpb=241f59e81ce9ee83d7586ebf9a367f1d1871cc7d;p=packages%2Fexim.git

diff --git a/exim.spec b/exim.spec
index c9f5e74..711ccc7 100644
--- a/exim.spec
+++ b/exim.spec
@@ -9,20 +9,30 @@
 %bcond_without	spf	# without spf support
 %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.80.1
-Release:	16
+Version:	4.92
+Release:	5
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5:	1a95dc9f02834b1b7430403a75edf162
+# Source0-md5:	c2c34e7e0c3956d2b93c458106c9dc22
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	a0974c2ed244faa27cb6bc1724880ed3
+# Source1-md5:	ab60afdcf56f28e85d74f299ffc12cf7
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -35,30 +45,35 @@ Source9:	%{name}.aliases
 Source10:	newaliases
 Source11:	%{name}.logrotate
 Source12:	%{name}.sysconfig
-Source13:	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/FAQ.txt.bz2
-# Source13-md5:	ff781bd31fb1d574c8b9d33f4bfd34a7
-Source14:	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/config.samples.tar.bz2
+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:	7d26da1d8b32ebabe0cbd3b721a45e7e
 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
+Patch6:		exim-bug-1891.patch
 
-# http://sourceforge.net/projects/eximdsn/
-Patch7:		%{name}_463_dsn_1_3.patch
 Patch8:		%{name}-spam-timeout.patch
-Patch9:		exim-bug-659.patch
-Patch10:	%{name}-force-sigalrm.patch
-Patch11:	%{name}-bug-1057.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
@@ -68,6 +83,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}
@@ -93,6 +109,7 @@ Requires:	which
 Provides:	group(exim)
 Provides:	smtpdaemon
 Provides:	user(exim)
+Obsoletes:	exipick
 Obsoletes:	smtpdaemon
 Conflicts:	logrotate < 3.8.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -160,21 +177,21 @@ 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
 
-%patch7 -p1
 %patch8 -p1
-%patch9 -p2
-%patch10 -p1
-%patch11 -p1
 
-install %{SOURCE13} doc/FAQ.txt.bz2
+install %{SOURCE4} exim4.conf
 install %{SOURCE14} doc/config.samples.tar.bz2
-
+%patch20 -p1
 install -d Local
 cat << 'EOF' >> Local/Makefile-Linux
 CC=%{__cc}
@@ -184,9 +201,32 @@ 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
-%{?with_spf:EXPERIMENTAL_SPF=yes}
-%{?with_srs:EXPERIMENTAL_SRS=yes}
+EXPERIMENTAL_ARC=yes
+EXPERIMENTAL_DCC=yes
+EXPERIMENTAL_PRDR=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}
+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
+%endif
 %if %{with mysql}
 LOOKUP_MYSQL=%{dynamic_type}
 # for dynamic
@@ -219,7 +259,10 @@ LOOKUP_WHOSON_LIBS=-lwhoson
 # for static
 LOOKUP_LIBS+=-lwhoson
 %endif
-%{?with_sasl:AUTH_CYRUS_SASL=yes}
+%if %{with sasl}
+AUTH_CYRUS_SASL=yes
+LOOKUP_LIBS+=-lsasl2
+%endif
 %if %{with ldap}
 LOOKUP_LDAP=%{dynamic_type}
 LDAP_LIB_TYPE=OPENLDAP2
@@ -228,7 +271,10 @@ LOOKUP_LDAP_LIBS=-lldap -llber
 # for static
 LOOKUP_LIBS+=-lldap -llber
 %endif
-LOOKUP_LIBS+=%{?with_spf:-lspf2} %{?with_srs:-lsrs_alt} %{?with_sasl:-lsasl2}
+%if %{with lmdb}
+EXPERIMENTAL_LMDB=yes
+LOOKUP_LIBS+=-llmdb
+%endif
 EOF
 
 # have to be after Local/Makefile-Linux creation
@@ -250,7 +296,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,eximstats,exiqsumm,convert4r4} \
+	build-Linux-*/{exigrep,exiqgrep,exipick,eximstats,exiqsumm,convert4r4} \
 	util/unknownuser.sh \
 	$RPM_BUILD_ROOT%{_bindir}
 install build-Linux-*/eximon.bin $RPM_BUILD_ROOT%{_bindir}
@@ -261,8 +307,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
@@ -317,7 +363,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README* NOTICE LICENCE analyse-log-errors doc/{ChangeLog,NewStuff,dbm.discuss.txt,filter.txt,spec.txt,Exim*.upgrade,OptionLists.txt,experimental-spec.txt} build-Linux-*/transport-filter.pl
-%doc exim-html-*/doc/html
+%doc exim-html-*/exim-html-*/doc/html
 %dir %{_sysconfdir}/mail
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/exim.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/aliases
@@ -334,6 +380,8 @@ fi
 %attr(755,root,root) %{_bindir}/exiwhat
 %attr(755,root,root) %{_bindir}/exicyclog
 %attr(755,root,root) %{_bindir}/exigrep
+%attr(755,root,root) %{_bindir}/exipick
+%attr(755,root,root) %{_bindir}/exiqgrep
 %attr(755,root,root) %{_bindir}/eximstats
 %attr(755,root,root) %{_bindir}/exiqsumm
 %attr(755,root,root) %{_bindir}/unknownuser.sh