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 +