Attachment #155130 for bug #199123

View | Details | Raw Unified | Return to bug 199123
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-5 / +24 lines)
3		3
4	PORTNAME= kerberos	4	PORTNAME= kerberos
5	PORTVERSION= 1.1.1	5	PORTVERSION= 1.1.1
6	PORTREVISION= 1	6	PORTREVISION= 6
7	CATEGORIES= security python	7	CATEGORIES= security python
8	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 13-25 Link Here
13		13
14	LICENSE= APACHE20	14	LICENSE= APACHE20
15		15
16	LIB_DEPENDS= libkrb5support.so:${PORTSDIR}/security/krb5	16	OPTIONS_DEFAULT= GSSAPI_MIT
		17	OPTIONS_SINGLE= GSSAPI
		18	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
17		19
		20	GSSAPI_BASE_USES= gssapi
		21	GSSAPI_HEIMDAL_USES= gssapi:heimdal
		22	GSSAPI_HEIMDAL_LIB_DEPENDS= libgssapi.so.3:${PORTSDIR}/security/heimdal
		23	GSSAPI_MIT_USES= gssapi:mit
		24	GSSAPI_MIT_LIB_DEPENDS= libkrb5support.so:${PORTSDIR}/security/krb5
		25
18	USES= python	26	USES= python
19	USE_PYTHON= distutils autoplist	27	USE_PYTHON= autoplist distutils
20		28
		29	.include <bsd.port.options.mk>
		30
		31	.if ${PORT_OPTIONS:MGSSAPI_BASE} \|\| ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
		32	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_kerberosbasic.h \
		33	${PATCHDIR}/extra-patch-src_kerberosgss.c \
		34	${PATCHDIR}/extra-patch-src_kerberosgss.h \
		35	${PATCHDIR}/extra-patch-src_kerberospw.h
		36	.endif
		37
21	post-patch:	38	post-patch:
22	@${REINPLACE_CMD} -e 's\|krb5\|${PREFIX}/bin/krb5\|g' ${WRKSRC}/setup.py	39	@${REINPLACE_CMD} -e 's\|krb5\|${GSSAPIBASEDIR}/bin/krb5\|g' ${WRKSRC}/setup.py
23	@${REINPLACE_CMD} -e 's\|split\|replace("/usr/lib:", "").split\|g' ${WRKSRC}/setup.py
24		40
		41	post-install:
		42	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/kerberos.so
		43
25	.include <bsd.port.mk>	44	.include <bsd.port.mk>




--- 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)




--- 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);




--- 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)




--- 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)

Return to bug 199123

Line 0 Link Here

(-)files/extra-patch-src_kerberosbasic.h (+12 lines)
	1	--- src/kerberosbasic.h.orig 2015-03-29 03:39:10 UTC
	2	+++ src/kerberosbasic.h
	3	@@ -14,8 +14,8 @@
	4	* limitations under the License.
	5	**/
	6
	7	+#include <krb5.h>
	8	#include <gssapi/gssapi.h>
	9	-#include <gssapi/gssapi_generic.h>
	10	#include <gssapi/gssapi_krb5.h>
	11
	12	#define krb5_get_err_text(context,code) error_message(code)

Line 0 Link Here

(-)files/extra-patch-src_kerberosgss.c (+39 lines)
	1	--- src/kerberosgss.c.orig 2015-03-29 03:40:20 UTC
	2	+++ src/kerberosgss.c
	3	@@ -38,7 +38,7 @@ char* server_principal_details(const cha
	4	int code;
	5	krb5_context kcontext;
	6	krb5_keytab kt = NULL;
	7	- krb5_kt_cursor cursor = NULL;
	8	+ krb5_kt_cursor cursor;
	9	krb5_keytab_entry entry;
	10	char* pname = NULL;
	11
	12	@@ -81,13 +81,13 @@ char* server_principal_details(const cha
	13	{
	14	result = malloc(strlen(pname) + 1);
	15	strcpy(result, pname);
	16	- krb5_free_unparsed_name(kcontext, pname);
	17	- krb5_free_keytab_entry_contents(kcontext, &entry);
	18	+ krb5_xfree(pname);
	19	+ krb5_kt_free_entry(kcontext, &entry);
	20	break;
	21	}
	22
	23	- krb5_free_unparsed_name(kcontext, pname);
	24	- krb5_free_keytab_entry_contents(kcontext, &entry);
	25	+ krb5_xfree(pname);
	26	+ krb5_kt_free_entry(kcontext, &entry);
	27	}
	28
	29	if (result == NULL)
	30	@@ -97,8 +97,7 @@ char* server_principal_details(const cha
	31	}
	32
	33	end:
	34	- if (cursor)
	35	- krb5_kt_end_seq_get(kcontext, kt, &cursor);
	36	+ krb5_kt_end_seq_get(kcontext, kt, &cursor);
	37	if (kt)
	38	krb5_kt_close(kcontext, kt);
	39	krb5_free_context(kcontext);

Line 0 Link Here

(-)files/extra-patch-src_kerberosgss.h (+13 lines)
	1	--- src/kerberosgss.h.orig 2015-03-29 03:41:32 UTC
	2	+++ src/kerberosgss.h
	3	@@ -14,8 +14,9 @@
	4	* limitations under the License.
	5	**/
	6
	7	+#include <krb5.h>
	8	+#define gss_krb5_nt_service_name GSS_KRB5_NT_PRINCIPAL_NAME
	9	#include <gssapi/gssapi.h>
	10	-#include <gssapi/gssapi_generic.h>
	11	#include <gssapi/gssapi_krb5.h>
	12
	13	#define krb5_get_err_text(context,code) error_message(code)

Line 0 Link Here

(-)files/extra-patch-src_kerberospw.h (+12 lines)
	1	--- src/kerberospw.h.orig 2015-03-29 03:42:28 UTC
	2	+++ src/kerberospw.h
	3	@@ -15,8 +15,8 @@
	4	*
	5	**/
	6
	7	+#include <krb5.h>
	8	#include <gssapi/gssapi.h>
	9	-#include <gssapi/gssapi_generic.h>
	10	#include <gssapi/gssapi_krb5.h>
	11
	12	#define krb5_get_err_text(context,code) error_message(code)