cyrus-sasl-gcc4.patch

   1 --- cyrus-sasl-2.1.20/saslauthd/configure.in.orig       2005-04-24 16:39:30.088004312 +0000
   2 +++ cyrus-sasl-2.1.20/saslauthd/configure.in    2005-04-24 16:40:31.172718024 +0000
   3 @@ -44,9 +44,10 @@
   4  SASL_GSSAPI_CHK
   5
   6  if test "$gssapi" != no; then
   7 -       if test "$gss_impl" = "heimdal"; then
   8 -           AC_DEFINE(KRB5_HEIMDAL,[],[Using Heimdal])
   9 -       fi
  10 +dnl This is taken care of by -DKRB5_HEIMDAL in CPPFLAGS in ../Makefile
  11 +dnl    if test "$gss_impl" = "heimdal"; then
  12 +dnl        AC_DEFINE(KRB5_HEIMDAL,[],[Using Heimdal])
  13 +dnl    fi
  14         AC_DEFINE(HAVE_GSSAPI,[],[Include GSSAPI/Kerberos 5 Support])
  15  fi
  16
  17 --- cyrus-sasl-2.1.20/saslauthd/saslcache.c.orig        2005-04-24 16:47:45.989615808 +0000
  18 +++ cyrus-sasl-2.1.20/saslauthd/saslcache.c     2005-04-24 16:50:27.482065224 +0000
  19 @@ -137,7 +137,7 @@
  20         }
  21
  22         table_stats = shm_base + 64;
  23 -       (char *)table = (char *)table_stats + 128;
  24 +       table = (struct bucket*)((char *)table_stats + 128);
  25
  26         if (dump_stat_info == 0 && dump_user_info == 0)
  27                 dump_stat_info = 1;
  28 --- cyrus-sasl-2.1.22/plugins/digestmd5.c.orig  2009-07-02 15:21:59.000000000 +0200
  29 +++ cyrus-sasl-2.1.22/plugins/digestmd5.c       2009-07-02 15:25:38.190152725 +0200
  30 @@ -2743,7 +2743,7 @@
  31         "DIGEST-MD5",                   /* mech_name */
  32  #ifdef WITH_RC4
  33         128,                            /* max_ssf */
  34 -#elif WITH_DES
  35 +#elif defined(WITH_DES)
  36         112,
  37  #else
  38         1,
  39 @@ -4071,7 +4071,7 @@
  40         "DIGEST-MD5",
  41  #ifdef WITH_RC4                                /* mech_name */
  42         128,                            /* max ssf */
  43 -#elif WITH_DES
  44 +#elif defined(WITH_DES)
  45         112,
  46  #else
  47         1,