[packages/exim] - up to 4.68; spamd read/write timeout can now be set from config file (dropped hardcoded change to
arekm
arekm at pld-linux.org
Wed Jul 29 10:53:38 CEST 2015
commit f4d0d08185a310ea9246b915c828df5c08a3d022
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jul 29 10:53:26 2015 +0200
- up to 4.68; spamd read/write timeout can now be set from config file (dropped hardcoded change to 240s); CERTNAMES and DSN are now always on; enable AUTH_TLS
exim-bug-1639.patch | 56 -------------------------------------------------
exim-spam-timeout.patch | 32 +++++++++-------------------
exim.spec | 22 +++++++------------
exim4-EDITME.patch | 21 ++++++++++---------
openssl_build_fix.patch | 35 -------------------------------
5 files changed, 29 insertions(+), 137 deletions(-)
---
diff --git a/exim.spec b/exim.spec
index 494e718..6067837 100644
--- a/exim.spec
+++ b/exim.spec
@@ -10,7 +10,6 @@
%bcond_without srs # without srs support
%bcond_without dynamic # dynamic modules
%bcond_without hiredis # without redis
-%bcond_without dsn # DSN
%if "%{pld_release}" == "ac"
# hiredis build segfaults on ac-alpha
@@ -21,15 +20,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.85
-Release: 5
+Version: 4.86
+Release: 1
Epoch: 2
License: GPL
Group: Networking/Daemons/SMTP
Source0: ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: ebae28762b6f125726283dc9434e8709
+# Source0-md5: 797f248ef3e0c0e2f178e915f88fc4e9
Source1: ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: ac087bcf14337f152adfdf8b64145c37
+# Source1-md5: 64eae24e1f268fa843a9de77e1c4009a
Source2: %{name}.init
Source3: %{name}.cron.db
Source4: %{name}4.conf
@@ -53,10 +52,10 @@ 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-1639.patch
+
Patch8: %{name}-spam-timeout.patch
Patch10: %{name}-force-sigalrm.patch
-Patch11: openssl_build_fix.patch
+
Patch20: %{name}4-disableSSLv3.patch
URL: http://www.exim.org/
%{?with_sasl:BuildRequires: cyrus-sasl-devel >= 2.1.0}
@@ -172,10 +171,10 @@ Pliki nagłówkowe dla Exima.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p2
+
%patch8 -p1
%patch10 -p1
-%patch11 -p1
+
install %{SOURCE4} exim4.conf
install %{SOURCE14} doc/config.samples.tar.bz2
%patch20 -p1
@@ -188,14 +187,11 @@ 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
EXPERIMENTAL_DANE=yes
EXPERIMENTAL_DCC=yes
EXPERIMENTAL_PRDR=yes
EXPERIMENTAL_EVENT=yes
EXPERIMENTAL_PROXY=yes
-EXPERIMENTAL_CERTNAMES=yes
-%{?with_dsn:EXPERIMENTAL_DSN=yes}
%if %{with spf}
EXPERIMENTAL_SPF=yes
LOOKUP_LIBS+=-lspf2
@@ -254,8 +250,6 @@ LOOKUP_LIBS+=-lldap -llber
%endif
EOF
-%{!?with_dsn:sed -i -e 's|dsn_advertise_hosts|#dsn_advertise_hosts|g exim4.conf}
-
# have to be after Local/Makefile-Linux creation
cp -f src/EDITME Local/Makefile
cp -f exim_monitor/EDITME Local/eximon.conf
diff --git a/exim-bug-1639.patch b/exim-bug-1639.patch
deleted file mode 100644
index 4899cea..0000000
--- a/exim-bug-1639.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a818f67959c0f6dd23ca37280d5c4f9b9ee07125 Mon Sep 17 00:00:00 2001
-From: Jeremy Harris <jgh146exb at wizmail.org>
-Date: Fri, 5 Jun 2015 15:30:33 +0100
-Subject: [PATCH] Guard routing against a null-deref. Bug 1639
-
----
- src/src/route.c | 31 +++++++++++++++----------------
- 1 file changed, 15 insertions(+), 16 deletions(-)
-
-diff --git a/src/src/route.c b/src/src/route.c
-index cdfa6e6..39aed90 100644
---- a/src/src/route.c
-+++ b/src/src/route.c
-@@ -1920,24 +1920,23 @@ if (unseen && r->next != NULL)
- /* Unset the address expansions, and return the final result. */
-
- ROUTE_EXIT:
--if (yield == DEFER) {
-- if (
-- ((Ustrstr(addr->message, "failed to expand") != NULL) || (Ustrstr(addr->message, "expansion of ") != NULL)) &&
-- (
-- Ustrstr(addr->message, "mysql") != NULL ||
-- Ustrstr(addr->message, "pgsql") != NULL ||
-+if ( yield == DEFER
-+ && addr->message
-+ && ( Ustrstr(addr->message, "failed to expand") != NULL
-+ || Ustrstr(addr->message, "expansion of ") != NULL
-+ )
-+ && ( Ustrstr(addr->message, "mysql") != NULL
-+ || Ustrstr(addr->message, "pgsql") != NULL
- #ifdef EXPERIMENTAL_REDIS
-- Ustrstr(addr->message, "redis") != NULL ||
-+ || Ustrstr(addr->message, "redis") != NULL
- #endif
-- Ustrstr(addr->message, "sqlite") != NULL ||
-- Ustrstr(addr->message, "ldap:") != NULL ||
-- Ustrstr(addr->message, "ldapdn:") != NULL ||
-- Ustrstr(addr->message, "ldapm:") != NULL
-- )
-- ) {
-- addr->message = string_sprintf("Temporary internal error");
-- }
--}
-+ || Ustrstr(addr->message, "sqlite") != NULL
-+ || Ustrstr(addr->message, "ldap:") != NULL
-+ || Ustrstr(addr->message, "ldapdn:") != NULL
-+ || Ustrstr(addr->message, "ldapm:") != NULL
-+ )
-+ )
-+ addr->message = string_sprintf("Temporary internal error");
-
- deliver_set_expansions(NULL);
- router_name = NULL;
---
-1.9.1
-
diff --git a/exim-spam-timeout.patch b/exim-spam-timeout.patch
index df41fe6..b1dfe12 100644
--- a/exim-spam-timeout.patch
+++ b/exim-spam-timeout.patch
@@ -1,23 +1,11 @@
-diff -urN exim-4.62.org/src/spam.c exim-4.62/src/spam.c
---- exim-4.62.org/src/spam.c 2006-04-28 12:32:23.000000000 +0200
-+++ exim-4.62/src/spam.c 2006-06-08 10:20:26.000000000 +0200
-@@ -147,7 +147,7 @@
- AF_INET,
- spamd_address_vector[current_server]->tcp_addr,
- spamd_address_vector[current_server]->tcp_port,
-- 5 ) > -1) {
-+ 15 ) > -1) {
- /* connection OK */
- break;
- };
---- exim-4.85/src/spam.h~ 2015-01-06 00:40:11.000000000 +0100
-+++ exim-4.85/src/spam.h 2015-07-10 14:04:36.437933012 +0200
-@@ -10,7 +10,7 @@
- #ifdef WITH_CONTENT_SCAN
+--- exim-4.86/src/spam.c~ 2015-07-23 23:20:37.000000000 +0200
++++ exim-4.86/src/spam.c 2015-07-29 10:41:57.918864020 +0200
+@@ -344,7 +344,7 @@ start = time(NULL);
- /* timeout for reading and writing spamd */
--#define SPAMD_TIMEOUT 120
-+#define SPAMD_TIMEOUT 240
-
- /* maximum length of the spam bar */
- #define MAX_SPAM_BAR_CHARS 50
+ for (;;)
+ {
+- if ( (spamd_sock = ip_streamsocket(sd->hostspec, &errstr, 5)) >= 0
++ if ( (spamd_sock = ip_streamsocket(sd->hostspec, &errstr, 15)) >= 0
+ || sd->retry <= 0
+ )
+ break;
diff --git a/exim4-EDITME.patch b/exim4-EDITME.patch
index 70f9236..ee5182d 100644
--- a/exim4-EDITME.patch
+++ b/exim4-EDITME.patch
@@ -60,7 +60,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
#------------------------------------------------------------------------------
-@@ -263,15 +263,15 @@
+@@ -263,15 +264,15 @@
LOOKUP_LSEARCH=yes
LOOKUP_DNSDB=yes
@@ -96,7 +96,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
#------------------------------------------------------------------------------
# Compiling Exim with experimental features. These are documented in
-@@ -579,15 +579,15 @@
+@@ -629,15 +630,15 @@ FIXED_NEVER_USERS=root
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.
@@ -111,12 +111,13 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
-# AUTH_PLAINTEXT=yes
-# AUTH_SPA=yes
+-# AUTH_TLS=yes
+AUTH_PLAINTEXT=yes
+AUTH_SPA=yes
++AUTH_TLS=yes
- #------------------------------------------------------------------------------
-@@ -610,7 +610,7 @@
+@@ -610,7 +611,7 @@
# one that is set in the headers_charset option. The default setting is
# defined by this setting:
@@ -125,7 +126,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
# If you are going to make use of $header_xxx expansions in your configuration
# file, or if your users are going to use them in filter files, and the normal
-@@ -690,11 +690,11 @@
+@@ -690,11 +691,11 @@
# leave these settings commented out.
# This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -168,14 +169,14 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
@@ -700,7 +701,7 @@
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
-
+ # ZCAT_COMMAND=zcat
+ #
+ # Or specify the full pathname:
-ZCAT_COMMAND=/usr/bin/zcat
+ZCAT_COMMAND=/bin/zcat
-
#------------------------------------------------------------------------------
+ # Compiling in support for embedded Perl: If you want to be able to
@@ -709,7 +710,7 @@
# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
# Perl costs quite a lot of resources. Only do this if you really need it.
@@ -253,7 +254,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
#------------------------------------------------------------------------------
-@@ -1164,6 +1164,6 @@
+@@ -1164,6 +1166,6 @@
# feature should only be used in very exceptional circumstances. YOU HAVE BEEN
# WARNED.
diff --git a/openssl_build_fix.patch b/openssl_build_fix.patch
deleted file mode 100644
index e9e6230..0000000
--- a/openssl_build_fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 740f36d42bb3f61fdbaf53a68380a9a96096c229 Mon Sep 17 00:00:00 2001
-From: Jeremy Harris <jgh146exb at wizmail.org>
-Date: Wed, 25 Mar 2015 17:11:56 +0000
-Subject: [PATCH] Fix recent-openssl compile
-
----
- src/tls-openssl.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/tls-openssl.c b/src/tls-openssl.c
-index 96ac72c..65d6089 100644
---- a/src/tls-openssl.c
-+++ b/src/tls-openssl.c
-@@ -380,7 +380,7 @@ else
- /* client, wanting hostname check */
- {
-
--# if EXIM_HAVE_OPENSSL_CHECKHOST
-+# ifdef EXIM_HAVE_OPENSSL_CHECKHOST
- # ifndef X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS
- # define X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS 0
- # endif
-@@ -394,7 +394,8 @@ else
- while ((name = string_nextinlist(&list, &sep, NULL, 0)))
- if ((rc = X509_check_host(cert, name, 0,
- X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS
-- | X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS)))
-+ | X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS,
-+ NULL)))
- {
- if (rc < 0)
- {
---
-1.9.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exim.git/commitdiff/f4d0d08185a310ea9246b915c828df5c08a3d022
More information about the pld-cvs-commit
mailing list