Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1494419353136790"
MIME-Version: 1.0
Date: Wed, 10 May 2017 12:29:13 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/mail/mutt
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20170510122913.E69B8FBE4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1494419353136790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

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.57 -r1.58 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r1.10 -r1.11 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.


--_----------=_1494419353136790
Content-Disposition: inline
Content-Length: 2705
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.57 pkgsrc/mail/mutt/distinfo:1.58
--- pkgsrc/mail/mutt/distinfo:1.57	Wed Apr 19 06:34:44 2017
+++ pkgsrc/mail/mutt/distinfo	Wed May 10 12:29:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2017/04/19 06:34:44 tron Exp $
+$NetBSD: distinfo,v 1.58 2017/05/10 12:29:13 jperkin Exp $
 
 SHA1 (mutt-1.8.2.tar.gz) = bdac1201de464d63f61a663f3dcf1ee4484dbbb3
 RMD160 (mutt-1.8.2.tar.gz) = 9df882078b1592fbe9a7bee91a4f11cac65e7c7c
@@ -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.11
--- pkgsrc/mail/mutt/patches/patch-al:1.10	Sun Aug 21 11:39:31 2016
+++ pkgsrc/mail/mutt/patches/patch-al	Wed May 10 12:29:13 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.10 2016/08/21 11:39:31 wiz Exp $
+$NetBSD: patch-al,v 1.11 2017/05/10 12:29:13 jperkin 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


--_----------=_1494419353136790--