Browse Source

upgrading package: docker 18.09.0.20181005 -> 18.09.0.20181108

master
parent
commit
468c417e89
  1. 30
      docker/docker.patch
  2. 6
      docker/docker.spec

30
docker/docker.patch

@ -1,6 +1,6 @@
Index: src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go
--- src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go.orig 2018-07-01 13:21:33.000000000 +0200
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2018-07-01 13:35:59.891463000 +0200
--- src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go.orig 2018-11-08 20:36:50.000000000 +0100
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2018-11-08 20:41:19.616194000 +0100
@@ -1,4 +1,4 @@
-// +build !windows,!darwin,!linux
+// +build !windows,!darwin,!linux,!freebsd
@ -8,8 +8,8 @@ Index: src/github.com/docker/cli/cli/config/credentials/default_store_unsupporte
package credentials
Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2018-07-01 13:22:34.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2018-07-01 13:35:59.891641000 +0200
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2018-11-08 20:37:46.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2018-11-08 20:41:19.616334000 +0100
@@ -62,7 +62,7 @@
s, ok := stat.(*syscall.Stat_t)
@ -20,8 +20,8 @@ Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/arc
return
Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2018-07-01 13:22:33.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2018-07-01 13:35:59.891776000 +0200
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2018-11-08 20:37:46.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2018-11-08 20:41:19.616442000 +0100
@@ -29,7 +29,7 @@
}
@ -32,8 +32,8 @@ Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/cha
func hasHardlinks(fi os.FileInfo) bool {
Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-07-01 13:22:33.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go 2018-07-01 13:39:17.643070000 +0200
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-11-08 20:37:46.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go 2018-11-08 20:41:19.616557000 +0100
@@ -37,7 +37,7 @@
if filter != nil {
@ -43,15 +43,15 @@ Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mount
if skip {
continue
}
Index: src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go.orig 2018-07-01 13:21:49.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go 2018-07-01 13:35:59.891921000 +0200
@@ -41,7 +41,7 @@
Index: src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2018-11-08 20:37:11.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go 2018-11-08 20:42:38.834658000 +0100
@@ -45,7 +45,7 @@
stat.Devminor = int64(minor(uint64(s.Rdev)))
}
- ino := s.Ino
+ ino := uint64(s.Ino)
if s.Nlink > 1 {
if oldpath, ok := seenFiles[ino]; ok {
stat.Linkname = oldpath
if seenFiles != nil {
if s.Nlink > 1 {
if oldpath, ok := seenFiles[ino]; ok {

6
docker/docker.spec

@ -23,8 +23,8 @@
# package version
%define V_opkg 18.09.0
%define V_dist 18.09.0-ce-beta1
%define V_snap 20181005
%define V_dist 18.09.0-ce
%define V_snap 20181108
# package information
Name: docker
@ -37,7 +37,7 @@ Class: EVAL
Group: Filesystem
License: Apache
Version: %{V_opkg}.%{V_snap}
Release: 20181005
Release: 20181108
# list of sources
Source0: http://download.openpkg.org/components/versioned/docker/docker-%{V_snap}.tar.xz

Loading…
Cancel
Save