From 2a58a9a7057ba1fb217fe173ead2d824fbe80b65 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 14 Aug 2014 13:26:03 +0200 Subject: [PATCH] Remove software defs that were updated upstream --- config/software/cacerts.rb | 52 ---------------------------------------------------- config/software/chef-gem.rb | 28 ---------------------------- config/software/ohai.rb | 26 -------------------------- config/software/openssl.rb | 158 -------------------------------------------------------------------------------------------------------------------------------------------------------------- config/software/ruby.rb | 171 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 5 files changed, 0 insertions(+), 435 deletions(-) delete mode 100644 config/software/cacerts.rb delete mode 100644 config/software/chef-gem.rb delete mode 100644 config/software/ohai.rb delete mode 100644 config/software/openssl.rb delete mode 100644 config/software/ruby.rb diff --git a/config/software/cacerts.rb b/config/software/cacerts.rb deleted file mode 100644 index db75859..0000000 --- a/config/software/cacerts.rb +++ /dev/null @@ -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 diff --git a/config/software/chef-gem.rb b/config/software/chef-gem.rb deleted file mode 100644 index 6639356..0000000 --- a/config/software/chef-gem.rb +++ /dev/null @@ -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 diff --git a/config/software/ohai.rb b/config/software/ohai.rb deleted file mode 100644 index 48fc593..0000000 --- a/config/software/ohai.rb +++ /dev/null @@ -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 diff --git a/config/software/openssl.rb b/config/software/openssl.rb deleted file mode 100644 index 91d2faa..0000000 --- a/config/software/openssl.rb +++ /dev/null @@ -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 diff --git a/config/software/ruby.rb b/config/software/ruby.rb deleted file mode 100644 index dc0a692..0000000 --- a/config/software/ruby.rb +++ /dev/null @@ -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 -- libgit2 0.21.2