Merge branch 'omnibus_software_updates' into 'master'

Omnibus software updates

Updated omnibus-software to the latest master ea7a40b619...master

Changes that are of interest to us:

1. [libxml2 bumped to version with security fixes](5fd898b35e)
1. [postgresql bumped to minor version with security fixes](e17a880894)
1. [No need to provide md5 for ruby 2.1.6](b99ecfaf98 (diff-b7915a1c384a6ad708ed53c14a27ab10))
1. [Upgraded omnibus-ctl version](98a5a429d9). [No big changes between versions](https://github.com/chef/omnibus-ctl/compare/0.3.4...0.3.6)
1. [Newer version of redis, no need to pin anymore](592f6cf727)
1. [Default zlib version changed, no need to pin anymore](bc225b8668 (diff-ca7c8fe95c252a70d222233155ee8c88))

Additionally in this MR:

1. Bumped chef version to 12.4.0.rc.2
1. Bumped nginx version to 1.7.12, [contains few bugfixes](http://nginx.org/en/CHANGES-1.8)
1. Updated omnibus version. Apart from new experimental features and few gem updates nothing I could find that would influence us. [Diff here](3600fa3332...0abab93bb67377d20c94bc4322018e2248b4a610)

See merge request !393
This commit is contained in:
Marin Jankovski 2015-06-29 14:05:13 +00:00
commit d1f2f38da7
3 changed files with 5 additions and 8 deletions

View File

@ -1,6 +1,6 @@
GIT
remote: git://github.com/opscode/omnibus-software.git
revision: ea7a40b61917f78493c59920a2e691d56a096691
revision: 28cfcad233a92caec3008ff1a89e6cda608b9454
branch: master
specs:
omnibus-software (4.0.0)

View File

@ -45,13 +45,10 @@ install_dir "/opt/gitlab"
build_version Omnibus::BuildVersion.new.semver
build_iteration Gitlab::BuildIteration.new.build_iteration
override :ruby, version: '2.1.6', source: { md5: "6e5564364be085c45576787b48eeb75f" }
override :ruby, version: '2.1.6'
override :rubygems, version: '2.2.5', source: { md5: "7701b5bc348d8da41a511ac012a092a8" }
override :chef, version: '12.4.0.rc.0'
override :'omnibus-ctl', version: '0.3.4'
override :zlib, version: '1.2.8'
override :chef, version: '12.4.0.rc.2'
override :cacerts, version: '2015.04.22', source: { md5: '380df856e8f789c1af97d0da9a243769' }
override :redis, version: '2.8.20', source: { md5: 'a2588909eb497719bbbf664e6364962a' }
override :openssl, version: '1.0.1o', source: { url: 'https://www.openssl.org/source/openssl-1.0.1o.tar.gz', md5: 'af1096f500a612e2e2adacb958d7eab1' }
# Openssh needs to be installed

View File

@ -17,13 +17,13 @@
#
name "nginx"
default_version "1.7.11"
default_version "1.7.12"
dependency "pcre"
dependency "openssl"
source url: "http://nginx.org/download/nginx-#{version}.tar.gz",
md5: "22912ba71eebd6987be47eeaff79f0f0"
md5: "9120b06539e7acb25712a9c5e4711d22"
relative_path "nginx-#{version}"