Attachment 195823 Details for Bug 230336 – patch file

[patch] patch file

docker-18.06.0.patch (text/plain), 9.19 KB, created by Dmitri Goutnik on 2018-08-03 17:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2018-08-03 17:38:57 UTC

Size: 9.19 KB

patch

obsolete

>Index: sysutils/docker/Makefile
>===================================================================
>--- sysutils/docker/Makefile	(revision 476295)
>+++ sysutils/docker/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=		docker
>-PORTVERSION=		18.03.0
>+PORTVERSION=		18.06.0
> DISTVERSIONPREFIX=	v
> DISTVERSIONSUFFIX=	-ce
> CATEGORIES=		sysutils
>@@ -26,7 +26,5 @@
> 		@${MV} ${GO_WRKSRC}/components/* ${GO_WRKSRC}/
> 		@${CP} ${FILESDIR}/default_store_freebsd.go \
> 			${GO_WRKSRC}/cli/cli/config/credentials/
>-		@${CP} ${FILESDIR}/pass_freebsd.go \
>-			${GO_WRKSRC}/cli/vendor/github.com/docker/docker-credential-helpers/pass/
> 
> .include <bsd.port.mk>
>Index: sysutils/docker/distinfo
>===================================================================
>--- sysutils/docker/distinfo	(revision 476295)
>+++ sysutils/docker/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1522780844
>-SHA256 (docker-docker-ce-v18.03.0-ce_GH0.tar.gz) = 07651973b4a4adac86599b5c1abc9b1c82aa143ac18205ff399afa814d403280
>-SIZE (docker-docker-ce-v18.03.0-ce_GH0.tar.gz) = 12751925
>+TIMESTAMP = 1533309208
>+SHA256 (docker-docker-ce-v18.06.0-ce_GH0.tar.gz) = 18754ecb38d7c210fb2b96ee618dc2bdf94e66cd501d4eef0c685903a83e8501
>+SIZE (docker-docker-ce-v18.06.0-ce_GH0.tar.gz) = 13656557
>Index: sysutils/docker/files/default_store_freebsd.go
>===================================================================
>--- sysutils/docker/files/default_store_freebsd.go	(revision 476295)
>+++ sysutils/docker/files/default_store_freebsd.go	(working copy)
>@@ -1,11 +1,11 @@
> package credentials
> 
> import (
>-	"github.com/docker/docker-credential-helpers/pass"
>+	"os/exec"
> )
> 
> func defaultCredentialsStore() string {
>-	if pass.PassInitialized {
>+	if _, err := exec.LookPath("pass"); err == nil {
> 		return "pass"
> 	}
> 
>Index: sysutils/docker/files/pass_freebsd.go
>===================================================================
>--- sysutils/docker/files/pass_freebsd.go	(revision 476295)
>+++ sysutils/docker/files/pass_freebsd.go	(nonexistent)
>@@ -1,204 +0,0 @@
>-package pass
>-
>-import (
>-	"encoding/base64"
>-	"errors"
>-	"fmt"
>-	"io/ioutil"
>-	"os"
>-	"os/exec"
>-	"path"
>-	"strings"
>-
>-	"github.com/docker/docker-credential-helpers/credentials"
>-)
>-
>-const PASS_FOLDER = "docker-credential-helpers"
>-
>-var (
>-	PassInitialized bool
>-)
>-
>-func init() {
>-	PassInitialized = exec.Command("pass").Run() == nil
>-}
>-
>-func runPass(stdinContent string, args ...string) (string, error) {
>-	cmd := exec.Command("pass", args...)
>-
>-	stdin, err := cmd.StdinPipe()
>-	if err != nil {
>-		return "", err
>-	}
>-	defer stdin.Close()
>-
>-	stderr, err := cmd.StderrPipe()
>-	if err != nil {
>-		return "", err
>-	}
>-	defer stderr.Close()
>-
>-	stdout, err := cmd.StdoutPipe()
>-	if err != nil {
>-		return "", err
>-	}
>-	defer stdout.Close()
>-
>-	err = cmd.Start()
>-	if err != nil {
>-		return "", err
>-	}
>-
>-	_, err = stdin.Write([]byte(stdinContent))
>-	if err != nil {
>-		return "", err
>-	}
>-	stdin.Close()
>-
>-	errContent, err := ioutil.ReadAll(stderr)
>-	if err != nil {
>-		return "", fmt.Errorf("error reading stderr: %s", err)
>-	}
>-
>-	result, err := ioutil.ReadAll(stdout)
>-	if err != nil {
>-		return "", fmt.Errorf("Error reading stdout: %s", err)
>-	}
>-
>-	cmdErr := cmd.Wait()
>-	if cmdErr != nil {
>-		return "", fmt.Errorf("%s: %s", cmdErr, errContent)
>-	}
>-
>-	return string(result), nil
>-}
>-
>-// Pass handles secrets using Linux secret-service as a store.
>-type Pass struct{}
>-
>-// Add adds new credentials to the keychain.
>-func (h Pass) Add(creds *credentials.Credentials) error {
>-	if !PassInitialized {
>-		return errors.New("pass store is uninitialized")
>-	}
>-
>-	if creds == nil {
>-		return errors.New("missing credentials")
>-	}
>-
>-	encoded := base64.URLEncoding.EncodeToString([]byte(creds.ServerURL))
>-
>-	_, err := runPass(creds.Secret, "insert", "-f", "-m", path.Join(PASS_FOLDER, encoded, creds.Username))
>-	return err
>-}
>-
>-// Delete removes credentials from the store.
>-func (h Pass) Delete(serverURL string) error {
>-	if !PassInitialized {
>-		return errors.New("pass store is uninitialized")
>-	}
>-
>-	if serverURL == "" {
>-		return errors.New("missing server url")
>-	}
>-
>-	encoded := base64.URLEncoding.EncodeToString([]byte(serverURL))
>-	_, err := runPass("", "rm", "-rf", path.Join(PASS_FOLDER, encoded))
>-	return err
>-}
>-
>-// listPassDir lists all the contents of a directory in the password store.
>-// Pass uses fancy unicode to emit stuff to stdout, so rather than try
>-// and parse this, let's just look at the directory structure instead.
>-func listPassDir(args ...string) ([]os.FileInfo, error) {
>-	passDir := os.ExpandEnv("$HOME/.password-store")
>-	for _, e := range os.Environ() {
>-		parts := strings.SplitN(e, "=", 2)
>-		if len(parts) < 2 {
>-			continue
>-		}
>-
>-		if parts[0] != "PASSWORD_STORE_DIR" {
>-			continue
>-		}
>-
>-		passDir = parts[1]
>-		break
>-	}
>-
>-	p := path.Join(append([]string{passDir, PASS_FOLDER}, args...)...)
>-	contents, err := ioutil.ReadDir(p)
>-	if err != nil {
>-		if os.IsNotExist(err) {
>-			return []os.FileInfo{}, nil
>-		}
>-
>-		return nil, err
>-	}
>-
>-	return contents, nil
>-}
>-
>-// Get returns the username and secret to use for a given registry server URL.
>-func (h Pass) Get(serverURL string) (string, string, error) {
>-	if !PassInitialized {
>-		return "", "", errors.New("pass store is uninitialized")
>-	}
>-
>-	if serverURL == "" {
>-		return "", "", errors.New("missing server url")
>-	}
>-
>-	encoded := base64.URLEncoding.EncodeToString([]byte(serverURL))
>-
>-	usernames, err := listPassDir(encoded)
>-	if err != nil {
>-		return "", "", err
>-	}
>-
>-	if len(usernames) < 1 {
>-		return "", "", fmt.Errorf("no usernames for %s", serverURL)
>-	}
>-
>-	actual := strings.TrimSuffix(usernames[0].Name(), ".gpg")
>-	secret, err := runPass("", "show", path.Join(PASS_FOLDER, encoded, actual))
>-	return actual, secret, err
>-}
>-
>-// List returns the stored URLs and corresponding usernames for a given credentials label
>-func (h Pass) List() (map[string]string, error) {
>-	if !PassInitialized {
>-		return nil, errors.New("pass store is uninitialized")
>-	}
>-
>-	servers, err := listPassDir()
>-	if err != nil {
>-		return nil, err
>-	}
>-
>-	resp := map[string]string{}
>-
>-	for _, server := range servers {
>-		if !server.IsDir() {
>-			continue
>-		}
>-
>-		serverURL, err := base64.URLEncoding.DecodeString(server.Name())
>-		if err != nil {
>-			return nil, err
>-		}
>-
>-		usernames, err := listPassDir(server.Name())
>-		if err != nil {
>-			return nil, err
>-		}
>-
>-		if len(usernames) < 1 {
>-			return nil, fmt.Errorf("no usernames for %s", serverURL)
>-		}
>-
>-		resp[string(serverURL)] = strings.TrimSuffix(usernames[0].Name(), ".gpg")
>-	}
>-
>-	return resp, nil
>-}
>
>Property changes on: sysutils/docker/files/pass_freebsd.go
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go
>===================================================================
>--- sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go	(nonexistent)
>+++ sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig	2018-08-03 16:04:11 UTC
>++++ components/cli/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
>+@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc) 
>+ 
>+ 		if filter != nil {
>+ 			// filter out entries we're not interested in
>+-			skip, stop = filter(p)
>++			skip, stop = filter(&mountinfo)
>+ 			if skip {
>+ 				continue
>+ 			}
>
>Property changes on: sysutils/docker/files/patch-components_cli_vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go
>===================================================================
>--- sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go	(nonexistent)
>+++ sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go	(working copy)
>@@ -0,0 +1,8 @@
>+--- components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go.orig	2018-08-03 15:31:57 UTC
>++++ components/cli/vendor/github.com/tonistiigi/fsutil/chtimes_nolinux.go
>+@@ -1,4 +1,4 @@
>+-// +build !linux
>++// +build !linux,!freebsd
>+ 
>+ package fsutil
>+ 
>
>Property changes on: sysutils/docker/files/patch-components_cli_vendor_github.com_tonistiigi_fsutil_chtimes__nolinux.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

dmgk: maintainer-approval?

Actions: View | Diff

Attachments on bug 230336: 195823