From owner-svn-ports-head@freebsd.org Tue May 3 00:46:44 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63F5BB2BAC0; Tue, 3 May 2016 00:46:44 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 311551C98; Tue, 3 May 2016 00:46:44 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u430khc3010096; Tue, 3 May 2016 00:46:43 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u430khvO010093; Tue, 3 May 2016 00:46:43 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201605030046.u430khvO010093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Tue, 3 May 2016 00:46:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414499 - in head/security/py-kerberos: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2016 00:46:44 -0000 Author: dvl Date: Tue May 3 00:46:42 2016 New Revision: 414499 URL: https://svnweb.freebsd.org/changeset/ports/414499 Log: Upgrade to 1.2.4 Fixed bug noticed by John W. O'Brien PR: 204185 Submitted by: David Shane Holden Modified: head/security/py-kerberos/Makefile head/security/py-kerberos/distinfo head/security/py-kerberos/files/extra-patch-src_kerberosgss.c Modified: head/security/py-kerberos/Makefile ============================================================================== --- head/security/py-kerberos/Makefile Tue May 3 00:40:04 2016 (r414498) +++ head/security/py-kerberos/Makefile Tue May 3 00:46:42 2016 (r414499) @@ -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}/e 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 Modified: head/security/py-kerberos/distinfo ============================================================================== --- head/security/py-kerberos/distinfo Tue May 3 00:40:04 2016 (r414498) +++ head/security/py-kerberos/distinfo Tue May 3 00:46:42 2016 (r414499) @@ -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 Modified: head/security/py-kerberos/files/extra-patch-src_kerberosgss.c ============================================================================== --- head/security/py-kerberos/files/extra-patch-src_kerberosgss.c Tue May 3 00:40:04 2016 (r414498) +++ head/security/py-kerberos/files/extra-patch-src_kerberosgss.c Tue May 3 00:46:42 2016 (r414499) @@ -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); + }