From owner-svn-ports-head@freebsd.org Thu Sep 22 17:55:04 2016 Return-Path: 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 9B183BE56F8; Thu, 22 Sep 2016 17:55:04 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F059D0E; Thu, 22 Sep 2016 17:55:04 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8MHt3Of022205; Thu, 22 Sep 2016 17:55:03 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8MHt3Xb022202; Thu, 22 Sep 2016 17:55:03 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201609221755.u8MHt3Xb022202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 22 Sep 2016 17:55:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422637 - in head/sysutils/vagrant: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Sep 2016 17:55:04 -0000 Author: swills Date: Thu Sep 22 17:55:03 2016 New Revision: 422637 URL: https://svnweb.freebsd.org/changeset/ports/422637 Log: sysutils/vagrant: pull in upstream bugfix for ssh auth issues PR: 212754 Approved by: joe@thrallingpenguin.com (maintainer) Added: head/sysutils/vagrant/files/patch-plugins_guests_bsd_cap_public__key.rb (contents, props changed) head/sysutils/vagrant/files/patch-plugins_guests_linux_cap_public__key.rb (contents, props changed) Modified: head/sysutils/vagrant/Makefile Modified: head/sysutils/vagrant/Makefile ============================================================================== --- head/sysutils/vagrant/Makefile Thu Sep 22 17:17:44 2016 (r422636) +++ head/sysutils/vagrant/Makefile Thu Sep 22 17:55:03 2016 (r422637) @@ -3,7 +3,7 @@ PORTNAME= vagrant PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= sysutils rubygems devel Added: head/sysutils/vagrant/files/patch-plugins_guests_bsd_cap_public__key.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/vagrant/files/patch-plugins_guests_bsd_cap_public__key.rb Thu Sep 22 17:55:03 2016 (r422637) @@ -0,0 +1,10 @@ +--- plugins/guests/bsd/cap/public_key.rb.orig 2016-09-16 14:28:57 UTC ++++ plugins/guests/bsd/cap/public_key.rb +@@ -54,6 +54,7 @@ module VagrantPlugins + if test -f ~/.ssh/authorized_keys; then + grep -v -x -f '#{remote_path}' ~/.ssh/authorized_keys > ~/.ssh/authorized_keys.tmp + mv ~/.ssh/authorized_keys.tmp ~/.ssh/authorized_keys ++ chmod 0600 ~/.ssh/authorized_keys + fi + + rm -f '#{remote_path}' Added: head/sysutils/vagrant/files/patch-plugins_guests_linux_cap_public__key.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/vagrant/files/patch-plugins_guests_linux_cap_public__key.rb Thu Sep 22 17:55:03 2016 (r422637) @@ -0,0 +1,10 @@ +--- plugins/guests/linux/cap/public_key.rb.orig 2016-09-16 14:28:57 UTC ++++ plugins/guests/linux/cap/public_key.rb +@@ -54,6 +54,7 @@ module VagrantPlugins + if test -f ~/.ssh/authorized_keys; then + grep -v -x -f '#{remote_path}' ~/.ssh/authorized_keys > ~/.ssh/authorized_keys.tmp + mv ~/.ssh/authorized_keys.tmp ~/.ssh/authorized_keys ++ chmod 0600 ~/.ssh/authorized_keys + fi + + rm -f '#{remote_path}'