Download as
Browse Code »

Commit 2a58a9a7057ba1fb217fe173ead2d824fbe80b65

Authored by Jacob Vosmaer
1 parent b8e51f74
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Remove software defs that were updated upstream

Showing 5 changed files with 0 additions and 435 deletions   Show diff stats
config/software/cacerts.rb
View file @b8e51f7
@@ -1,52 +0,0 @@ @@ -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  
config/software/chef-gem.rb
View file @b8e51f7
@@ -1,28 +0,0 @@ @@ -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  
config/software/ohai.rb
View file @b8e51f7
@@ -1,26 +0,0 @@ @@ -1,26 +0,0 @@
1 -#  
2 -# Copyright:: Copyright (c) 2014 GitLab B.V.  
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 "ohai"  
19 -default_version "7.0.4"  
20 -  
21 -dependency "ruby"  
22 -dependency "rubygems"  
23 -  
24 -build do  
25 - gem "install ohai -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"  
26 -end  
config/software/openssl.rb
View file @b8e51f7
@@ -1,158 +0,0 @@ @@ -1,158 +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 "openssl"  
19 -  
20 -dependency "zlib"  
21 -dependency "cacerts"  
22 -dependency "libgcc"  
23 -dependency "makedepend"  
24 -  
25 -  
26 -if platform == "aix"  
27 - # XXX: OpenSSL has an open bug on 1.0.1e where it fails to install on AIX  
28 - # http://rt.openssl.org/Ticket/Display.html?id=2986&user=guest&pass=guest  
29 - default_version "1.0.1c"  
30 - source :url => "http://www.openssl.org/source/openssl-1.0.1c.tar.gz",  
31 - :md5 => "ae412727c8c15b67880aef7bd2999b2e"  
32 -else  
33 - default_version "1.0.1h"  
34 - source :url => "http://www.openssl.org/source/openssl-1.0.1h.tar.gz",  
35 - :md5 => "8d6d684a9430d5cc98a62a5d8fbda8cf"  
36 -end  
37 -  
38 -relative_path "openssl-#{version}"  
39 -  
40 -build do  
41 - patch :source => "openssl-1.0.1f-do-not-build-docs.patch"  
42 -  
43 - env = case platform  
44 - when "mac_os_x"  
45 - {  
46 - "CFLAGS" => "-arch x86_64 -m64 -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -I#{install_dir}/embedded/include/ncurses",  
47 - "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"  
48 - }  
49 - when "aix"  
50 - {  
51 - "CC" => "xlc -q64",  
52 - "CXX" => "xlC -q64",  
53 - "LD" => "ld -b64",  
54 - "CFLAGS" => "-q64 -I#{install_dir}/embedded/include -O",  
55 - "CXXFLAGS" => "-q64 -I#{install_dir}/embedded/include -O",  
56 - "LDFLAGS" => "-q64 -L#{install_dir}/embedded/lib -Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib",  
57 - "OBJECT_MODE" => "64",  
58 - "AR" => "/usr/bin/ar",  
59 - "ARFLAGS" => "-X64 cru",  
60 - "M4" => "/opt/freeware/bin/m4",  
61 - }  
62 - when "solaris2"  
63 - {  
64 - "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",  
65 - "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -static-libgcc",  
66 - "LD_OPTIONS" => "-R#{install_dir}/embedded/lib"  
67 - }  
68 - else  
69 - {  
70 - "CFLAGS" => "-I#{install_dir}/embedded/include",  
71 - "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib"  
72 - }  
73 - end  
74 -  
75 - common_args = [  
76 - "--prefix=#{install_dir}/embedded",  
77 - "--with-zlib-lib=#{install_dir}/embedded/lib",  
78 - "--with-zlib-include=#{install_dir}/embedded/include",  
79 - "no-idea",  
80 - "no-mdc2",  
81 - "no-rc5",  
82 - "zlib",  
83 - "shared",  
84 - ].join(" ")  
85 -  
86 - configure_command = case platform  
87 - when "aix"  
88 - ["perl", "./Configure",  
89 - "aix64-cc",  
90 - common_args,  
91 - "-L#{install_dir}/embedded/lib",  
92 - "-I#{install_dir}/embedded/include",  
93 - "-Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib"].join(" ")  
94 - when "mac_os_x"  
95 - ["./Configure",  
96 - "darwin64-x86_64-cc",  
97 - common_args,  
98 - ].join(" ")  
99 - when "smartos"  
100 - ["/bin/bash ./Configure",  
101 - "solaris64-x86_64-gcc",  
102 - common_args,  
103 - "-L#{install_dir}/embedded/lib",  
104 - "-I#{install_dir}/embedded/include",  
105 - "-R#{install_dir}/embedded/lib",  
106 - "-static-libgcc"].join(" ")  
107 - when "solaris2"  
108 - if Omnibus.config.solaris_compiler == "gcc"  
109 - if architecture == "sparc"  
110 - ["/bin/sh ./Configure",  
111 - "solaris-sparcv9-gcc",  
112 - common_args,  
113 - "-L#{install_dir}/embedded/lib",  
114 - "-I#{install_dir}/embedded/include",  
115 - "-R#{install_dir}/embedded/lib",  
116 - "-static-libgcc"].join(" ")  
117 - else  
118 - # This should not require a /bin/sh, but without it we get  
119 - # Errno::ENOEXEC: Exec format error  
120 - ["/bin/sh ./Configure",  
121 - "solaris-x86-gcc",  
122 - common_args,  
123 - "-L#{install_dir}/embedded/lib",  
124 - "-I#{install_dir}/embedded/include",  
125 - "-R#{install_dir}/embedded/lib",  
126 - "-static-libgcc"].join(" ")  
127 - end  
128 - else  
129 - raise "sorry, we don't support building openssl on non-gcc solaris builds right now."  
130 - end  
131 - else  
132 - ["./config",  
133 - common_args,  
134 - "disable-gost", # fixes build on linux, but breaks solaris  
135 - "-L#{install_dir}/embedded/lib",  
136 - "-I#{install_dir}/embedded/include",  
137 - "-Wl,-rpath,#{install_dir}/embedded/lib"].join(" ")  
138 - end  
139 -  
140 - # openssl build process uses a `makedepend` tool that we build inside the bundle.  
141 - env["PATH"] = "#{install_dir}/embedded/bin" + File::PATH_SEPARATOR + ENV["PATH"]  
142 -  
143 - # @todo: move into omnibus-ruby  
144 - has_gmake = system("gmake --version")  
145 -  
146 - if has_gmake  
147 - env.merge!({'MAKE' => 'gmake'})  
148 - make_binary = 'gmake'  
149 - else  
150 - make_binary = 'make'  
151 - end  
152 -  
153 - command configure_command, :env => env  
154 - command "#{make_binary} depend", :env => env  
155 - # make -j N on openssl is not reliable  
156 - command "#{make_binary}", :env => env  
157 - command "#{make_binary} install", :env => env  
158 -end  
config/software/ruby.rb
View file @b8e51f7
@@ -1,171 +0,0 @@ @@ -1,171 +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 "ruby"  
20 -default_version "1.9.3-p484"  
21 -  
22 -dependency "zlib"  
23 -dependency "ncurses"  
24 -dependency "libedit"  
25 -dependency "openssl"  
26 -dependency "libyaml"  
27 -dependency "libiconv"  
28 -dependency "gdbm"  
29 -dependency "libgcc" if (platform == "solaris2" and Omnibus.config.solaris_compiler == "gcc")  
30 -  
31 -version "1.9.3-p484" do  
32 - source md5: '8ac0dee72fe12d75c8b2d0ef5d0c2968'  
33 -end  
34 -  
35 -version "2.0.0-p451" do  
36 - source md5: '9227787a9636551f1749ee8394b5ffe5'  
37 -end  
38 -  
39 -version "2.1.1" do  
40 - source md5: 'e57fdbb8ed56e70c43f39c79da1654b2'  
41 -end  
42 -  
43 -version "2.1.2" do  
44 - source md5: 'a5b5c83565f8bd954ee522bd287d2ca1'  
45 -end  
46 -  
47 -source url: "http://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz"  
48 -  
49 -relative_path "ruby-#{version}"  
50 -  
51 -env =  
52 - case platform  
53 - when "mac_os_x"  
54 - {  
55 - # -Qunused-arguments suppresses "argument unused during compilation"  
56 - # warnings. These can be produced if you compile a program that doesn't  
57 - # link to anything in a path given with -Lextra-libs. Normally these  
58 - # would be harmless, except that autoconf treats any output to stderr as  
59 - # a failure when it makes a test program to check your CFLAGS (regardless  
60 - # of the actual exit code from the compiler).  
61 - "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",  
62 - "LDFLAGS" => "-arch x86_64 -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -I#{install_dir}/embedded/include/ncurses"  
63 - }  
64 - when "solaris2"  
65 - {  
66 - "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -O3 -g -pipe",  
67 - "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -static-libgcc",  
68 - "LD_OPTIONS" => "-R#{install_dir}/embedded/lib"  
69 - }  
70 - when "aix"  
71 - {  
72 - # see http://www.ibm.com/developerworks/aix/library/au-gnu.html  
73 - #  
74 - # specifically:  
75 - #  
76 - # "To use AIX run-time linking, you should create the shared object  
77 - # using gcc -shared -Wl,-G and create executables using the library  
78 - # by adding the -Wl,-brtl option to the link line. Technically, you  
79 - # can leave off the -shared option, but it does no harm and reduces  
80 - # confusion."  
81 - #  
82 - # AIX also uses -Wl,-blibpath instead of -R or LD_RUN_PATH, but the  
83 - # option is not additive, so requires /usr/lib and /lib as well (there  
84 - # is a -bsvr4 option to allow ld to take an -R flag in addition  
85 - # to turning on -brtl, but it had other side effects I couldn't fix).  
86 - #  
87 - # If libraries linked with gcc -shared have symbol resolution failures  
88 - # then it may be useful to add -bexpfull to export all symbols.  
89 - #  
90 - # -O2 optimized away some configure test which caused ext libs to fail  
91 - #  
92 - # We also need prezl's M4 instead of picking up /usr/bin/m4 which  
93 - # barfs on ruby.  
94 - #  
95 - "CC" => "xlc -q64",  
96 - "CXX" => "xlC -q64",  
97 - "LD" => "ld -b64",  
98 - "CFLAGS" => "-q64 -O -qhot -I#{install_dir}/embedded/include",  
99 - "CXXFLAGS" => "-q64 -O -qhot -I#{install_dir}/embedded/include",  
100 - "LDFLAGS" => "-q64 -L#{install_dir}/embedded/lib -Wl,-brtl -Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib",  
101 - "OBJECT_MODE" => "64",  
102 - "ARFLAGS" => "-X64 cru",  
103 - "M4" => "/opt/freeware/bin/m4",  
104 - "warnflags" => "-qinfo=por"  
105 - }  
106 - else  
107 - {  
108 - "CFLAGS" => "-I#{install_dir}/embedded/include -O3 -g -pipe",  
109 - "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib"  
110 - }  
111 - end  
112 -  
113 -build do  
114 - configure_command = ["./configure",  
115 - "--prefix=#{install_dir}/embedded",  
116 - "--with-out-ext=fiddle,dbm",  
117 - "--enable-shared",  
118 - "--enable-libedit",  
119 - "--with-ext=psych",  
120 - "--disable-install-doc"]  
121 -  
122 - case platform  
123 - when "aix"  
124 - patch :source => "ruby-aix-configure.patch", :plevel => 1  
125 - patch :source => "ruby_aix_1_9_3_448_ssl_EAGAIN.patch", :plevel => 1  
126 - # --with-opt-dir causes ruby to send bogus commands to the AIX linker  
127 - when "freebsd"  
128 - configure_command << "--without-execinfo"  
129 - configure_command << "--with-opt-dir=#{install_dir}/embedded"  
130 - when "smartos"  
131 - # Opscode patch - someara@opscode.com  
132 - # GCC 4.7.0 chokes on mismatched function types between OpenSSL 1.0.1c and Ruby 1.9.3-p286  
133 - patch :source => "ruby-openssl-1.0.1c.patch", :plevel => 1  
134 -  
135 - # Patches taken from RVM.  
136 - # http://bugs.ruby-lang.org/issues/5384  
137 - # https://www.illumos.org/issues/1587  
138 - # https://github.com/wayneeseguin/rvm/issues/719  
139 - patch :source => "rvm-cflags.patch", :plevel => 1  
140 -  
141 - # From RVM forum  
142 - # https://github.com/wayneeseguin/rvm/commit/86766534fcc26f4582f23842a4d3789707ce6b96  
143 - configure_command << "ac_cv_func_dl_iterate_phdr=no"  
144 - configure_command << "--with-opt-dir=#{install_dir}/embedded"  
145 - else  
146 - configure_command << "--with-opt-dir=#{install_dir}/embedded"  
147 - end  
148 -  
149 - # @todo expose bundle_bust() in the DSL  
150 - env.merge!({  
151 - "RUBYOPT" => nil,  
152 - "BUNDLE_BIN_PATH" => nil,  
153 - "BUNDLE_GEMFILE" => nil,  
154 - "GEM_PATH" => nil,  
155 - "GEM_HOME" => nil  
156 - })  
157 -  
158 - # @todo: move into omnibus-ruby  
159 - has_gmake = system("gmake --version")  
160 -  
161 - if has_gmake  
162 - env.merge!({'MAKE' => 'gmake'})  
163 - make_binary = 'gmake'  
164 - else  
165 - make_binary = 'make'  
166 - end  
167 -  
168 - command configure_command.join(" "), :env => env  
169 - command "#{make_binary} -j #{max_build_jobs}", :env => env  
170 - command "#{make_binary} -j #{max_build_jobs} install", :env => env  
171 -end