Date: Tue, 15 Apr 2014 22:03:14 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/188674: [patch] Updated sysutils/vagrant to 1.5.3. Message-ID: <201404152203.s3FM3EqN089537@cgiserv.freebsd.org> Resent-Message-ID: <201404152210.s3FMA0Lk034832@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188674 >Category: ports >Synopsis: [patch] Updated sysutils/vagrant to 1.5.3. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 15 22:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Joseph Benden >Release: FreeBSD 11 >Organization: >Environment: FreeBSD freebsd-11 11.0-CURRENT FreeBSD 11.0-CURRENT #2 r263915: Sat Mar 29 16:29:15 MST 2014 root@freebsd-11:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Updated port to latest released version of 1.5.3. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile index aaebfbf..6597a14 100644 --- a/sysutils/vagrant/Makefile +++ b/sysutils/vagrant/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vagrant -PORTVERSION= 1.5.2 +PORTVERSION= 1.5.3 CATEGORIES= sysutils rubygems devel MASTER_SITES= LOCAL/swills https://codeload.github.com/mitchellh/vagrant/legacy.tar.gz/v${PORTVERSION}?dummy=/ @@ -30,7 +30,7 @@ RUN_DEPENDS= rubygem-main>=1.0:${PORTSDIR}/devel/rubygem-main \ rubygem-rb-kqueue>=0.2.2:${PORTSDIR}/devel/rubygem-rb-kqueue \ rubygem-wdm>=0.1.0:${PORTSDIR}/devel/rubygem-wdm -WRKSRC= ${WRKDIR}/mitchellh-vagrant-5b360d0 +WRKSRC= ${WRKDIR}/mitchellh-vagrant-8c05b08 USE_RUBY= yes GEMFILES= vagrant-${PORTVERSION}.gem RUBYGEMBIN= gem${RUBY_SUFFIX} @@ -44,7 +44,6 @@ GEM_ENV+= RB_USER_INSTALL=yes post-patch: @${RM} ${WRKSRC}/bin/vagrant.orig - @${RM} ${WRKSRC}/vagrant.gemspec.orig do-build: @(cd ${WRKSRC}; (${ECHO_CMD} -e "install:\n\techo\n") > Makefile) diff --git a/sysutils/vagrant/distinfo b/sysutils/vagrant/distinfo index 0ae5aed..fb09f04 100644 --- a/sysutils/vagrant/distinfo +++ b/sysutils/vagrant/distinfo @@ -1,2 +1,2 @@ -SHA256 (vagrant-1.5.2.tar.gz) = 6fd52cec74253e7bcbc4a847a9f5524b27f29dcca9bf6e5c2736b9cfc9c617f7 -SIZE (vagrant-1.5.2.tar.gz) = 2671799 +SHA256 (vagrant-1.5.3.tar.gz) = d48fb86566c9fa75d80437445c654f0376dda3a7e14bf4ba9a53fd961b17d9d3 +SIZE (vagrant-1.5.3.tar.gz) = 2683655 diff --git a/sysutils/vagrant/files/patch-is-vagrant-installer.patch b/sysutils/vagrant/files/patch-is-vagrant-installer.patch deleted file mode 100644 index 8a88542..0000000 --- a/sysutils/vagrant/files/patch-is-vagrant-installer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/vagrant.orig 2014-03-14 10:26:06.000000000 -0700 -+++ bin/vagrant 2014-03-14 10:27:05.000000000 -0700 -@@ -5,6 +5,8 @@ - # initializing which have historically resulted in stack traces. - Signal.trap("INT") { abort } - -+ENV["VAGRANT_INSTALLER_ENV"] = 'true' -+ - # Split arguments by "--" if its there, we'll recombine them later - argv = ARGV.dup - argv_extra = [] diff --git a/sysutils/vagrant/files/patch-vagrant-is-vagrant-installer.patch b/sysutils/vagrant/files/patch-vagrant-is-vagrant-installer.patch new file mode 100644 index 0000000..546340a --- /dev/null +++ b/sysutils/vagrant/files/patch-vagrant-is-vagrant-installer.patch @@ -0,0 +1,11 @@ +--- bin/vagrant.orig 2014-04-15 12:11:54.000000000 -0700 ++++ bin/vagrant 2014-04-15 12:11:16.000000000 -0700 +@@ -5,6 +5,8 @@ + # initializing which have historically resulted in stack traces. + Signal.trap("INT") { abort } + ++ENV["VAGRANT_INSTALLER_ENV"] = 'true' ++ + # Split arguments by "--" if its there, we'll recombine them later + argv = ARGV.dup + argv_extra = [] diff --git a/sysutils/vagrant/files/patch-vagrant.gemspec b/sysutils/vagrant/files/patch-vagrant.gemspec deleted file mode 100644 index eb856da..0000000 --- a/sysutils/vagrant/files/patch-vagrant.gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- ./vagrant.gemspec.orig 2014-03-21 01:53:27.910407727 +0000 -+++ ./vagrant.gemspec 2014-03-21 01:53:45.557406276 +0000 -@@ -18,7 +18,7 @@ - s.add_dependency "childprocess", "~> 0.5.0" - s.add_dependency "erubis", "~> 2.7.0" - s.add_dependency "i18n", "~> 0.6.0" -- s.add_dependency "listen", "~> 2.4.0" -+ s.add_dependency "listen", "~> 2.7.1" - s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" - s.add_dependency "net-ssh", ">= 2.6.6", "< 2.8.0" - s.add_dependency "net-scp", "~> 1.1.0" diff --git a/sysutils/vagrant/pkg-plist b/sysutils/vagrant/pkg-plist index a4aab91..50af145 100644 --- a/sysutils/vagrant/pkg-plist +++ b/sysutils/vagrant/pkg-plist @@ -737,6 +737,14 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/halt_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/rsync_test.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/coreos/cap/docker.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/fedora/cap/change_host_name.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/action/check_enabled.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/check_hyperv.ps1 +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/linux/docker_daemon_running.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/ansible/config_test.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/ansible/provisioner_test.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/support/shared/config.rb @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/util @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/plugin/v2 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/plugin/v1 @@ -759,6 +767,9 @@ bin/vagrant @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/docker @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/chef/provisioner @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/chef +@dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/support/shared +@dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/support +@dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/ansible @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/virtualbox/support/shared @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/virtualbox/support >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404152203.s3FM3EqN089537>