Commit 10a04010 authored by Marin Jankovski's avatar Marin Jankovski

Update multiple software definition license and syntax.

parent 86cd607d
......@@ -49,7 +49,7 @@ build_version Omnibus::BuildVersion.new.semver
build_iteration Gitlab::BuildIteration.new.build_iteration
override :ruby, version: '2.1.8', source: { md5: '091b62f0a9796a3c55de2a228a0e6ef3' }
override :rubygems, version: 'v2.5.1'
override :rubygems, version: '2.6.6'
override :'chef-gem', version: '12.10.24'
override :redis, version: '3.2.1', source: { md5: 'b311d4332326f1e6f86a461b4025636d' }
override :postgresql, version: '9.2.17', source: { md5: 'a75d4a82eae1edda04eda2e60656e74c' }
......
......@@ -23,12 +23,13 @@ license "MIT"
license_file "NOTICE"
source url: "http://web.mit.edu/kerberos/dist/krb5/#{version.rpartition('.').first}/krb5-#{version}.tar.gz",
md5: '2e35f0af0344d68aba99cef616d3a64f'
sha256: '6bcad7e6778d1965e4ce4af21d2efdc15b274c5ce5c69031c58e4c954cda8b27'
relative_path "krb5-#{version}"
build do
env = with_standard_compiler_flags(with_embedded_path)
cwd = "#{Omnibus::Config.source_dir}/krb5/krb5-#{version}/src"
# 'configure' will detect libkeyutils and set up the krb5 build
# to link against it. This gives us trouble during the Omnibus 'health
......@@ -37,8 +38,8 @@ build do
patch source: 'disable-keyutils.patch', target: 'src/configure'
command "./configure" \
" --prefix=#{install_dir}/embedded --without-system-verto", env: env, cwd: "#{Omnibus::Config.source_dir}/krb5/krb5-#{version}/src"
" --prefix=#{install_dir}/embedded --without-system-verto", env: env, cwd: cwd
command "make -j #{workers}", env: env, cwd: "#{Omnibus::Config.source_dir}/krb5/krb5-#{version}/src"
command "make install", cwd: "#{Omnibus::Config.source_dir}/krb5/krb5-#{version}/src"
make " -j #{workers}", env: env, cwd: cwd
make "install", env: env, cwd: cwd
end
......@@ -19,10 +19,8 @@
name "libicu"
default_version "56.1"
source :url => "http://download.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.tgz",
:md5 => "c4a2d71ff56aec5ebfab2a3f059be99d"
relative_path 'icu/source'
source url: "http://download.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.tgz",
sha256: "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816"
license "MIT"
license_file "license.html"
......@@ -30,6 +28,7 @@ license_file "license.html"
build do
env = with_standard_compiler_flags(with_embedded_path)
env['LD_RPATH'] = "#{install_dir}/embedded/lib"
cwd = "#{Omnibus::Config.source_dir}/icu/source"
command ["./runConfigureICU",
"Linux/gcc",
......@@ -37,8 +36,8 @@ build do
"--with-data-packaging=files",
"--enable-shared",
"--without-samples"
].join(" "), :env => env
].join(" "), env: env, cwd: cwd
command "make -j #{workers}", :env => env
command "make install"
make "-j #{workers}", env: env, cwd: cwd
make "install", env: env, cwd: cwd
end
......@@ -20,6 +20,9 @@
name "mixlib-log"
default_version "1.6.0"
license "Apache-2.0"
license_file "https://raw.githubusercontent.com/chef/mixlib-log/master/LICENSE"
dependency "ruby"
dependency "rubygems"
......
......@@ -18,7 +18,7 @@ name "ohai"
default_version "8.15.1"
license "Apache-2.0"
license_file "LICENSE"
license_file "https://raw.githubusercontent.com/chef/ohai/v#{version}/LICENSE"
dependency "ruby"
dependency "rubygems"
......
......@@ -27,8 +27,8 @@ dependency "ncurses"
license "GPL-3.0"
license_file "COPYING"
source :url => "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz",
:md5 => "67948acb2ca081f23359d0256e9a271c"
source url: "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz",
md5: "67948acb2ca081f23359d0256e9a271c"
relative_path "#{name}-#{version}"
......@@ -44,8 +44,8 @@ build do
"--prefix=#{install_dir}/embedded"
].join(" ")
patch :source => "readline-6.2-curses-link.patch" , :plevel => 1
patch source: "readline-6.2-curses-link.patch", plevel: 1
command configure_command, :env => env
command "make", :env => env
command "make install", :env => env
make " -j #{workers}", env: env
make "install", env: env
end
......@@ -22,8 +22,8 @@ default_version "6.0"
license "Info-ZIP"
license_file "LICENSE"
source :url => "http://vorboss.dl.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz",
:md5 => "62b490407489521db863b523a7f86375"
source url: "http://vorboss.dl.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz",
sha256: "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37"
relative_path "unzip60"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment