- updated to 4.92

diff --git a/branch.sh b/branch.sh
index b82d66e462e72c090bb73e9f20d390f9d1eed71c..5a1947a08d42d44ea9d8dba08def0918a8ba2338 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -2,8 +2,8 @@
 set -e
 url=git://git.exim.org/exim.git
 package=exim
-tag=exim-4_91
-branch=exim-4_91+fixes
+tag=exim-4_92
+branch=exim-4_92+fixes
 out=$package-git.patch
 repo=$package.git
 

diff --git a/exim-spam-timeout.patch b/exim-spam-timeout.patch
index 0c6c0fa870095271bfd1e7c730f6f23a5fc00093..8ef66bd69aa008b81876908d1cca95bfcdd9bf92 100644 (file)
--- a/exim-spam-timeout.patch
+++ b/exim-spam-timeout.patch
@@ -4,8 +4,8 @@
      for (;;)
        {
        /*XXX could potentially use TFO early-data here */
--      if (  (spamd_sock = ip_streamsocket(sd->hostspec, &errstr, 5)) >= 0
-+      if (  (spamd_sock = ip_streamsocket(sd->hostspec, &errstr, 15)) >= 0
+-      if (  (spamd_cctx.sock = ip_streamsocket(sd->hostspec, &errstr, 5)) >= 0
++      if (  (spamd_cctx.sock = ip_streamsocket(sd->hostspec, &errstr, 15)) >= 0
           || sd->retry <= 0
         )
        break;

diff --git a/exim.spec b/exim.spec
index b787100b0e376b9b8ca5dc86f23a724ce4bde846..16adbcda6098f568ac1267831923a46162b6f6ae 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -24,15 +24,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.91
-Release:       19
+Version:       4.92
+Release:       1
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: e4db1e9013227539acfd662c3cf816d9
+# Source0-md5: c2c34e7e0c3956d2b93c458106c9dc22
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 587e1e9018b593f5c0a19a8205235db9
+# Source1-md5: ab60afdcf56f28e85d74f299ffc12cf7
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -176,7 +176,7 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
-%patch100 -p2
+#%patch100 -p2
 
 %patch0 -p1
 %patch1 -p1
@@ -361,7 +361,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

diff --git a/localscan_dlopen_exim_4.20_or_better.patch b/localscan_dlopen_exim_4.20_or_better.patch
index 1a941ed89fc6c2fd3274f47890168fda50564b45..33a735e81e283754256c7fcceb2de56794ec12f9 100644 (file)
--- a/localscan_dlopen_exim_4.20_or_better.patch
+++ b/localscan_dlopen_exim_4.20_or_better.patch
@@ -264,6 +264,6 @@ diff -urN exim-4.14-0/src/readconf.c exim-4.14-1/src/readconf.c
 +#ifdef DLOPEN_LOCAL_SCAN
 +  { "local_scan_path",          opt_stringptr,   &local_scan_path },
 +#endif
+ #ifdef HAVE_LOCAL_SCAN
    { "local_scan_timeout",       opt_time,        &local_scan_timeout },
-   { "local_sender_retain",      opt_bool,        &local_sender_retain },
-   { "localhost_number",         opt_stringptr,   &host_number_string },
+ #endif