Thu May 11 18:10:14 2017 UTC ()
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.


(bsiegert)
diff -r1.55 -r1.55.2.1 pkgsrc/mail/mutt/distinfo
diff -r1.10 -r1.10.6.1 pkgsrc/mail/mutt/patches/patch-al
cvs diff -r1.55 -r1.55.2.1 pkgsrc/mail/mutt/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mutt/distinfo 2017/03/08 10:05:34 1.55
+++ pkgsrc/mail/mutt/distinfo 2017/05/11 18:10:14 1.55.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.55 2017/03/08 10:05:34 wiz Exp $ 1$NetBSD: distinfo,v 1.55.2.1 2017/05/11 18:10:14 bsiegert Exp $
2 2
3SHA1 (mutt-1.8.0.tar.gz) = faddcf7b8044eb7f1887d61f5ffcc086fb2122ef 3SHA1 (mutt-1.8.0.tar.gz) = faddcf7b8044eb7f1887d61f5ffcc086fb2122ef
4RMD160 (mutt-1.8.0.tar.gz) = c3c4f716d100aff840c96c734208b24766430d24 4RMD160 (mutt-1.8.0.tar.gz) = c3c4f716d100aff840c96c734208b24766430d24
5SHA512 (mutt-1.8.0.tar.gz) = 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d 5SHA512 (mutt-1.8.0.tar.gz) = 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d
6Size (mutt-1.8.0.tar.gz) = 4116223 bytes 6Size (mutt-1.8.0.tar.gz) = 4116223 bytes
7SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 7SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
8SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681 8SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
9SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044 9SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
10SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344 10SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
11SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6 11SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
12SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61 12SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61
13SHA1 (patch-ag) = ccf9d69c4fc1017c3a906e86dd8c60f6c8c87683 13SHA1 (patch-ag) = ccf9d69c4fc1017c3a906e86dd8c60f6c8c87683
14SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a 14SHA1 (patch-ah) = 047f167939367b2e0d29189348deb1c83d4b013a
15SHA1 (patch-al) = fb7e089c9703d13821165659f88fe78204d38a47 15SHA1 (patch-al) = 65f22d4ec1536f8eabbee4f6b0f825d725f56ed7
16SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f 16SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
17SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1 17SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
18SHA1 (patch-ao) = 7c8f18ccb3dc6a6f40daf55b53e52b4722f60efd 18SHA1 (patch-ao) = 7c8f18ccb3dc6a6f40daf55b53e52b4722f60efd
19SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62 19SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
20SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d 20SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
cvs diff -r1.10 -r1.10.6.1 pkgsrc/mail/mutt/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/mail/mutt/patches/Attic/patch-al 2016/08/21 11:39:31 1.10
+++ pkgsrc/mail/mutt/patches/Attic/patch-al 2017/05/11 18:10:14 1.10.6.1
@@ -1,22 +1,39 @@ @@ -1,22 +1,39 @@
1$NetBSD: patch-al,v 1.10 2016/08/21 11:39:31 wiz Exp $ 1$NetBSD: patch-al,v 1.10.6.1 2017/05/11 18:10:14 bsiegert Exp $
2 2
3--- configure.orig 2016-08-18 01:56:27.000000000 +0000 3--- configure.orig 2017-04-18 23:07:15.000000000 +0000
4+++ configure 4+++ configure
5@@ -8355,7 +8355,7 @@ fi 5@@ -8406,7 +8406,7 @@ fi
6  6
7 old_LIBS="$LIBS" 7 old_LIBS="$LIBS"
8 LIBS="$LIBS $MUTTLIBS" 8 LIBS="$LIBS $MUTTLIBS"
9- for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm 9- for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm
10+ for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm mvchgat mvwchgat 10+ for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm mvchgat mvwchgat
11 do 11 do
12  12
13 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5 13 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5
14@@ -9412,7 +9412,7 @@ fi 14@@ -9463,7 +9463,7 @@ fi
15  15
16 if test x$mutt_cv_setgid = xyes; then 16 if test x$mutt_cv_setgid = xyes; then
17 DOTLOCK_GROUP='mail' 17 DOTLOCK_GROUP='mail'
18- DOTLOCK_PERMISSION=2755 18- DOTLOCK_PERMISSION=2755
19+ DOTLOCK_PERMISSION=2555 19+ DOTLOCK_PERMISSION=2555
20 else 20 else
21 DOTLOCK_GROUP='' 21 DOTLOCK_GROUP=''
22 DOTLOCK_PERMISSION=755 22 DOTLOCK_PERMISSION=755
 23@@ -9772,6 +9772,7 @@ fi
 24 case "`$KRB5CFGPATH --version`" in
 25 "Kerberos 5 "*) GSSAPI_IMPL="MIT";;
 26 ?eimdal*) GSSAPI_IMPL="Heimdal";;
 27+ Solaris*) GSSAPI_IMPL="Solaris";;
 28 *) GSSAPI_IMPL="Unknown";;
 29 esac
 30 else
 31@@ -10021,7 +10022,7 @@ rm -f confcache
 32 { $as_echo "$as_me:${as_lineno-$LINENO}: result: GSSAPI libraries not found" >&5
 33 $as_echo "GSSAPI libraries not found" >&6; }
 34 fi
 35- if test "$GSSAPI_IMPL" = "Heimdal"
 36+ if test "$GSSAPI_IMPL" = "Heimdal" || test "$GSSAPI_IMPL" = "Solaris"
 37 then
 38
 39 $as_echo "#define HAVE_HEIMDAL 1" >>confdefs.h