Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Sep 2016 17:55:03 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r422637 - in head/sysutils/vagrant: . files
Message-ID:  <201609221755.u8MHt3Xb022202@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}'



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609221755.u8MHt3Xb022202>