[packages/exim] - fix building with recent openssl
hawk
hawk at pld-linux.org
Mon Jun 1 10:12:13 CEST 2015
commit 5d13b696b5658e91e5ab5df019180a321944ae32
Author: Marcin Krol <hawk at tld-linux.org>
Date: Mon Jun 1 08:11:56 2015 +0000
- fix building with recent openssl
exim.spec | 13 +++++--------
openssl_build_fix.patch | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 8 deletions(-)
---
diff --git a/exim.spec b/exim.spec
index 7515d59..78c4f2c 100644
--- a/exim.spec
+++ b/exim.spec
@@ -22,7 +22,7 @@ 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: 2
+Release: 3
Epoch: 2
License: GPL
Group: Networking/Daemons/SMTP
@@ -42,7 +42,6 @@ Source9: %{name}.aliases
Source10: newaliases
Source11: %{name}.logrotate
Source12: %{name}.sysconfig
-
Source14: ftp://ftp.exim.org/pub/exim/exim4/old/config.samples.tar.bz2
# Source14-md5: 4b93321938a800caa6127c48ad60a42b
Source15: %{name}4-smtp.pamd
@@ -54,11 +53,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
-
Patch8: %{name}-spam-timeout.patch
-
Patch10: %{name}-force-sigalrm.patch
-Patch11: %{name}4-disableSSLv3.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}
BuildRequires: db-devel
@@ -173,13 +171,12 @@ Pliki nagłówkowe dla Exima.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-
%patch8 -p1
-
%patch10 -p1
+%patch11 -p1
install %{SOURCE4} exim4.conf
install %{SOURCE14} doc/config.samples.tar.bz2
-%patch11 -p1
+%patch20 -p1
install -d Local
cat << 'EOF' >> Local/Makefile-Linux
CC=%{__cc}
diff --git a/openssl_build_fix.patch b/openssl_build_fix.patch
new file mode 100644
index 0000000..e9e6230
--- /dev/null
+++ b/openssl_build_fix.patch
@@ -0,0 +1,35 @@
+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/5d13b696b5658e91e5ab5df019180a321944ae32
More information about the pld-cvs-commit
mailing list