Merge branch 'update/omnibus' into 'master'

Update omnibus-ruby to 3.2.1 See merge request !177

Merge branch 'update/omnibus' into 'master'
Update omnibus-ruby to 3.2.1 See merge request !177
Jacob Vosmaer
2 parents d1311763 d7e8ae72
Showing 14 changed files with 86 additions and 477 deletions Show diff stats
Gemfile
Gemfile.lock
Makefile
config/projects/gitlab.rb
config/software/cacerts.rb
config/software/chef-gem.rb
config/software/gitlab-cookbooks.rb
config/software/gitlab-ctl.rb
config/software/gitlab-rails.rb
config/software/libffi.rb
config/software/mysql-client.rb
config/software/ohai.rb
config/software/openssl.rb
config/software/ruby.rb
 source 'https://rubygems.org'
  
-gem 'omnibus', '~> 3.0.0'
+gem 'omnibus'
 gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master'
 gem 'ohai'
 GIT
   remote: git://github.com/opscode/omnibus-software.git
-  revision: 4309667e135644c0c49473ec16aa7dba9fa84f41
+  revision: 7ac92daa6892e0898eb868679e578df530e38ee8
   branch: master
   specs:
-    omnibus-software (0.0.1)
+    omnibus-software (4.0.0)
  
 GEM
   remote: https://rubygems.org/
@@ -13,18 +13,20 @@ GEM
       cabin (> 0)
     backports (3.6.0)
     cabin (0.6.1)
-    chef-sugar (1.2.6)
-    childprocess (0.5.2)
+    chef-sugar (1.3.0)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     clamp (0.6.3)
     ffi (1.9.3)
-    fpm (1.0.2)
+    ffi-yajl (1.0.2)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.0)
+    fpm (0.4.42)
       arr-pm (~> 0.0.8)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
       childprocess
       clamp (~> 0.6)
-      ffi
       ftw (~> 0.0.30)
       json (>= 1.7.7)
     ftw (0.0.39)
@@ -35,37 +37,40 @@ GEM
     http_parser.rb (0.5.3)
     ipaddress (0.8.0)
     json (1.8.1)
+    libyajl2 (1.0.1)
     mime-types (1.25.1)
-    mixlib-cli (1.4.0)
+    mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.3.0)
-    ohai (6.20.0)
+    mixlib-shellout (1.4.0)
+    ohai (7.2.0)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.0)
       ipaddress
+      mime-types (~> 1.16)
       mixlib-cli
-      mixlib-config
+      mixlib-config (~> 2.0)
       mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    omnibus (3.0.0)
+      mixlib-shellout (~> 1.2)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    omnibus (3.2.1)
       chef-sugar (~> 1.2)
-      fpm (~> 1.0.0)
-      mixlib-config (~> 2.1)
-      mixlib-shellout (~> 1.3)
-      ohai (~> 6.12)
-      thor (>= 0.16.0)
+      fpm (~> 0.4)
+      mixlib-shellout (~> 1.4)
+      ohai (~> 7.2)
+      thor (~> 0.18)
       uber-s3
-    systemu (2.5.2)
+    systemu (2.6.4)
     thor (0.19.1)
     uber-s3 (0.2.4)
       mime-types (~> 1.17)
-    yajl-ruby (1.2.0)
+    wmi-lite (1.0.0)
  
 PLATFORMS
   ruby
  
 DEPENDENCIES
   ohai
-  omnibus (~> 3.0.0)
+  omnibus
   omnibus-software!
@@ -5,7 +5,7 @@ SECRET_DIR:=$(shell openssl rand -hex 20)
 PLATFORM_DIR:=$(shell ruby -rjson -e 'puts JSON.parse(`bin/ohai`).values_at("platform", "platform_version").join("-")')
  
 build:
-	OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT}
+	bin/omnibus build ${PROJECT} --override append_timestamp:false --log-level info
  
 do_release: no_changes on_tag purge build move_to_platform_dir sync
  
@@ -21,7 +21,7 @@ maintainer &quot;GitLab.com&quot;
 homepage "http://www.gitlab.com/"
  
 replaces        "gitlab"
-install_path    "/opt/gitlab"
+install_dir     "/opt/gitlab"
 build_version   Omnibus::BuildVersion.new.semver
 build_iteration 1
  
@@ -35,7 +35,7 @@ dependency &quot;git&quot;
 dependency "redis"
 dependency "nginx"
 dependency "chef-gem"
-if system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") || system("#{Omnibus.project_root}/support/is_gitlab_com.sh")
+if system("#{Config.project_root}/support/is_gitlab_ee.sh") || system("#{Config.project_root}/support/is_gitlab_com.sh")
   dependency "remote-syslog"
 end
 dependency "runit"
@@ -1,52 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# License:: Apache License, Version 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.
-#
-
-name "cacerts"
-default_version "2014.07.15"  # date of the file is in a comment at the start, or in the changelog
-
-version "2014.07.15" do
-  source :md5 => "fd48275847fa10a8007008379ee902f1"
-end
-
-version "2014.04.22" do
-  source :md5 => "9f92a0d9f605e227ae068e605f4c86fa"
-end
-
-version "2014.01.28" do
-  source :md5 => "5d108f8ab86afacc6663aafca8604dd3"
-end
-
-source :url => "http://curl.haxx.se/ca/cacert.pem"
-relative_path "cacerts-#{version}"
-
-build do
-  block do
-    FileUtils.mkdir_p(File.expand_path("embedded/ssl/certs", install_dir))
-
-    # There is a bug in omnibus-ruby that may or may not have been fixed. Since the source url
-    # does not point to an archive, omnibus-ruby tries to copy cacert.pem into the project working
-    # directory. However, it fails and copies to '/var/cache/omnibus/src/cacerts-2012.12.19\' instead
-    # There is supposed to be a fix in omnibus-ruby, but under further testing, it was unsure if the
-    # fix worked. Rather than trying to fix this now, we're filing a bug and copying the cacert.pem
-    # directly from the cache instead.
-
-    FileUtils.cp(File.expand_path("cacert.pem", Config.cache_dir),
-                 File.expand_path("embedded/ssl/certs/cacert.pem", install_dir))
-  end
-
-  command "ln -sf #{install_dir}/embedded/ssl/certs/cacert.pem #{install_dir}/embedded/ssl/cert.pem"
-end
@@ -1,28 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# Copyright:: Copyright (c) 2014 GitLab B.V.
-# License:: Apache License, Version 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.
-#
-
-name "chef-gem"
-default_version "11.12.2"
-
-dependency "ruby"
-dependency "rubygems"
-dependency "ohai"
-
-build do
-  gem "install chef -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"
-end
@@ -22,7 +22,7 @@ dependency &quot;rsync&quot;
  
 always_build true
  
-source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root)
+source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root)
  
 build do
   command "mkdir -p #{install_dir}/embedded/cookbooks"
@@ -21,7 +21,7 @@ name &quot;gitlab-ctl&quot;
 dependency "rsync"
 dependency "omnibus-ctl"
  
-source :path => File.expand_path("files/gitlab-ctl-commands", Omnibus.project_root)
+source :path => File.expand_path("files/gitlab-ctl-commands", Config.project_root)
  
 build do
   block do
@@ -19,7 +19,7 @@
 name "gitlab-rails"
 default_version "70ed6ef2a6894042c9bbd92f273542bca2a2374f" # 7.0.0.rc1
  
-EE = system("#{Omnibus.project_root}/support/is_gitlab_ee.sh")
+EE = system("#{Config.project_root}/support/is_gitlab_ee.sh")
  
 dependency "ruby"
 dependency "bundler"
@@ -62,7 +62,7 @@ build do
   # database at this point so that is a problem. This bug is fixed in
   # acts-as-taggable-on 3.0.0 by
   # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e
-  aato_patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff"
+  aato_patch = "#{Config.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff"
  
   # To make this idempotent, we apply the patch (in case this is a first run) or
   # we revert and re-apply the patch (if this is a second or later run).
@@ -0,0 +1,47 @@
+#
+# Copyright 2012-2014 Chef Software, Inc.
+#
+# 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.
+#
+
+name "libffi"
+default_version "3.0.13"
+
+dependency "libgcc"
+dependency "libtool"
+
+source url: "ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz",
+       md5: '45f3b6dbc9ee7c7dfbbbc5feba571529'
+
+relative_path "libffi-3.0.13"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+
+  command "./configure" \
+          " --prefix=#{install_dir}/embedded", env: env
+
+  command "make -j #{max_build_jobs}", env: env
+  command "make -j #{max_build_jobs} install", env: env
+
+  # libffi's default install location of header files is awful...
+  copy "#{install_dir}/embedded/lib/libffi-#{version}/include/*", "#{install_dir}/embedded/include"
+
+  # On 64-bit centos, libffi libraries are places under /embedded/lib64
+  # move them over to lib
+  if rhel? && _64_bit?
+    copy "#{install_dir}/embedded/lib64/*", "#{install_dir}/embedded/lib/"
+    delete "#{install_dir}/embedded/lib64"
+  end
+end
+
@@ -18,11 +18,9 @@
 name "mysql-client"
 default_version "5.5.37"
  
-dependencies [
-                "openssl",
-                "zlib",
-                "ncurses"
-             ]
+dependency "openssl"
+dependency "zlib"
+dependency "ncurses"
  
 source  :url => "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.37.tar.gz",
         :md5 => "bf1d80c66d4822ec6036300399a33c03"
@@ -38,14 +36,8 @@ env = {
   "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}",
 }
  
-unless OHAI.platform =~ /ubuntu/ && OHAI.platform_version =~ /^14.04/
-  # Perhaps we can drop LD_LIBRARY_PATH on all platforms? For now, all we know
-  # is that it breaks the build on Ubuntu 14.04.
-  env.merge!("LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib")
-end
-
 # Force CentOS-5 to use gcc/g++ v4.4
-if OHAI.platform =~ /centos/ and OHAI.platform_version =~ /^5/
+if Ohai['platform'] =~ /centos/ and Ohai['platform_version'] =~ /^5/
     env.merge!( {
         "CC" => "gcc44",
         "CXX" => "g++44"
@@ -1,26 +0,0 @@
-#
-# Copyright:: Copyright (c) 2014 GitLab B.V.
-# License:: Apache License, Version 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.
-#
-
-name "ohai"
-default_version "7.0.4"
-
-dependency "ruby"
-dependency "rubygems"
-
-build do
-  gem "install ohai -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"
-end
@@ -1,158 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# License:: Apache License, Version 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.
-#
-
-name "openssl"
-
-dependency "zlib"
-dependency "cacerts"
-dependency "libgcc"
-dependency "makedepend"
-
-
-if platform == "aix"
-  # XXX: OpenSSL has an open bug on 1.0.1e where it fails to install on AIX
-  #      http://rt.openssl.org/Ticket/Display.html?id=2986&user=guest&pass=guest
-  default_version "1.0.1c"
-  source :url => "http://www.openssl.org/source/openssl-1.0.1c.tar.gz",
-         :md5 => "ae412727c8c15b67880aef7bd2999b2e"
-else
-  default_version "1.0.1h"
-  source :url => "http://www.openssl.org/source/openssl-1.0.1h.tar.gz",
-         :md5 => "8d6d684a9430d5cc98a62a5d8fbda8cf"
-end
-
-relative_path "openssl-#{version}"
-
-build do
-  patch :source => "openssl-1.0.1f-do-not-build-docs.patch"
-
-  env = case platform
-        when "mac_os_x"
-          {
-            "CFLAGS" => "-arch x86_64 -m64 -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -I#{install_dir}/embedded/include/ncurses",
-            "LDFLAGS" => "-arch x86_64 -R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -I#{install_dir}/embedded/include/ncurses"
-          }
-        when "aix"
-        {
-            "CC" => "xlc -q64",
-            "CXX" => "xlC -q64",
-            "LD" => "ld -b64",
-            "CFLAGS" => "-q64 -I#{install_dir}/embedded/include -O",
-            "CXXFLAGS" => "-q64 -I#{install_dir}/embedded/include -O",
-            "LDFLAGS" => "-q64 -L#{install_dir}/embedded/lib -Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib",
-            "OBJECT_MODE" => "64",
-            "AR" => "/usr/bin/ar",
-            "ARFLAGS" => "-X64 cru",
-            "M4" => "/opt/freeware/bin/m4",
-        }
-        when "solaris2"
-          {
-            "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
-            "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -static-libgcc",
-            "LD_OPTIONS" => "-R#{install_dir}/embedded/lib"
-          }
-        else
-          {
-            "CFLAGS" => "-I#{install_dir}/embedded/include",
-            "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib"
-          }
-        end
-
-  common_args = [
-    "--prefix=#{install_dir}/embedded",
-    "--with-zlib-lib=#{install_dir}/embedded/lib",
-    "--with-zlib-include=#{install_dir}/embedded/include",
-    "no-idea",
-    "no-mdc2",
-    "no-rc5",
-    "zlib",
-    "shared",
-  ].join(" ")
-
-  configure_command = case platform
-                      when "aix"
-                        ["perl", "./Configure",
-                         "aix64-cc",
-                         common_args,
-                        "-L#{install_dir}/embedded/lib",
-                        "-I#{install_dir}/embedded/include",
-                        "-Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib"].join(" ")
-                      when "mac_os_x"
-                        ["./Configure",
-                         "darwin64-x86_64-cc",
-                         common_args,
-                        ].join(" ")
-                      when "smartos"
-                        ["/bin/bash ./Configure",
-                         "solaris64-x86_64-gcc",
-                         common_args,
-                         "-L#{install_dir}/embedded/lib",
-                         "-I#{install_dir}/embedded/include",
-                         "-R#{install_dir}/embedded/lib",
-                        "-static-libgcc"].join(" ")
-                      when "solaris2"
-                        if Omnibus.config.solaris_compiler == "gcc"
-                          if architecture == "sparc"
-                            ["/bin/sh ./Configure",
-                             "solaris-sparcv9-gcc",
-                             common_args,
-                            "-L#{install_dir}/embedded/lib",
-                            "-I#{install_dir}/embedded/include",
-                            "-R#{install_dir}/embedded/lib",
-                            "-static-libgcc"].join(" ")
-                          else
-                            # This should not require a /bin/sh, but without it we get
-                            # Errno::ENOEXEC: Exec format error
-                            ["/bin/sh ./Configure",
-                             "solaris-x86-gcc",
-                             common_args,
-                            "-L#{install_dir}/embedded/lib",
-                            "-I#{install_dir}/embedded/include",
-                            "-R#{install_dir}/embedded/lib",
-                            "-static-libgcc"].join(" ")
-                          end
-                        else
-                          raise "sorry, we don't support building openssl on non-gcc solaris builds right now."
-                        end
-                      else
-                        ["./config",
-                        common_args,
-                        "disable-gost",  # fixes build on linux, but breaks solaris
-                        "-L#{install_dir}/embedded/lib",
-                        "-I#{install_dir}/embedded/include",
-                        "-Wl,-rpath,#{install_dir}/embedded/lib"].join(" ")
-                      end
-
-  # openssl build process uses a `makedepend` tool that we build inside the bundle.
-  env["PATH"] = "#{install_dir}/embedded/bin" + File::PATH_SEPARATOR + ENV["PATH"]
-
-  # @todo: move into omnibus-ruby
-  has_gmake = system("gmake --version")
-
-  if has_gmake
-    env.merge!({'MAKE' => 'gmake'})
-    make_binary = 'gmake'
-  else
-    make_binary = 'make'
-  end
-
-  command configure_command, :env => env
-  command "#{make_binary} depend", :env => env
-  # make -j N on openssl is not reliable
-  command "#{make_binary}", :env => env
-  command "#{make_binary} install", :env => env
-end
@@ -1,171 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# Copyright:: Copyright (c) 2014 GitLab B.V.
-# License:: Apache License, Version 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.
-#
-
-name "ruby"
-default_version "1.9.3-p484"
-
-dependency "zlib"
-dependency "ncurses"
-dependency "libedit"
-dependency "openssl"
-dependency "libyaml"
-dependency "libiconv"
-dependency "gdbm"
-dependency "libgcc" if (platform == "solaris2" and Omnibus.config.solaris_compiler == "gcc")
-
-version "1.9.3-p484" do
-  source md5: '8ac0dee72fe12d75c8b2d0ef5d0c2968'
-end
-
-version "2.0.0-p451" do
-  source md5: '9227787a9636551f1749ee8394b5ffe5'
-end
-
-version "2.1.1" do
-  source md5: 'e57fdbb8ed56e70c43f39c79da1654b2'
-end
-
-version "2.1.2" do
-  source md5: 'a5b5c83565f8bd954ee522bd287d2ca1'
-end
-
-source url: "http://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz"
-
-relative_path "ruby-#{version}"
-
-env =
-  case platform
-  when "mac_os_x"
-    {
-      # -Qunused-arguments suppresses "argument unused during compilation"
-      # warnings. These can be produced if you compile a program that doesn't
-      # link to anything in a path given with -Lextra-libs. Normally these
-      # would be harmless, except that autoconf treats any output to stderr as
-      # a failure when it makes a test program to check your CFLAGS (regardless
-      # of the actual exit code from the compiler).
-      "CFLAGS" => "-arch x86_64 -m64 -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -I#{install_dir}/embedded/include/ncurses -O3 -g -pipe -Qunused-arguments",
-      "LDFLAGS" => "-arch x86_64 -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -I#{install_dir}/embedded/include/ncurses"
-    }
-  when "solaris2"
-    {
-      "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -O3 -g -pipe",
-      "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -static-libgcc",
-      "LD_OPTIONS" => "-R#{install_dir}/embedded/lib"
-    }
-  when "aix"
-    {
-      # see http://www.ibm.com/developerworks/aix/library/au-gnu.html
-      #
-      # specifically:
-      #
-      # "To use AIX run-time linking, you should create the shared object
-      # using gcc -shared -Wl,-G and create executables using the library
-      # by adding the -Wl,-brtl option to the link line. Technically, you
-      # can leave off the -shared option, but it does no harm and reduces
-      # confusion."
-      #
-      # AIX also uses -Wl,-blibpath instead of -R or LD_RUN_PATH, but the
-      # option is not additive, so requires /usr/lib and /lib as well (there
-      # is a -bsvr4 option to allow ld to take an -R flag in addition
-      # to turning on -brtl, but it had other side effects I couldn't fix).
-      #
-      # If libraries linked with gcc -shared have symbol resolution failures
-      # then it may be useful to add -bexpfull to export all symbols.
-      #
-      # -O2 optimized away some configure test which caused ext libs to fail
-      #
-      # We also need prezl's M4 instead of picking up /usr/bin/m4 which
-      # barfs on ruby.
-      #
-      "CC" => "xlc -q64",
-      "CXX" => "xlC -q64",
-      "LD" => "ld -b64",
-      "CFLAGS" => "-q64 -O -qhot -I#{install_dir}/embedded/include",
-      "CXXFLAGS" => "-q64 -O -qhot -I#{install_dir}/embedded/include",
-      "LDFLAGS" => "-q64  -L#{install_dir}/embedded/lib -Wl,-brtl -Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib",
-      "OBJECT_MODE" => "64",
-      "ARFLAGS" => "-X64 cru",
-      "M4" => "/opt/freeware/bin/m4",
-      "warnflags" => "-qinfo=por"
-    }
-  else
-    {
-      "CFLAGS" => "-I#{install_dir}/embedded/include -O3 -g -pipe",
-      "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib"
-    }
-  end
-
-build do
-  configure_command = ["./configure",
-                       "--prefix=#{install_dir}/embedded",
-                       "--with-out-ext=fiddle,dbm",
-                       "--enable-shared",
-                       "--enable-libedit",
-                       "--with-ext=psych",
-                       "--disable-install-doc"]
-
-  case platform
-  when "aix"
-    patch :source => "ruby-aix-configure.patch", :plevel => 1
-    patch :source => "ruby_aix_1_9_3_448_ssl_EAGAIN.patch", :plevel => 1
-    # --with-opt-dir causes ruby to send bogus commands to the AIX linker
-  when "freebsd"
-    configure_command << "--without-execinfo"
-    configure_command << "--with-opt-dir=#{install_dir}/embedded"
-  when "smartos"
-    # Opscode patch - someara@opscode.com
-    # GCC 4.7.0 chokes on mismatched function types between OpenSSL 1.0.1c and Ruby 1.9.3-p286
-    patch :source => "ruby-openssl-1.0.1c.patch", :plevel => 1
-
-    # Patches taken from RVM.
-    # http://bugs.ruby-lang.org/issues/5384
-    # https://www.illumos.org/issues/1587
-    # https://github.com/wayneeseguin/rvm/issues/719
-    patch :source => "rvm-cflags.patch", :plevel => 1
-
-    # From RVM forum
-    # https://github.com/wayneeseguin/rvm/commit/86766534fcc26f4582f23842a4d3789707ce6b96
-    configure_command << "ac_cv_func_dl_iterate_phdr=no"
-    configure_command << "--with-opt-dir=#{install_dir}/embedded"
-  else
-    configure_command << "--with-opt-dir=#{install_dir}/embedded"
-  end
-
-  # @todo expose bundle_bust() in the DSL
-  env.merge!({
-    "RUBYOPT"         => nil,
-    "BUNDLE_BIN_PATH" => nil,
-    "BUNDLE_GEMFILE"  => nil,
-    "GEM_PATH"        => nil,
-    "GEM_HOME"        => nil
-  })
-
-  # @todo: move into omnibus-ruby
-  has_gmake = system("gmake --version")
-
-  if has_gmake
-    env.merge!({'MAKE' => 'gmake'})
-    make_binary = 'gmake'
-  else
-    make_binary = 'make'
-  end
-
-  command configure_command.join(" "), :env => env
-  command "#{make_binary} -j #{max_build_jobs}", :env => env
-  command "#{make_binary} -j #{max_build_jobs} install", :env => env
-end
1	1	source 'https://rubygems.org'
2	2
3		-gem 'omnibus', '~> 3.0.0'
	3	+gem 'omnibus'
4	4	gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master'
5	5	gem 'ohai'
...	...
1	1	GIT
2	2	remote: git://github.com/opscode/omnibus-software.git
3		- revision: 4309667e135644c0c49473ec16aa7dba9fa84f41
	3	+ revision: 7ac92daa6892e0898eb868679e578df530e38ee8
4	4	branch: master
5	5	specs:
6		- omnibus-software (0.0.1)
	6	+ omnibus-software (4.0.0)
7	7
8	8	GEM
9	9	remote: https://rubygems.org/
...	...	@@ -13,18 +13,20 @@ GEM
13	13	cabin (> 0)
14	14	backports (3.6.0)
15	15	cabin (0.6.1)
16		- chef-sugar (1.2.6)
17		- childprocess (0.5.2)
	16	+ chef-sugar (1.3.0)
	17	+ childprocess (0.5.3)
18	18	ffi (~> 1.0, >= 1.0.11)
19	19	clamp (0.6.3)
20	20	ffi (1.9.3)
21		- fpm (1.0.2)
	21	+ ffi-yajl (1.0.2)
	22	+ ffi (~> 1.5)
	23	+ libyajl2 (~> 1.0)
	24	+ fpm (0.4.42)
22	25	arr-pm (~> 0.0.8)
23	26	backports (>= 2.6.2)
24	27	cabin (>= 0.6.0)
25	28	childprocess
26	29	clamp (~> 0.6)
27		- ffi
28	30	ftw (~> 0.0.30)
29	31	json (>= 1.7.7)
30	32	ftw (0.0.39)
...	...	@@ -35,37 +37,40 @@ GEM
35	37	http_parser.rb (0.5.3)
36	38	ipaddress (0.8.0)
37	39	json (1.8.1)
	40	+ libyajl2 (1.0.1)
38	41	mime-types (1.25.1)
39		- mixlib-cli (1.4.0)
	42	+ mixlib-cli (1.5.0)
40	43	mixlib-config (2.1.0)
41	44	mixlib-log (1.6.0)
42		- mixlib-shellout (1.3.0)
43		- ohai (6.20.0)
	45	+ mixlib-shellout (1.4.0)
	46	+ ohai (7.2.0)
	47	+ ffi (~> 1.9)
	48	+ ffi-yajl (~> 1.0)
44	49	ipaddress
	50	+ mime-types (~> 1.16)
45	51	mixlib-cli
46		- mixlib-config
	52	+ mixlib-config (~> 2.0)
47	53	mixlib-log
48		- mixlib-shellout
49		- systemu (~> 2.5.2)
50		- yajl-ruby
51		- omnibus (3.0.0)
	54	+ mixlib-shellout (~> 1.2)
	55	+ systemu (~> 2.6.4)
	56	+ wmi-lite (~> 1.0)
	57	+ omnibus (3.2.1)
52	58	chef-sugar (~> 1.2)
53		- fpm (~> 1.0.0)
54		- mixlib-config (~> 2.1)
55		- mixlib-shellout (~> 1.3)
56		- ohai (~> 6.12)
57		- thor (>= 0.16.0)
	59	+ fpm (~> 0.4)
	60	+ mixlib-shellout (~> 1.4)
	61	+ ohai (~> 7.2)
	62	+ thor (~> 0.18)
58	63	uber-s3
59		- systemu (2.5.2)
	64	+ systemu (2.6.4)
60	65	thor (0.19.1)
61	66	uber-s3 (0.2.4)
62	67	mime-types (~> 1.17)
63		- yajl-ruby (1.2.0)
	68	+ wmi-lite (1.0.0)
64	69
65	70	PLATFORMS
66	71	ruby
67	72
68	73	DEPENDENCIES
69	74	ohai
70		- omnibus (~> 3.0.0)
	75	+ omnibus
71	76	omnibus-software!
...	...
...	...	@@ -5,7 +5,7 @@ SECRET_DIR:=$(shell openssl rand -hex 20)
5	5	PLATFORM_DIR:=$(shell ruby -rjson -e 'puts JSON.parse(`bin/ohai`).values_at("platform", "platform_version").join("-")')
6	6
7	7	build:
8		- OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT}
	8	+ bin/omnibus build ${PROJECT} --override append_timestamp:false --log-level info
9	9
10	10	do_release: no_changes on_tag purge build move_to_platform_dir sync
11	11
...	...
...	...	@@ -21,7 +21,7 @@ maintainer "GitLab.com"
21	21	homepage "http://www.gitlab.com/"
22	22
23	23	replaces "gitlab"
24		-install_path "/opt/gitlab"
	24	+install_dir "/opt/gitlab"
25	25	build_version Omnibus::BuildVersion.new.semver
26	26	build_iteration 1
27	27
...	...	@@ -35,7 +35,7 @@ dependency "git"
35	35	dependency "redis"
36	36	dependency "nginx"
37	37	dependency "chef-gem"
38		-if system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") \|\| system("#{Omnibus.project_root}/support/is_gitlab_com.sh")
	38	+if system("#{Config.project_root}/support/is_gitlab_ee.sh") \|\| system("#{Config.project_root}/support/is_gitlab_com.sh")
39	39	dependency "remote-syslog"
40	40	end
41	41	dependency "runit"
...	...
...	...	@@ -1,52 +0,0 @@
1		-#
2		-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
3		-# License:: Apache License, Version 2.0
4		-#
5		-# Licensed under the Apache License, Version 2.0 (the "License");
6		-# you may not use this file except in compliance with the License.
7		-# You may obtain a copy of the License at
8		-#
9		-# http://www.apache.org/licenses/LICENSE-2.0
10		-#
11		-# Unless required by applicable law or agreed to in writing, software
12		-# distributed under the License is distributed on an "AS IS" BASIS,
13		-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14		-# See the License for the specific language governing permissions and
15		-# limitations under the License.
16		-#
17		-
18		-name "cacerts"
19		-default_version "2014.07.15" # date of the file is in a comment at the start, or in the changelog
20		-
21		-version "2014.07.15" do
22		- source :md5 => "fd48275847fa10a8007008379ee902f1"
23		-end
24		-
25		-version "2014.04.22" do
26		- source :md5 => "9f92a0d9f605e227ae068e605f4c86fa"
27		-end
28		-
29		-version "2014.01.28" do
30		- source :md5 => "5d108f8ab86afacc6663aafca8604dd3"
31		-end
32		-
33		-source :url => "http://curl.haxx.se/ca/cacert.pem"
34		-relative_path "cacerts-#{version}"
35		-
36		-build do
37		- block do
38		- FileUtils.mkdir_p(File.expand_path("embedded/ssl/certs", install_dir))
39		-
40		- # There is a bug in omnibus-ruby that may or may not have been fixed. Since the source url
41		- # does not point to an archive, omnibus-ruby tries to copy cacert.pem into the project working
42		- # directory. However, it fails and copies to '/var/cache/omnibus/src/cacerts-2012.12.19\' instead
43		- # There is supposed to be a fix in omnibus-ruby, but under further testing, it was unsure if the
44		- # fix worked. Rather than trying to fix this now, we're filing a bug and copying the cacert.pem
45		- # directly from the cache instead.
46		-
47		- FileUtils.cp(File.expand_path("cacert.pem", Config.cache_dir),
48		- File.expand_path("embedded/ssl/certs/cacert.pem", install_dir))
49		- end
50		-
51		- command "ln -sf #{install_dir}/embedded/ssl/certs/cacert.pem #{install_dir}/embedded/ssl/cert.pem"
52		-end
...	...	@@ -1,28 +0,0 @@
1		-#
2		-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
3		-# Copyright:: Copyright (c) 2014 GitLab B.V.
4		-# License:: Apache License, Version 2.0
5		-#
6		-# Licensed under the Apache License, Version 2.0 (the "License");
7		-# you may not use this file except in compliance with the License.
8		-# You may obtain a copy of the License at
9		-#
10		-# http://www.apache.org/licenses/LICENSE-2.0
11		-#
12		-# Unless required by applicable law or agreed to in writing, software
13		-# distributed under the License is distributed on an "AS IS" BASIS,
14		-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15		-# See the License for the specific language governing permissions and
16		-# limitations under the License.
17		-#
18		-
19		-name "chef-gem"
20		-default_version "11.12.2"
21		-
22		-dependency "ruby"
23		-dependency "rubygems"
24		-dependency "ohai"
25		-
26		-build do
27		- gem "install chef -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"
28		-end
...	...	@@ -22,7 +22,7 @@ dependency "rsync"
22	22
23	23	always_build true
24	24
25		-source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root)
	25	+source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root)
26	26
27	27	build do
28	28	command "mkdir -p #{install_dir}/embedded/cookbooks"
...	...
...	...	@@ -21,7 +21,7 @@ name "gitlab-ctl"
21	21	dependency "rsync"
22	22	dependency "omnibus-ctl"
23	23
24		-source :path => File.expand_path("files/gitlab-ctl-commands", Omnibus.project_root)
	24	+source :path => File.expand_path("files/gitlab-ctl-commands", Config.project_root)
25	25
26	26	build do
27	27	block do
...	...
...	...	@@ -19,7 +19,7 @@
19	19	name "gitlab-rails"
20	20	default_version "70ed6ef2a6894042c9bbd92f273542bca2a2374f" # 7.0.0.rc1
21	21
22		-EE = system("#{Omnibus.project_root}/support/is_gitlab_ee.sh")
	22	+EE = system("#{Config.project_root}/support/is_gitlab_ee.sh")
23	23
24	24	dependency "ruby"
25	25	dependency "bundler"
...	...	@@ -62,7 +62,7 @@ build do
62	62	# database at this point so that is a problem. This bug is fixed in
63	63	# acts-as-taggable-on 3.0.0 by
64	64	# https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e
65		- aato_patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff"
	65	+ aato_patch = "#{Config.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff"
66	66
67	67	# To make this idempotent, we apply the patch (in case this is a first run) or
68	68	# we revert and re-apply the patch (if this is a second or later run).
...	...
...	...	@@ -0,0 +1,47 @@
	1	+#
	2	+# Copyright 2012-2014 Chef Software, Inc.
	3	+#
	4	+# Licensed under the Apache License, Version 2.0 (the "License");
	5	+# you may not use this file except in compliance with the License.
	6	+# You may obtain a copy of the License at
	7	+#
	8	+# http://www.apache.org/licenses/LICENSE-2.0
	9	+#
	10	+# Unless required by applicable law or agreed to in writing, software
	11	+# distributed under the License is distributed on an "AS IS" BASIS,
	12	+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	13	+# See the License for the specific language governing permissions and
	14	+# limitations under the License.
	15	+#
	16	+
	17	+name "libffi"
	18	+default_version "3.0.13"
	19	+
	20	+dependency "libgcc"
	21	+dependency "libtool"
	22	+
	23	+source url: "ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz",
	24	+ md5: '45f3b6dbc9ee7c7dfbbbc5feba571529'
	25	+
	26	+relative_path "libffi-3.0.13"
	27	+
	28	+build do
	29	+ env = with_standard_compiler_flags(with_embedded_path)
	30	+
	31	+ command "./configure" \
	32	+ " --prefix=#{install_dir}/embedded", env: env
	33	+
	34	+ command "make -j #{max_build_jobs}", env: env
	35	+ command "make -j #{max_build_jobs} install", env: env
	36	+
	37	+ # libffi's default install location of header files is awful...
	38	+ copy "#{install_dir}/embedded/lib/libffi-#{version}/include/*", "#{install_dir}/embedded/include"
	39	+
	40	+ # On 64-bit centos, libffi libraries are places under /embedded/lib64
	41	+ # move them over to lib
	42	+ if rhel? && _64_bit?
	43	+ copy "#{install_dir}/embedded/lib64/*", "#{install_dir}/embedded/lib/"
	44	+ delete "#{install_dir}/embedded/lib64"
	45	+ end
	46	+end
	47	+
...	...