diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-25 22:06:00 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-25 22:11:35 +0200 |
commit | a26ffb006b8d3c2d1f3c52345783a8d043b828cd (patch) | |
tree | 9f64f557cc74b3c3feffcfc3ea765c0c4f8d3daf /pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch | |
parent | fffabfaefd2955647c4c15a0ee9913f1834d4177 (diff) | |
download | nixpkgs-a26ffb006b8d3c2d1f3c52345783a8d043b828cd.tar nixpkgs-a26ffb006b8d3c2d1f3c52345783a8d043b828cd.tar.gz nixpkgs-a26ffb006b8d3c2d1f3c52345783a8d043b828cd.tar.bz2 nixpkgs-a26ffb006b8d3c2d1f3c52345783a8d043b828cd.tar.lz nixpkgs-a26ffb006b8d3c2d1f3c52345783a8d043b828cd.tar.xz nixpkgs-a26ffb006b8d3c2d1f3c52345783a8d043b828cd.tar.zst nixpkgs-a26ffb006b8d3c2d1f3c52345783a8d043b828cd.zip |
vagrant: 2.2.9 -> 2.2.10
ChangeLog: https://github.com/hashicorp/vagrant/blob/v2.2.10/CHANGELOG.md#2210-august-24-2020 Apart from the usual `gemset`-update the following patches were altered: * Deprecation fix on ruby 2.6.5: was removed since the underlying issue was fixed upstream. * 0004-Support-system-installed-plugins.patch: re-downloaded the rebased version from `salsa.debian.org`[1] where we originally obtained the patch from. * use-system-bundler-version: re-applied on top of Vagrant 2.2.10. [1] https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch
Diffstat (limited to 'pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch')
-rw-r--r-- | pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch index f87ff5135b3..fa6555c594e 100644 --- a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch +++ b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch @@ -1,7 +1,7 @@ From: Antonio Terceiro <terceiro@debian.org> Date: Wed, 27 May 2015 09:36:17 -0300 Subject: Support system-installed plugins -Source: https://salsa.debian.org/ruby-team/vagrant/blob/cb672c6dc0c63f6552c5ec4d6d7d22929d353503/debian/patches/0004-Support-system-installed-plugins.patch +Source: https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch Plugins must be installed as regular Ruby libraries, and they must contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the @@ -22,7 +22,7 @@ following content: 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb -index 567347d..d9d76a0 100644 +index 9058e68..2772131 100644 --- a/lib/vagrant/plugin/manager.rb +++ b/lib/vagrant/plugin/manager.rb @@ -18,7 +18,7 @@ module Vagrant @@ -80,7 +80,7 @@ index c6872d4..935d431 100644 end # Add a plugin that is installed to the state file. -@@ -107,6 +123,14 @@ module Vagrant +@@ -107,6 +123,10 @@ module Vagrant f.close FileUtils.mv(f.path, @path) end @@ -88,10 +88,6 @@ index c6872d4..935d431 100644 + # Ignore permission denied against system-installed plugins; regular + # users are not supposed to write there. + raise unless @system -+ rescue Errno::EROFS -+ # Ignore read-only filesystem against system-installed plugins; regular -+ # users are not supposed to write there. -+ raise unless @system end protected |