Skip to content
Snippets Groups Projects
Commit e58ec09b authored by Balasankar C's avatar Balasankar C
Browse files

Merge overrides to definitions itself

parent f311a76a
No related branches found
No related tags found
No related merge requests found
......@@ -61,25 +61,6 @@
end
build_iteration Gitlab::BuildIteration.new.build_iteration
# Overrides for remote URLs of the software
#
# Original git://git.sv.gnu.org/config.git is failing intermittently
config_guess_version = Gitlab::Version.new('config_guess', "master")
rb_readline_version = Gitlab::Version.new('rb-readline', "master")
override :ruby, version: '2.3.3', source: { md5: 'e485f3a55649eb24a1e2e1a40bc120df' }
override :rubygems, version: '2.6.6'
override :'chef-gem', version: '12.12.15'
override :redis, version: '3.2.5', source: { md5: 'd3d2b4dd4b2a3e07ee6f63c526b66b08' }
override :liblzma, version: '5.2.2', source: { md5: '7cf6a8544a7dae8e8106fdf7addfa28c' }
override :libxml2, version: '2.9.4', source: { md5: 'ae249165c173b1ff386ee8ad676815f5' }
override :pcre, version: '8.38', source: { md5: '8a353fe1450216b6655dfcf3561716d9', url: "http://downloads.sourceforge.net/project/pcre/pcre/8.38/pcre-8.38.tar.gz" }
override :expat, version: '2.2.0', source: { md5: '2f47841c829facb346eb6e3fab5212e2', url: "http://downloads.sourceforge.net/project/expat/expat/2.2.0/expat-2.2.0.tar.bz2" }
override :config_guess, version: config_guess_version.print, source: { git: config_guess_version.remote }
override :rsync, version: '3.1.2'
override :'rb-readline' , version: rb_readline_version.print, source: { git: rb_readline_version.remote }
override :zlib, version: '1.2.10', source: { sha256: '8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017' }
# Openssh needs to be installed
if suse?
......
......@@ -15,7 +15,7 @@
#
name "chef-gem"
default_version "11.12.2"
default_version "12.12.15"
license "Apache-2.0"
license_file "https://github.com/chef/chef/blob/master/LICENSE"
......
......@@ -14,4 +14,6 @@
# limitations under the License.
#
require "#{Omnibus::Config.project_root}/lib/gitlab/version"
name "config_guess"
......@@ -17,4 +19,5 @@
name "config_guess"
version = Gitlab::Version.new('config_guess', "master")
default_version "master"
# occasionally http protocol downloads get 500s, so we use git://
......@@ -18,10 +21,10 @@
default_version "master"
# occasionally http protocol downloads get 500s, so we use git://
source git: "git://git.sv.gnu.org/config.git"
source git: version.remote
# http://savannah.gnu.org/projects/config
license "GPL-3.0 (with exception)"
license_file "config.guess"
license_file "config.sub"
......@@ -22,10 +25,10 @@
# http://savannah.gnu.org/projects/config
license "GPL-3.0 (with exception)"
license_file "config.guess"
license_file "config.sub"
relative_path "config_guess-#{version}"
relative_path "config_guess-#{version.print}"
build do
mkdir "#{install_dir}/embedded/lib/config_guess"
......
......@@ -15,7 +15,7 @@
#
name "expat"
default_version "2.1.0"
default_version "2.2.0"
relative_path "expat-#{version}"
dependency "config_guess"
......@@ -24,8 +24,8 @@
license_file "COPYING"
skip_transitive_dependency_licensing true
source url: "http://downloads.sourceforge.net/project/expat/expat/#{version}/expat-#{version}.tar.gz",
md5: "dd7dab7a5fea97d2a6a43f511449b7cd"
source url: "http://downloads.sourceforge.net/project/expat/expat/#{version}/expat-#{version}.tar.bz2",
md5: "2f47841c829facb346eb6e3fab5212e2"
build do
env = with_standard_compiler_flags(with_embedded_path)
......
......@@ -14,4 +14,6 @@
# limitations under the License.
#
require "#{Omnibus::Config.project_root}/lib/gitlab/version"
name "rb-readline"
......@@ -17,4 +19,5 @@
name "rb-readline"
version = Gitlab::Version.new('rb-readline', "master")
default_version "master"
license "BSD-3-Clause"
......@@ -23,7 +26,7 @@
dependency "ruby"
dependency "rubygems"
source git: "https://github.com/ConnorAtherton/rb-readline.git"
source git: version.remote
build do
env = with_embedded_path
......
......@@ -20,7 +20,11 @@
license_file "COPYING"
dependency "config_guess"
default_version "3.0.4"
default_version "3.2.5"
version "3.2.5" do
source md5: "d3d2b4dd4b2a3e07ee6f63c526b66b08"
end
version "3.0.7" do
source md5: "84ed3f486e7a6f0ebada6917370f3532"
......
......@@ -16,6 +16,8 @@
##
#
require "#{Omnibus::Config.project_root}/lib/gitlab/version"
name "registry"
version = Gitlab::Version.new("registry", "2.4.1")
......
#!/usr/bin/env python
import glob
import os
files = ["bundler.rb",
"bzip2.rb",
"cacerts.rb",
"chef-gem.rb",
"chef-zero.rb",
"config_guess.rb",
"curl.rb",
"git.rb",
"gitlab-config-template.rb",
"gitlab-cookbooks.rb",
"gitlab-ctl.rb",
"gitlab-pages.rb",
"gitlab-psql.rb",
"gitlab-rails.rb",
"gitlab-scripts.rb",
"gitlab-selinux.rb",
"gitlab-shell.rb",
"gitlab-workhorse.rb",
"jemalloc.rb",
"krb5.rb",
"libedit.rb",
"libffi.rb",
"libiconv.rb",
"libicu.rb",
"liblzma.rb",
"libossp-uuid.rb",
"libtool.rb",
"libxml2.rb",
"libxslt.rb",
"libyaml.rb",
"logrotate.rb",
"makedepend.rb",
"mattermost.rb",
"mixlib-log.rb",
"mysql-client.rb",
"ncurses.rb",
"nginx.rb",
"nodejs.rb",
"ohai.rb",
"omnibus-ctl.rb",
"openssl.rb",
"pcre.rb",
"pkg-config-lite.rb",
"popt.rb",
"postgresql.rb",
"postgresql_new.rb",
"python-docutils.rb",
"python3.rb",
"rb-readline.rb",
"readline.rb",
"redis.rb",
"registry.rb",
"remote-syslog.rb",
"rsync.rb",
"ruby.rb",
"rubygems.rb",
"runit.rb",
"unzip.rb",
"util-macros.rb",
"xproto.rb",
"zlib.rb"]
for f in glob.glob("*.rb"):
if f not in files:
os.remove(f)
......@@ -15,7 +15,7 @@
#
name "rsync"
default_version "3.1.1"
default_version "3.1.2"
license "GPL v3"
license_file "COPYING"
......
......@@ -15,7 +15,6 @@
#
name "ruby"
license "BSD-2-Clause"
license_file "BSDL"
license_file "COPYING"
......@@ -25,7 +24,7 @@
# https://bugs.ruby-lang.org/issues/11869
# - the current status of 2.3.x is that it downloads but fails to compile.
# - verify that all ffi libs are available for your version on all platforms.
default_version "2.1.8"
default_version "2.3.3"
fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false
......@@ -41,6 +40,7 @@
# and that's the only one we will ever use.
dependency "libiconv"
version("2.3.3") { source md5: "e485f3a55649eb24a1e2e1a40bc120df" }
version("2.3.0") { source md5: "e81740ac7b14a9f837e9573601db3162" }
version("2.2.5") { source md5: "bd8e349d4fb2c75d90817649674f94be" }
......
......@@ -15,6 +15,7 @@
#
name "rubygems"
default_version "2.6.6"
license "MIT"
license_file "https://raw.githubusercontent.com/rubygems/rubygems/master/LICENSE.txt"
......
......@@ -15,7 +15,11 @@
#
name "zlib"
default_version "1.2.8"
default_version "1.2.10"
version "1.2.10" do
source sha256: "8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017"
end
version "1.2.8" do
source md5: "44d667c142d7cda120332623eab69f40"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment