Merge branch 'update-omnibus-software' into 'master'

Update omnibus-software and remove workarounds

Workarounds removed:
- libossp-uuid download URL
- cacerts version/SHA

Both of these local fixes are fixed upstream in omnibus-software now.
None of the other changes in omnibus-software look like they affect us:

be79783ecc...ea7a40b619

See merge request !335

Gemfile.lock

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

Makefile

@@ -6,20 +6,14 @@ PLATFORM_DIR:=$(shell bundle exec support/ohai-helper platform-dir)
 PACKAGECLOUD_USER=gitlab
 PACKAGECLOUD_REPO:=$(shell if support/is_gitlab_ee.sh ; then echo gitlab-ee; else echo gitlab-ce; fi)
 PACKAGECLOUD_OS:=$(shell bundle exec support/ohai-helper repo-string)
-UUID_TARBALL=/var/cache/omnibus/cache/uuid-1.6.2.tar.gz
 
-build: ${UUID_TARBALL}
+build:
 	bin/omnibus build ${PROJECT} --override append_timestamp:false --log-level info
 
 # No need to suppress timestamps on the test builds
-test_build: ${UUID_TARBALL}
+test_build:
 	bin/omnibus build ${PROJECT} --log-level info
 
-${UUID_TARBALL}:
-	# Download libossp-uuid outside of omnibus, because FTP through firewalls sucks
-	mkdir -p /var/cache/omnibus/cache
-	curl ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz > ${UUID_TARBALL}
-
 # If this task were called 'release', running 'make release' would confuse Make
 # because there exists a file called 'release.sh' in this directory. Make has
 # built-in rules on how to build .sh files. By calling this task do_release, it

config/projects/gitlab.rb

@@ -47,7 +47,6 @@ override :rubygems, version: '2.2.1'
 override :'chef-gem', version: '11.18.0'
 override :'omnibus-ctl', version: '0.3.3'
 override :zlib, version: '1.2.8'
-override :'libossp-uuid', version: '1.6.2', source: { md5: "5db0d43a9022a6ebbbc25337ae28942f", url: "http://gnome-build-stage-1.googlecode.com/files/uuid-1.6.2.tar.gz" }
 override :cacerts, version: '2015.04.22', source: { md5: '380df856e8f789c1af97d0da9a243769' }
 
 # Openssh needs to be installed