Attachment 169898 Details for Bug 204185 – py-kerberos-1.2.4.diff

[patch] py-kerberos-1.2.4.diff

py-kerberos-1.2.4.diff (text/plain), 2.71 KB, created by David Shane Holden on 2016-05-02 23:43:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Shane Holden

Created: 2016-05-02 23:43:19 UTC

Size: 2.71 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 414034)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kerberos
>-PORTVERSION=	1.1.1
>-PORTREVISION=	2
>+PORTVERSION=	1.2.4
> CATEGORIES=	security python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -32,7 +31,7 @@
> GSSAPI_HEIMDAL_EXTRA_PATCHES=	${GSSAPI_BASE_EXTRA_PATCHES}
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|commands.getoutput("krb5-config|commands.getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py
>+	@${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
>Index: distinfo
>===================================================================
>--- distinfo	(revision 414034)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (kerberos-1.1.1.tar.gz) = 09132e3b2027854e8714894546aff11f31e6051eb75513e774948e10a5dde6f5
>-SIZE (kerberos-1.1.1.tar.gz) = 15343
>+SHA256 (kerberos-1.2.4.tar.gz) = d6f49923bbcf4ebc47ae47b7ceac7866543200669e1dfb24821221da3e940987
>+SIZE (kerberos-1.2.4.tar.gz) = 19615
>Index: files/extra-patch-src_kerberosgss.c
>===================================================================
>--- files/extra-patch-src_kerberosgss.c	(revision 414034)
>+++ files/extra-patch-src_kerberosgss.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/kerberosgss.c.orig	2015-03-29 03:40:20 UTC
>+--- src/kerberosgss.c.orig	2016-01-25 17:51:33 UTC
> +++ src/kerberosgss.c
>-@@ -38,7 +38,7 @@ char* server_principal_details(const cha
>+@@ -43,7 +43,7 @@ char* server_principal_details(const cha
>      int code;
>      krb5_context kcontext;
>      krb5_keytab kt = NULL;
>@@ -9,9 +9,9 @@
>      krb5_keytab_entry entry;
>      char* pname = NULL;
>      
>-@@ -81,13 +81,13 @@ char* server_principal_details(const cha
>-         {
>-             result = malloc(strlen(pname) + 1);
>+@@ -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);
>@@ -26,14 +26,15 @@
> +        krb5_kt_free_entry(kcontext, &entry);
>      }
>      
>-     if (result == NULL)
>-@@ -97,8 +97,7 @@ char* server_principal_details(const cha
>+     if (result == NULL) {
>+@@ -115,9 +115,7 @@ char* server_principal_details(const cha
>      }
>      
>  end:
>--    if (cursor)
>+-    if (cursor) {
> -        krb5_kt_end_seq_get(kcontext, kt, &cursor);
>+-    }
> +    krb5_kt_end_seq_get(kcontext, kt, &cursor);
>-     if (kt)
>+     if (kt) {
>          krb5_kt_close(kcontext, kt);
>-     krb5_free_context(kcontext);
>+     }

Actions: View | Diff

Attachments on bug 204185: 162660 | 162661 | 162662 | 162663 | 169898