Update Consul deps, this lets us get rid of the patches, as changes have been implemented with the respective upstreams, some mentioned in the original SmartOS support ticket:

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update Consul deps, this lets us get rid of the patches, as changes have been implemented with the respective upstreams, some mentioned in the original SmartOS support ticket:
From: Filip Hajny <filip%joyent.com@localhost>
Date: Thu, 07 Jan 2016 10:07:00 +0000
Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Thu Jan 7 10:07:00 2016 +0000
Changeset:	e96163e51adaab73732fc169b57809489747c641

Modified Files:
	consul/Makefile
	consul/distinfo
Added Files:
	consul/TODO
Removed Files:
	consul/patches/patch-.._.._.._golang.org_x_crypto_util__solaris.go
	consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_Sirupsen_logrus_terminal_solaris.go
	consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_solaris.go
	consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_unsupported.go

Log Message:
Update Consul deps, this lets us get rid of the patches, as changes have
been implemented with the respective upstreams, some mentioned in the
original SmartOS support ticket:

  https://github.com/hashicorp/consul/issues/159

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e96163e51adaab73732fc169b57809489747c641

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 consul/Makefile                                    |  7 +-
 consul/TODO                                        | 14 ++++
 consul/distinfo                                    | 12 +--
 ...h-.._.._.._golang.org_x_crypto_util__solaris.go | 95 ----------------------
 ..._github.com_Sirupsen_logrus_terminal_solaris.go | 23 ------
 ...ub.com_docker_docker_pkg_system_stat_solaris.go | 26 ------
 ...om_docker_docker_pkg_system_stat_unsupported.go | 14 ----
 7 files changed, 22 insertions(+), 169 deletions(-)

diffs:
diff --git a/consul/Makefile b/consul/Makefile
index 9d6a94f..39e4e37 100644
--- a/consul/Makefile
+++ b/consul/Makefile
@@ -10,8 +10,9 @@ COMMENT=	Tool for service discovery, monitoring and configuration
 LICENSE=	mpl-2.0
 
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTFILES+=	${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
-SITES.${DISTNAME}-deps.tar.gz=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
+DEPS=		${DISTNAME}-deps-20160107.tar.gz
+DISTFILES+=	${DEFAULT_DISTFILES} ${DEPS}
+SITES.${DEPS}=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
 
 WRKSRC=		${WRKDIR}/src/github.com/hashicorp/consul
 
@@ -30,7 +31,7 @@ post-extract:
 	${MKDIR} ${WRKSRC}
 	${MV} ${WRKDIR}/${DISTNAME}/* ${WRKSRC}
 
-deps: extract
+getdeps: extract
 	cd ${WRKSRC} && env ${MAKE_ENV} ${MAKE_PROGRAM} deps ${MAKE_FLAGS}
 
 do-build:
diff --git a/consul/TODO b/consul/TODO
new file mode 100644
index 0000000..d2ccfbb
--- /dev/null
+++ b/consul/TODO
@@ -0,0 +1,14 @@
+There are two ways this package differs from other Go package in pkgsrc.
+
+1. Dependencies are pre-fetched and pre-packed as DISTFILES. They are not
+   actually required or used in any way at run time, and when installed
+   via `go install`, they fail to build on some platforms for various
+   reasons, which is not the case when simply fetched and made available
+   for the Consul build to succeed.
+
+2. The lang/go-package.mk framework is not used, because the Consul build
+   only results in a single fat binary, and doesn't need the hundreds of
+   source files. Also this helps avoid #1 above.
+
+To prepare dependencies, disable the DISTFILES (re)definition and use
+the 'getdeps' post-extract pkgsrc target.
diff --git a/consul/distinfo b/consul/distinfo
index 773b32c..36ab3ca 100644
--- a/consul/distinfo
+++ b/consul/distinfo
@@ -1,14 +1,10 @@
 $NetBSD$
 
-SHA1 (consul-0.6.0-deps.tar.gz) = a0a159930e08a97a458fe260c3b132150019c59f
-RMD160 (consul-0.6.0-deps.tar.gz) = dbe75c2a0262306ddad95edc5cab287d864fa831
-SHA512 (consul-0.6.0-deps.tar.gz) = ad97be504cb9623f2add67607abffa6710c49b59d475086c187ae9aa686ac4543a2de8ca09355f958a6adb5ce45177db77f9351c65806eaad0174763c8bb5376
-Size (consul-0.6.0-deps.tar.gz) = 36566770 bytes
+SHA1 (consul-0.6.0-deps-20160107.tar.gz) = 6b7548a6479fef5e790a065e43899bb15dfe91ce
+RMD160 (consul-0.6.0-deps-20160107.tar.gz) = c26bfa79c6244407be5339757e885b366fab3b83
+SHA512 (consul-0.6.0-deps-20160107.tar.gz) = 47adf427509eb66cb77a3e81a427824101d1f7e1fdc5e839c56a3f8d71c14b86f261dcede0e752a6dcb46d83043d956f319ab392b8a2c1c50127dc28a0a39d59
+Size (consul-0.6.0-deps-20160107.tar.gz) = 37924371 bytes
 SHA1 (consul-0.6.0.tar.gz) = 86c156079c9138b11580ac1dedd5acbbe7a0f6e3
 RMD160 (consul-0.6.0.tar.gz) = cc5481473ad55978b62cda5af7bfcbcd6978ff3c
 SHA512 (consul-0.6.0.tar.gz) = 0caea4f7b45424c0d9d07cd931c7c3ae99c38a865d29c0d21affd11a92bef6459ab6d55d98b4d3b6c1a77b51cd92444f3ca157160e2febc1377d8ea92c8a3b49
 Size (consul-0.6.0.tar.gz) = 1966751 bytes
-SHA1 (patch-.._.._.._golang.org_x_crypto_util__solaris.go) = 55011f421620199634d3dade15da365831df0d8c
-SHA1 (patch-.._.._fsouza_go-dockerclient_external_github.com_Sirupsen_logrus_terminal_solaris.go) = f9dd9eafefa30c84b5a98109c20d14a828c5dc09
-SHA1 (patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_solaris.go) = 431566fe7d5350888e918a5ffc1ce49d4a96bebd
-SHA1 (patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_unsupported.go) = 0b550ceec7123de545b7066898a8ce816001859d
diff --git a/consul/patches/patch-.._.._.._golang.org_x_crypto_util__solaris.go b/consul/patches/patch-.._.._.._golang.org_x_crypto_util__solaris.go
deleted file mode 100644
index b37efd5..0000000
--- a/consul/patches/patch-.._.._.._golang.org_x_crypto_util__solaris.go
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD$
-
-Rudimentary SunOS support based on community patches by @MerlinDMC.
-
-https://github.com/hashicorp/consul/issues/159
-
---- ../../../golang.org/x/crypto/ssh/terminal/util_solaris.go.orig	2015-12-17 13:38:55.387411381 +0000
-+++ ../../../golang.org/x/crypto/ssh/terminal/util_solaris.go
-@@ -0,0 +1,86 @@
-+// Copyright 2011 The Go Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style
-+// license that can be found in the LICENSE file.
-+
-+// +build solaris
-+
-+// Package terminal provides support functions for dealing with terminals, as
-+// commonly found on UNIX systems.
-+//
-+// Putting a terminal into raw mode is the most common requirement:
-+//
-+//     oldState, err := terminal.MakeRaw(0)
-+//     if err != nil {
-+//             panic(err)
-+//     }
-+//     defer terminal.Restore(0, oldState)
-+package terminal // import "golang.org/x/crypto/ssh/terminal"
-+
-+import (
-+       "fmt"
-+       "io"
-+       "syscall"
-+)
-+
-+// State contains the state of a terminal.
-+type State struct {
-+       termios syscall.Termios
-+}
-+
-+// IsTerminal returns true if the given file descriptor is a terminal.
-+func IsTerminal(fd int) bool {
-+       return false
-+}
-+
-+// MakeRaw put the terminal connected to the given file descriptor into raw
-+// mode and returns the previous state of the terminal so that it can be
-+// restored.
-+func MakeRaw(fd int) (*State, error) {
-+       return nil, fmt.Errorf("unsupported")
-+}
-+
-+// GetState returns the current state of a terminal which may be useful to
-+// restore the terminal after a signal.
-+func GetState(fd int) (*State, error) {
-+       return nil, fmt.Errorf("unsupported")
-+}
-+
-+// Restore restores the terminal connected to the given file descriptor to a
-+// previous state.
-+func Restore(fd int, state *State) error {
-+       return fmt.Errorf("unsupported")
-+}
-+
-+// GetSize returns the dimensions of the given terminal.
-+func GetSize(fd int) (width, height int, err error) {
-+       return 0, 0, fmt.Errorf("unsupported")
-+}
-+
-+// ReadPassword reads a line of input from a terminal without local echo.  This
-+// is commonly used for inputting passwords and other sensitive data. The slice
-+// returned does not include the \n.
-+func ReadPassword(fd int) ([]byte, error) {
-+       var buf [16]byte
-+       var ret []byte
-+       for {
-+               n, err := syscall.Read(fd, buf[:])
-+               if err != nil {
-+                       return nil, err
-+               }
-+               if n == 0 {
-+                       if len(ret) == 0 {
-+                               return nil, io.EOF
-+                       }
-+                       break
-+               }
-+               if buf[n-1] == '\n' {
-+                       n--
-+               }
-+               ret = append(ret, buf[:n]...)
-+               if n < len(buf) {
-+                       break
-+               }
-+       }
-+
-+       return ret, nil
-+}
diff --git a/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_Sirupsen_logrus_terminal_solaris.go b/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_Sirupsen_logrus_terminal_solaris.go
deleted file mode 100644
index 0970ea4..0000000
--- a/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_Sirupsen_logrus_terminal_solaris.go
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Rudimentary SunOS support based on community patches by @MerlinDMC.
-
-https://github.com/hashicorp/consul/issues/159
-
---- ../../fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go.orig	2015-12-17 12:43:25.130991954 +0000
-+++ ../../fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go
-@@ -0,0 +1,14 @@
-+// Based on ssh/terminal:
-+// Copyright 2011 The Go Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style
-+// license that can be found in the LICENSE file.
-+
-+// +build solaris
-+
-+package logrus
-+
-+// IsTerminal returns true if the given file descriptor is a terminal.
-+// Since the needed syscalls are mising on Illumos/Solaris we're just returning false here
-+func IsTerminal() bool {
-+       return false
-+}
diff --git a/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_solaris.go b/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_solaris.go
deleted file mode 100644
index a291e08..0000000
--- a/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_solaris.go
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-Rudimentary SunOS support based on community patches by @MerlinDMC.
-
-https://github.com/hashicorp/consul/issues/159
-
---- ../../fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go.orig	2015-12-17 12:43:25.131247327 +0000
-+++ ../../fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go
-@@ -0,0 +1,17 @@
-+// +build solaris
-+
-+package system
-+
-+import (
-+       "syscall"
-+)
-+
-+// fromStatT creates a system.StatT type from a syscall.Stat_t type
-+func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-+       return &StatT{size: s.Size,
-+               mode: uint32(s.Mode),
-+               uid:  s.Uid,
-+               gid:  s.Gid,
-+               rdev: uint64(s.Rdev),
-+               mtim: s.Mtim}, nil
-+}
diff --git a/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_unsupported.go b/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_unsupported.go
deleted file mode 100644
index 8340944..0000000
--- a/consul/patches/patch-.._.._fsouza_go-dockerclient_external_github.com_docker_docker_pkg_system_stat_unsupported.go
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Rudimentary SunOS support based on community patches by @MerlinDMC.
-
-https://github.com/hashicorp/consul/issues/159
-
---- ../../fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go.orig	2015-12-17 12:38:21.000000000 +0000
-+++ ../../fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
-@@ -1,4 +1,4 @@
--// +build !linux,!windows,!freebsd
-+// +build !linux,!windows,!freebsd,!solaris
- 
- package system
-
Prev by Date: Remove py-yenc, imported to pkgsrc.
Next by Date: firefox-hg: Update PLIST for upstream changes.
Previous by Thread: Remove py-yenc, imported to pkgsrc.
Next by Thread: Bump PKGREVISION for Consul for the dependency changes
Indexes:
Home | Main Index | Thread Index | Old Index