 @@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.7 2021/10/21 07:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/10 22:42:35 joerg Exp $
 DISTNAME=	kerberos-1.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/kerberos/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/apple/ccs-pykerberos
 COMMENT=	Python Kerberos implementation
 LICENSE=	apache-2.0
-# uses krb5_free_keytab_entry_contents, which only mit-krb5 provides
+# When updating, try to build with the following:
-KRB5_ACCEPTED=	mit-krb5
+#CFLAGS+=	-Werror=implicit-function-declaration
 .include "../../lang/python/egg.mk"
 .include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:17:46 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/12/10 22:42:35 joerg Exp $
 BLAKE2s (kerberos-1.3.1.tar.gz) = 87120c28fc13c67a6b30623755f18c459cb1ccf0faf57284ef8cc99ed5374cc2
 SHA512 (kerberos-1.3.1.tar.gz) = 63608c6ee94bcade567de19bea5e139039b336e181a319184666a0d1a11b1b6cd10cebf7bab52adc67502788c1632ff36a2534de37b4d01a5a32d9003aa74c6e
 Size (kerberos-1.3.1.tar.gz) = 19126 bytes
 SHA1 (patch-setup.py) = a9dbfbba526c9c82f2c3180e3469fc5040362ffe
-SHA1 (patch-src_kerberosbasic.h) = 7afb1da96ef6ecfcfa619ad8e6235e81d1cf87e9
+SHA1 (patch-src_kerberosbasic.h) = 4a8dea49295958709d8db9b272bb65f4a99baad1
-SHA1 (patch-src_kerberosgss.c) = 8207233909e0342da5f9440184621ac1f5b7476d
+SHA1 (patch-src_kerberosgss.c) = e2e41001a1ef7a50a23aac7884a1985a1794a9eb
-SHA1 (patch-src_kerberosgss.h) = e142a4bfc60e7cf0b944f1df461c806b14dbfb15
+SHA1 (patch-src_kerberosgss.h) = bedf261df0906057b692ad2265fbdc2b488b7932
-SHA1 (patch-src_kerberospw.h) = fc856dc69a0fd9b0bcba4fd29dacf731de3be308
+SHA1 (patch-src_kerberospw.h) = 6d2ac5d9ab2970427a0906a68e557057779d5d0c

 @@ -1,22 +1,26 @@
-$NetBSD: patch-src_kerberosbasic.h,v 1.1 2016/06/09 02:06:18 markd Exp $
+$NetBSD: patch-src_kerberosbasic.h,v 1.2 2021/12/10 22:42:35 joerg Exp $
 Support heimdal
---- src/kerberosbasic.h.orig	2016-01-25 17:51:33.000000000 +0000
+--- src/kerberosbasic.h.orig	2021-01-07 23:03:04.000000000 +0000
 +++ src/kerberosbasic.h
-@@ -14,9 +14,15 @@
+@@ -14,11 +14,19 @@
   * limitations under the License.
   **/
 +#ifdef HEIMDAL
 +#include <gssapi/gssapi.h>
 +#include <gssapi/gssapi_krb5.h>
 +#include <krb5.h>
 +#else
  #include <gssapi/gssapi.h>
  #include <gssapi/gssapi_generic.h>
  #include <gssapi/gssapi_krb5.h>
 +#endif
 +#ifndef HEIMDAL
  #define krb5_get_err_text(context,code) error_message(code)
 +#endif
  int authenticate_user_krb5pwd(
      const char *user, const char *pswd, const char *service,

 @@ -1,18 +1,18 @@
-$NetBSD: patch-src_kerberosgss.c,v 1.1 2016/06/09 02:06:18 markd Exp $
+$NetBSD: patch-src_kerberosgss.c,v 1.2 2021/12/10 22:42:35 joerg Exp $
 Support heimdal
---- src/kerberosgss.c.orig	2016-01-25 17:51:33.000000000 +0000
+--- src/kerberosgss.c.orig	2021-01-07 23:03:04.000000000 +0000
 +++ src/kerberosgss.c
 @@ -43,7 +43,7 @@ char* server_principal_details(const cha
      int code;
      krb5_context kcontext;
      krb5_keytab kt = NULL;
 -    krb5_kt_cursor cursor = NULL;
 +    krb5_kt_cursor cursor;
      krb5_keytab_entry entry;
      char* pname = NULL;
 @@ -67,7 +67,7 @@ char* server_principal_details(const cha
              KrbException_class,
              Py_BuildValue("((s:i))", "Cannot get default keytab", code)
 @@ -21,25 +21,46 @@ Support heimdal
 +        goto end1;
+     }
      if ((code = krb5_kt_start_seq_get(kcontext, kt, &cursor))) {
 @@ -77,7 +77,7 @@ char* server_principal_details(const cha
                  "((s:i))", "Cannot get sequence cursor from keytab", code
+             )
          );
 -        goto end;
 +        goto end1;
+     }
      while ((code = krb5_kt_next_entry(kcontext, kt, &entry, &cursor)) == 0) {
-@@ -115,9 +115,8 @@ char* server_principal_details(const cha
+@@ -99,12 +99,20 @@ char* server_principal_details(const cha
+             }
              strcpy(result, pname);
              krb5_free_unparsed_name(kcontext, pname);
 +#ifdef HEIMDAL
 +            krb5_kt_free_entry(kcontext, &entry);
 +#else
              krb5_free_keytab_entry_contents(kcontext, &entry);
 +#endif
              break;
+         }
          krb5_free_unparsed_name(kcontext, pname);
 +#ifdef HEIMDAL
 +        krb5_kt_free_entry(kcontext, &entry);
 +#else
          krb5_free_keytab_entry_contents(kcontext, &entry);
 +#endif
+     }
      if (result == NULL) {
@@ -115,9 +123,8 @@ char* server_principal_details(const cha
+     }
  end:
 -    if (cursor) {
 -        krb5_kt_end_seq_get(kcontext, kt, &cursor);
 -    }
 +    krb5_kt_end_seq_get(kcontext, kt, &cursor);
 +end1:
      if (kt) {
          krb5_kt_close(kcontext, kt);
+     }

 @@ -1,23 +1,27 @@
-$NetBSD: patch-src_kerberosgss.h,v 1.1 2016/06/09 02:06:18 markd Exp $
+$NetBSD: patch-src_kerberosgss.h,v 1.2 2021/12/10 22:42:35 joerg Exp $
 Support heimdal
---- src/kerberosgss.h.orig	2016-01-25 17:51:33.000000000 +0000
+--- src/kerberosgss.h.orig	2021-01-07 23:03:04.000000000 +0000
 +++ src/kerberosgss.h
-@@ -14,9 +14,16 @@
+@@ -14,11 +14,20 @@
   * limitations under the License.
   **/
 +#ifdef HEIMDAL
 +#include <gssapi/gssapi.h>
 +#include <gssapi/gssapi_krb5.h>
 +#include <krb5.h>
 +#define gss_krb5_nt_service_name    GSS_KRB5_NT_PRINCIPAL_NAME
 +#else
  #include <gssapi/gssapi.h>
  #include <gssapi/gssapi_generic.h>
  #include <gssapi/gssapi_krb5.h>
 +#endif
 +#ifndef HEIMDAL
  #define krb5_get_err_text(context,code) error_message(code)
 +#endif
  #define AUTH_GSS_ERROR      -1
  #define AUTH_GSS_COMPLETE    1

 @@ -1,22 +1,26 @@
-$NetBSD: patch-src_kerberospw.h,v 1.1 2016/06/09 02:06:18 markd Exp $
+$NetBSD: patch-src_kerberospw.h,v 1.2 2021/12/10 22:42:35 joerg Exp $
 Support heimdal
---- src/kerberospw.h.orig	2015-03-26 21:53:18.000000000 +0000
+--- src/kerberospw.h.orig	2021-01-07 23:03:04.000000000 +0000
 +++ src/kerberospw.h
-@@ -15,9 +15,15 @@
+@@ -15,11 +15,19 @@
+  *
   **/
 +#ifdef HEIMDAL
 +#include <gssapi/gssapi.h>
 +#include <gssapi/gssapi_krb5.h>
 +#include <krb5.h>
 +#else
  #include <gssapi/gssapi.h>
  #include <gssapi/gssapi_generic.h>
  #include <gssapi/gssapi_krb5.h>
 +#endif
 +#ifndef HEIMDAL
  #define krb5_get_err_text(context,code) error_message(code)
 +#endif
  int change_user_krb5pwd(
      const char *user, const char* oldpswd, const char *newpswd