mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-07 11:49:40 +00:00
Upgrade to 1.2.4
Fixed bug noticed by John W. O'Brien <john@saltant.com> PR: 204185 Submitted by: David Shane Holden <dpejesh@yahoo.com>
This commit is contained in:
parent
46dd503088
commit
e4d95277c8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=414499
@ -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_BASE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_kerberosbasic.h \
|
||||
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
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user