From 62a24ed165ea675cc2c054f11d63fdcea75d8619 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Fri, 11 Aug 2017 12:58:55 +0000 Subject: [PATCH] Update to 0.70, and make GSSAPI impl. selectable. PR: 220838 Submitted by: cy@ --- security/putty/Makefile | 20 +++++++++++++++----- security/putty/distinfo | 6 +++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/security/putty/Makefile b/security/putty/Makefile index 2e0693b40a3d..338deffb7b63 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= putty -PORTVERSION= 0.69 -PORTREVISION= 1 +PORTVERSION= 0.70 CATEGORIES= security ipv6 MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \ ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ @@ -24,8 +23,11 @@ CPE_VENDOR= simon_tatham PLIST_FILES= bin/plink bin/pscp bin/psftp bin/puttygen PLIST_FILES+= man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man1/puttygen.1.gz -OPTIONS_DEFINE= GSSAPI GTK3 -OPTIONS_DEFAULT=GSSAPI GTK3 +OPTIONS_DEFINE= GTK3 +OPTIONS_DEFAULT=GSSAPI_BASE GTK3 +OPTIONS_SINGLE= GSSAPI_SELECT +OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \ + GSSAPI_MIT CONFLICTS_INSTALL?= pssh-[0-9]* putty-nogtk-[0-9]* @@ -52,10 +54,18 @@ DESKTOP_ENTRIES="PuTTY" \ MAKE_ARGS+= GTK_CONFIG=: .endif -.if ${PORT_OPTIONS:MGSSAPI} +.if ${PORT_OPTIONS:MGSSAPI_BASE} _COMPAT= -DSTATIC_GSSAPI USES+= gssapi:base,flags MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG} +.elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL} +_COMPAT= -DSTATIC_GSSAPI +USES+= gssapi:heimdal,flags +MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG} +.elif ${PORT_OPTIONS:MGSSAPI_MIT} +_COMPAT= -DSTATIC_GSSAPI +USES+= gssapi:mit,flags +MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG} .else _COMPAT= -DNO_GSSAPI .endif diff --git a/security/putty/distinfo b/security/putty/distinfo index 58cd447b0ef4..29f6624e99a5 100644 --- a/security/putty/distinfo +++ b/security/putty/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1493852442 -SHA256 (putty-0.69.tar.gz) = b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1 -SIZE (putty-0.69.tar.gz) = 2122306 +TIMESTAMP = 1500391843 +SHA256 (putty-0.70.tar.gz) = bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be +SIZE (putty-0.70.tar.gz) = 2386108