BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/261174

Change subject: Update packager scripts
......................................................................

Update packager scripts

* VirtualBox 5.0.12
* Vagrant 1.8.1
* Git 2.6.3
* Enhancements for packager scripts from testing on Labs host
* Document git in image README
* Word wrap LICENSE and README files

Change-Id: If7f59108f5311791f97a5d96b0309f74f3498df2
---
M support/packager/build.sh
M support/packager/package.rb
M support/packager/template/LICENSE
M support/packager/template/README.txt
M support/packager/urls.yaml
5 files changed, 136 insertions(+), 145 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/74/261174/1

diff --git a/support/packager/build.sh b/support/packager/build.sh
index 9206b4d..2250bbe 100755
--- a/support/packager/build.sh
+++ b/support/packager/build.sh
@@ -7,45 +7,53 @@
 #   - aptitude
 #   - genisoimage
 
+set -euf -o pipefail
+
 MWV=/vagrant
 CONTENTS=${MWV}/support/packager/output/contents
-
-# Get latest MediaWiki-Vagrant
-cd ${MWV}
-git fetch
-git reset --hard origin/master
-
-# Get latest MediaWiki-core
-export COMPOSER_CACHE_DIR="${MWV}/cache/composer"
-/usr/local/bin/run-git-update
-cd ${MWV}/mediawiki
-git reset --hard origin/master
-
-# Freshen git cache
-sudo apt-get update
-sudo aptitiude dist-upgrade
-# Get rid of obsolete apt packages
-sudo aptitude autoclean
-
-# Hack some things into the build
-mkdir -p ${CONTENTS}
-
-# Add a BUILD_INFO file so we can tell what was included in the image
 BUILD_INFO=${CONTENTS}/BUILD_INFO
-echo "Build date: $(date +%Y-%m-%dT%H:%MZ)" >${BUILD_INFO}
-echo "MediaWiki-Vagrant: $(cd ${MWV}; git rev-parse HEAD)" >>${BUILD_INFO}
-echo "MediaWiki: $(cd ${MWV}/mediawiki; git rev-parse HEAD)" >>${BUILD_INFO}
+APT_OPTS="-o Dpkg::Options::='--force-confdef' -o 
Dpkg::Options::='--force-confold' -y"
+export DEBIAN_FRONTEND=noninteractive
 
-# Populate apt cache
-mkdir -p ${CONTENTS}/cache/apt/partial
-rm -rf ${CONTENTS}/cache/apt/*.deb
-(cd /vagrant/cache/apt/archives; tar cf - *.deb) |
-(cd ${CONTENTS}/cache/apt; tar xf -)
+{
+    set -x
 
-# Generate installer output (directory and iso)
-cd ${MWV}/support/packager
-ruby package.rb
+    # Get latest MediaWiki-Vagrant
+    cd ${MWV}
+    git fetch
+    git reset --hard origin/master
 
-# Compute and store a checksum for the image
-cd ${MWV}/support/packager/output
-sha1sum mediawiki-vagrant-installer.iso > 
mediawiki-vagrant-installer.iso.SHA1.txt
+    # Get latest MediaWiki-core
+    export COMPOSER_CACHE_DIR="${MWV}/cache/composer"
+    /usr/local/bin/run-git-update
+    cd ${MWV}/mediawiki
+    git reset --hard origin/master
+
+    # Freshen git cache
+    sudo apt-get update
+    sudo apt-get $APT_OPTS dist-upgrade
+    # Get rid of obsolete apt packages
+    sudo apt-get $APT_OPTS autoclean
+
+    # Hack some things into the build
+    mkdir -p ${CONTENTS}
+
+    # Add a BUILD_INFO file so we can tell what was included in the image
+    echo "Build date: $(date +%Y-%m-%dT%H:%MZ)" >${BUILD_INFO}
+    echo "MediaWiki-Vagrant: $(cd ${MWV}; git rev-parse HEAD)" >>${BUILD_INFO}
+    echo "MediaWiki: $(cd ${MWV}/mediawiki; git rev-parse HEAD)" 
>>${BUILD_INFO}
+
+    # Populate apt cache from local cache
+    rsync -a --delete --include='*.deb' ${MWV}/cache/apt/ ${CONTENTS}/cache/apt
+    mkdir -p ${CONTENTS}/cache/apt/partial
+
+    # Generate installer output (directory and iso)
+    cd ${MWV}/support/packager
+    ruby package.rb
+
+    # Compute and store a checksum for the image
+    cd ${MWV}/support/packager/output
+    sha1sum mediawiki-vagrant-installer.iso > 
mediawiki-vagrant-installer.iso.SHA1.txt
+
+    echo "Done!"
+} 2>&1
diff --git a/support/packager/package.rb b/support/packager/package.rb
index d34a6f9..d41e0b3 100755
--- a/support/packager/package.rb
+++ b/support/packager/package.rb
@@ -15,14 +15,11 @@
 
 $url_config = YAML.load(($packager_dir + 'urls.yaml').read)
 
-# TODO: (mattflaschen, 2014-04-30): Symbolic links might be nice, but
-# not sure if there's a USB filesystem (NTFS?) that supports symlinks
-# reliably and works cross-OS.
-
 # TODO: (mattflaschen, 2014-04-30): Should it automatically find and
 # download the latest file for each installer?
 
 $sha256 = Digest::SHA256.new
+$stdout.sync = true
 
 # Checks the SHA256.  If it matches, doesn't need to be downloaded again
 def download_file(target_dir_pathname, url_info)
@@ -151,7 +148,7 @@
   puts 'Creating iso image to distribute...'
   # -r: Rock Ridge with recommended values for permissions, etc.
   if system('which genisoimage >/dev/null 2>&1')
-    system('genisoimage', '-r', '-o', $iso_file.to_s, $contents_dir.to_s)
+    system('genisoimage', '-quiet', '-r', '-o', $iso_file.to_s, 
$contents_dir.to_s)
   else
     puts '"genisoimage" not found. Iso image not created.'
   end
diff --git a/support/packager/template/LICENSE 
b/support/packager/template/LICENSE
index 0495aba..c8949f6 100644
--- a/support/packager/template/LICENSE
+++ b/support/packager/template/LICENSE
@@ -1,7 +1,13 @@
-VirtualBox is released under the GNU General Public License v2 (GPL-2.0.txt) 
license.  Source code is available at https://www.virtualbox.org/browser .
+VirtualBox is released under the GNU General Public License v2
+(GPL-2.0.txt) license. Source code is available at
+https://www.virtualbox.org/browser .
 
-Vagrant is released under the MIT License  (VAGRANT_MIT.txt).  Source code is 
available at https://github.com/mitchellh/vagrant .
+Vagrant is released under the MIT License (VAGRANT_MIT.txt). Source
+code is available at https://github.com/mitchellh/vagrant .
 
-MediaWiki-Vagrant is released under the MIT License.  Source code and license 
are available in the MediaWiki-Vagrant repository (~/Code/Vagrant) by cloning 
bundle, per README.
+MediaWiki-Vagrant is released under the MIT License. Source code and
+license are available in the MediaWiki-Vagrant repository by cloning
+bundle, per README.
 
-MediaWiki is released under GPLv2 or later.  Source code and license are 
available in the MediaWiki repository (~/Code/Vagrant/mediawiki) by cloning 
bundle, per README.
+MediaWiki is released under GPLv2 or later.  Source code and license are
+available in the MediaWiki repository by cloning bundle, per README.
diff --git a/support/packager/template/README.txt 
b/support/packager/template/README.txt
index ad2b75f..f58fba5 100644
--- a/support/packager/template/README.txt
+++ b/support/packager/template/README.txt
@@ -12,25 +12,26 @@
 NOTE: You can replace ~/Vagrant with your choice of directory, but
 mediawiki must be directly underneath.
 
-Replace /USB_DRIVE_PATH with the location of the USB drive, or the location 
where
-you copied the files from the drive.
+Replace /USB_DRIVE_PATH with the location of the USB drive, or the
+location where you copied the files from the drive.
 
-1. If you don't have git installed (typically only windows users), install it
-   from http://git-scm.com/downloads
+1. If you don't have git installed (typically only windows users),
+   install it from the directory for your OS.
 
 2. If you don't have a Gerrit username yet, signup at
    https://wikitech.wikimedia.org/wiki/Special:UserLogin/signup .  The
-   "Instance shell account name" you give (not your Wiki username) is your
-   username in Gerrit, replace GERRIT_USER in the instructions below with it.
+   "Instance shell account name" you give (not your Wiki username) is
+   your username in Gerrit, replace GERRIT_USER in the instructions
+   below with it.
 
 3. From the directory for your OS, install VirtualBox.
 
 4. From the directory for your OS, install Vagrant.  If you use Linux,
-   use files from Linux/DEB/ for Debian or Ubuntu and Linux/RPM/ for Red Hat,
-   Centos, Fedora, etc.
+   use files from Linux/DEB/ for Debian or Ubuntu and Linux/RPM/ for Red
+   Hat, Centos, Fedora, etc.
 
-5. Install the virtual machine (an Ubuntu 14.04 "Trusty" Linux distribution)
-   that Vagrant uses as a base:
+5. Install the virtual machine (an Ubuntu 14.04 "Trusty" Linux
+   distribution) that Vagrant uses as a base:
 
     $ cd /USB_DRIVE_PATH
     $ vagrant box add trusty-cloud 
trusty-server-cloudimg-amd64-vagrant-disk1.box
@@ -55,8 +56,9 @@
 
 9a. You're done with the USB drive, you can unmount/safely remove it.
 
-10. You've got fairly recent code off the USB drive, but development continues.
-   So configure git repositories to sync with Gerrit over the network:
+10. You've got fairly recent code off the USB drive, but development
+    continues. Configure git repositories to sync with Gerrit over
+    the network:
 
     $ cd ~/Vagrant
     $ git remote set-url origin 
ssh://[email protected]:29418/mediawiki/vagrant.git
@@ -64,8 +66,8 @@
     $ cd ~/Vagrant/mediawiki
     $ git remote set-url origin 
ssh://[email protected]:29418/mediawiki/core.git
 
-11. Update MediaWiki-Vagrant and MediaWiki core git repositories to latest
-   versions:
+11. Update MediaWiki-Vagrant and MediaWiki core git repositories to
+    latest versions:
 
    $ cd ~/Vagrant
    $ git pull
diff --git a/support/packager/urls.yaml b/support/packager/urls.yaml
index 74ff9df..5189a3e 100644
--- a/support/packager/urls.yaml
+++ b/support/packager/urls.yaml
@@ -8,88 +8,66 @@
 
 Vagrant License:
   url: https://raw.githubusercontent.com/mitchellh/vagrant/master/LICENSE
-  sha256: 6a98fd9141fb93effb120368883a8d0106ad5304710338985df846d1558484de
+  sha256: 22408bd278fbab6a518f29e3332a417fd30840ae6ed424217a6fb89ba893d3bf
   filename: Vagrant_MIT.txt
 
 # https://www.virtualbox.org/wiki/Downloads
 VirtualBox:
   # https://www.virtualbox.org/wiki/Linux_Downloads
   Linux:
-    Debian Squeeze:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/virtualbox-4.3_4.3.20-96996~Debian~squeeze_amd64.deb
-      sha256: 398ec57ad5fc76aac063486fc0bdd97aaab85eab8fad9ba41cfbbb06e06211ad
-
-    Debian Wheezy:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/virtualbox-4.3_4.3.20-96996~Debian~wheezy_amd64.deb
-      sha256: eba5535888eb2b7379ed9272a93a0d103c3e79a8389ee0f38fdd64df639f1d45
-
-    Fedora 17:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_fedora17-1.x86_64.rpm
-      sha256: a373306bc638f1b68ea213c0eb7de0cc2b4d6ffc9bc8bc0a03a94dc763de81a2
-
-    Fedora 18 and 19:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_fedora18-1.x86_64.rpm
-      sha256: a9b7a2b8725d34586c7b63f594d069ccd5db14785018028987e3b69987bdd275
-
-    Mandriva 2011.0:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_mdv2011.0-1.x86_64.rpm
-      sha256: 379def1fbbe5c073d8d0d5a379090ab716f8a3c471f5e4ef890e846d4f8dd60d
-
-    openSUSE 12.3 and 13.1:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_openSUSE123-1.x86_64.rpm
-      sha256: 180bc6c26dd057817ca09824aa9953fb0286dcf517821ec07d6d072761d38ca4
-
-    openSUSE 11.4, 12.1, and 12.2:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_openSUSE114-1.x86_64.rpm
-      sha256: f8dea6f42fc04baf77280df386595162c55420337c39ba966862f458358bbfec
-
-    Other:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3.20-96996-Linux_amd64.run
-      sha256: 46ac2b2848e71259274ee975a71da0c93189b2f02dad74a84a46e152af68e0ca
-
-    Red Hat Enterprise Linux and CentOS and Oracle Linux 5:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_el5-1.x86_64.rpm
-      sha256: 4eb970778e287ffd7f985ddf0a3aa5a272b8d48cb7d59b79f504036cbbf8247d
-
-    Red Hat Enterprise Linux and CentOS and Oracle Linux 6:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_el6-1.x86_64.rpm
-      sha256: f26a6a71b57b58dfb11c4afc2a709aae73fb2628c5d2224575ce5f4011f0db86
-
-    Red Hat Enterprise Linux and CentOS and Oracle Linux 7:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_el7-1.x86_64.rpm
-      sha256: ced4ebbf905342386f9b694047b8a3ad8d3548add4998f2430ca2543dfb39801
-
-    SUSE Linux Enterprise Server 10:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_sles10.1-1.x86_64.rpm
-      sha256: 12cefe1ea65335f719aa550653ca5dd409b9c8608a2d537fd93684a71b337a4a
-
+    Ubuntu 15.10 Wily:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/virtualbox-5.0_5.0.12-104815~Ubuntu~wily_amd64.deb
+      sha256: ec6b4cb0c81e4f11da78f9df0ef7419a837659ba1fe11e6e1b4b64221c1be010
+    Ubuntu 14.04 Trusty, 14.10 Utopic, 15.04 Vivid:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/virtualbox-5.0_5.0.12-104815~Ubuntu~trusty_amd64.deb
+      sha256: d91695e2544fa3f8127b19de0e43d92f6a422e6324ba7590df66f5fb6d28ec24
+    Ubuntu 12.04 Precise:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/virtualbox-5.0_5.0.12-104815~Ubuntu~precise_amd64.deb
+      sha256: b1f30ecd7a61a53773c47b8d609c26d34e9d783f9293a8cbb226c1d5eef5892c
+    Debian 8 Jessie:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/virtualbox-5.0_5.0.12-104815~Debian~jessie_amd64.deb
+      sha256: f99e9e38902ee8a0e28e96d098d7d89680ae8cfa5009252b4717322101b6cb79
+    Debian 7 Wheezy:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/virtualbox-5.0_5.0.12-104815~Debian~wheezy_amd64.deb
+      sha256: 3d32a9946c734580ed3cf05e209abe34f177659988e313c11d6cc016c3224b45
+    Debian 6 Squeeze:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/virtualbox-5.0_5.0.12-104815~Debian~squeeze_amd64.deb
+      sha256: f5a02056a30ccdd4e3e5261fc5b89529fc530f9b428245ed01f412eaf512da60
+    openSUSE 13.2:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0-5.0.12_104815_openSUSE132-1.x86_64.rpm
+      sha256: 0b6b0c2fa70ccb9177da915f9d08bbd21cfb9caaf99bccfc67f512fb2b202256
+    openSUSE 13.1:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0-5.0.12_104815_openSUSE131-1.x86_64.rpm
+      sha256: 06219b61c5221073d51934f255be15b782d5770de265b12e0bb9bfa56dba6104
     SUSE Linux Enterprise Server 11:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3-4.3.20_96996_sles11.0-1.x86_64.rpm
-      sha256: b982cfb8c7932603cedc7639a2ecd8db9a15b2a9452b21d729132b583b8af0a8
-
-    Ubuntu Lucid:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/virtualbox-4.3_4.3.20-96996~Ubuntu~lucid_amd64.deb
-      sha256: f7f14a14bfbc5ed40932214c551cc69cf8f04d0c88442c4ff85b105a56ac0c2a
-
-    Ubuntu Precise:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/virtualbox-4.3_4.3.20-96996~Ubuntu~precise_amd64.deb
-      sha256: aeb7ef1dbd7832eeec030a2a7d06c5d649389d9d346056543c4958fb507f0944
-
-    Ubuntu Quantal:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/virtualbox-4.3_4.3.20-96996~Ubuntu~quantal_amd64.deb
-      sha256: 5671afb36777063700f1d8e4ba080d2531ef16ebad5f3fa742ed4e8f9e2a6bff
-
-    Ubuntu Raring, Saucy, Trusty and Utopic:
-      url: 
http://download.virtualbox.org/virtualbox/4.3.20/virtualbox-4.3_4.3.20-96996~Ubuntu~raring_amd64.deb
-      sha256: ab367fe4815bfb30941b31ed432a91e3e1628a00922a200f0d676f4ef55069d5
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0-5.0.12_104815_sles11.0-1.x86_64.rpm
+      sha256: a37d788bcf6d620d8331e3c72daea8733a15613f98129af97e0855f9274a3392
+    Fedora 22:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0-5.0.12_104815_fedora22-1.x86_64.rpm
+      sha256: a00de72cc11c832f8a172836c75d73e5ebd251ed77bb3a42349facb0a2e0b3f9
+    Fedora 18, 19, 20, 21:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0-5.0.12_104815_fedora18-1.x86_64.rpm
+      sha256: ee49b40dd7964007e13ce8f84aadfa2208d74c38e1211bc6aee130f96cacebd8
+    Red Hat Enterprise Linux and CentOS and Oracle Linux 7:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0-5.0.12_104815_el7-1.x86_64.rpm
+      sha256: 6dfaec27ba6ef28f879b973caecf26a0958ca84a93d1bdd56015d7ab1fbcbada
+    Red Hat Enterprise Linux and CentOS and Oracle Linux 6:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0-5.0.12_104815_el6-1.x86_64.rpm
+      sha256: 16467c9d4c4894db2088f5a250695303f02c940135a851aba50366e9967ad120
+    Red Hat Enterprise Linux and CentOS and Oracle Linux 5:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0-5.0.12_104815_el5-1.x86_64.rpm
+      sha256: eab4fcf312e8696ce06294246e7414c3aa3ac94f51f501b5d8414df354bd7979
+    Other:
+      url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0.12-104815-Linux_amd64.run
+      sha256: 5f182a1c98f72888c973d9ebb8429835fef8c48e9bd2ed436dd7cbeebe0e0f02
 
   Mac:
-    url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3.20-96996-OSX.dmg
-    sha256: 744e77119a640a5974160213c9912568a3d88dbd06a2fc6b6970070941732705
+    url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0.12-104815-OSX.dmg
+    sha256: e74a078780377133789e3f984e3f75324bdb5e57bf3b920a036bf52a403a5aa0
 
   Windows:
-    url: 
http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3.20-96997-Win.exe
-    sha256: 5edd8cd2dc01ad7adc5c71f188ed64061b183ab2fd5b83da84f90948d4b4e3d6
+    url: 
http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0.12-104815-Win.exe
+    sha256: 5670448b8a7c80fa96171a4be54e97d7d2dc7981a8d282f442c87f082a773610
 
 # http://www.vagrantup.com/downloads.html
 # One package for all .deb, one for all .rpm
@@ -99,32 +77,32 @@
 Vagrant:
   Linux:
     DEB:
-      url: https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb
-      sha256: 9d7f1c587134011e2d5429eb21b6c0e95487f52e6d6d47c03ecc82cbeee73968
+      url: 
https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.deb
+      sha256: ed0e1ae0f35aecd47e0b3dfb486a230984a08ceda3b371486add4d42714a693d
 
     RPM:
-      url: https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.rpm
-      sha256: 683d9926922685adfb456605ef6becaa811b87f18f54faf7c19abc4888636617
+      url: 
https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.rpm
+      sha256: d2b2308cb1a7da656f6f7cd926287cd21f3c79bf29bc15f09d7471a93f1ef118
 
   Mac:
-    url: https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2.dmg
-    sha256: 78d02afada2f066368bd0ce1883f900f89b6dc20f860463ce125e7cb295e347c
+    url: https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1.dmg
+    sha256: 2cfdbeec9e40376e49dae9d9f27511896e3b296f0e24f8731339bb3d32c48c93
 
   Windows:
-    url: https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2.msi
-    sha256: 37750541f29e7161b9ac56136c02c3b2d07d2080ed01d5ff71f464357f1a3bdf
+    url: https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1.msi
+    sha256: 6468cc140f6f236c3ac4bc0bbb1cc2177114249bc344e0aba8c826eae9cc6eb2
 
   Plugins:
     vagrant-vbguest:
-      url: https://rubygems.org/downloads/vagrant-vbguest-0.10.0.gem
-      sha256: 5eadad72fc80d2ae78463966654dab1f5e4d9803e084a4ff2c85a01be23ff105
+      url: https://rubygems.org/downloads/vagrant-vbguest-0.11.0.gem
+      sha256: 287a378f93e4242e384e882f78c0d0f37aae24e4e6b871d675ab65d8f60839d6
 
 Git:
   Mac:
-    url: 
http://iweb.dl.sourceforge.net/project/git-osx-installer/git-2.2.1-intel-universal-mavericks.dmg
-    sha256: f9b1d926736a7d5dbcff2ffe0920ae25c03b9880d4e218e23e3c06c231ba6b63
+    url: 
http://iweb.dl.sourceforge.net/project/git-osx-installer/git-2.6.3-intel-universal-mavericks.dmg
+    sha256: b725f0728616695eb7612a8848fd223f1b30cce3b1a91bd14813e14774b8d3d3
 
   Windows:
-    url: 
https://s3.amazonaws.com/github-cloud/releases/325827/e8237682-8701-11e4-9dbe-7fb433262871.exe?response-content-disposition=attachment%3B%20filename%3DGit-1.9.5-preview20141217.exe&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1420854625&Signature=yV4yIngIM5ns31s59eeqXIxRxHk%3D
-    filename: Git-1.9.5-preview20141217.exe
-    shar256: d7e78da2251a35acd14a932280689c57ff9499a474a448ae86e6c43b882692dd
+    url: 
https://github.com/git-for-windows/git/releases/download/v2.6.4.windows.1/Git-2.6.4-32-bit.exe
+    filename: Git-2.6.4-32-bit.exe
+    shar256: c2c27746010f3b09949fb8435ac8a8d1496aeb6fb26fc6ac787ed09686cffcaa

-- 
To view, visit https://gerrit.wikimedia.org/r/261174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7f59108f5311791f97a5d96b0309f74f3498df2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to