Page MenuHomeFreeBSD
Files F157534477

D4115.id10101.diff
No OneTemporary
Actions

D4115.id10101.diff
View Options

Index: security/py-kerberos/Makefile
===================================================================
--- security/py-kerberos/Makefile
+++ security/py-kerberos/Makefile
@@ -3,23 +3,40 @@
PORTNAME= kerberos
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= roland@micite.net
+MAINTAINER= dvl@FreeBSD.org
COMMENT= Kerberos bindings for python
LICENSE= APACHE20
-LIB_DEPENDS= libkrb5support.so:${PORTSDIR}/security/krb5
+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
+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|commands.getoutput("krb5-config|commands.getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/kerberos.so
.include <bsd.port.mk>
Index: security/py-kerberos/files/extra-patch-src_kerberosbasic.h
===================================================================
--- /dev/null
+++ security/py-kerberos/files/extra-patch-src_kerberosbasic.h
@@ -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)
Index: security/py-kerberos/files/extra-patch-src_kerberosgss.h
===================================================================
--- /dev/null
+++ security/py-kerberos/files/extra-patch-src_kerberosgss.h
@@ -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)
Index: security/py-kerberos/files/extra-patch-src_kerberosgss.c
===================================================================
--- /dev/null
+++ security/py-kerberos/files/extra-patch-src_kerberosgss.c
@@ -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);
Index: security/py-kerberos/files/extra-patch-src_kerberospw.h
===================================================================
--- /dev/null
+++ security/py-kerberos/files/extra-patch-src_kerberospw.h
@@ -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)

File Metadata

Mime Type
text/plain
Expires
Sat, May 23, 12:59 PM (18 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33446966
Default Alt Text
D4115.id10101.diff (4 KB)

Event Timeline