CVS commit: [pkgsrc-2017Q1] pkgsrc/mail/mutt

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu May 11 18:10:14 UTC 2017

Modified Files:
        pkgsrc/mail/mutt [pkgsrc-2017Q1]: distinfo
        pkgsrc/mail/mutt/patches [pkgsrc-2017Q1]: patch-al

Log Message:
Pullup ticket #5410 - requested by sevan
mail/mutt: build fix for SunOS

Revisions pulled up:
- mail/mutt/distinfo                                            1.58
- mail/mutt/patches/patch-al                                    1.11

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Wed May 10 12:29:13 UTC 2017

   Modified Files:
           pkgsrc/mail/mutt: distinfo
           pkgsrc/mail/mutt/patches: patch-al

   Log Message:
   Treat native Solaris Kerberos as Heimdal.  It isn't, but it fixes the build.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.2.1 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r1.10 -r1.10.6.1 pkgsrc/mail/mutt/patches/patch-al

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.55 pkgsrc/mail/mutt/distinfo:1.55.2.1
--- pkgsrc/mail/mutt/distinfo:1.55      Wed Mar  8 10:05:34 2017
+++ pkgsrc/mail/mutt/distinfo   Thu May 11 18:10:14 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2017/03/08 10:05:34 wiz Exp $
+$NetBSD: distinfo,v 1.55.2.1 2017/05/11 18:10:14 bsiegert Exp $
 
 SHA1 (mutt-1.8.0.tar.gz) = faddcf7b8044eb7f1887d61f5ffcc086fb2122ef
 RMD160 (mutt-1.8.0.tar.gz) = c3c4f716d100aff840c96c734208b24766430d24
@@ -12,7 +12,7 @@ SHA1 (patch-ae) = 6534848a4c27d4a3830edd
 SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61
 SHA1 (patch-ag) = ccf9d69c4fc1017c3a906e86dd8c60f6c8c87683
 SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a
-SHA1 (patch-al) = fb7e089c9703d13821165659f88fe78204d38a47
+SHA1 (patch-al) = 65f22d4ec1536f8eabbee4f6b0f825d725f56ed7
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
 SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
 SHA1 (patch-ao) = 7c8f18ccb3dc6a6f40daf55b53e52b4722f60efd

Index: pkgsrc/mail/mutt/patches/patch-al
diff -u pkgsrc/mail/mutt/patches/patch-al:1.10 pkgsrc/mail/mutt/patches/patch-al:1.10.6.1
--- pkgsrc/mail/mutt/patches/patch-al:1.10      Sun Aug 21 11:39:31 2016
+++ pkgsrc/mail/mutt/patches/patch-al   Thu May 11 18:10:14 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.10 2016/08/21 11:39:31 wiz Exp $
+$NetBSD: patch-al,v 1.10.6.1 2017/05/11 18:10:14 bsiegert Exp $
 
---- configure.orig     2016-08-18 01:56:27.000000000 +0000
+--- configure.orig     2017-04-18 23:07:15.000000000 +0000
 +++ configure
-@@ -8355,7 +8355,7 @@ fi
+@@ -8406,7 +8406,7 @@ fi
  
          old_LIBS="$LIBS"
          LIBS="$LIBS $MUTTLIBS"
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.10 2016/08/21 11:3
  do
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5
-@@ -9412,7 +9412,7 @@ fi
+@@ -9463,7 +9463,7 @@ fi
  
  if test x$mutt_cv_setgid = xyes; then
          DOTLOCK_GROUP='mail'
@@ -20,3 +20,20 @@ $NetBSD: patch-al,v 1.10 2016/08/21 11:3
  else
          DOTLOCK_GROUP=''
          DOTLOCK_PERMISSION=755
+@@ -9772,6 +9772,7 @@ fi
+     case "`$KRB5CFGPATH --version`" in
+       "Kerberos 5 "*) GSSAPI_IMPL="MIT";;
+       ?eimdal*)               GSSAPI_IMPL="Heimdal";;
++      Solaris*)               GSSAPI_IMPL="Solaris";;
+       *)              GSSAPI_IMPL="Unknown";;
+    esac
+   else
+@@ -10021,7 +10022,7 @@ rm -f confcache
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: GSSAPI libraries not found" >&5
+ $as_echo "GSSAPI libraries not found" >&6; }
+     fi
+-    if test "$GSSAPI_IMPL" = "Heimdal"
++    if test "$GSSAPI_IMPL" = "Heimdal" || test "$GSSAPI_IMPL" = "Solaris"
+     then
+ 
+ $as_echo "#define HAVE_HEIMDAL 1" >>confdefs.h