Attachment 155130 Details for Bug 199123 – patches for compiling against HEIMDAL port / BASE

[patch] patches for compiling against HEIMDAL port / BASE

py-kerberos.diff (text/plain), 6.04 KB, created by Dan Langille on 2015-04-02 20:48:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Langille

Created: 2015-04-02 20:48:15 UTC

Size: 6.04 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 383059)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	kerberos
> PORTVERSION=	1.1.1
>-PORTREVISION=	1
>+PORTREVISION=	6
> CATEGORIES=	security python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,13 +13,32 @@
> 
> LICENSE=	APACHE20
> 
>-LIB_DEPENDS=	libkrb5support.so:${PORTSDIR}/security/krb5
>+OPTIONS_DEFAULT=	GSSAPI_MIT
>+OPTIONS_SINGLE=		GSSAPI
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
> 
>+GSSAPI_BASE_USES=		gssapi
>+GSSAPI_HEIMDAL_USES=		gssapi:heimdal
>+GSSAPI_HEIMDAL_LIB_DEPENDS=	libgssapi.so.3:${PORTSDIR}/security/heimdal
>+GSSAPI_MIT_USES=		gssapi:mit
>+GSSAPI_MIT_LIB_DEPENDS=		libkrb5support.so:${PORTSDIR}/security/krb5
>+
> USES=		python
>-USE_PYTHON=	distutils autoplist
>+USE_PYTHON=	autoplist distutils
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MGSSAPI_BASE} || ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
>+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
>+.endif
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's|krb5|${PREFIX}/bin/krb5|g' ${WRKSRC}/setup.py
>-	@${REINPLACE_CMD} -e 's|split|replace("/usr/lib:", "").split|g' ${WRKSRC}/setup.py
>+	@${REINPLACE_CMD} -e 's|krb5|${GSSAPIBASEDIR}/bin/krb5|g' ${WRKSRC}/setup.py
> 
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/kerberos.so
>+
> .include <bsd.port.mk>
>Index: files/extra-patch-src_kerberosbasic.h
>===================================================================
>--- files/extra-patch-src_kerberosbasic.h	(revision 0)
>+++ files/extra-patch-src_kerberosbasic.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/kerberosbasic.h.orig	2015-03-29 03:39:10 UTC
>++++ src/kerberosbasic.h
>+@@ -14,8 +14,8 @@
>+  * limitations under the License.
>+  **/
>+ 
>++#include <krb5.h>
>+ #include <gssapi/gssapi.h>
>+-#include <gssapi/gssapi_generic.h>
>+ #include <gssapi/gssapi_krb5.h>
>+ 
>+ #define krb5_get_err_text(context,code) error_message(code)
>
>Property changes on: files/extra-patch-src_kerberosbasic.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/extra-patch-src_kerberosgss.c
>===================================================================
>--- files/extra-patch-src_kerberosgss.c	(revision 0)
>+++ files/extra-patch-src_kerberosgss.c	(working copy)
>@@ -0,0 +1,39 @@
>+--- src/kerberosgss.c.orig	2015-03-29 03:40:20 UTC
>++++ src/kerberosgss.c
>+@@ -38,7 +38,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;
>+     
>+@@ -81,13 +81,13 @@ char* server_principal_details(const cha
>+         {
>+             result = malloc(strlen(pname) + 1);
>+             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)
>+@@ -97,8 +97,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);
>+     krb5_free_context(kcontext);
>
>Property changes on: files/extra-patch-src_kerberosgss.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/extra-patch-src_kerberosgss.h
>===================================================================
>--- files/extra-patch-src_kerberosgss.h	(revision 0)
>+++ files/extra-patch-src_kerberosgss.h	(working copy)
>@@ -0,0 +1,13 @@
>+--- src/kerberosgss.h.orig	2015-03-29 03:41:32 UTC
>++++ src/kerberosgss.h
>+@@ -14,8 +14,9 @@
>+  * 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)
>
>Property changes on: files/extra-patch-src_kerberosgss.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/extra-patch-src_kerberospw.h
>===================================================================
>--- files/extra-patch-src_kerberospw.h	(revision 0)
>+++ files/extra-patch-src_kerberospw.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/kerberospw.h.orig	2015-03-29 03:42:28 UTC
>++++ src/kerberospw.h
>+@@ -15,8 +15,8 @@
>+  *
>+  **/
>+ 
>++#include <krb5.h>
>+ #include <gssapi/gssapi.h>
>+-#include <gssapi/gssapi_generic.h>
>+ #include <gssapi/gssapi_krb5.h>
>+ 
>+ #define krb5_get_err_text(context,code) error_message(code)
>
>Property changes on: files/extra-patch-src_kerberospw.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 199123: 155130