package/security/heimdal/emacs-pop.diff

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../heimdal/emacs-pop.diff
   5 # Copyright (C) 2007 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 diff -urN emacs-22.0.97.orig/lib-src/pop.c emacs-22.0.97/lib-src/pop.c
  18 --- emacs-22.0.97.orig/lib-src/pop.c    2007-03-19 09:36:41.000000000 +1000
  19 +++ emacs-22.0.97/lib-src/pop.c 2007-04-09 10:56:32.000000000 +1000
  20 @@ -1181,16 +1181,16 @@
  21        krb5_free_principal (kcontext, server);
  22        if (rem)
  23         {
  24 -         if (err_ret && err_ret->text.length)
  25 +         if (err_ret && err_ret->e_data->length)
  26             {
  27               strcpy (pop_error, KRB_ERROR);
  28               strncat (pop_error, error_message (rem),
  29                        ERROR_MAX - sizeof (KRB_ERROR));
  30               strncat (pop_error, " [server says '",
  31                        ERROR_MAX - strlen (pop_error) - 1);
  32 -             strncat (pop_error, err_ret->text.data,
  33 +             strncat (pop_error, err_ret->e_data->data,
  34                        min (ERROR_MAX - strlen (pop_error) - 1,
  35 -                           err_ret->text.length));
  36 +                           err_ret->e_data->length));
  37               strncat (pop_error, "']",
  38                        ERROR_MAX - strlen (pop_error) - 1);
  39             }
  40 diff -urN emacs-22.0.97.orig/src/config.in emacs-22.0.97/src/config.in
  41 --- emacs-22.0.97.orig/src/config.in    2007-01-27 02:33:17.000000000 +1000
  42 +++ emacs-22.0.97/src/config.in 2007-04-09 10:58:18.000000000 +1000
  43 @@ -283,7 +283,7 @@
  44  #undef HAVE_KERBEROS_KRB_H
  45
  46  /* Define to 1 if you have the <krb5.h> header file. */
  47 -#undef HAVE_KRB5_H
  48 +#define HAVE_KRB5_H
  49
  50  /* Define to 1 if you have the <krb.h> header file. */
  51  #undef HAVE_KRB_H
  52 @@ -325,7 +325,7 @@
  53  #undef HAVE_LIBKRB4
  54
  55  /* Define to 1 if you have the `krb5' library (-lkrb5). */
  56 -#undef HAVE_LIBKRB5
  57 +#define HAVE_LIBKRB5
  58
  59  /* Define to 1 if you have the `kstat' library (-lkstat). */
  60  #undef HAVE_LIBKSTAT