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

upgrading package: docker 18.09.2.20190224 -> 18.09.5.20190505

master
Dr. Ralf S. Engelschall 7 years ago
parent
f75c514f51
commit
ea49d5248a
2 changed files with 74 additions and 16 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. 82
      docker/docker.patch
  2. 8
      docker/docker.spec

82
docker/docker.patch
Unescape View File

@ -1,15 +1,49 @@
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-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
--- src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go.orig 2019-05-05 13:40:00.000000000 +0200
+++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go 2019-05-05 15:41:35.596484000 +0200
@@ -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-05-05 13:40:26.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/containerd/containerd/archive/tar_unix.go 2019-05-05 15:42:17.216788000 +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-05-05 13:40:14.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/containerd/continuity/devices/devices_unix.go 2019-05-05 15:42:37.693943000 +0200
@@ -55,7 +55,7 @@
m |= unix.S_IFIFO
}
- return unix.Mknod(p, m, int(dev))
+ return unix.Mknod(p, m, uint64(dev))
}
// 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-05-05 13:40:14.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/containerd/continuity/fs/copy_unix.go 2019-05-05 15:41:35.596636000 +0200
@@ -108,5 +108,5 @@
if !ok {
return errors.New("unsupported stat type")
}
- return unix.Mknod(dst, uint32(fi.Mode()), int(st.Rdev))
+ 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 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
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2019-05-05 13:40:59.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go 2019-05-05 15:41:35.596769000 +0200
@@ -62,7 +62,7 @@
s, ok := stat.(*syscall.Stat_t)
@ -20,9 +54,9 @@ 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-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 @@
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2019-05-05 13:40:59.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go 2019-05-05 15:41:35.596886000 +0200
@@ -35,7 +35,7 @@
}
func getIno(fi os.FileInfo) uint64 {
@ -32,8 +66,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-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
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2019-05-05 13:40:59.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go 2019-05-05 15:41:35.597006000 +0200
@@ -37,7 +37,7 @@
if filter != nil {
@ -43,15 +77,39 @@ 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/docker/docker/pkg/system/mknod.go
--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go.orig 2019-05-05 13:40:59.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/system/mknod.go 2019-05-05 15:41:35.597128000 +0200
@@ -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.
func Mknod(path string, mode uint32, dev int) error {
- return unix.Mknod(path, mode, dev)
+ return unix.Mknod(path, mode, uint64(dev))
}
// 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-05-05 13:40:17.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/diskwriter_unix.go 2019-05-05 15:41:35.597256000 +0200
@@ -45,7 +45,7 @@
mode |= syscall.S_IFBLK
}
- if err := syscall.Mknod(path, mode, int(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
+ if err := syscall.Mknod(path, mode, uint64(mkdev(stat.Devmajor, stat.Devminor))); err != nil {
return err
}
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 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
--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go.orig 2019-05-05 13:40:17.000000000 +0200
+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/stat_unix.go 2019-05-05 15:41:35.597374000 +0200
@@ -45,7 +45,7 @@
stat.Devminor = int64(minor(uint64(s.Rdev)))
}
- ino := s.Ino
+ ino := uint64(s.Ino)
linked := false
if seenFiles != nil {
if s.Nlink > 1 {
if oldpath, ok := seenFiles[ino]; ok {

8
docker/docker.spec
Unescape View File

@ -22,9 +22,9 @@
##
# package version
%define V_opkg 18.09.2
%define V_dist 18.09.2-ce
%define V_snap 20190224
%define V_opkg 18.09.5
%define V_dist 18.09.5-ce
%define V_snap 20190505
# package information
Name: docker
@ -37,7 +37,7 @@ Class: EVAL
Group: Filesystem
License: Apache
Version: %{V_opkg}.%{V_snap}
Release: 20190224
Release: 20190505
# list of sources
Source0: http://download.openpkg.org/components/versioned/docker/docker-%{V_snap}.tar.xz

Write Preview
Loading…
Cancel
Save