Tue Sep 17 08:21:01 2019 UTC ()
mongo-tools: updated to 3.4.23

Match with mongodb3


(adam)
diff -r1.16 -r1.17 pkgsrc/databases/mongo-tools/Makefile
diff -r1.5 -r1.6 pkgsrc/databases/mongo-tools/distinfo
diff -r0 -r1.1 pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_howeyc_gopass_nix.go
diff -r0 -r1.1 pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go
diff -r0 -r1.1 pkgsrc/databases/mongo-tools/patches/patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go
diff -r1.1 -r0 pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_howeyc_gopass_nix.go
diff -r1.1 -r0 pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go
diff -r1.1 -r0 pkgsrc/databases/mongo-tools/patches/patch-vendor_src_gopkg.in_mgo.v2_internal_sasl_sasl.go
diff -r1.2 -r0 pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go
cvs diff -r1.16 -r1.17 pkgsrc/databases/mongo-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mongo-tools/Makefile 2018/12/15 21:12:19 1.16
+++ pkgsrc/databases/mongo-tools/Makefile 2019/09/17 08:21:01 1.17
@@ -1,46 +1,49 @@ @@ -1,46 +1,49 @@
1# $NetBSD: Makefile,v 1.16 2018/12/15 21:12:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2019/09/17 08:21:01 adam Exp $
2 2
3DISTNAME= mongo-tools-3.4.4 3DISTNAME= mongo-tools-3.4.23
4PKGREVISION= 1 
5CATEGORIES= databases 4CATEGORIES= databases
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/}
 6GITHUB_TAG= r${PKGVERSION_NOREV}
7 7
8MAINTAINER= fhajny@NetBSD.org 8MAINTAINER= fhajny@NetBSD.org
9HOMEPAGE= https://github.com/mongodb/mongo-tools/ 9HOMEPAGE= https://github.com/mongodb/mongo-tools
10COMMENT= MongoDB CLI tools 10COMMENT= MongoDB CLI tools
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13GITHUB_TAG= r${PKGVERSION_NOREV} 
14 
15BUILD_DEPENDS+= ${GO_PACKAGE_DEP} 13BUILD_DEPENDS+= ${GO_PACKAGE_DEP}
16 14
17EXTRACT_USING= bsdtar 15EXTRACT_USING= bsdtar
18USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
19 17
20.include "options.mk" 18.include "options.mk"
21 19
22MONGO_TOOLS= bsondump mongostat mongofiles mongoexport mongoimport \ 20# TODO: mongoreplay
23 mongorestore mongodump mongotop mongooplog 21MONGO_TOOLS= bsondump mongodump mongoexport mongofiles mongoimport \
 22 mongooplog mongorestore mongostat mongotop
24 23
25# go uses volatile /tmp dirs that contain required includes files too 24# go uses volatile /tmp dirs that contain required includes files too
26BUILDLINK_PASSTHRU_DIRS+= /tmp 25BUILDLINK_PASSTHRU_DIRS+= /tmp
27 26
28INSTALLATION_DIRS+= bin 27INSTALLATION_DIRS+= bin
29 28
30post-extract: 29post-extract:
31 ${MKDIR} -p ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools 30 ${MKDIR} -p ${WRKSRC}/vendor/github.com/mongodb/mongo-tools
32.for tool in common ${MONGO_TOOLS} 31.for tool in common ${MONGO_TOOLS}
33 ${LN} -s ${WRKSRC}/${tool} ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools/${tool} 32 ${LN} -s ${WRKSRC}/${tool} ${WRKSRC}/vendor/github.com/mongodb/mongo-tools/${tool}
 33.endfor
 34 ${MKDIR} -p ${WRKSRC}/vendor/src
 35.for site in github.com golang.org gopkg.in
 36 ${LN} -s ${WRKSRC}/vendor/${site} ${WRKSRC}/vendor/src/${site}
34.endfor 37.endfor
35 38
36do-build: 39do-build:
37.for tool in ${MONGO_TOOLS} 40.for tool in ${MONGO_TOOLS}
38 cd ${WRKSRC} && \ 41 cd ${WRKSRC} && \
39 ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor:${PREFIX}/gopkg \ 42 ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor:${PREFIX}/gopkg \
40 ${GO} build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go 43 ${GO} build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go
41.endfor 44.endfor
42 45
43do-install: 46do-install:
44.for tool in ${MONGO_TOOLS} 47.for tool in ${MONGO_TOOLS}
45 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool} 48 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool}
46.endfor 49.endfor
cvs diff -r1.5 -r1.6 pkgsrc/databases/mongo-tools/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mongo-tools/distinfo 2017/05/03 16:49:54 1.5
+++ pkgsrc/databases/mongo-tools/distinfo 2019/09/17 08:21:01 1.6
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.5 2017/05/03 16:49:54 fhajny Exp $ 1$NetBSD: distinfo,v 1.6 2019/09/17 08:21:01 adam Exp $
2 2
3SHA1 (mongo-tools-3.4.4.tar.gz) = c92e1ef6d9efd1c671292003595ef673d5f04dab 3SHA1 (mongo-tools-3.4.23.tar.gz) = 0bd7be176321aac9c9b46ec6cfa96dc3919ec6ff
4RMD160 (mongo-tools-3.4.4.tar.gz) = 130ad7e1981d353149d5b59c29f3482e86a5392b 4RMD160 (mongo-tools-3.4.23.tar.gz) = 352b8695a3e194fb0ce904015d0398297ca2daec
5SHA512 (mongo-tools-3.4.4.tar.gz) = d49243e41bf3144264add3766a6f7016a07509a583a7368a639d85d2305500dd5afcfbc4449f3dcc8bec6e88bfb76ce021c813fe14169e3bd2476ed0db7c2d5d 5SHA512 (mongo-tools-3.4.23.tar.gz) = 1cfba67daf82837df2a27f8961f78bdcfcd7be57af66b34c090cdd6f385a38272680e5c4d9513b139cb18307576ce23663ae19b283ed92edbf1c5327043585e8
6Size (mongo-tools-3.4.4.tar.gz) = 4700326 bytes 6Size (mongo-tools-3.4.23.tar.gz) = 4712212 bytes
7SHA1 (patch-vendor_src_github.com_howeyc_gopass_nix.go) = 47c207612693b2a116b69ddf92806778033013d5 7SHA1 (patch-vendor_github.com_howeyc_gopass_nix.go) = 3eae07c84c7c4c08a9076f9f91ae0b56e7e1183b
8SHA1 (patch-vendor_src_github.com_spacemonkeygo_openssl_build.go) = db5d61cea2567d3b9e6e4000807362ba482e69a1 8SHA1 (patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go) = 5af1e27b7bc791b9d0d2c8b69089cdb964826851
9SHA1 (patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go) = c1249796b3404ab13861dd8a7f9873ac4fb1a0f8 9SHA1 (patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go) = 20cd357bc6175415a52b3f4d3adf568ed8fdc206
10SHA1 (patch-vendor_src_gopkg.in_mgo.v2_internal_sasl_sasl.go) = b860646c4125001d2c025005bc2d63cf12d10a68 
File Added: pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_howeyc_gopass_nix.go
$NetBSD: patch-vendor_github.com_howeyc_gopass_nix.go,v 1.1 2019/09/17 08:21:01 adam Exp $

Builds on SunOS.

--- vendor/github.com/howeyc/gopass/nix.go.orig	2016-12-29 22:33:41.000000000 +0000
+++ vendor/github.com/howeyc/gopass/nix.go
@@ -1,4 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd
+// +build linux darwin freebsd netbsd openbsd solaris
 
 package gopass
File Added: pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go
$NetBSD: patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go,v 1.1 2019/09/17 08:21:01 adam Exp $

Use unix.Dup2 instead of syscall.Dup2.

--- vendor/github.com/spacemonkeygo/spacelog/capture_other.go.orig	2016-12-29 22:33:41.000000000 +0000
+++ vendor/github.com/spacemonkeygo/spacelog/capture_other.go
@@ -17,17 +17,18 @@
 package spacelog
 
 import (
+	"golang.org/x/sys/unix"
 	"syscall"
 )
 
 // CaptureOutputToFd redirects the current process' stdout and stderr file
 // descriptors to the given file descriptor, using the dup2 syscall.
 func CaptureOutputToFd(fd int) error {
-	err := syscall.Dup2(fd, syscall.Stdout)
+	err := unix.Dup2(fd, syscall.Stdout)
 	if err != nil {
 		return err
 	}
-	err = syscall.Dup2(fd, syscall.Stderr)
+	err = unix.Dup2(fd, syscall.Stderr)
 	if err != nil {
 		return err
 	}
File Added: pkgsrc/databases/mongo-tools/patches/patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go
$NetBSD: patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go,v 1.1 2019/09/17 08:21:01 adam Exp $

Simplify lib flags look up via pkg-config.

--- vendor/gopkg.in/mgo.v2/internal/sasl/sasl.go.orig	2015-09-25 20:02:24.000000000 +0000
+++ vendor/gopkg.in/mgo.v2/internal/sasl/sasl.go
@@ -7,7 +7,7 @@
 
 package sasl
 
-// #cgo LDFLAGS: -lsasl2
+// #cgo pkg-config: libsasl2
 //
 // struct sasl_conn {};
 //
File Deleted: pkgsrc/databases/mongo-tools/patches/Attic/patch-vendor_src_github.com_howeyc_gopass_nix.go
File Deleted: pkgsrc/databases/mongo-tools/patches/Attic/patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go
File Deleted: pkgsrc/databases/mongo-tools/patches/Attic/patch-vendor_src_gopkg.in_mgo.v2_internal_sasl_sasl.go
File Deleted: pkgsrc/databases/mongo-tools/patches/Attic/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go