From owner-svn-ports-head@freebsd.org  Mon Nov 23 11:35:27 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
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 CB1DAA35857;
 Mon, 23 Nov 2015 11:35:27 +0000 (UTC)
 (envelope-from freebsd.contact@marino.st)
Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A67D515A8;
 Mon, 23 Nov 2015 11:35:27 +0000 (UTC)
 (envelope-from freebsd.contact@marino.st)
Received: from [192.168.1.22] (210.Red-81-38-187.dynamicIP.rima-tde.net
 [81.38.187.210])
 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
 (No client certificate requested)
 by shepard.synsport.net (Postfix) with ESMTP id 8364843BC7;
 Mon, 23 Nov 2015 05:35:19 -0600 (CST)
Subject: Re: svn commit: r401087 - head/security/putty
To: Matthias Andree <mandree@FreeBSD.org>, ports-committers@freebsd.org,
 svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
References: <201511090918.tA99IMFA014333@repo.freebsd.org>
From: John Marino <freebsd.contact@marino.st>
X-Enigmail-Draft-Status: N1110
Reply-To: marino@freebsd.org
Message-ID: <5652F9F4.3030201@marino.st>
Date: Mon, 23 Nov 2015 12:35:16 +0100
User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101
 Thunderbird/38.0.1
MIME-Version: 1.0
In-Reply-To: <201511090918.tA99IMFA014333@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2015 11:35:27 -0000

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>