openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: docker 19.03.5.20191130 -> 19.03.5.20191215

master
Dr. Ralf S. Engelschall 6 years ago
parent
9144b24148
commit
8600b11452
2 changed files with 18 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      docker/docker.patch
  2. 4
      docker/docker.spec

44
docker/docker.patch
Unescape View File

@ -1,27 +1,15 @@
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 2019-10-09 08:11:53.000000000 +0200
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2019-10-09 21:23:25.096043000 +0200
--- src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go.orig 2019-12-15 12:22:35.000000000 +0100
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2019-12-15 13:40:22.263683000 +0100
@@ -1,4 +1,4 @@
-// +build !windows,!darwin,!linux
+// +build !windows,!darwin,!linux,!freebsd
package credentials
Index: src/github.com/docker/cli/vendor/github.com/containerd/containerd/archive/tar_unix.go
--- src/github.com/docker/cli/vendor/github.com/containerd/containerd/archive/tar_unix.go.orig 2019-10-09 08:12:32.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/containerd/containerd/archive/tar_unix.go 2019-10-09 21:23:25.096198000 +0200
@@ -122,7 +122,7 @@
mode |= unix.S_IFIFO
}
- return unix.Mknod(path, mode, int(unix.Mkdev(uint32(hdr.Devmajor), uint32(hdr.Devminor))))
+ return unix.Mknod(path, mode, uint64(unix.Mkdev(uint32(hdr.Devmajor), uint32(hdr.Devminor))))
}
func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error {
Index: src/github.com/docker/cli/vendor/github.com/containerd/continuity/devices/devices_unix.go
--- src/github.com/docker/cli/vendor/github.com/containerd/continuity/devices/devices_unix.go.orig 2019-10-09 08:12:09.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/containerd/continuity/devices/devices_unix.go 2019-10-09 21:23:25.096331000 +0200
--- src/github.com/docker/cli/vendor/github.com/containerd/continuity/devices/devices_unix.go.orig 2019-12-15 12:23:03.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/containerd/continuity/devices/devices_unix.go 2019-12-15 13:40:22.263846000 +0100
@@ -55,7 +55,7 @@
m |= unix.S_IFIFO
}
@ -32,8 +20,8 @@ Index: src/github.com/docker/cli/vendor/github.com/containerd/continuity/devices
// syscallMode returns the syscall-specific mode bits from Go's portable mode bits.
Index: src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go
--- src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go.orig 2019-10-09 08:12:09.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go 2019-10-09 21:23:25.096457000 +0200
--- src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go.orig 2019-12-15 12:23:03.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go 2019-12-15 13:40:22.894824000 +0100
@@ -108,5 +108,5 @@
if !ok {
return errors.New("unsupported stat type")
@ -42,8 +30,8 @@ Index: src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy
+ return unix.Mknod(dst, uint32(fi.Mode()), uint64(st.Rdev))
}
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 2019-10-09 08:13:07.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2019-10-09 21:23:25.096588000 +0200
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2019-12-15 12:24:07.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2019-12-15 13:40:22.894963000 +0100
@@ -63,7 +63,7 @@
s, ok := stat.(*syscall.Stat_t)
@ -54,8 +42,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 2019-10-09 08:13:07.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2019-10-09 21:23:25.096704000 +0200
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2019-12-15 12:24:07.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2019-12-15 13:40:22.895075000 +0100
@@ -35,7 +35,7 @@
}
@ -66,8 +54,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/system/mknod.go
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go.orig 2019-10-09 08:13:07.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go 2019-10-09 22:53:47.113099000 +0200
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go.orig 2019-12-15 12:24:07.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go 2019-12-15 13:40:22.895195000 +0100
@@ -9,7 +9,7 @@
// Mknod creates a filesystem node (file, device special file or named pipe) named path
// with attributes specified by mode and dev.
@ -78,8 +66,8 @@ Index: src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mkno
// Mkdev is used to build the value of linux devices (in /dev/) which specifies major
Index: src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig 2019-10-09 08:12:14.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go 2019-10-09 22:53:47.113297000 +0200
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go.orig 2019-12-15 12:23:15.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go 2019-12-15 13:40:22.895314000 +0100
@@ -45,7 +45,7 @@
mode |= syscall.S_IFBLK
}
@ -90,8 +78,8 @@ Index: src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_
}
return nil
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 2019-10-09 08:12:14.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go 2019-10-09 22:53:47.113468000 +0200
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2019-12-15 12:23:15.000000000 +0100
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go 2019-12-15 13:40:22.895426000 +0100
@@ -45,7 +45,7 @@
stat.Devminor = int64(minor(uint64(s.Rdev)))
}

4
docker/docker.spec
Unescape View File

@ -23,7 +23,7 @@
# package version
%define V_opkg 19.03.5
%define V_snap 20191130
%define V_snap 20191215
# package information
Name: docker
@ -36,7 +36,7 @@ Class: EVAL
Group: Filesystem
License: Apache
Version: %{V_opkg}.%{V_snap}
Release: 20191130
Release: 20191215
# list of sources
Source0: http://download.openpkg.org/components/versioned/docker/docker-%{V_snap}.tar.xz

Write Preview
Loading…
Cancel
Save