From fca71a0c39451ddd4275c7f9fdfc9feb0b2064c408c2844cc765e0373e653b32 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 21 Apr 2011 11:25:27 +0000 Subject: [PATCH 1/8] Updating link to change in openSUSE:Factory/exim revision 10.0 OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=a380ede07005b4626c9434f1072602bb --- exim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exim.spec b/exim.spec index a42527d..9fb76bf 100644 --- a/exim.spec +++ b/exim.spec @@ -41,7 +41,7 @@ Requires: logrotate PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils %endif Version: 4.74 -Release: 1 +Release: 8 %if %{?build_with_mysql:1}0 BuildRequires: mysql-devel Provides: exim = %version From 0150f231386b3d980a62c994f496b459fa02779f57aecfc0073d15ff230ea85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 6 May 2011 18:59:57 +0000 Subject: [PATCH 2/8] - Don't pass DKIM compound log line as format string; (beo#1106); (bnc#692227). OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=104 --- 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff | 34 +++++++++++++++++++ exim.changes | 5 +++ exim.spec | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff diff --git a/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff b/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff new file mode 100644 index 0000000..0af5b71 --- /dev/null +++ b/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff @@ -0,0 +1,34 @@ +From 337e3505b0e6cd4309db6bf6062b33fa56e06cf8 Mon Sep 17 00:00:00 2001 +From: Tom Kistner +Date: Sat, 30 Apr 2011 13:20:17 +0100 +Subject: [PATCH] Bugzilla #1106: Don't pass DKIM compound log line as format string + +--- + src/src/dkim.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/src/dkim.c b/src/src/dkim.c +index e25ff8c..2318cc3 100644 +--- a/src/src/dkim.c ++++ b/src/src/dkim.c +@@ -108,7 +108,7 @@ void dkim_exim_verify_finish(void) { + /* Log a line for each signature */ + uschar *logmsg = string_append(NULL, &size, &ptr, 5, + +- string_sprintf( "DKIM: d=%s s=%s c=%s/%s a=%s ", ++ string_sprintf( "d=%s s=%s c=%s/%s a=%s ", + sig->domain, + sig->selector, + (sig->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed", +@@ -176,7 +176,7 @@ void dkim_exim_verify_finish(void) { + } + + logmsg[ptr] = '\0'; +- log_write(0, LOG_MAIN, (char *)logmsg); ++ log_write(0, LOG_MAIN, "DKIM: %s", logmsg); + + /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */ + dkim_signers = string_append(dkim_signers, +-- +1.6.3.2 + diff --git a/exim.changes b/exim.changes index 2886c46..8c309d5 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/exim.spec b/exim.spec index 9fb76bf..83232cf 100644 --- a/exim.spec +++ b/exim.spec @@ -63,6 +63,7 @@ Source30: eximstats-html-update.py Source31: eximstats.conf Patch: exim-4.12-tail.patch Patch1: aa097c4c00f62487128d74f65c521f9e877b184f.diff +Patch2: 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %package -n eximon @@ -130,6 +131,7 @@ Authors: %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" From 418a2f7e59c43f0e4c2c741ddad6db4435c48fc8fe1b2dc5ccf6457b7fc6f9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 6 May 2011 19:00:24 +0000 Subject: [PATCH 3/8] Fix patch2 typo. OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=105 --- exim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exim.spec b/exim.spec index 83232cf..a44038a 100644 --- a/exim.spec +++ b/exim.spec @@ -131,7 +131,7 @@ Authors: %setup -q -n exim-%{version} %patch %patch1 -p1 -%patch1 -p2 +%patch2 -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" From ff09813c026578eb74256d547627e934884bf3970a84a43148293ef30f39cd9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 6 May 2011 19:19:54 +0000 Subject: [PATCH 4/8] - 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. OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=106 --- 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff | 34 -------------- aa097c4c00f62487128d74f65c521f9e877b184f.diff | 45 ------------------- exim-4.74.tar.bz2 | 3 -- exim-4.75.tar.bz2 | 3 ++ exim.changes | 37 +++++++++++++++ exim.spec | 8 +--- 6 files changed, 42 insertions(+), 88 deletions(-) delete mode 100644 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff delete mode 100644 aa097c4c00f62487128d74f65c521f9e877b184f.diff delete mode 100644 exim-4.74.tar.bz2 create mode 100644 exim-4.75.tar.bz2 diff --git a/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff b/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff deleted file mode 100644 index 0af5b71..0000000 --- a/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 337e3505b0e6cd4309db6bf6062b33fa56e06cf8 Mon Sep 17 00:00:00 2001 -From: Tom Kistner -Date: Sat, 30 Apr 2011 13:20:17 +0100 -Subject: [PATCH] Bugzilla #1106: Don't pass DKIM compound log line as format string - ---- - src/src/dkim.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/src/dkim.c b/src/src/dkim.c -index e25ff8c..2318cc3 100644 ---- a/src/src/dkim.c -+++ b/src/src/dkim.c -@@ -108,7 +108,7 @@ void dkim_exim_verify_finish(void) { - /* Log a line for each signature */ - uschar *logmsg = string_append(NULL, &size, &ptr, 5, - -- string_sprintf( "DKIM: d=%s s=%s c=%s/%s a=%s ", -+ string_sprintf( "d=%s s=%s c=%s/%s a=%s ", - sig->domain, - sig->selector, - (sig->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed", -@@ -176,7 +176,7 @@ void dkim_exim_verify_finish(void) { - } - - logmsg[ptr] = '\0'; -- log_write(0, LOG_MAIN, (char *)logmsg); -+ log_write(0, LOG_MAIN, "DKIM: %s", logmsg); - - /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */ - dkim_signers = string_append(dkim_signers, --- -1.6.3.2 - diff --git a/aa097c4c00f62487128d74f65c521f9e877b184f.diff b/aa097c4c00f62487128d74f65c521f9e877b184f.diff deleted file mode 100644 index 13634b0..0000000 --- a/aa097c4c00f62487128d74f65c521f9e877b184f.diff +++ /dev/null @@ -1,45 +0,0 @@ -commit aa097c4c00f62487128d74f65c521f9e877b184f -Author: Nigel Metheringham -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(); diff --git a/exim-4.74.tar.bz2 b/exim-4.74.tar.bz2 deleted file mode 100644 index d8cc7ce..0000000 --- a/exim-4.74.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e55b51c87e0be920f7f5aee830261566a4def8820f318d14a822fe2ae2ff8e40 -size 1588636 diff --git a/exim-4.75.tar.bz2 b/exim-4.75.tar.bz2 new file mode 100644 index 0000000..fe69675 --- /dev/null +++ b/exim-4.75.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc6ef216dcf5b44b6c43f00a3ccb16c4b22e1cb2a414e324df22e991fd490ded +size 1600867 diff --git a/exim.changes b/exim.changes index 8c309d5..fc0148c 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +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 diff --git a/exim.spec b/exim.spec index a44038a..61cfb23 100644 --- 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,8 +62,6 @@ 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 -Patch2: 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %package -n eximon @@ -130,8 +128,6 @@ Authors: %prep %setup -q -n exim-%{version} %patch -%patch1 -p1 -%patch2 -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" From 2b642981ee93fb57929e5693d569a371d69f6739bc4f86c62e34d6119540c273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 6 May 2011 20:03:01 +0000 Subject: [PATCH 5/8] Cast third arg to void * when calling ldap_set_option(). OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=107 --- exim.changes | 5 +++++ exim.spec | 2 ++ ldap_set_option-void-cast.diff | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 ldap_set_option-void-cast.diff diff --git a/exim.changes b/exim.changes index fc0148c..0f27de0 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/exim.spec b/exim.spec index 61cfb23..572032b 100644 --- a/exim.spec +++ b/exim.spec @@ -62,6 +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: ldap_set_option-void-cast.diff %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %package -n eximon @@ -128,6 +129,7 @@ Authors: %prep %setup -q -n exim-%{version} %patch +%patch1 -p1 # 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" diff --git a/ldap_set_option-void-cast.diff b/ldap_set_option-void-cast.diff new file mode 100644 index 0000000..a3dee30 --- /dev/null +++ b/ldap_set_option-void-cast.diff @@ -0,0 +1,13 @@ +Index: exim-4.75/src/lookups/ldap.c +=================================================================== +--- exim-4.75.orig/src/lookups/ldap.c ++++ exim-4.75/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, (void *)&cert_option); + } + #endif + From 5099ec172f08a68e05c0a0ad31e410f35894b10e63586d9a24f52e16bfe3134f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 6 May 2011 20:31:26 +0000 Subject: [PATCH 6/8] Add header to patch. OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=108 --- ldap_set_option-void-cast.diff | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ldap_set_option-void-cast.diff b/ldap_set_option-void-cast.diff index a3dee30..d2f4cfe 100644 --- a/ldap_set_option-void-cast.diff +++ b/ldap_set_option-void-cast.diff @@ -1,3 +1,7 @@ +Author: Lars Mueller +Subject: ldap_set_option() called with int as third arg instead of void +Bugzilla: beo 1108 + Index: exim-4.75/src/lookups/ldap.c =================================================================== --- exim-4.75.orig/src/lookups/ldap.c From 5f88d73f56eb3704192033b1c25aab49d609ca2e606759c9afb18298df40c9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 7 May 2011 13:15:50 +0000 Subject: [PATCH 7/8] - Use upstream patch to address ldap_set_option() third arg issue; (beo#230); (beo#1108). OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=109 --- 109066729a54f6ba5c4e8bc174133da33242e930.diff | 52 +++++++++++++++++++ exim.changes | 6 +++ exim.spec | 4 +- ldap_set_option-void-cast.diff | 17 ------ 4 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 109066729a54f6ba5c4e8bc174133da33242e930.diff delete mode 100644 ldap_set_option-void-cast.diff diff --git a/109066729a54f6ba5c4e8bc174133da33242e930.diff b/109066729a54f6ba5c4e8bc174133da33242e930.diff new file mode 100644 index 0000000..0eccbda --- /dev/null +++ b/109066729a54f6ba5c4e8bc174133da33242e930.diff @@ -0,0 +1,52 @@ +From 109066729a54f6ba5c4e8bc174133da33242e930 Mon Sep 17 00:00:00 2001 +From: Phil Pennock +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 + diff --git a/exim.changes b/exim.changes index 0f27de0..d7d4ca3 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 7 13:12:08 UTC 2011 - lars@samba.org + +- Use upstream patch to address ldap_set_option() third arg issue; (beo#230); + (beo#1108). + ------------------------------------------------------------------- Fri May 6 20:00:38 UTC 2011 - lars@samba.org diff --git a/exim.spec b/exim.spec index 572032b..3a66847 100644 --- a/exim.spec +++ b/exim.spec @@ -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: ldap_set_option-void-cast.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" diff --git a/ldap_set_option-void-cast.diff b/ldap_set_option-void-cast.diff deleted file mode 100644 index d2f4cfe..0000000 --- a/ldap_set_option-void-cast.diff +++ /dev/null @@ -1,17 +0,0 @@ -Author: Lars Mueller -Subject: ldap_set_option() called with int as third arg instead of void -Bugzilla: beo 1108 - -Index: exim-4.75/src/lookups/ldap.c -=================================================================== ---- exim-4.75.orig/src/lookups/ldap.c -+++ exim-4.75/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, (void *)&cert_option); - } - #endif - From 71324ebc7d0df47958e7ea4f16685c0489111c01e24685d948dbdecbccd652c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 7 May 2011 13:33:18 +0000 Subject: [PATCH 8/8] - The new ldap_require_cert option would segfault if used; use upstream patch to address the ldap_set_option() issue; (beo#230); (beo#1108). OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=110 --- exim.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exim.changes b/exim.changes index d7d4ca3..3da1a66 100644 --- a/exim.changes +++ b/exim.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Sat May 7 13:12:08 UTC 2011 - lars@samba.org -- Use upstream patch to address ldap_set_option() third arg issue; (beo#230); - (beo#1108). +- 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