CVS commit: pkgsrc/mail/mutt

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May  3 06:33:44 UTC 2024

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

Log Message:
mutt: Fix native Solaris Kerberos detection.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/mutt/patches/patch-configure

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.117 pkgsrc/mail/mutt/distinfo:1.118
--- pkgsrc/mail/mutt/distinfo:1.117     Sat Mar  9 18:32:16 2024
+++ pkgsrc/mail/mutt/distinfo   Fri May  3 06:33:44 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.117 2024/03/09 18:32:16 tron Exp $
+$NetBSD: distinfo,v 1.118 2024/05/03 06:33:44 jperkin Exp $
 
 BLAKE2s (mutt-2.2.13.tar.gz) = 8a18a21d1da8b6b2c1ea62dbf5dc16538f757974700236fee2ae6c679ae4f2be
 SHA512 (mutt-2.2.13.tar.gz) = dcd84235b6f759c31b56cf021efc17c0bb1fd4d59226d12af9838f3cbbcf0301262ae5f67803565cce3afd6ff5eed3a380a81958f57fb7d8f38e2ecfd0ff7d2c
 Size (mutt-2.2.13.tar.gz) = 5539130 bytes
 SHA1 (patch-Makefile.in) = 646eab10790053fff80bf8012ea85f40412b330c
 SHA1 (patch-color.c) = fc3777cace89e615b13118561ba133c504741bd0
-SHA1 (patch-configure) = 6ecee8d2aef0a6280d9eb9d195beed2c439a2c87
+SHA1 (patch-configure) = d481cfd7e1e288d70ff9d48ac07d758ede5d3d30
 SHA1 (patch-doc_Makefile.in) = 8086887afeec554d0c78047a48ec3eb33d38f26c

Index: pkgsrc/mail/mutt/patches/patch-configure
diff -u pkgsrc/mail/mutt/patches/patch-configure:1.3 pkgsrc/mail/mutt/patches/patch-configure:1.4
--- pkgsrc/mail/mutt/patches/patch-configure:1.3        Sun May  1 06:51:24 2022
+++ pkgsrc/mail/mutt/patches/patch-configure    Fri May  3 06:33:44 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.3 2022/05/01 06:51:24 tron Exp $
+$NetBSD: patch-configure,v 1.4 2024/05/03 06:33:44 jperkin Exp $
 
 - Allow build as an unpriviliged user
 - Fix Kerberos related build failure under Solaris
 
---- configure.orig     2022-04-30 20:42:13.000000000 +0100
-+++ configure  2022-05-01 07:47:26.388433920 +0100
-@@ -10512,7 +10512,7 @@
+--- configure.orig     2024-03-09 10:29:18.000000000 +0000
++++ configure
+@@ -10491,7 +10491,7 @@ fi
  
  if test x$mutt_cv_setgid = xyes; then
          DOTLOCK_GROUP='mail'
@@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.3 2022/05/0
  else
          DOTLOCK_GROUP=''
          DOTLOCK_PERMISSION=755
-@@ -10821,6 +10821,7 @@
+@@ -10800,6 +10800,7 @@ fi
      case "`$KRB5CFGPATH --version`" in
        "Kerberos 5 "*) GSSAPI_IMPL="MIT";;
        ?eimdal*)               GSSAPI_IMPL="Heimdal";;
@@ -22,7 +22,16 @@ $NetBSD: patch-configure,v 1.3 2022/05/0
        *)              GSSAPI_IMPL="Unknown";;
      esac
          LIBS="$saved_LIBS $GSSAPI_LIBS"
-@@ -11103,7 +11104,7 @@
+@@ -10964,7 +10965,7 @@ fi
+     if test "$GSSAPI_IMPL" != "none"
+   then
+     CPPFLAGS="$saved_CPPFLAGS $GSSAPI_CFLAGS"
+-    if test "$GSSAPI_IMPL" != "Heimdal"
++    if test "$GSSAPI_IMPL" != "Heimdal" -a "$GSSAPI_IMPL" != "Solaris"
+     then
+       ac_fn_c_check_header_compile "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default"
+ if test "x$ac_cv_header_gssapi_gssapi_generic_h" = xyes
+@@ -11082,7 +11083,7 @@ fi
  rm -f confcache
        as_fn_error $? "GSSAPI libraries not found" "$LINENO" 5
      fi