CVS commit: pkgsrc/databases/mongo-tools

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Wed May  3 16:49:54 UTC 2017

Modified Files:
        pkgsrc/databases/mongo-tools: Makefile distinfo
        pkgsrc/databases/mongo-tools/patches:
            patch-vendor_src_github.com_spacemonkeygo_openssl_build.go
Added Files:
        pkgsrc/databases/mongo-tools/patches:
            patch-vendor_src_github.com_howeyc_gopass_nix.go
            patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go
Removed Files:
        pkgsrc/databases/mongo-tools/patches:
            patch-vendor_src_github.com_howeyc_gopass_bsd.go

Log Message:
Update databases/mongo-tools to 3.4.4

3.4.2
- PreProcessing is failling with "got invalid document size"
- mongo-replay crashes during playback
- nil pointer derereference when error occurs

3.4.1
- Stats collection has large playback performance impact
- Add option to set capture buffer size to avoid packet loss
- Playback file contains full reply payload
- mongoreplay: out of bounds error in "shortenreply" during record
- Add test for restoring a collection with a default collation
- nil pointer dereference in mongoreplay when error on new playback
  file creation

3.2.10
- Don't create intents for system.profile.metadata.json files
- tools do not respect readPreference=secondary when connecting to a
  mongos
- Mongodump SSL and GSSAPI authentication
- No numeric version in -version output
- Backport to v3.2
- Issue only one ApplyOps cmd per oplog entry

3.2.9
- Make -version spit out a bit more information.

3.2.8
- Mongostat with discover can find the same node twice in a sharded
  cluster
- mongostat -discover does not alias localhost to the target hostname
- mongoimport returns exit code 0 even when error prevents records
  from being inserted
- Wrong error message while using mongoimport
- add a "-assertExists" option to mongoexport
- Use v3.2.7 for qa tests
- mongoimport types jstest fails on functions


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mongo-tools/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mongo-tools/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_howeyc_gopass_bsd.go
cvs rdiff -u -r0 -r1.1 \
    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
cvs rdiff -u -r1.1 -r1.2 \
    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.10 pkgsrc/databases/mongo-tools/Makefile:1.11
--- pkgsrc/databases/mongo-tools/Makefile:1.10  Thu Apr 13 15:12:03 2017
+++ pkgsrc/databases/mongo-tools/Makefile       Wed May  3 16:49:54 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2017/04/13 15:12:03 bsiegert Exp $
+# $NetBSD: Makefile,v 1.11 2017/05/03 16:49:54 fhajny Exp $
 
-DISTNAME=      mongo-tools-3.2.4
-PKGREVISION=   5
+DISTNAME=      mongo-tools-3.4.4
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mongodb/}
 
@@ -45,5 +44,6 @@ do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool}
 .endfor
 
+.include "../../devel/go-sys/buildlink3.mk"
 .include "../../lang/go/version.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/mongo-tools/distinfo
diff -u pkgsrc/databases/mongo-tools/distinfo:1.4 pkgsrc/databases/mongo-tools/distinfo:1.5
--- pkgsrc/databases/mongo-tools/distinfo:1.4   Sun Mar 13 21:05:34 2016
+++ pkgsrc/databases/mongo-tools/distinfo       Wed May  3 16:49:54 2017
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2016/03/13 21:05:34 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2017/05/03 16:49:54 fhajny Exp $
 
-SHA1 (mongo-tools-3.2.4.tar.gz) = 75b9646509ac8a2a045d5a9f42735e333f5ecf70
-RMD160 (mongo-tools-3.2.4.tar.gz) = 26bdb86c83723937879beb3822a8b42191f274ee
-SHA512 (mongo-tools-3.2.4.tar.gz) = d34ad87bb2a53c9df0124c26a4c200236aa889c7a5bd09a3b535acd4b18c5757018e78813fa04b48b359004eb9097853b49fd359617e71f66e41ef71da01c222
-Size (mongo-tools-3.2.4.tar.gz) = 2229852 bytes
-SHA1 (patch-vendor_src_github.com_howeyc_gopass_bsd.go) = 13efab29de38877ef9948439edc23d57ca41e48d
-SHA1 (patch-vendor_src_github.com_spacemonkeygo_openssl_build.go) = fa1dd7b8e6d4811298e52d11fa5c198db0cb0f50
+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

Index: pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go
diff -u pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go:1.1 
pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go:1.2
--- pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go:1.1 Wed Oct 21 16:37:22 2015
+++ pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go     Wed May  3 16:49:54 2017
@@ -1,15 +1,17 @@
-$NetBSD: patch-vendor_src_github.com_spacemonkeygo_openssl_build.go,v 1.1 2015/10/21 16:37:22 fhajny Exp $
+$NetBSD: patch-vendor_src_github.com_spacemonkeygo_openssl_build.go,v 1.2 2017/05/03 16:49:54 fhajny Exp $
 
 Simplify lib flags look up via pkg-config.
 
---- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig  2015-09-25 20:02:24.000000000 +0000
+--- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig  2016-12-29 22:33:41.000000000 +0000
 +++ vendor/src/github.com/spacemonkeygo/openssl/build.go
-@@ -16,7 +16,5 @@
+@@ -16,9 +16,5 @@
  
  package openssl
  
 -// #cgo linux pkg-config: openssl
 -// #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN
--// #cgo darwin LDFLAGS: -lssl -lcrypto
+-// #cgo windows LDFLAGS: -lcrypt32
+-// #cgo darwin CFLAGS: -Wno-deprecated-declarations
+-// #cgo darwin LDFLAGS: -lssl -lcrypto -framework CoreFoundation -framework Foundation -framework Security
 +// #cgo pkg-config: openssl
  import "C"

Added files:

Index: pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_howeyc_gopass_nix.go
diff -u /dev/null pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_howeyc_gopass_nix.go:1.1
--- /dev/null   Wed May  3 16:49:54 2017
+++ pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_howeyc_gopass_nix.go       Wed May  3 16:49:54 2017
@@ -0,0 +1,12 @@
+$NetBSD: patch-vendor_src_github.com_howeyc_gopass_nix.go,v 1.1 2017/05/03 16:49:54 fhajny Exp $
+
+Builds on SunOS.
+
+--- vendor/src/github.com/howeyc/gopass/nix.go.orig    2016-12-29 22:33:41.000000000 +0000
++++ vendor/src/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_src_github.com_spacemonkeygo_spacelog_capture__other.go
diff -u /dev/null pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go:1.1
--- /dev/null   Wed May  3 16:49:54 2017
+++ pkgsrc/databases/mongo-tools/patches/patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go   Wed May  3 16:49:54 2017
@@ -0,0 +1,27 @@
+$NetBSD: patch-vendor_src_github.com_spacemonkeygo_spacelog_capture__other.go,v 1.1 2017/05/03 16:49:54 fhajny Exp $
+
+Use unix.Dup2 instead of syscall.Dup2.
+
+--- vendor/src/github.com/spacemonkeygo/spacelog/capture_other.go.orig 2016-12-29 22:33:41.000000000 +0000
++++ vendor/src/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
+       }