alvistack/v2.4.1

git clean -xdf git submodule sync --recursive git submodule update --recursive --init git submodule foreach --recursive git clean -xdf gem build vagrant.gemspec -o ../vagrant-2.4.1.gem bundle config set --local path ./bundle bundle install --verbose --standalone bundle config set --local cache_all true bundle config set --local cache_all_platforms true bundle cache mv ../vagrant-2.4.1.gem ./vendor/cache/ rm -rf .bundle bundle vendor/bundle Gemfile.lock tar zcvf ../vagrant_2.4.1.orig.tar.gz --exclude=.git . debuild -uc -us cp vagrant.spec ../vagrant_2.4.1-1.spec cp vagrant.rpmlintrc /osc/home\:alvistack/hashicorp-vagrant-2.4.1/ cp ../vagrant*2.4.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/hashicorp-vagrant-2.4.1/ rm -rf ../vagrant*2.4.1*.* See https://salsa.debian.org/ruby-team/vagrant/-/blob/master/debian/patches/0001-bin-vagrant-silence-warning-about-installer.patch See https://salsa.debian.org/ruby-team/vagrant/-/blob/master/debian/patches/0005-Relax-dependency-resolution.patch See https://build.opensuse.org/package/show/openSUSE:Factory/vagrant See hashicorp#13390 See hashicorp#13499 See hashicorp#13503 Signed-off-by: Wong Hoi Sing Edison <[email protected]>
alvistack · Sep 18, 2024 · 5c18229 · 5c18229
1 parent 720b68f
commit 5c18229
Show file tree

Hide file tree

Showing 37 changed files with 1,419 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,7 @@ lib/vagrant/vagrant_ssl.so
 
 # direnv directory
 .direnv
+
+bundle
+embedded
+vendor
diff --git a/Gemfile b/Gemfile
@@ -4,9 +4,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))
-  gem 'vagrant-spec', path: "../vagrant-spec"
-else
-  gem 'vagrant-spec', git: "https://github.com/hashicorp/vagrant-spec.git", branch: :main
-end
diff --git a/bin/vagrant b/bin/vagrant
@@ -221,11 +221,6 @@ begin
       end
     end
 
-    if !Vagrant.in_installer? && !Vagrant.very_quiet?
-      # If we're not in the installer, warn.
-      env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)
-    end
-
     # Acceptable experimental flag values include:
     #
     # Unset  - Disables experimental features

diff --git a/debian/.gitignore b/debian/.gitignore
@@ -0,0 +1,6 @@
+*.substvars
+*debhelper*
+.debhelper
+files
+vagrant
+tmp
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,5 @@
+vagrant (100:2.4.1-1) UNRELEASED; urgency=medium
+
+  * https://github.com/hashicorp/vagrant/releases/tag/v2.4.1
+
+ -- Wong Hoi Sing Edison <[email protected]>  Sat, 20 Jan 2024 11:04:06 +0800
diff --git a/debian/control b/debian/control
@@ -0,0 +1,31 @@
+Source: vagrant
+Section: admin
+Priority: optional
+Standards-Version: 4.5.0
+Maintainer: Wong Hoi Sing Edison <[email protected]>
+Homepage: https://github.com/hashicorp/vagrant/tags
+Vcs-Browser: https://github.com/alvistack/hashicorp-vagrant
+Vcs-Git: https://github.com/alvistack/hashicorp-vagrant.git
+Build-Depends:
+ debhelper,
+ debhelper-compat (= 10),
+ chrpath,
+ fdupes,
+ libffi-dev,
+ ruby-bundler,
+ ruby-dev (>= 3.0),
+
+Package: vagrant
+Architecture: amd64
+Description: Build and distribute virtualized development environments
+ Vagrant is a tool for building and distributing virtualized development
+ environments.
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ curl,
+ libarchive-tools,
+ openssh-client,
+ rsync,
+ ruby (>= 3.0),
+ ruby-bundler,
diff --git a/debian/copyright b/debian/copyright
@@ -0,0 +1,21 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: debian/*
+Copyright: 2024 Wong Hoi Sing Edison <[email protected]>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ The complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+
+SHELL := /bin/bash
+
+override_dh_auto_build:
+	mkdir -p bin
+	bundle config set --local without development
+	bundle config set --local path ./bundle
+	bundle install --verbose --local --standalone
+	bundle config set --local deployment true
+	bundle install --verbose --local --standalone
+
+override_dh_auto_install:
+	install -Dpm755 -d debian/tmp/usr/bin
+	install -Dpm755 -d debian/tmp/usr/share/bash-completion/completions
+	install -Dpm755 -d debian/tmp/opt
+	install -Dpm644 contrib/bash/completion.sh debian/tmp/usr/share/bash-completion/completions/vagrant
+	mkdir -p debian/tmp/opt/vagrant
+	tar xf ./vendor/cache/vagrant-2.4.1.gem data.tar.gz -O | tar zx -C debian/tmp/opt/vagrant
+	cp -rfp .bundle bundle Gemfile.lock debian/tmp/opt/vagrant/
+	pushd debian/tmp/opt/vagrant && \
+		bundle binstubs --all --force --path binstubs && \
+		bundle exec vagrant --version && \
+	popd
+	ln -fs /opt/vagrant/binstubs/vagrant debian/tmp/usr/bin/vagrant
+	fdupes -qnrps debian/tmp
+	find debian/tmp -type f -name '*.so' -exec chrpath -d {} \;
+	find debian/tmp -type f -exec sed -i 's?$(CURDIR)/debian/tmp??g' {} \;
+	find debian/tmp -type f -exec sed -i 's?^#!.*ruby.*?#!/usr/bin/ruby?g' {} \;
+
+override_dh_strip:
+
+override_dh_strip_nondeterminism:
+
+override_dh_shlibdeps:
+
+override_dh_makeshlibs:
+
+override_dh_dwz:
+
+override_dh_auto_test:
+
+override_dh_auto_clean:
+
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+vagrant source: file-without-copyright-information
+vagrant source: missing-notice-file-for-apache-license
+vagrant source: no-debian-changes
diff --git a/debian/vagrant.install b/debian/vagrant.install
@@ -0,0 +1,3 @@
+opt/vagrant
+usr/bin/*
+usr/share/bash-completion/completions/*
diff --git a/debian/vagrant.lintian-overrides b/debian/vagrant.lintian-overrides
@@ -0,0 +1,17 @@
+vagrant: copyright-without-copyright-notice
+vagrant: custom-library-search-path
+vagrant: dir-or-file-in-opt
+vagrant: embedded-library
+vagrant: executable-not-elf-or-script
+vagrant: hardening-no-pie
+vagrant: initial-upload-closes-no-bugs
+vagrant: mismatched-override embedded-library
+vagrant: no-manual-page
+vagrant: package-contains-vcs-control-file
+vagrant: ruby-script-but-no-ruby-dep
+vagrant: script-not-executable
+vagrant: shared-library-lacks-prerequisites
+vagrant: statically-linked-binary
+vagrant: unstripped-binary-or-object
+vagrant: windows-devel-file-in-package
+vagrant: zero-byte-file-in-doc-directory
diff --git a/plugins/guests/alt/cap/configure_networks.rb b/plugins/guests/alt/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestALT

diff --git a/plugins/guests/arch/cap/configure_networks.rb b/plugins/guests/arch/cap/configure_networks.rb
@@ -5,7 +5,7 @@
 require "socket"
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestArch

diff --git a/plugins/guests/coreos/cap/configure_networks.rb b/plugins/guests/coreos/cap/configure_networks.rb
@@ -4,7 +4,7 @@
 require "tempfile"
 require "yaml"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestCoreOS

diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestDebian

diff --git a/plugins/guests/freebsd/cap/configure_networks.rb b/plugins/guests/freebsd/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestFreeBSD

diff --git a/plugins/guests/funtoo/cap/configure_networks.rb b/plugins/guests/funtoo/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestFuntoo

diff --git a/plugins/guests/gentoo/cap/configure_networks.rb b/plugins/guests/gentoo/cap/configure_networks.rb
@@ -4,7 +4,7 @@
 require "tempfile"
 require "ipaddr"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestGentoo

diff --git a/plugins/guests/netbsd/cap/configure_networks.rb b/plugins/guests/netbsd/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestNetBSD

diff --git a/plugins/guests/nixos/cap/change_host_name.rb b/plugins/guests/nixos/cap/change_host_name.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestNixos

diff --git a/plugins/guests/nixos/cap/configure_networks.rb b/plugins/guests/nixos/cap/configure_networks.rb
@@ -4,7 +4,7 @@
 require "ipaddr"
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestNixos

diff --git a/plugins/guests/openbsd/cap/configure_networks.rb b/plugins/guests/openbsd/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestOpenBSD

diff --git a/plugins/guests/redhat/cap/configure_networks.rb b/plugins/guests/redhat/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestRedHat

diff --git a/plugins/guests/slackware/cap/configure_networks.rb b/plugins/guests/slackware/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestSlackware

diff --git a/plugins/guests/suse/cap/configure_networks.rb b/plugins/guests/suse/cap/configure_networks.rb
@@ -3,7 +3,7 @@
 
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestSUSE

diff --git a/plugins/providers/docker/config.rb b/plugins/providers/docker/config.rb
@@ -3,7 +3,7 @@
 
 require "pathname"
 
-require_relative "../../../lib/vagrant/util/platform"
+require "vagrant/util/platform"
 
 module VagrantPlugins
   module DockerProvider

diff --git a/plugins/providers/virtualbox/action/package_setup_folders.rb b/plugins/providers/virtualbox/action/package_setup_folders.rb
@@ -3,7 +3,7 @@
 
 require "fileutils"
 
-require_relative "../../../../lib/vagrant/action/general/package_setup_folders"
+require "vagrant/action/general/package"
 
 module VagrantPlugins
   module ProviderVirtualBox

diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
@@ -69,6 +69,7 @@ def initialize(uuid=nil)
             "6.0" => Version_6_0,
             "6.1" => Version_6_1,
             "7.0" => Version_7_0,
+            "7.1" => Version_7_1,
           }
 
           if @@version.start_with?("4.2.14")