INN 2.6.0 release candidate

Dennis Preiser dp-inn at d--p.de
Sat May 2 14:45:40 UTC 2015


On Sat, May 02, 2015 at 12:14:25PM +0200, Julien ÉLIE wrote:
> Here is a suggestion, similar to yours:
> 
> --- configure.ac  (révision 9831)
> +++ configure.ac  (copie de travail)
> @@ -214,8 +214,9 @@
>      fi
>      ;;
>  
> -dnl OSX needs -multiply_defined suppress.
> -*darwin*)
> +dnl OSX needs "-multiply_defined suppress" before this linker flag became
> +dnl obsolete (darwin13 is Mavericks, OS X v10.9).
> +*-darwin[0-9].*|*-darwin1[0-2].*)
>      LDFLAGS="$LDFLAGS -multiply_defined suppress"
>      ;;
>  

After ./autogen configure looks like this:

| *-darwin0-9.*|*-darwin10-2.*)
|     LDFLAGS="$LDFLAGS -multiply_defined suppress"
|     ;;

I guess we need:

diff -urp inn-2.6.0rc1_orig/configure.ac inn-2.6.0rc1/configure.ac
--- inn-2.6.0rc1_orig/configure.ac  2015-03-25 21:36:36.000000000 +0100
+++ inn-2.6.0rc1/configure.ac   2015-05-02 16:30:19.000000000 +0200
@@ -214,8 +214,9 @@ dnl -g on link as well as compile for de
     fi
     ;;

-dnl OSX needs -multiply_defined suppress.
-*darwin*)
+dnl OSX needs "-multiply_defined suppress" before this linker flag became
+dnl obsolete (darwin13 is Mavericks, OS X v10.9).
+*-darwin[[0-9]].*|*-darwin1[[0-2]].*)
     LDFLAGS="$LDFLAGS -multiply_defined suppress"
     ;;

> Here is suggestion of patch that should fix the bug.
> The need was in fact to define sasl_callback_ft when it was not defined,
> and the first version that defines it is 2.1.25 (not 2.1.24).
> 
> --- innfeed/imap_connection.c (révision 9831)
> +++ innfeed/imap_connection.c (copie de travail)
> @@ -52,8 +52,8 @@
>  # include <sasl/sasl.h>
>  # include <sasl/saslplug.h>
>  # include <sasl/saslutil.h>
> -/* For Cyrus SASL versions < 2.1.24. */
> -# ifndef sasl_callback_ft
> +/* For Cyrus SASL versions < 2.1.25 (in hexadecimal notation below). */
> +# if !defined (SASL_VERSION_FULL) || SASL_VERSION_FULL < 0x020119
>  typedef int (*sasl_callback_ft)(void);
>  # endif
>  #endif

This patch fixes the typedef issue.

> Do you confirm everything now works fine with these two patches?

I can confirm this with the revised configure.ac patch (doubled opening and
closing brackets).

Dennis


More information about the inn-workers mailing list