Date: Mon, 23 Nov 2015 12:35:16 +0100 From: John Marino <freebsd.contact@marino.st> To: Matthias Andree <mandree@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r401087 - head/security/putty Message-ID: <5652F9F4.3030201@marino.st> In-Reply-To: <201511090918.tA99IMFA014333@repo.freebsd.org> References: <201511090918.tA99IMFA014333@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 11/9/2015 10:18 AM, Matthias Andree wrote: > Author: mandree > Date: Mon Nov 9 09:18:22 2015 > New Revision: 401087 > URL: https://svnweb.freebsd.org/changeset/ports/401087 > > Log: > Update to new upstream release 0.66 (security fix). > > Switch to USES=gssapi:mit. > > Security: CVE-2015-5309 > Security: 0cb0afd9-86b8-11e5-bf60-080027ef73ec > > Modified: > head/security/putty/Makefile > head/security/putty/distinfo > > Modified: head/security/putty/Makefile > ============================================================================== > --- head/security/putty/Makefile Mon Nov 9 08:27:41 2015 (r401086) > +++ head/security/putty/Makefile Mon Nov 9 09:18:22 2015 (r401087) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= putty > -PORTVERSION= 0.65 > +PORTVERSION= 0.66 > CATEGORIES= security ipv6 > MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \ > ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ > @@ -45,7 +45,7 @@ MAKE_ARGS+= GTK_CONFIG=: > > .if ${PORT_OPTIONS:MGSSAPI} > _COMPAT= -DSTATIC_GSSAPI > -LIB_DEPENDS+= libkrb5support.so:${PORTSDIR}/security/krb5 > +USES+= gssapi:mit > .else > _COMPAT= -DNO_GSSAPI > .endif > Mattias, This isn't correct due to using both <bsd.ports.pre.mk> and <bsd.ports.options.mk> # make -V DEPENDS gmake:/usr/ports/devel/gmake pkgconf:/usr/ports/devel/pkgconf With the following patch, kerberos is included. # make -V DEPENDS gmake:/usr/ports/devel/gmake pkgconf:/usr/ports/devel/pkgconf /usr/local/lib/libkrb5support.so:/usr/ports/security/krb5 I think it is just picking up base kerberos. By the way, seeing <pre> and <options> used together is almost always a red flag. I can commit the patch if you want. Regards, John Index: security/putty/Makefile =================================================================== --- security/putty/Makefile (revision 402205) +++ security/putty/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= putty PORTVERSION= 0.66 +PORTREVISION 1 CATEGORIES= security ipv6 MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \ ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ @@ -41,8 +42,6 @@ MAKE_ARGS+= GTK_CONFIG=: .endif -.include <bsd.port.pre.mk> - .if ${PORT_OPTIONS:MGSSAPI} _COMPAT= -DSTATIC_GSSAPI USES+= gssapi:mit @@ -71,4 +70,4 @@ s,make,${MAKE_CMD},'\ ${WRKSRC}/${MAKEFILE} -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5652F9F4.3030201>