CVS commit: pkgsrc/databases/mongo-tools

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Sep 17 08:21:01 UTC 2019

Modified Files:
        pkgsrc/databases/mongo-tools: Makefile distinfo
Added Files:
        pkgsrc/databases/mongo-tools/patches:
            patch-vendor_github.com_howeyc_gopass_nix.go
            patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go
            patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go
Removed Files:
        pkgsrc/databases/mongo-tools/patches:
            patch-vendor_src_github.com_howeyc_gopass_nix.go
            patch-vendor_src_github.com_spacemonkeygo_openssl_build.go
            patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go
            patch-vendor_src_gopkg.in_mgo.v2_internal_sasl_sasl.go

Log Message:
mongo-tools: updated to 3.4.23

Match with mongodb3


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mongo-tools/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mongo-tools/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_howeyc_gopass_nix.go \
    pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go \
    pkgsrc/databases/mongo-tools/patches/patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_howeyc_gopass_nix.go \
    pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go \
    pkgsrc/databases/mongo-tools/patches/patch-vendor_src_gopkg.in_mgo.v2_internal_sasl_sasl.go
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go

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

Modified files:

Index: pkgsrc/databases/mongo-tools/Makefile
diff -u pkgsrc/databases/mongo-tools/Makefile:1.16 pkgsrc/databases/mongo-tools/Makefile:1.17
--- pkgsrc/databases/mongo-tools/Makefile:1.16  Sat Dec 15 21:12:19 2018
+++ pkgsrc/databases/mongo-tools/Makefile       Tue Sep 17 08:21:01 2019
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.16 2018/12/15 21:12:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/09/17 08:21:01 adam Exp $
 
-DISTNAME=      mongo-tools-3.4.4
-PKGREVISION=   1
+DISTNAME=      mongo-tools-3.4.23
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mongodb/}
+GITHUB_TAG=    r${PKGVERSION_NOREV}
 
 MAINTAINER=    fhajny%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/mongodb/mongo-tools/
+HOMEPAGE=      https://github.com/mongodb/mongo-tools
 COMMENT=       MongoDB CLI tools
 LICENSE=       apache-2.0
 
-GITHUB_TAG=    r${PKGVERSION_NOREV}
-
 BUILD_DEPENDS+=        ${GO_PACKAGE_DEP}
 
 EXTRACT_USING= bsdtar
@@ -19,8 +17,9 @@ USE_TOOLS+=   pkg-config
 
 .include "options.mk"
 
-MONGO_TOOLS=   bsondump mongostat mongofiles mongoexport mongoimport \
-               mongorestore mongodump mongotop mongooplog
+# TODO: mongoreplay
+MONGO_TOOLS=   bsondump mongodump mongoexport mongofiles mongoimport \
+               mongooplog mongorestore mongostat mongotop
 
 # go uses volatile /tmp dirs that contain required includes files too
 BUILDLINK_PASSTHRU_DIRS+=      /tmp
@@ -28,9 +27,13 @@ BUILDLINK_PASSTHRU_DIRS+=    /tmp
 INSTALLATION_DIRS+=            bin
 
 post-extract:
-       ${MKDIR} -p ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools
+       ${MKDIR} -p ${WRKSRC}/vendor/github.com/mongodb/mongo-tools
 .for tool in common ${MONGO_TOOLS}
-       ${LN} -s ${WRKSRC}/${tool} ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools/${tool}
+       ${LN} -s ${WRKSRC}/${tool} ${WRKSRC}/vendor/github.com/mongodb/mongo-tools/${tool}
+.endfor
+       ${MKDIR} -p ${WRKSRC}/vendor/src
+.for site in github.com golang.org gopkg.in
+       ${LN} -s ${WRKSRC}/vendor/${site} ${WRKSRC}/vendor/src/${site}
 .endfor
 
 do-build:

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

Added files:

Index: pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_howeyc_gopass_nix.go
diff -u /dev/null pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_howeyc_gopass_nix.go:1.1
--- /dev/null   Tue Sep 17 08:21:01 2019
+++ pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_howeyc_gopass_nix.go   Tue Sep 17 08:21:01 2019
@@ -0,0 +1,12 @@
+$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
+ 
Index: pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go
diff -u /dev/null pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go:1.1
--- /dev/null   Tue Sep 17 08:21:01 2019
+++ pkgsrc/databases/mongo-tools/patches/patch-vendor_github.com_spacemonkeygo_spacelog_capture__other.go       Tue Sep 17 08:21:01 2019
@@ -0,0 +1,27 @@
+$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
+       }
Index: pkgsrc/databases/mongo-tools/patches/patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go
diff -u /dev/null pkgsrc/databases/mongo-tools/patches/patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go:1.1
--- /dev/null   Tue Sep 17 08:21:01 2019
+++ pkgsrc/databases/mongo-tools/patches/patch-vendor_gopkg.in_mgo.v2_internal_sasl_sasl.go     Tue Sep 17 08:21:01 2019
@@ -0,0 +1,15 @@
+$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 {};
+ //