D15053.id41417.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15053.id41417.diff
View Options

	Index: security/openssh-portable/Makefile
	===================================================================
	--- security/openssh-portable/Makefile
	+++ security/openssh-portable/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= openssh
	DISTVERSION= 7.7p1
	-PORTREVISION= 0
	+PORTREVISION= 1
	PORTEPOCH= 1
	CATEGORIES= security ipv6
	MASTER_SITES= OPENBSD/OpenSSH/portable
	Index: security/openssh-portable/files/patch-ssh.c
	===================================================================
	--- security/openssh-portable/files/patch-ssh.c
	+++ security/openssh-portable/files/patch-ssh.c
	@@ -5,11 +5,11 @@

	Canonicize the host name before looking it up in the host file.

	---- ssh.c.orig 2010-08-16 09:59:31.000000000 -0600
	-+++ ssh.c 2010-08-25 17:55:01.000000000 -0600
	-@@ -699,6 +699,23 @@
	- "h", host, (char *)NULL);
	- }
	+--- ssh.c.orig 2018-04-02 05:38:28 UTC
	++++ ssh.c
	+@@ -1281,6 +1281,23 @@ main(int ac, char **av)
	+ ssh_digest_free(md);
	+ conn_hash_hex = tohex(conn_hash, ssh_digest_bytes(SSH_DIGEST_SHA1));

	+ /* Find canonic host name. */
	+ if (strchr(host, '.') == 0) {
	@@ -28,6 +28,6 @@
	+ }
	+ }
	+
	- if (options.local_command != NULL) {
	- char thishost[NI_MAXHOST];
	-
	+ /*
	+ * Expand tokens in arguments. NB. LocalCommand is expanded later,
	+ * after port-forwarding is set up, so it may pick up any local