Accepting request 69839 from server:mail

- The new ldap_require_cert option would segfault if used; use upstream patch to address the ldap_set_option() issue; (beo#230); (beo#1108). - Cast third arg to void * when calling ldap_set_option(). - update to 4.75 - Don't pass DKIM compound log line as format string; (beo#1106); (bnc#692227). OBS-URL: https://build.opensuse.org/request/show/69839 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/exim?expand=0&rev=11
2011-05-09 08:26:18 +00:00 · 2011-05-09 08:26:18 +00:00 · d6714d6315
commit d6714d6315
parent d89b18cfe8 71324ebc7d
6 changed files with 112 additions and 52 deletions
--- a/109066729a54f6ba5c4e8bc174133da33242e930.diff
+++ b/109066729a54f6ba5c4e8bc174133da33242e930.diff
@ -0,0 +1,52 @@
+From 109066729a54f6ba5c4e8bc174133da33242e930 Mon Sep 17 00:00:00 2001
+From: Phil Pennock <pdp@exim.org>
+Date: Tue, 22 Mar 2011 06:43:34 -0400
+Subject: [PATCH] Make ldap_require_cert work (not segfault).
+
+The clang complaint, which also triggered a gcc complaint, was
+legitimate. My first test, which suggested no problem, was flawed.
+
+This:
+  ldap_start_tls
+  ldap_require_cert = demand
+would cause a segfault on LDAP lookup.
+
+fixes bug 230
+---
+ doc/doc-txt/ChangeLog  |    6 ++++++
+ src/src/lookups/ldap.c |    2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
+index 853f3a5..94952af 100644
+--- a/doc/doc/ChangeLog
+++ b/doc/doc/ChangeLog
+@@ -3,6 +3,12 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v 1.632 2010/06/12 15:21:25 jetmore Exp $
+ Change log file for Exim from version 4.21
+ -------------------------------------------
+ 
+Exim version 4.76
+-----------------
+
+PP/01 The new ldap_require_cert option would segfault if used.  Fixed.
+
+
+ Exim version 4.75
+ -----------------
+ 
+diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
+index ddf803e..06b7494 100644
+--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
+@@ -481,7 +481,7 @@ if (lcp == NULL)
+       {
+       cert_option = LDAP_OPT_X_TLS_TRY;
+       }
+-    ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, cert_option);
+    ldap_set_option(ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &cert_option);
+     }
+   #endif
+ 
+-- 
+1.6.3.2
+
--- a/aa097c4c00f62487128d74f65c521f9e877b184f.diff
+++ b/aa097c4c00f62487128d74f65c521f9e877b184f.diff
@ -1,45 +0,0 @@
-commit aa097c4c00f62487128d74f65c521f9e877b184f
-Author: Nigel Metheringham <nigel@exim.org>
-Date:   Wed Jan 26 11:04:32 2011 +0000
-
-    Workround compile error with old PCRE versions
-    
-    Fixes bug #1073
-
-Index: exim-4.74/doc/ChangeLog
-===================================================================
--- exim-4.74.orig/doc/ChangeLog
-+++ exim-4.74/doc/ChangeLog
-@@ -3,6 +3,13 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v
- Change log file for Exim from version 4.21
- -------------------------------------------
- 
-+Exim version 4.75
-+-----------------
-+
-+NM/01 Workround for PCRE version dependancy in version reporting
-+      Bugzilla 1073
-+
-+
- Exim version 4.74
- -----------------
- 
-Index: exim-4.74/src/exim.c
-===================================================================
--- exim-4.74.orig/src/exim.c
-+++ exim-4.74/src/exim.c
-@@ -931,8 +931,13 @@ DEBUG(D_any) do {
-              "                       Runtime: %s\n",
-           PCRE_MAJOR, PCRE_MINOR,
-           /* PRE_PRERELEASE is either defined and empty or a string.
-           * This should work: */
-+           * unless its an ancient version of PCRE in which case it
-+           * is not defined */
-+#ifdef PCRE_PRERELEASE
-           PCRE_PRERELEASE "",
-+#else
-+          "",
-+#endif
-           pcre_version());
- 
-   init_lookup_list();
--- a/exim-4.74.tar.bz2
+++ b/exim-4.74.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e55b51c87e0be920f7f5aee830261566a4def8820f318d14a822fe2ae2ff8e40
-size 1588636
--- a/exim-4.75.tar.bz2
+++ b/exim-4.75.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc6ef216dcf5b44b6c43f00a3ccb16c4b22e1cb2a414e324df22e991fd490ded
+size 1600867
--- a/exim.changes
+++ b/exim.changes
@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Sat May  7 13:12:08 UTC 2011 - lars@samba.org
+
+- The new ldap_require_cert option would segfault if used; use upstream patch
+  to address the ldap_set_option() issue; (beo#230); (beo#1108).
+
+-------------------------------------------------------------------
+Fri May  6 20:00:38 UTC 2011 - lars@samba.org
+
+- Cast third arg to void * when calling ldap_set_option().
+
+-------------------------------------------------------------------
+Fri May  6 19:14:37 UTC 2011 - lars@samba.org
+
+- update to 4.75
+  - Workround for PCRE version dependency in version reporting
+    Bugzilla 1073
+  - Permit LOOKUP_foo enabling on the make command-line.
+    Also via indented variable definition in the Makefile.
+  - Restore caching of spamd results with expanded spamd_address.
+  - Build issue: lookups-Makefile now exports LC_ALL=C
+    Improves build reliability.
+  - Fix wide character breakage in the rfc2047 coding; Fixes bug 1064.
+  - Allow underscore in dnslist lookups; Fixes bug 1026.
+  - Bugzilla 230: Support TLS-enabled LDAP (in addition to ldaps).
+  - Fixed exiqgrep to cope with mailq missing size issue
+    Fixes bug 943.
+  - Bugzilla 1083: when lookup expansion defers, escape the output which
+    is logged, to avoid truncation.
+  - Bugzilla 1042: implement freeze_signal on pipe transports.
+  - Bugzilla 1061: restrict error messages sent over SMTP to not reveal
+    SQL string expansion failure details.
+  - Bugzilla 486: implement %M datestamping in log filenames.
+  - New lookups functionality failed to compile on old gcc which rejects
+    extern declarations in function scope.
+  - Use sig_atomic_t for flags set from signal handlers.
+    Check getgroups() return and improve debugging.
+    Fixed developed for diagnosis in bug 927 (which turned out to be
+    a kernel bug).
+  - Bugzilla 1055: Update $message_linecount for maildir_tag.
+  - Bugzilla 1056: Improved spamd server selection.
+  - Bugzilla 1086: Deal with maildir quota file races.
+  - Bugzilla 1019: DKIM multiple signature generation fix.
+  - Fix to spam.c to accommodate older gcc versions which dislike
+    variable declaration deep within a block.
+  - Make DISABLE_DKIM build knob functional.
+  - Bugzilla 968: child_open_uid: restore default SIGPIPE handler
+
+-------------------------------------------------------------------
+Fri May  6 18:18:00 UTC 2011 - lars@samba.org
+
+- Don't pass DKIM compound log line as format string; (beo#1106); (bnc#692227).
+
 -------------------------------------------------------------------
 Thu Mar 10 18:30:11 UTC 2011 - poeml@cmdline.net

--- a/exim.spec
+++ b/exim.spec
@ -40,8 +40,8 @@ Provides:       smtp_daemon
 Requires:       logrotate
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils
 %endif
-Version:        4.74
-Release:        8
+Version:        4.75
+Release:        0
 %if %{?build_with_mysql:1}0
 BuildRequires:  mysql-devel
 Provides:       exim = %version
@ -62,7 +62,7 @@ Source20:       http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exi
 Source30:       eximstats-html-update.py
 Source31:       eximstats.conf
 Patch:          exim-4.12-tail.patch
-Patch1:         aa097c4c00f62487128d74f65c521f9e877b184f.diff
+Patch1:         109066729a54f6ba5c4e8bc174133da33242e930.diff
 %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 

 %package -n eximon
@ -129,7 +129,7 @@ Authors:
 %prep
 %setup -q -n exim-%{version}
 %patch
-%patch1 -p1
+%patch1 -p2
 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
 fPIE="-fPIE"