Utilities/dep-build-scripts/cyrus-sasl-2.1.21.patch

   1 --- cyrus-sasl-2.1.21/lib/client.c      2004-11-17 08:19:30.000000000 -0600
   2 +++ cyrus-sasl-2.1.21-mine/lib/client.c 2007-10-22 21:44:06.000000000 -0500
   3 @@ -59,9 +59,9 @@
   4  #include "saslutil.h"
   5  #include "saslint.h"
   6
   7 -static cmech_list_t *cmechlist; /* global var which holds the list */
   8 +extern sasl_global_callbacks_t global_callbacks;
   9
  10 -static sasl_global_callbacks_t global_callbacks;
  11 +static cmech_list_t *cmechlist; /* global var which holds the list */
  12
  13  static int _sasl_client_active = 0;
  14
  15 --- cyrus-sasl-2.1.21/plugins/gssapi.c  2004-07-21 09:39:06.000000000 -0500
  16 +++ cyrus-sasl-2.1.21-mine/plugins/gssapi.c     2007-10-22 21:34:05.000000000 -0500
  17 @@ -46,7 +46,7 @@
  18  #include <config.h>
  19
  20  #ifdef HAVE_GSSAPI_H
  21 -#include <gssapi.h>
  22 +#include <gssapi/gssapi.h>
  23  #else
  24  #include <gssapi/gssapi.h>
  25  #endif
  26
  27 --- cyrus-sasl-2.1.21/plugins/kerberos4.c       2005-01-10 01:08:53.000000000 -0600
  28 +++ cyrus-sasl-2.1.21-mine/plugins/kerberos4.c  2007-10-22 21:34:05.000000000 -0500
  29 @@ -50,7 +50,8 @@
  30
  31  #ifdef WITH_DES
  32  # ifdef WITH_SSL_DES
  33 -#  include <openssl/des.h>
  34 +//#  include <openssl/des.h>
  35 +#  include <des.h>
  36  # else
  37  #  include <des.h>
  38  # endif /* WITH_SSL_DES */
  39
  40 --- cyrus-sasl-2.1.21/Makefile.in       2007-10-23 12:32:17.000000000 -0500
  41 +++ cyrus-sasl-2.1.21/Makefile2.in      2007-10-23 12:32:03.000000000 -0500
  42 @@ -35,6 +35,7 @@
  43  NORMAL_UNINSTALL = :
  44  PRE_UNINSTALL = :
  45  POST_UNINSTALL = :
  46 +build_triplet = @build@
  47  host_triplet = @host@
  48  ACLOCAL = @ACLOCAL@
  49  AMDEP_FALSE = @AMDEP_FALSE@
  50
  51 --- cyrus-sasl-2.1.21/include/Makefile.in       2007-10-23 12:32:17.000000000 -0500
  52 +++ cyrus-sasl-2.1.21/include/Makefile2.in      2007-10-23 12:32:03.000000000 -0500
  53 @@ -35,6 +35,7 @@
  54  NORMAL_UNINSTALL = :
  55  PRE_UNINSTALL = :
  56  POST_UNINSTALL = :
  57 +build_triplet = @build@
  58  host_triplet = @host@
  59  ACLOCAL = @ACLOCAL@
  60  AMDEP_FALSE = @AMDEP_FALSE@
  61
  62 --- cyrus-sasl-2.1.21/lib/Makefile.in   2007-10-23 12:32:17.000000000 -0500
  63 +++ cyrus-sasl-2.1.21/lib/Makefile2.in  2007-10-23 12:32:03.000000000 -0500
  64 @@ -35,6 +35,7 @@
  65  NORMAL_UNINSTALL = :
  66  PRE_UNINSTALL = :
  67  POST_UNINSTALL = :
  68 +build_triplet = @build@
  69  host_triplet = @host@
  70  ACLOCAL = @ACLOCAL@
  71  AMDEP_FALSE = @AMDEP_FALSE@
  72
  73 --- cyrus-sasl-2.1.21/plugins/Makefile.in       2007-10-23 12:32:17.000000000 -0500
  74 +++ cyrus-sasl-2.1.21/plugins/Makefile2.in      2007-10-23 12:32:03.000000000 -0500
  75 @@ -35,6 +35,7 @@
  76  NORMAL_UNINSTALL = :
  77  PRE_UNINSTALL = :
  78  POST_UNINSTALL = :
  79 +build_triplet = @build@
  80  host_triplet = @host@
  81  ACLOCAL = @ACLOCAL@
  82  AMDEP_FALSE = @AMDEP_FALSE@
  83
  84 --- cyrus-sasl-2.1.21/pwcheck/Makefile.in       2007-10-23 12:32:17.000000000 -0500
  85 +++ cyrus-sasl-2.1.21/pwcheck/Makefile2.in      2007-10-23 12:32:03.000000000 -0500
  86 @@ -35,6 +35,7 @@
  87  NORMAL_UNINSTALL = :
  88  PRE_UNINSTALL = :
  89  POST_UNINSTALL = :
  90 +build_triplet = @build@
  91  host_triplet = @host@
  92  ACLOCAL = @ACLOCAL@
  93  AMDEP_FALSE = @AMDEP_FALSE@
  94
  95
  96 --- cyrus-sasl-2.1.21/sample/Makefile.in        2007-10-23 12:32:17.000000000 -0500
  97 +++ cyrus-sasl-2.1.21/sample/Makefile2.in       2007-10-23 12:32:03.000000000 -0500
  98 @@ -35,6 +35,7 @@
  99  NORMAL_UNINSTALL = :
 100  PRE_UNINSTALL = :
 101  POST_UNINSTALL = :
 102 +build_triplet = @build@
 103  host_triplet = @host@
 104  ACLOCAL = @ACLOCAL@
 105  AMDEP_FALSE = @AMDEP_FALSE@
 106
 107
 108 --- cyrus-sasl-2.1.21/saslauthd/Makefile.in     2007-10-23 12:32:17.000000000 -0500
 109 +++ cyrus-sasl-2.1.21/saslauthd/Makefile2.in    2007-10-23 12:32:03.000000000 -0500
 110 @@ -35,6 +35,7 @@
 111  NORMAL_UNINSTALL = :
 112  PRE_UNINSTALL = :
 113  POST_UNINSTALL = :
 114 +build_triplet = @build@
 115  host_triplet = @host@
 116  ACLOCAL = @ACLOCAL@
 117  AMDEP_FALSE = @AMDEP_FALSE@
 118
 119
 120 --- cyrus-sasl-2.1.21/sasldb/Makefile.in        2007-10-23 12:32:17.000000000 -0500
 121 +++ cyrus-sasl-2.1.21/sasldb/Makefile2.in       2007-10-23 12:32:03.000000000 -0500
 122 @@ -35,6 +35,7 @@
 123  NORMAL_UNINSTALL = :
 124  PRE_UNINSTALL = :
 125  POST_UNINSTALL = :
 126 +build_triplet = @build@
 127  host_triplet = @host@
 128  ACLOCAL = @ACLOCAL@
 129  AMDEP_FALSE = @AMDEP_FALSE@
 130
 131
 132 --- cyrus-sasl-2.1.21/utils/Makefile.in 2007-10-23 12:32:17.000000000 -0500
 133 +++ cyrus-sasl-2.1.21/utils/Makefile2.in        2007-10-23 12:32:03.000000000 -0500
 134 @@ -35,6 +35,7 @@
 135  NORMAL_UNINSTALL = :
 136  PRE_UNINSTALL = :
 137  POST_UNINSTALL = :
 138 +build_triplet = @build@
 139  host_triplet = @host@
 140  ACLOCAL = @ACLOCAL@
 141  AMDEP_FALSE = @AMDEP_FALSE@