diff options
author | Amy Fong <amy.fong@windriver.com> | 2015-06-08 13:26:01 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-06-14 23:00:09 -0400 |
commit | fe357d8c80137595ee6d0a84b9178f2f846ba441 (patch) | |
tree | fb1c7a56e680e716eeb1fd231331b483bd8a7737 /recipes-containers/docker/files/disable_sha1sum_startup.patch | |
parent | e50e36cfa3898b1defcbffe9f3fd0a20403c8de3 (diff) | |
download | meta-virtualization-fe357d8c80137595ee6d0a84b9178f2f846ba441.tar.gz |
docker uprev 1.6.2
Uprev docker to 1.6.2
go-capability is upreved to a later git commit
go-dbus is upreved to version 2
go-distribution-digest is added as a new dependency. Only the
digest part of go-distribution is needed/kept here,
hence go-distribution-digest
go-logrus is upreved to 0.7.1
Remove PR since it's no longer used
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/docker/files/disable_sha1sum_startup.patch')
-rw-r--r-- | recipes-containers/docker/files/disable_sha1sum_startup.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-containers/docker/files/disable_sha1sum_startup.patch b/recipes-containers/docker/files/disable_sha1sum_startup.patch index cc6819bd..580ca23a 100644 --- a/recipes-containers/docker/files/disable_sha1sum_startup.patch +++ b/recipes-containers/docker/files/disable_sha1sum_startup.patch | |||
@@ -17,15 +17,15 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com> | |||
17 | 17 | ||
18 | --- a/utils/utils.go | 18 | --- a/utils/utils.go |
19 | +++ b/utils/utils.go | 19 | +++ b/utils/utils.go |
20 | @@ -4,7 +4,6 @@ | 20 | @@ -3,7 +3,6 @@ |
21 | import ( | ||
21 | "bufio" | 22 | "bufio" |
22 | "bytes" | 23 | "bytes" |
23 | "crypto/rand" | ||
24 | - "crypto/sha1" | 24 | - "crypto/sha1" |
25 | "crypto/sha256" | 25 | "crypto/sha256" |
26 | "encoding/hex" | 26 | "encoding/hex" |
27 | "fmt" | 27 | "fmt" |
28 | @@ -76,20 +75,6 @@ | 28 | @@ -75,20 +74,6 @@ |
29 | return path | 29 | return path |
30 | } | 30 | } |
31 | 31 | ||
@@ -46,7 +46,7 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com> | |||
46 | func isValidDockerInitPath(target string, selfPath string) bool { // target and selfPath should be absolute (InitPath and SelfPath already do this) | 46 | func isValidDockerInitPath(target string, selfPath string) bool { // target and selfPath should be absolute (InitPath and SelfPath already do this) |
47 | if target == "" { | 47 | if target == "" { |
48 | return false | 48 | return false |
49 | @@ -111,7 +96,7 @@ | 49 | @@ -110,7 +95,7 @@ |
50 | } | 50 | } |
51 | return os.SameFile(targetFileInfo, selfPathFileInfo) | 51 | return os.SameFile(targetFileInfo, selfPathFileInfo) |
52 | } | 52 | } |