Merge branch 'update/cacerts' into 'master'

Update cacerts to 20140820 See merge request !187

Merge branch 'update/cacerts' into 'master'
Update cacerts to 20140820 See merge request !187
Jacob Vosmaer
2 parents f4712547 3abebe20
Showing 2 changed files with 51 additions and 0 deletions Show diff stats
Makefile
config/software/cacerts.rb
@@ -18,6 +18,7 @@ on_tag:
 purge:
 	rm -rf /var/cache/omnibus/src/gitlab-rails
 	rm -rf /var/cache/omnibus/pkg
+	rm -rf /var/cache/omnibus/cache/cacert.pem
 	mkdir -p pkg
 	(cd pkg && find . -delete)
  
@@ -0,0 +1,50 @@
+#
+# 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 "cacerts"
+
+# Date of the file is in a comment at the start, or in the changelog
+default_version "2014.08.20"
+
+version "2014.08.20" do
+  source md5: "c9f4f7f4d6a5ef6633e893577a09865e"
+end
+
+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
+  mkdir "#{install_dir}/embedded/ssl/certs"
+  copy "#{project_dir}/cacert.pem", "#{install_dir}/embedded/ssl/certs/cacert.pem"
+
+  # Windows does not support symlinks
+  unless windows?
+    link "#{install_dir}/embedded/ssl/certs/cacert.pem", "#{install_dir}/embedded/ssl/cert.pem"
+  end
+end
...	...	@@ -18,6 +18,7 @@ on_tag:
18	18	purge:
19	19	rm -rf /var/cache/omnibus/src/gitlab-rails
20	20	rm -rf /var/cache/omnibus/pkg
	21	+ rm -rf /var/cache/omnibus/cache/cacert.pem
21	22	mkdir -p pkg
22	23	(cd pkg && find . -delete)
23	24
...	...
...	...	@@ -0,0 +1,50 @@
	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 "cacerts"
	18	+
	19	+# Date of the file is in a comment at the start, or in the changelog
	20	+default_version "2014.08.20"
	21	+
	22	+version "2014.08.20" do
	23	+ source md5: "c9f4f7f4d6a5ef6633e893577a09865e"
	24	+end
	25	+
	26	+version "2014.07.15" do
	27	+ source md5: "fd48275847fa10a8007008379ee902f1"
	28	+end
	29	+
	30	+version "2014.04.22" do
	31	+ source md5: "9f92a0d9f605e227ae068e605f4c86fa"
	32	+end
	33	+
	34	+version "2014.01.28" do
	35	+ source md5: "5d108f8ab86afacc6663aafca8604dd3"
	36	+end
	37	+
	38	+source url: "http://curl.haxx.se/ca/cacert.pem"
	39	+
	40	+relative_path "cacerts-#{version}"
	41	+
	42	+build do
	43	+ mkdir "#{install_dir}/embedded/ssl/certs"
	44	+ copy "#{project_dir}/cacert.pem", "#{install_dir}/embedded/ssl/certs/cacert.pem"
	45	+
	46	+ # Windows does not support symlinks
	47	+ unless windows?
	48	+ link "#{install_dir}/embedded/ssl/certs/cacert.pem", "#{install_dir}/embedded/ssl/cert.pem"
	49	+ end
	50	+end
...	...