diff options
| author | Dan Langille <dvl@FreeBSD.org> | 2016-05-03 00:46:42 +0000 |
|---|---|---|
| committer | Dan Langille <dvl@FreeBSD.org> | 2016-05-03 00:46:42 +0000 |
| commit | e4d95277c88964eb0df17a6c7859ac908e6c3b01 (patch) | |
| tree | 014cbe3f95bbec8d72407614ad3b1368666c01d2 /security/py-kerberos | |
| parent | 46dd503088f80afa5416c86ce68a64c99d91bb9e (diff) | |
| download | ports-e4d95277c88964eb0df17a6c7859ac908e6c3b01.tar.gz ports-e4d95277c88964eb0df17a6c7859ac908e6c3b01.zip | |
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>
Notes
Notes:
svn path=/head/; revision=414499
Diffstat (limited to 'security/py-kerberos')
| -rw-r--r-- | security/py-kerberos/Makefile | 5 | ||||
| -rw-r--r-- | security/py-kerberos/distinfo | 4 | ||||
| -rw-r--r-- | security/py-kerberos/files/extra-patch-src_kerberosgss.c | 21 |
3 files changed, 15 insertions, 15 deletions
diff --git a/security/py-kerberos/Makefile b/security/py-kerberos/Makefile index b3923e162432..06eecc40e96e 100644 --- a/security/py-kerberos/Makefile +++ b/security/py-kerberos/Makefile @@ -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 diff --git a/security/py-kerberos/distinfo b/security/py-kerberos/distinfo index 50cbebcc751d..59e4a1260f49 100644 --- a/security/py-kerberos/distinfo +++ b/security/py-kerberos/distinfo @@ -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 diff --git a/security/py-kerberos/files/extra-patch-src_kerberosgss.c b/security/py-kerberos/files/extra-patch-src_kerberosgss.c index ba7d091643ea..0b9e4f7d78ab 100644 --- a/security/py-kerberos/files/extra-patch-src_kerberosgss.c +++ b/security/py-kerberos/files/extra-patch-src_kerberosgss.c @@ -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); + } |