Rel 14; fix segfault in srs

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index bcba5d69fb591d419e0def2684f32da548a45633..e3554c7d5f96516e50aec246e0918086fc52a58d 100644 (file)
--- 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
+Version:       4.97
 Release:       14
 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: c970646b913b3a414d5c7a3725da7018
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: e840b2f90c08bdaa8c7a356c5cab79dd
+# Source1-md5: e1ba08655a1c045384244ecd9129f14d
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -50,18 +49,20 @@ Source15:   %{name}4-smtp.pamd
 Source16:      %{name}on.png
 # sh branch.sh
 Patch100:      %{name}-git.patch
-# Patch100-md5:        d0d10bc09191861c778812abbba943ec
+# Patch100-md5:        eef923600fc1e8d56d0d6fa23ca28887
 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
-# 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
+# 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
@@ -69,14 +70,14 @@ 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-File-FcntlLock
 BuildRequires: perl-devel >= 1:5.6.0
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: readline-devel
@@ -182,12 +183,14 @@ Pliki nagłówkowe dla Exima.
 %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,10 +205,11 @@ EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
 EXPERIMENTAL_DSN_INFO=yes
 EXPERIMENTAL_QUEUEFILE=yes
-EXPERIMENTAL_QUEUE_RAMP=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}
@@ -216,10 +220,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
@@ -294,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}