Skip to content

Commit

Permalink
security/putty: update to snapshot 20221023
Browse files Browse the repository at this point in the history
FreeBSD-relevant changes since previous snapshot:
* 75ac4443 2022-10-22 | Document subdomain matching of cert expr wildcards. [Jacob Nevins]
* 500568d2 2022-10-22 | Docs: fix trivial typo from 6472f7fc77. [Jacob Nevins]
* 5f3b743e 2022-10-21 | Tweak certified-host-key prompt. [Jacob Nevins]
* bb1ebc9b 2022-10-21 | Docs: tweak certified-host-key warning responses. [Jacob Nevins]
* 5716c638 2022-10-21 | Docs: cross-reference host-key warning sections. [Jacob Nevins]
* 8c534c26 2022-10-21 | Docs: note "wrong host key" warning is stronger. [Jacob Nevins]
* 1d1d81d6 2022-10-21 | Fix regressions in Gtk host key "More info". [Jacob Nevins]
* dc9ab5e0 2022-10-21 | Rename NTRU Prime / Curve25519 kex in UI. [Jacob Nevins]
* 6472f7fc 2022-10-21 | Docs: update Pageant key list description. [Jacob Nevins]
* 5d5a6a8f 2022-10-21 | Docs: MD5 is forced for SSH-1 key fingerprints. [Jacob Nevins]
* d4298308 2022-10-21 | Docs: prime generation defaults are usually fine. [Jacob Nevins]
* 2b5b7b5c 2022-10-21 | Docs: note warning about <2048-bit RSA/DSA keys. [Jacob Nevins]
* 617bf732 2022-10-21 | Docs: PuTTYgen: fix gratuitous exclusion of PSFTP. [Jacob Nevins]
* 11950739 2022-10-21 | Docs: add index alias for "ECDSA". [Jacob Nevins]
* 4af8a585 2022-10-20 | cmdgen: Fix docs and usage messages. [Jacob Nevins]
* 68c97fb2 2022-10-19 | Fix installing man pages from our tarballs. [Jacob Nevins]
* 2222cd10 2022-10-12 | AES-GCM NEON: cope with missing vaddq_p128. [Simon Tatham]

While here, fix PORTVERSION->DISTVERSION to get rid of the tilde
that confuses pkg(8).

And while it may not fix the issue, I still want this commit log
to appear in
PR:		267253
  • Loading branch information
mandree committed Oct 23, 2022
1 parent 5759034 commit 765de7a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 82 deletions.
28 changes: 14 additions & 14 deletions security/putty/Makefile
@@ -1,7 +1,6 @@
PORTNAME= putty
PORTVERSION= 0.78~pre20220922
DISTVERSIONSUFFIX= .9fcfd67
PORTREVISION= 1
DISTVERSION= 0.78~pre20221023
DISTVERSIONSUFFIX= .0c59d49
CATEGORIES= security
#MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
# ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
Expand Down Expand Up @@ -37,9 +36,7 @@ PLIST_FILES= bin/pageant \
OPTIONS_DEFINE= GTK3
OPTIONS_DEFAULT= GSSAPI_BASE GTK3
OPTIONS_SINGLE= GSSAPI_SELECT
OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_BASE \
GSSAPI_HEIMDAL \
GSSAPI_MIT \
OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT \
GSSAPI_NONE

.include <bsd.port.options.mk>
Expand Down Expand Up @@ -74,26 +71,29 @@ CMAKE_ARGS+= -DPUTTY_GTK_VERSION:STRING=NONE

.if ${PORT_OPTIONS:MGSSAPI_BASE} # Heimdal-like in base system
USES+= gssapi:base,flags
CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC -DKRB5_CONFIG:PATH=${KRB5CONFIG}
CMAKE_ARGS+= -DKRB5_CONFIG:PATH=${KRB5CONFIG} \
-DPUTTY_GSSAPI:STRING=STATIC
.elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
USES+= gssapi:heimdal,flags
CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC -DKRB5_CONFIG:PATH=${KRB5CONFIG}
CMAKE_ARGS+= -DKRB5_CONFIG:PATH=${KRB5CONFIG} \
-DPUTTY_GSSAPI:STRING=STATIC
.elif ${PORT_OPTIONS:MGSSAPI_MIT}
USES+= gssapi:mit,flags
CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC -DKRB5_CONFIG:PATH=${KRB5CONFIG}
CMAKE_ARGS+= -DKRB5_CONFIG:PATH=${KRB5CONFIG} \
-DPUTTY_GSSAPI:STRING=STATIC
.else
CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=OFF
.endif

post-patch:
# we don't want to inherit FreeBSD commits
# as PUTTY Git commit revisions,
# so pretend we do not have Git:
# we don't want to inherit FreeBSD commits
# as PUTTY Git commit revisions,
# so pretend we do not have Git:
${REINPLACE_CMD} '/FindGit/d' \
${WRKSRC}/cmake/setup.cmake \
${WRKSRC}/doc/CMakeLists.txt
# nuke pkg-config detection of GSSAPI/Kerberos libs,
# it interferes with FreeBSD's krb5-config approach
# nuke pkg-config detection of GSSAPI/Kerberos libs,
# it interferes with FreeBSD's krb5-config approach
${REINPLACE_CMD} '/pkg_check_modules(KRB5 krb5-gssapi)/d' \
${WRKSRC}/cmake/platforms/unix.cmake

Expand Down
6 changes: 3 additions & 3 deletions security/putty/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1663867740
SHA256 (putty-0.78~pre20220922.9fcfd67.tar.gz) = 6ec5ed3c341cd4c815f7233fbc51bc925accf433fe58e233aa3eb67078994f5c
SIZE (putty-0.78~pre20220922.9fcfd67.tar.gz) = 2811211
TIMESTAMP = 1666518096
SHA256 (putty-0.78~pre20221023.0c59d49.tar.gz) = 205c9a7462d4e4ef8808cf7b2c485d3c30dfb6783625323e3b39b047c867f8aa
SIZE (putty-0.78~pre20221023.0c59d49.tar.gz) = 2814676
65 changes: 0 additions & 65 deletions security/putty/files/patch-vaddq_p128

This file was deleted.

0 comments on commit 765de7a

Please sign in to comment.