Merge branch 'cacert_update' into 'master'

Update to latest cacerts file

Tried to build a package this morning and it looks like the cacerts.pem file from curl.haxx.se has been changed recently.   Updated with a new version number and checksum.  

I have also updated the URL to get from https as if you try and get it with curl on a command line it redirects to https so probably better to define the download over https as well:

```
~> curl http://curl.haxx.se/ca/cacert.pem
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>301 Moved Permanently</title>
</head><body>
<h1>Moved Permanently</h1>
<p>The document has moved <a href="https://curl.haxx.se/ca/cacert.pem">here</a>.</p>
<hr>
<address>Apache Server at curl.haxx.se Port 80</address>
</body></html>
```

I think this may be needed in 8.12.2 when that goes out, let me know if the CHANGELOG needs to corrected for that though.

See merge request !1007
This commit is contained in:
Marin Jankovski 2016-09-29 15:37:40 +00:00
commit 9bc1fec5bc
2 changed files with 7 additions and 2 deletions

View File

@ -6,6 +6,7 @@ omnibus-gitlab repository.
8.13.0
- Add support for registry debug addr configuration
- Updated cacerts.pem to 2016-09-14 version
8.12.2

View File

@ -17,7 +17,11 @@
name "cacerts"
# Date of the file is in a comment at the start, or in the changelog
default_version "2016.04.20"
default_version "2016.09.14"
version "2016.09.14" do
source md5: "8d35a5cef6ce28da07867a0712558067"
end
version "2016.04.20" do
source md5: "782dcde8f5d53b1b9e888fdf113c42b9"
@ -55,7 +59,7 @@ version "2014.01.28" do
source md5: "5d108f8ab86afacc6663aafca8604dd3"
end
source url: "http://curl.haxx.se/ca/cacert.pem"
source url: "https://curl.haxx.se/ca/cacert.pem"
relative_path "cacerts-#{version}"