commit vagrant for openSUSE:Factory

Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2018-07-06 10:42:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vagrant" Fri Jul 6 10:42:03 2018 rev:8 rq:620645 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2018-01-30 15:44:46.413568862 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new/vagrant.changes 2018-07-06 10:42:06.199247052 +0200 @@ -1,0 +2,301 @@ +Sun Jul 1 16:55:53 UTC 2018 - opensuse_buildservice@ojkastl.de + +- added patch 0027-now-use-rubygem-net-ssh-5.0.x.patch to allow builds with latest version of net-ssh in Tumbleweed + +------------------------------------------------------------------- +Mon Jun 4 09:38:13 UTC 2018 - opensuse_buildservice@ojkastl.de + +- replace shebang in /usr/lib64/ruby/gems/*/gems/vagrant-2.1.1/.runner.sh +- remove shebang in /etc/bash_completion.d/vagrant.sh + +------------------------------------------------------------------- +Mon Jun 4 09:06:27 UTC 2018 - opensuse_buildservice@ojkastl.de + +- added patch 0026-remove-dependency-on-win32-file.patch + +------------------------------------------------------------------- +Mon Jun 4 07:36:34 UTC 2018 - opensuse_buildservice@ojkastl.de + +- update to 2.1.1 + IMPROVEMENTS: + - guest/linux: Support builtin vboxsf module for shared folders [GH-9800] + - host/windows: Update SMB capability to work without Get-SmbShare cmdlet [GH-9785] + BUG FIXES: + - core/triggers: Initialize internal trigger object for machine before initializing provider [GH-9784] + - core/triggers: Ensure internal trigger fire does not get called if plugin installed [GH-9799] + - provider/hyperv: Call import script with switchid instead of switchname [GH-9781] + +------------------------------------------------------------------- +Mon Jun 4 07:32:50 UTC 2018 - opensuse_buildservice@ojkastl.de + +- update to 2.1.0 + FEATURES: + - core: Integrate vagrant-triggers plugin functionality into core Vagrant [GH-9713] + IMPROVEMENTS: + - core: Improve messaging around not finding requested provider [GH-9735] + - core: Disable exception reports by default [GH-9738] + - core: Continue on if vagrant fails to parse metadata box for update [GH-9760] + - hosts/linux: Support RDP capability within WSL [GH-9758] + - hosts/windows: Add SMB default mount options capability and set default version to 2.0 [GH-9734] + - provider/hyperv: Include neighbor check for MAC on guest IP detection [GH-9737] + - provider/virtualbox: Do not require VirtualBox availability within WSL [GH-9759] + - provisioner/chef_zero: Support arrays for data_bags_path [GH-9669] + - util/downloader: Don't raise error if response is HTTP 416 [GH-9729] + - util/platform: Update Hyper-V enabled check [GH-9746] + BUG FIXES: + - communicators/ssh: Log error and proceed on Windows private key permissions [GH-9769] + - middleware/authentication: Prevent URL modification when no changes are required [GH-9730] + - middleware/authentication: Ignore URLs which cannot be parsed [GH-9739] + - provider/hyperv: Reference switches by ID instead of name [GH-9747] + - provider/docker: Use Util::SafeExec if docker-exec is run with -t option [GH-9761] + - provisioner/chef: Trim drive letter from path on Windows [GH-9766] + - provisioner/puppet: Properly finalize structured_facts config option [GH-9720] + - util/platform: Fix original WSL to Windows path for "root" directory [GH-9696] + +------------------------------------------------------------------- +Mon Jun 4 07:26:24 UTC 2018 - opensuse_buildservice@ojkastl.de + +- update to 2.0.4 + FEATURES: + - core: Vagrant aliases [GH-9504] + IMPROVEMENTS: + - communicators/ssh: Update file permissions when generating new key pairs [GH-9676] + - core: Make resolv-replace usage opt-in instead of opt-out [GH-9644] + - core: Suppress error messages from checkpoint runs [GH-9645] + - guests/coreos: Identify operating systems closely related to CoreOS [GH-9600] + - guests/debian: Adjust network configuration file prefix to 50- [GH-9646] + - guests/photon: Less specific string grep to fix PhotonOS 2.0 detection [GH-9528] + - guests/windows: Fix slow timeout when updating windows hostname [GH-9578] + - hosts/windows: Make powershell version detection timeout configurable [GH-9506] + - providers/virtualbox: Improve network collision error message [GH-9685] + - provisioner/chef_solo: Improve Windows drive letter removal hack for remote paths[GH-9490] + - provisioner/chef_zero: File path expand all chef_zero config path options [GH-9690] + - provisioner/puppet: Puppet structured facts toyaml on provisioner [GH-9670] + - provisioner/salt: Add master_json_config & minion_json_config options [GH-9420] + - util/platform: Warn on ArgumentError exceptions from encoding [GH-9506] + BUG FIXES: + - commands/package: Fix uninitialized constant error [GH-9654] + - communicators/winrm: Fix command filter to properly parse commands [GH-9673] + - hosts/windows: Properly respect the VAGRANT_PREFER_SYSTEM_BIN environment variable [GH-9503] + - hosts/windows: Fix virtualbox shared folders path for windows guests [GH-8099] + - guests/freebsd: Fix typo in command that manages configuring networks [GH-9705] + - util/checkpoint_client: Respect VAGRANT_CHECKPOINT_DISABLE environment variable [GH-9659] + - util/platform: Use --version instead of version for WSL validation [GH-9674] +- rebased patch 0024-do-not-depend-on-wdm.patch + +------------------------------------------------------------------- +Mon Jun 4 06:09:16 UTC 2018 - opensuse_buildservice@ojkastl.de + +- update to version 2.0.3 + -> removed patch 0006-Relax-dependency-resolution.patch + + IMPROVEMENTS: + - guests/solaris: More explicit Solaris 11 and inherit SmartOS from Solaris [GH-9398] + - hosts/windows: Add support for latest WSL release [GH-9525, GH-9300] + - plugins/login: Update middleware to re-map hosts and warn on custom server [GH-9499] + - providers/hyper-v: Exit if Hyper-V is enabled and VirtualBox provider is used [GH-9456] + - provisioners/salt: Change to a temporary directory before downloading script files [GH-9351] + - sycned_folders/nfs: Default udp to false when using version 4 [GH-8828] + - util/downloader: Notify on host redirect [GH-9344] + + BUG FIXES: + - core: Use provider override when specifying box_version [GH-9502] + - guests/debian: Renew DHCP lease on hostname change [GH-9405] + - guests/debian: Point hostname to 127.0.1.1 in /etc/hosts [GH-9404] + - guests/debian: Update systemd? check for guest inspection [GH-9459] + - guests/debian: Use ip route in dhcp template [GH-8730] + - guests/gentoo: Disable if/netplugd when setting up a static ip on a gentoo guest using openrc [GH-9261] + - guests/openbsd: Atomically apply new hostname.if(5) [GH-9265] + - hosts/windows: Fix halt problem when determining powershell version on old powershells [GH-9470] + - hosts/windows: Convert to windows path if on WSL during vbox export [GH-9518] + - providers/virtualbox: Fix hostonly matching not respecting :name argument [GH-9302] + - util/credential_scrubber: Ignore empty strings [GH-9472, GH-9462] + +------------------------------------------------------------------- +Mon Jun 4 06:03:31 UTC 2018 - opensuse_buildservice@ojkastl.de + +- do no longer use /usr/share/vim/current for vagrant-vim, rather use the approach used by + package openSUSE:Leap:15.0/vim-plugins: %{_datadir}/vim/site/plugin/ + +------------------------------------------------------------------- +Sun May 13 19:54:25 UTC 2018 - opensuse_buildservice@ojkastl.de + +- re-added vim_data_dir macro until there is a better way to do this + +------------------------------------------------------------------- +Wed May 9 11:00:53 UTC 2018 - opensuse_buildservice@ojkastl.de + +- removed definition for vim_data_dir from spec file, to get rid of conflicts with vim80 package + +------------------------------------------------------------------- +Wed May 2 10:56:24 UTC 2018 - jengelh@inai.de + +- Use noun phrase in summary. +- Substitute obsolete %__-type macro indirections. + +------------------------------------------------------------------- +Thu Mar 1 21:34:53 UTC 2018 - opensuse_buildservice@ojkastl.de + +- removed some files during %install to avoid warnings on SLES12/Leap42.x + +------------------------------------------------------------------- +Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de + +- update to version 2.0.2 + -> removed patch 0001-Disable-Checkpoint.patch that has been upstreamed + -> removed patch 0031-allow-builds-with-ruby2.5.patch + + FEATURES: + - core: Provide mechanism for removing sensitive data from output [GH-9276] + - core: Relax Ruby constraints to include 2.5 [GH-9363] + - core: Hide sensitive values in output [GH-9369] + - command/init: Support custom Vagrantfile templates [GH-9202] + - guests: Add support for the Haiku operating system [GH-7805, GH-9245] + - synced_folders/smb: Add support for macOS hosts [GH-9294] + - vagrant-spec: Update vagrant-spec to include Windows platforms and updated linux boxes [GH-9183] + + IMPROVEMENTS: + - config/ssh: Deprecate :paranoid in favor of :verify_host_key [GH-9341] + - core: Add optional timestamp prefix on log output [GH-9269] + - core: Print more helpful error message for NameEror exceptions in Vagrantfiles [GH-9252] + - core: Update checkpoint implementation to announce updates and support notifications [GH-9380] + - core: Use Ruby's Resolv by default [GH-9394] + - docs: Include virtualbox 5.2.x as supported in docs [GH-9237] + - docs: Improve how to pipe debug log on powershell [GH-9330] + - guests/amazon: Improve guest detection [GH-9307] + - guests/debian: Update guest configure networks [GH-9338] + - guests/dragonflybsd: Base guest on FreeBSD to inherit more functionality [GH-9205] + - guests/linux: Improve NFS service name detection and interactions [GH-9274] + - guests/linux: Support mount option overrides for SMB mounts [GH-9366] + - guests/linux: Use `ip` for reading guest address if available [GH-9315] + - guests/solaris: Improve guest detection for alternatives [GH-9295] + - hosts/windows: Check credentials during SMB prepare [GH-9365] + - providers/hyper-v: Ensure Hyper-V cmdlets are fully qualified [GH-8863] + - middleware/authentication: Add app.vagrantup.com to allowed hosts [GH-9145] + - provisioners/shell: Support hiding environment variable values in output [GH-9367] + - providers/virtualbox: Add a clean error message for invalid IP addresses [GH-9275] + - providers/virtualbox: Introduce flag for SharedFoldersEnableSymlinksCreate setting [GH-9354] + - providers/virtualbox: Provide warning for SharedFoldersEnableSymlinksCreate setting [GH-9389] + - provisioners/salt: Fixes timeout issue in salt bootstrapping for windows [GH-8992] + - synced_folders/smb: Update Windows implementation [GH-9294] + - util/ssh: Attempt to locate local ssh client before attempting installer provided [GH-9400] + + BUG FIXES: + - commands/box: Show all box providers with `update outdated --global` [GH-9347] + - commands/destroy: Exit 0 if vagrant destroy finds no running vms [GH-9251] + - commands/package: Fix --output path with specified folder [GH-9131] + - guests/suse: Do not use full name when setting hostname [GH-9212] + - providers/hyper-v: Fix enable virtualization extensions on import [GH-9255] + - provisioners/ansible(both): Fix broken 'ask_sudo_pass' option [GH-9173] + +------------------------------------------------------------------- +Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de + +- added patch 0031-allow-builds-with-ruby2.5.patch to allow building with ruby2.5 + +------------------------------------------------------------------- +Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de ++++ 104 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/vagrant/vagrant.changes ++++ and /work/SRC/openSUSE:Factory/.vagrant.new/vagrant.changes Old: ---- 0001-Disable-Checkpoint.patch 0006-Relax-dependency-resolution.patch 0010-virtualbox-5.2-support.patch 0020-also-build-with-ruby2.4.patch 0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch 0022-Do-not-use-deprecated-API.patch vagrant-1.9.7.tar.gz New: ---- 0026-remove-dependency-on-win32-file.patch 0027-now-use-rubygem-net-ssh-5.0.x.patch vagrant-2.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.11eoXT/_old 2018-07-06 10:42:06.755246390 +0200 +++ /var/tmp/diff_new_pack.11eoXT/_new 2018-07-06 10:42:06.759246385 +0200 @@ -19,60 +19,74 @@ %define mod_name vagrant %define mod_full_name %{mod_name}-%{version} -%{!?vim_data_dir:%global vim_data_dir /usr/share/vim/%(readlink /usr/share/vim/current)} +# +# Use +# +%global vim_data_dir %{_datadir}/vim/site/plugin/ Name: vagrant -Version: 1.9.7 +Version: 2.1.1 Release: 0 -Summary: Build and distribute virtualized development environments +Summary: Tool for building and distributing virtualized development environments License: MIT Group: Development/Languages/Ruby -Url: https://github.com/mitchellh/vagrant -Source0: https://github.com/mitchellh/vagrant/archive/v%{version}/%{mod_name}-%{version}.tar.gz -Source2: vagrant.1 -Source3: README.SUSE +Url: https://github.com/hashicorp/vagrant +Source0: https://github.com/hashicorp/vagrant/archive/v%{version}.tar.gz#/%{mod_name}-%{version}.tar.gz +Source11: vagrant.1 +Source98: README.SUSE Source99: %{name}-rpmlintrc Provides: rubygem-vagrant = %{version} Obsoletes: rubygem-vagrant < %{version} Recommends: vagrant-libvirt # -Patch1: 0001-Disable-Checkpoint.patch Patch2: 0002-bin-vagrant-silence-warning-about-installer.patch Patch3: 0003-Use-a-private-temporary-dir.patch Patch4: 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch -Patch6: 0006-Relax-dependency-resolution.patch Patch8: 0008-Read-data-from-usr-share-vagrant.patch Patch9: 0009-plugins-don-t-abuse-require_relative.patch -Patch10: 0010-virtualbox-5.2-support.patch # # # try building with ruby2.4 -Patch20: 0020-also-build-with-ruby2.4.patch -Patch21: 0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch -Patch22: 0022-Do-not-use-deprecated-API.patch Patch23: 0023-vbox-fix-package.patch Patch24: 0024-do-not-depend-on-wdm.patch Patch25: 0025-do-not-abuse-relative-paths-in-docker-plugin.patch +Patch26: 0026-remove-dependency-on-win32-file.patch +Patch27: 0027-now-use-rubygem-net-ssh-5.0.x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +# force only one ruby version %define rb_build_versions %rb_default_ruby %define rb_build_abi %rb_default_ruby_abi # BuildRequires: %{ruby >= 2.0.0} +# +# +# BuildRequires: %{rubygem bundler} -BuildRequires: %{rubygem childprocess <= 0.7 } +# s.add_dependency "childprocess", "~> 0.6.0" +BuildRequires: %{rubygem childprocess:0.6 } BuildRequires: %{rubygem crack } -# Prevent have choice for rubygem(ruby:2.2.0:erubis) -BuildRequires: %{rubygem erubis >= 2.7} -BuildRequires: %{rubygem fake_ftp < 0.3} -BuildRequires: %{rubygem hashicorp-checkpoint} -BuildRequires: %{rubygem i18n <= 0.8 } -BuildRequires: %{rubygem listen >= 3.1.5} -BuildRequires: %{rubygem log4r} -# Prevent have choice for rubygem(ruby:2.2.0:net-scp) -BuildRequires: %{rubygem net-scp >= 1.2} -BuildRequires: %{rubygem net-sftp} -BuildRequires: %{rubygem net-ssh:4.1} +# s.add_dependency "erubis", "~> 2.7.0" +BuildRequires: %{rubygem erubis:2.7 } +# s.add_development_dependency "fake_ftp", "~> 0.1" +BuildRequires: %{rubygem fake_ftp:0.1 } +# s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" +BuildRequires: %{rubygem hashicorp-checkpoint:0.1.5 } +# s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0" +BuildRequires: %{rubygem i18n < 0.8 } +BuildRequires: %{rubygem i18n >= 0.6 } +# s.add_dependency "listen", "~> 3.1.5" +BuildRequires: %{rubygem listen:3.1.5 } +# s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" +BuildRequires: %{rubygem log4r < 1.1.11 } +BuildRequires: %{rubygem log4r >= 1.1.9 } +# s.add_dependency "net-scp", "~> 1.2.0" +BuildRequires: %{rubygem net-scp:1.2 } +# s.add_dependency "net-sftp", "~> 2.1" +BuildRequires: %{rubygem net-sftp:2.1 } +# s.add_dependency "net-ssh", "~> 4.2.0" +# patched to 5.0.x by 0027-now-use-rubygem-net-ssh-5.0.x.patch +BuildRequires: %{rubygem net-ssh:5.0} # Prevent have choice for rubygem(ruby:2.2.0:nokogiri) BuildRequires: %{rubygem nokogiri >= 1.7} # Prevent have choice for rubygem(ruby:2.1.0:mime-types) >= 1.16 @@ -82,20 +96,31 @@ # Prevent have choice for rubygem(ruby:2.4.0:builder) >= 2.1.2 BuildRequires: %{rubygem builder >= 3.1 } BuildRequires: ruby-macros >= 5 -# inotify should go here -#BuildRequires: %{rubygem rb-kqueue} -BuildRequires: %{rubygem rake <= 12.0 } -BuildRequires: %{rubygem rake >= 11.3 } -BuildRequires: %{rubygem rb-kqueue } -BuildRequires: %{rubygem rest-client} -BuildRequires: %{rubygem rspec <= 2.15 } +# s.add_development_dependency "rake", "~> 12.0.0" +BuildRequires: %{rubygem rake:12.0 } +# s.add_dependency "rb-kqueue", "~> 0.2.0" +BuildRequires: %{rubygem rb-kqueue:0.2 } +# s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" +BuildRequires: %{rubygem rest-client < 3.0} +BuildRequires: %{rubygem rest-client >= 1.6} +# s.add_development_dependency "rspec", "~> 3.5.0" +BuildRequires: %{rubygem rspec:3.5 } +# s.add_development_dependency "rspec-its", "~> 1.2.0" +BuildRequires: %{rubygem rspec-its:1.2 } +BuildRequires: %{rubygem rspec:3.5 } BuildRequires: %{rubygem ruby_dep <= 1.5 } # Intentionally removed, wdm only works on Windows # BuildRequires: %{rubygem wdm } -BuildRequires: %{rubygem webmock } -BuildRequires: %{rubygem winrm } -BuildRequires: %{rubygem winrm-elevated } -BuildRequires: %{rubygem winrm-fs } +# s.add_development_dependency "webmock", "~> 2.3.1" +BuildRequires: %{rubygem webmock:2.3 } +# s.add_dependency "winrm", "~> 2.1" +BuildRequires: %{rubygem winrm:2.1 } +# s.add_dependency "winrm-elevated", "~> 1.1" +BuildRequires: %{rubygem winrm-elevated:1.1 } +# s.add_dependency "winrm-fs", "~> 1.0" +BuildRequires: %{rubygem winrm-fs:1 } +# +# # Requires: %{rubygem childprocess} # Prevent have choice for rubygem(ruby:2.2.0:erubis) @@ -109,7 +134,6 @@ Requires: %{rubygem net-ssh} # Prevent have choice for rubygem(ruby:2.2.0:nokogiri) Requires: %{rubygem nokogiri >= 1.7} -# inotify should go here #Requires: %{rubygem rb-kqueue0} Requires: %{rubygem rest-client} # We don't require rubygem mime-types since it's pulled in transitively @@ -148,6 +172,7 @@ Summary: Vagrant bash autocompletion Group: Development/Languages/Ruby Supplements: packageand(vagrant:bash) +BuildRequires: bash Requires: bash BuildArch: noarch @@ -156,31 +181,26 @@ %prep %setup -q -n %{mod_full_name} -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch6 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 # # # -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 +%patch27 -p1 -cp %{SOURCE3} . +cp %{SOURCE98} . %build mv %{mod_name}.gemspec %{mod_full_name}.gemspec %gem_build mv %{mod_full_name}.gem %{_sourcedir} -bundle exec bin/vagrant --version %install # Tumbleweed OR Leap 42.2+ @@ -190,20 +210,22 @@ %gem_install -f %endif -%{__mkdir_p} %{buildroot}%{_mandir}/man1 -install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/vagrant.1 +mkdir -p %{buildroot}/%{_mandir}/man1 +install -m 644 %{SOURCE11} %{buildroot}%{_mandir}/man1/vagrant.1 install -D -d -m 0755 \ %{buildroot}%{_sysconfdir}/bash_completion.d/ \ - %{buildroot}%{vim_data_dir}/plugin/ \ %{buildroot}%{_datadir}/emacs/site-lisp/ +install -d -m 0777 \ + %{buildroot}%{vim_data_dir}/ \ + mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/bash/completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/%{mod_name}.sh -mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/vim/vagrantfile.vim %{buildroot}%{vim_data_dir}/plugin/%{mod_name}.vim +mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/vim/vagrantfile.vim %{buildroot}%{vim_data_dir}/%{mod_name}.vim mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/emacs/vagrant.el %{buildroot}%{_datadir}/emacs/site-lisp/%{mod_name}.el # Tumbleweed OR Leap 42.2+ -%if %suse_version >= 1320 || 0%{?sle_version} >= 120200 +%if %suse_version >= 1320 || 0%{?sle_version} >= 120000 mv -v %{buildroot}%{_bindir}/vagrant.%{rb_default_ruby_suffix} %{buildroot}%{_bindir}/vagrant %endif @@ -217,8 +239,19 @@ mkdir -p %{buildroot}%{_datadir}/%{name}-plugins/plugins.d echo "{}" > %{buildroot}%{_datadir}/%{name}-plugins/plugins.json -rm -rf %{buildroot}%{gem_base}/gems/%{mod_full_name}/.travis.yml -rm -rf %{buildroot}%{gem_base}/gems/%{mod_full_name}/.gitignore + +rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/.travis.yml +rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/.gitignore +rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/test/vagrant-spec/boxes/.keep +rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/bin/vagrant.orig +rm -f %{buildroot}%{_bindir}/vagrant.orig.%{rb_default_ruby_suffix} +rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/lib/vagrant/util.rb.orig + +# change shebang in /usr/lib64/ruby/gems/*/gems/vagrant-2.1.1/.runner.sh +sed -i '1 s/^.*$/#!\/bin\/bash/' %{buildroot}%{gem_base}/gems/%{mod_full_name}/.runner.sh + +# change shebang in /etc/bash_completion.d/vagrant.sh +sed -i '1d' %{buildroot}%{_sysconfdir}/bash_completion.d/%{mod_name}.sh %files %defattr(-,root,root,-) @@ -236,7 +269,7 @@ %files vim %defattr(-,root,root,-) -%{vim_data_dir}/plugin/%{mod_name}.vim +%{vim_data_dir}/%{mod_name}.vim %files emacs %defattr(-,root,root,-) ++++++ 0024-do-not-depend-on-wdm.patch ++++++ --- /var/tmp/diff_new_pack.11eoXT/_old 2018-07-06 10:42:06.783246357 +0200 +++ /var/tmp/diff_new_pack.11eoXT/_new 2018-07-06 10:42:06.783246357 +0200 @@ -1,11 +1,25 @@ -diff -ur vagrant-1.9.7.orig/vagrant.gemspec vagrant-1.9.7/vagrant.gemspec ---- vagrant-1.9.7.orig/vagrant.gemspec 2017-08-16 11:52:01.226243101 +0300 -+++ vagrant-1.9.7/vagrant.gemspec 2017-08-29 15:32:55.920511390 +0300 -@@ -27,7 +27,6 @@ +From 92ee846e1d5da65c75af6efef3f5ebdfa367158a Mon Sep 17 00:00:00 2001 +From: Johannes Kastl +Date: Mon, 4 Jun 2018 09:18:23 +0200 +Subject: [PATCH] do not depend on wdm + +Signed-off-by: Johannes Kastl +--- + vagrant.gemspec | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index 4096fd684..6b8736f6a 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -27,7 +27,6 @@ Gem::Specification.new do |s| s.add_dependency "net-scp", "~> 1.2.0" s.add_dependency "rb-kqueue", "~> 0.2.0" s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" - s.add_dependency "wdm", "~> 0.1.0" + s.add_dependency "win32-file", "~> 0.8.1" + s.add_dependency "win32-file-security", "~> 1.0.10" s.add_dependency "winrm", "~> 2.1" - s.add_dependency "winrm-fs", "~> 1.0" - s.add_dependency "winrm-elevated", "~> 1.1" +-- +2.17.1 + ++++++ 0026-remove-dependency-on-win32-file.patch ++++++

From e00908d36792ba0736ba20c3e1ebbf974a564cb2 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 11:04:54 +0200 Subject: [PATCH] remove dependency on win32-file*

Signed-off-by: Johannes Kastl --- vagrant.gemspec | 2 -- 1 file changed, 2 deletions(-) diff --git a/vagrant.gemspec b/vagrant.gemspec index 6b8736f6a..5f60fd0d8 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -27,8 +27,6 @@ Gem::Specification.new do |s| s.add_dependency "net-scp", "~> 1.2.0" s.add_dependency "rb-kqueue", "~> 0.2.0" s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" - s.add_dependency "win32-file", "~> 0.8.1" - s.add_dependency "win32-file-security", "~> 1.0.10" s.add_dependency "winrm", "~> 2.1" s.add_dependency "winrm-fs", "~> 1.0" s.add_dependency "winrm-elevated", "~> 1.1" -- 2.17.1 ++++++ 0027-now-use-rubygem-net-ssh-5.0.x.patch ++++++

From 54648b91f9531b6fd0a9639c0ec5d8331c79907c Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Sun, 1 Jul 2018 15:21:34 +0200 Subject: [PATCH] now use rubygem net-ssh 5.0.x

Signed-off-by: Johannes Kastl --- vagrant.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec index 4096fd684..f3a8d7d76 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency "listen", "~> 3.1.5" s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" - s.add_dependency "net-ssh", "~> 4.2.0" + s.add_dependency "net-ssh", "~> 5.0.0" s.add_dependency "net-sftp", "~> 2.1" s.add_dependency "net-scp", "~> 1.2.0" s.add_dependency "rb-kqueue", "~> 0.2.0" -- 2.18.0 ++++++ vagrant-1.9.7.tar.gz -> vagrant-2.1.1.tar.gz ++++++ ++++ 29718 lines of diff (skipped)