Index: head/security/py-kerberos/Makefile
===================================================================
--- head/security/py-kerberos/Makefile	(revision 460368)
+++ head/security/py-kerberos/Makefile	(revision 460369)
@@ -1,39 +1,40 @@
 # Created by: Roland van Laar <roland@micite.net>
 # $FreeBSD$
 
 PORTNAME=	kerberos
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Kerberos bindings for python
 
 LICENSE=	APACHE20
 
 OPTIONS_DEFAULT=	GSSAPI_BASE
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 GSSAPI_BASE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_kerberosbasic.h \
 				${PATCHDIR}/extra-patch-src_kerberosgss.c \
 				${PATCHDIR}/extra-patch-src_kerberosgss.h \
 				${PATCHDIR}/extra-patch-src_kerberospw.h
 
 GSSAPI_HEIMDAL_EXTRA_PATCHES=	${GSSAPI_BASE_EXTRA_PATCHES}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|getoutput("krb5-config|getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/kerberos.so
 
 .include <bsd.port.mk>
Index: head/security/py-kerberos/files/extra-patch-src_kerberosgss.c
===================================================================
--- head/security/py-kerberos/files/extra-patch-src_kerberosgss.c	(revision 460368)
+++ head/security/py-kerberos/files/extra-patch-src_kerberosgss.c	(revision 460369)
@@ -1,40 +1,49 @@
 --- src/kerberosgss.c.orig	2016-01-25 17:51:33 UTC
 +++ 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;
      
 @@ -98,13 +98,13 @@ char* server_principal_details(const cha
                  goto end;
              }
              strcpy(result, pname);
 -            krb5_free_unparsed_name(kcontext, pname);
 -            krb5_free_keytab_entry_contents(kcontext, &entry);
 +            krb5_xfree(pname);
 +            krb5_kt_free_entry(kcontext, &entry);
              break;
          }
          
 -        krb5_free_unparsed_name(kcontext, pname);
 -        krb5_free_keytab_entry_contents(kcontext, &entry);
 +        krb5_xfree(pname);
 +        krb5_kt_free_entry(kcontext, &entry);
      }
      
      if (result == NULL) {
 @@ -115,9 +115,7 @@ 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);
      if (kt) {
          krb5_kt_close(kcontext, kt);
      }
+@@ -150,7 +148,7 @@ int authenticate_gss_client_init(
+     name_token.value = (char *)service;
+     
+     maj_stat = gss_import_name(
+-        &min_stat, &name_token, gss_krb5_nt_service_name, &state->server_name
++        &min_stat, &name_token, GSS_C_NT_HOSTBASED_SERVICE, &state->server_name
+     );
+     
+     if (GSS_ERROR(maj_stat)) {
Index: head/security/py-kerberos/files/extra-patch-src_kerberosgss.h
===================================================================
--- head/security/py-kerberos/files/extra-patch-src_kerberosgss.h	(revision 460368)
+++ head/security/py-kerberos/files/extra-patch-src_kerberosgss.h	(revision 460369)
@@ -1,13 +1,12 @@
 --- src/kerberosgss.h.orig	2015-03-29 03:41:32 UTC
 +++ src/kerberosgss.h
-@@ -14,8 +14,9 @@
+@@ -14,8 +14,8 @@
   * limitations under the License.
   **/
  
 +#include <krb5.h>
-+#define gss_krb5_nt_service_name GSS_KRB5_NT_PRINCIPAL_NAME
  #include <gssapi/gssapi.h>
 -#include <gssapi/gssapi_generic.h>
  #include <gssapi/gssapi_krb5.h>
  
  #define krb5_get_err_text(context,code) error_message(code)