diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-04-10 04:19:17 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-04-10 04:19:17 +0800 |
| commit | 0e1132211deb85e46a6150371d5ee80c1beff020 (patch) | |
| tree | 84afc0d0116ec67d85a529492cb2b16bea69e4f2 /security/openssh-portable | |
| parent | 0e65416652095180cf53f182f518a66234ad87a1 (diff) | |
| download | freebsd-ports-gnome-0e1132211deb85e46a6150371d5ee80c1beff020.tar.gz freebsd-ports-gnome-0e1132211deb85e46a6150371d5ee80c1beff020.tar.zst freebsd-ports-gnome-0e1132211deb85e46a6150371d5ee80c1beff020.zip | |
Limit the TTSSH bug fix in r383618 to only versions that have it.
Submitted by: IWAMOTO Kouichi <sue@iwmt.org>
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/files/extra-patch-ttssh | 25 |
2 files changed, 21 insertions, 6 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index cbe3237ca4db..5fadb9581c30 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.8p1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} diff --git a/security/openssh-portable/files/extra-patch-ttssh b/security/openssh-portable/files/extra-patch-ttssh index bfa330831640..632f24a54c9f 100644 --- a/security/openssh-portable/files/extra-patch-ttssh +++ b/security/openssh-portable/files/extra-patch-ttssh @@ -1,11 +1,26 @@ ---- compat.c.orig 2015-04-08 21:02:53.327154000 -0500 -+++ compat.c 2015-04-08 21:03:58.915062000 -0500 -@@ -167,6 +167,8 @@ +Workaround TTSSH client crash with hostkeys-00@openssh.com messages in +OpenSSH 6.8p1. + + http://en.sourceforge.jp/ticket/browse.php?group_id=1412&tid=35010 + http://en.sourceforge.jp/projects/ttssh2/scm/svn/commits/5829 + +--- compat.c.orig 2015-03-17 00:49:20.000000000 -0500 ++++ compat.c 2015-04-09 15:13:35.061239000 -0500 +@@ -167,6 +167,17 @@ compat_datafellows(const char *version) SSH_BUG_SCANNER }, { "Probe-*", SSH_BUG_PROBE }, -+ { "TTSSH/*", -+ SSH_BUG_HOSTKEYS }, ++ { "TTSSH/1.5.*," ++ "TeraTerm SSH*," ++ "TTSSH/2.1*," ++ "TTSSH/2.2*," ++ "TTSSH/2.3*," ++ "TTSSH/2.4*," ++ "TTSSH/2.5*," ++ "TTSSH/2.6*," ++ "TTSSH/2.70*," ++ "TTSSH/2.71*," ++ "TTSSH/2.72*", SSH_BUG_HOSTKEYS }, { NULL, 0 } }; |