Browse Source

upgrading package: docker 17.07.0 -> 17.09.0

Ralf S. Engelschall 8 years ago
parent
commit
9f20bedf3e
2 changed files with 45 additions and 10 deletions
  1. 35 2
      docker/docker.patch
  2. 10 8
      docker/docker.spec

+ 35 - 2
docker/docker.patch

@@ -1,6 +1,39 @@
+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	2017-09-27 20:56:28.000000000 +0200
++++ src/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go	2017-09-27 21:08:05.653915000 +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/docker/docker/pkg/archive/archive_unix.go
+--- src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig	2017-09-27 20:57:07.000000000 +0200
++++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/archive_unix.go	2017-09-27 21:08:05.654068000 +0200
+@@ -62,7 +62,7 @@
+ 	s, ok := stat.(*syscall.Stat_t)
+ 
+ 	if ok {
+-		inode = s.Ino
++		inode = uint64(s.Ino)
+ 	}
+ 
+ 	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	2017-09-27 20:57:07.000000000 +0200
++++ src/github.com/docker/cli/vendor/github.com/docker/docker/pkg/archive/changes_unix.go	2017-09-27 21:08:28.640616000 +0200
+@@ -29,7 +29,7 @@
+ }
+ 
+ func getIno(fi os.FileInfo) uint64 {
+-	return fi.Sys().(*syscall.Stat_t).Ino
++	return uint64(fi.Sys().(*syscall.Stat_t).Ino)
+ }
+ 
+ func hasHardlinks(fi os.FileInfo) bool {
 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	2017-08-06 18:30:15.000000000 +0200
-+++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go	2017-08-06 18:42:25.220616000 +0200
+--- src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go.orig	2017-09-27 20:56:41.000000000 +0200
++++ src/github.com/docker/cli/vendor/github.com/tonistiigi/fsutil/walker_unix.go	2017-09-27 21:08:05.654193000 +0200
 @@ -41,7 +41,7 @@
  			stat.Devminor = int64(minor(uint64(s.Rdev)))
  		}

+ 10 - 8
docker/docker.spec

@@ -22,9 +22,9 @@
 ##
 
 #   package version
-%define       V_opkg 17.07.0
-%define       V_dist 17.07.0-ce
-%define       V_snap 20170901
+%define       V_opkg 17.09.0
+%define       V_dist 17.09.0-ce
+%define       V_snap 20170927
 
 #   package information
 Name:         docker
@@ -37,7 +37,7 @@ Class:        EVAL
 Group:        Filesystem
 License:      Apache
 Version:      %{V_opkg}
-Release:      20170901
+Release:      20170927
 
 #   list of sources
 Source0:      http://download.openpkg.org/components/versioned/docker/docker-%{V_snap}.tar.xz
@@ -67,8 +67,10 @@ PreReq:       OpenPKG, openpkg >= 20160101
     #   build program
     export GOPATH=`pwd`
     cd $GOPATH/src/github.com/docker/cli
-    rm -f cmd/docker/docker_windows.go
-    rm -f cmd/docker/daemon_unix.go
+    cp  cli/config/credentials/default_store_linux.go \
+        cli/config/credentials/default_store_freebsd.go
+    cp  vendor/github.com/docker/docker-credential-helpers/pass/pass_linux.go \
+        vendor/github.com/docker/docker-credential-helpers/pass/pass_freebsd.go
     date=`date "+%%a %%b %%d %%H:%%M:%%S %%Y"`
     go build \
         -x \
@@ -76,10 +78,10 @@ PreReq:       OpenPKG, openpkg >= 20160101
             -X 'github.com/docker/cli/cli.BuildTime=$date' \
             -X 'github.com/docker/cli/cli.Version=%{V_dist}'" \
         -o docker \
-        cmd/docker/*.go
+        github.com/docker/cli/cmd/docker
 
     #   build manpages
-    (   cd man
+    (   cd $GOPATH/src/github.com/docker/cli/man
         %{l_shtool} subst -e 's;go-md2man;md2man;g' md2man-all.sh
         sh md2man-all.sh
     ) || exit $?