diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2015-12-21 20:20:02 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2015-12-21 20:20:02 +0000 |
| commit | 74929a3e70abb2558b2ed4ab758d8aa9ed4b5a4a (patch) | |
| tree | 705cbe33e13db6772ecc639f3618f299a89b74ab /lang | |
| parent | 58fa2e9a18dd704fa92383ecf51f4f02223693c7 (diff) | |
| download | pkgsrc-74929a3e70abb2558b2ed4ab758d8aa9ed4b5a4a.tar.gz | |
Pull in http://golang.org/cl/8261 to fix build on OpenIndiana,
PR pkg/50565.
ok wiz@
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/go14/Makefile | 3 | ||||
| -rw-r--r-- | lang/go14/distinfo | 4 | ||||
| -rw-r--r-- | lang/go14/patches/patch-src_os_user_lookup__unix.go | 33 |
3 files changed, 34 insertions, 6 deletions
diff --git a/lang/go14/Makefile b/lang/go14/Makefile index 8ae632913bb..91d4d45a5d9 100644 --- a/lang/go14/Makefile +++ b/lang/go14/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2015/09/27 00:36:02 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2015/12/21 20:20:02 bsiegert Exp $ .include "../../lang/go/version.mk" DISTNAME= go${GO14_VERSION}.src PKGNAME= go14-${GO14_VERSION} +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= https://storage.googleapis.com/golang/ PATCH_SITES= https://codereview.appspot.com/download/ diff --git a/lang/go14/distinfo b/lang/go14/distinfo index 585f6cdc27c..77503b380f5 100644 --- a/lang/go14/distinfo +++ b/lang/go14/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 22:50:36 agc Exp $ +$NetBSD: distinfo,v 1.5 2015/12/21 20:20:02 bsiegert Exp $ SHA1 (go1.4.3.src.tar.gz) = 486db10dc571a55c8d795365070f66d343458c48 RMD160 (go1.4.3.src.tar.gz) = b1fbb2805a777c8107e7c946f36a881303ac5e35 @@ -23,7 +23,7 @@ SHA1 (patch-src_go_build_build.go) = b68bc557e7b48877889c63070e9cb9d8360f40f5 SHA1 (patch-src_net_cgo__bsd.go) = 4678fccd6956300ce55343965334fc3881383bbc SHA1 (patch-src_net_cgo__stub.go) = cf373587745d68e556dadf3a61956b489b4f420a SHA1 (patch-src_net_cgo__unix.go) = cebe897ab624aaf52bebc50d12a045d6b4ea2bc6 -SHA1 (patch-src_os_user_lookup__unix.go) = 861cf9b2b64bc314b6ee8e11411245e214717515 +SHA1 (patch-src_os_user_lookup__unix.go) = 2cb66fb1af534f45c14bded4994a00584a7cc19d SHA1 (patch-src_runtime_cgo_cgo.go) = 9cc88b35d12e0d52e76495e04f7fce2b78af08d5 SHA1 (patch-src_runtime_cgo_gcc__setenv.c) = c9614b76d71e84ad46b2ce785580fdc54b261455 SHA1 (patch-src_runtime_cgo_gcc__solaris__amd64.c) = 633d8dcc8a843e343ee2ab9edb7cfaf6f6c3865b diff --git a/lang/go14/patches/patch-src_os_user_lookup__unix.go b/lang/go14/patches/patch-src_os_user_lookup__unix.go index e4442f8b795..259a965ab3b 100644 --- a/lang/go14/patches/patch-src_os_user_lookup__unix.go +++ b/lang/go14/patches/patch-src_os_user_lookup__unix.go @@ -1,10 +1,10 @@ -$NetBSD: patch-src_os_user_lookup__unix.go,v 1.1 2015/07/31 14:46:25 bsiegert Exp $ +$NetBSD: patch-src_os_user_lookup__unix.go,v 1.2 2015/12/21 20:20:02 bsiegert Exp $ -Support cgo on illumos. +http://golang.org/cl/8261 --- src/os/user/lookup_unix.go.orig 2014-12-11 01:18:10.000000000 +0000 +++ src/os/user/lookup_unix.go -@@ -17,6 +17,7 @@ import ( +@@ -17,6 +17,7 @@ ) /* @@ -12,3 +12,30 @@ Support cgo on illumos. #include <unistd.h> #include <sys/types.h> #include <pwd.h> +@@ -24,7 +25,12 @@ + + static int mygetpwuid_r(int uid, struct passwd *pwd, + char *buf, size_t buflen, struct passwd **result) { +- return getpwuid_r(uid, pwd, buf, buflen, result); ++ return getpwuid_r(uid, pwd, buf, buflen, result); ++} ++ ++static int mygetpwnam_r(const char *name, struct passwd *pwd, ++ char *buf, size_t buflen, struct passwd **result) { ++ return getpwnam_r(name, pwd, buf, buflen, result); + } + */ + import "C" +@@ -67,7 +73,11 @@ + if lookupByName { + nameC := C.CString(username) + defer C.free(unsafe.Pointer(nameC)) +- rv = C.getpwnam_r(nameC, ++ // mygetpwnam_r is a wrapper around getpwnam_r to avoid ++ // passing a size_t to getpwnam_r, because for unknown ++ // reasons passing a size_t to getpwnam_r doesn't work on ++ // Solaris. ++ rv = C.mygetpwnam_r(nameC, + &pwd, + (*C.char)(buf), + C.size_t(bufSize), |