extra/fetchmail.diff

   1 diff --exclude fetchmail.pot --exclude configure --exclude aclocal.m4 -urw t/fetchmail-6.2.5/configure.in fetchmail-6.2.5/configure.in
   2 --- t/fetchmail-6.2.5/configure.in      2003-10-10 10:36:57.000000000 +0200
   3 +++ fetchmail-6.2.5/configure.in        2003-12-31 22:38:47.000000000 +0100
   4 @@ -704,6 +704,9 @@
   5      LDFLAGS="$LDFLAGS -L$with_gssapi/lib"
   6    fi
   7
   8 +  AC_CHECK_LIB(gss, gss_check_version, LIBS="$LIBS -lgss", nogss=t)
   9 +  if test -n "$nogss"
  10 +  then
  11    if test -f "$with_gssapi/include/roken.h"
  12    then
  13       LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken -ldb -ldl"
  14 @@ -714,10 +717,11 @@
  15       AC_CHECK_LIB(gssapi_krb5, gss_init_sec_context,LIBS="$LIBS -lgssapi_krb5",
  16                    AC_MSG_ERROR([could not find libgssapi_krb5 which is needed for GSSAPI support]), -lkrb5)
  17    fi
  18 +  fi
  19    AC_DEFINE(GSSAPI)
  20    save_CPPFLAGS=$CPPFLAGS
  21    CPPFLAGS="-I$with_gssapi/include"
  22 -  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
  23 +  AC_CHECK_HEADERS(gss.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
  24    if test "$ac_cv_header_gssapi_h" = "yes"; then
  25      AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
  26    else
  27 diff --exclude fetchmail.pot --exclude configure --exclude aclocal.m4 -urw t/fetchmail-6.2.5/gssapi.c fetchmail-6.2.5/gssapi.c
  28 --- t/fetchmail-6.2.5/gssapi.c  2003-07-17 03:03:22.000000000 +0200
  29 +++ fetchmail-6.2.5/gssapi.c    2003-12-31 22:38:39.000000000 +0100
  30 @@ -21,6 +21,9 @@
  31  #include <netinet/in.h>  /* for htonl/ntohl */
  32
  33  #ifdef GSSAPI
  34 +#  ifdef HAVE_GSS_H
  35 +#    include <gss.h>
  36 +#  else
  37  #  ifdef HAVE_GSSAPI_H
  38  #    include <gssapi.h>
  39  #  endif
  40 @@ -33,6 +36,7 @@
  41  #  ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
  42  #    define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
  43  #  endif
  44 +#  endif
  45
  46  #define GSSAUTH_P_NONE      1
  47  #define GSSAUTH_P_INTEGRITY 2