Attachment #203772 for bug #237352

Lines 201-206 Link Here

(-)databases/Makefile (+1 lines)
201	SUBDIR += mongodb36	201	SUBDIR += mongodb36
202	SUBDIR += mongodb36-tools	202	SUBDIR += mongodb36-tools
203	SUBDIR += mongodb40	203	SUBDIR += mongodb40
		204	SUBDIR += mongodb40-tools
204	SUBDIR += mroonga	205	SUBDIR += mroonga
205	SUBDIR += mrtg-mysql-load	206	SUBDIR += mrtg-mysql-load
206	SUBDIR += mtools-mongodb	207	SUBDIR += mtools-mongodb




# $FreeBSD$

PORTNAME=		mongodb40-tools
DISTVERSIONPREFIX=	r
DISTVERSION=		4.0.8
CATEGORIES=		databases

MAINTAINER=		dev.ashevchuk@gmail.com
COMMENT=		Tools for MongoDB

LICENSE=		APACHE20

ONLY_FOR_ARCHS=	amd64 i386
ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than i386 and amd64"

BUILD_DEPENDS=		${LOCALBASE}/go${GO_LANG_VER_PATH_STR}/bin/go:lang/go${GO_LANG_VER_PATH_STR}

USES=			compiler:c++14-lang localbase

GO_LANG_VERSION=       1.4
GO_LANG_VER_PATH_STR=  ${GO_LANG_VERSION:S/.//}

GO_LANG_PATH_DIR= 	.gopath

CONFLICTS_INSTALL=	mongodb3[46] mongodb3[46]-tools

USE_LDCONFIG=		yes

CC=			clang

USE_GITHUB=		yes
GH_ACCOUNT=		mongodb
GH_PROJECT=		mongo-tools
GH_TAG=		5db0b4a18cc1366ebd368eed8e7c4d426d851f13

OPTIONS_SUB=		yes
NO_OPTIONS_SORT=	yes

OPTIONS_DEFINE=	DOCS
OPTIONS_DEFAULT=	SSL SASL MONGOFILES MONGOEXPORT MONGOIMPORT MONGORESTORE MONGODUMP

OPTIONS_MULTI=		TOOLS SECURITY
OPTIONS_MULTI_TOOLS=	BSONDUMP MONGOSTAT MONGOFILES MONGOEXPORT MONGOIMPORT MONGORESTORE MONGODUMP MONGOTOP MONGOREPLAY
OPTIONS_MULTI_SECURITY=SSL SASL

BSONDUMP_DESC=		BSON files into human-readable formats
MONGOSTAT_DESC=	Status of a running mongod or mongos instance
MONGOFILES_DESC=	Interface to GridFS in a MongoDB instance
MONGOEXPORT_DESC=	JSON or CSV export of MongoDB instance data
MONGOIMPORT_DESC=	Importing JSON, CSV, or TSV into a MongoDB instance
MONGORESTORE_DESC=	BSON data to a MongoDB instance
MONGODUMP_DESC=	BSON data from the contents of a MongoDB instance
MONGOTOP_DESC=		Track the amount of data I/O time
MONGOREPLAY_DESC=	Traffic capture and replay tool

BSONDUMP_VARS=		tool_build+=bsondump
MONGOSTAT_VARS=	tool_build+=mongostat
MONGOFILES_VARS=	tool_build+=mongofiles
MONGOEXPORT_VARS=	tool_build+=mongoexport
MONGOIMPORT_VARS=	tool_build+=mongoimport
MONGORESTORE_VARS=	tool_build+=mongorestore
MONGODUMP_VARS=	tool_build+=mongodump
MONGOTOP_VARS=		tool_build+=mongotop
MONGOREPLAY_VARS=	tool_build+=mongoreplay

SSL_USE=		my_tags=ssl
SSL_USES=		ssl

SASL_USE=		my_tags=sasl
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2

.include <bsd.port.options.mk>

post-patch:
	@${ECHO_MSG} "Preparing hierarchy"
	${MKDIR} ${WRKSRC}/${GO_LANG_PATH_DIR} && \
	${LN} -sf ${WRKSRC}/vendor ${WRKSRC}/${GO_LANG_PATH_DIR}/src && \
	${MKDIR} ${WRKSRC}/${GO_LANG_PATH_DIR}/src/github.com/${GH_ACCOUNT} && \
	${LN} -sf ${WRKSRC} ${WRKSRC}/${GO_LANG_PATH_DIR}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}

do-build:
.for tool in ${TOOL_BUILD}
	@${ECHO_MSG} "Building ${tool}"
	${SETENV} ${MAKE_ENV} \
	GOPATH="${WRKSRC}/${GO_LANG_PATH_DIR}:${WRKSRC}/vendor" \
	CGO_CPPFLAGS="-isystem ${LOCALBASE}/include" \
	CGO_LDFLAGS="-L${LOCALBASE}/lib" \
	${LOCALBASE}/go${GO_LANG_VER_PATH_STR}/bin/go build \
	-o ${WRKSRC}/bin/${tool} \
	-tags "${USE_MY_TAGS}" \
	${WRKSRC}/${tool}/main/${tool}.go
.endfor

do-install:
.for tool in ${TOOL_BUILD}
	@${ECHO_MSG} "Installing ${tool}"
	${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${STAGEDIR}${PREFIX}/bin/
.endfor

	${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in README.md CONTRIBUTING.md LICENSE.md THIRD-PARTY-NOTICES
	@${ECHO_MSG} "Installing ${doc}"
	${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
.endfor

.include <bsd.port.mk>

Line 0 Link Here

(-)databases/mongodb40-tools/distinfo (+3 lines)
	1	TIMESTAMP = 1555539033
	2	SHA256 (mongodb-mongo-tools-r4.0.8_GH0.tar.gz) = c224df31f85476c0f651c4b5d70871b581f14bf16a8595a4aa7717e66ad07c5c
	3	SIZE (mongodb-mongo-tools-r4.0.8_GH0.tar.gz) = 11134459




--- common/util/file.go.orig  2018-11-21 17:52:58 UTC
+++ common/util/file.go
@@ -9,11 +9,68 @@
 import (
 	"bufio"
 	"io"
-	"net/url"
 	"os"
 	"path/filepath"
+	"strconv"
 )
 
+// Error reports an error and the operation and URL that caused it.
+type Error struct {
+	Op  string
+	URL string
+	Err error
+}
+
+func (e *Error) Error() string { return e.Op + " " + e.URL + ": " + e.Err.Error() }
+
+func ishex(c byte) bool {
+	switch {
+	case '0' <= c && c <= '9':
+		return true
+	case 'a' <= c && c <= 'f':
+		return true
+	case 'A' <= c && c <= 'F':
+		return true
+	}
+	return false
+}
+
+func unhex(c byte) byte {
+	switch {
+	case '0' <= c && c <= '9':
+		return c - '0'
+	case 'a' <= c && c <= 'f':
+		return c - 'a' + 10
+	case 'A' <= c && c <= 'F':
+		return c - 'A' + 10
+	}
+	return 0
+}
+
+type encoding int
+
+const (
+	encodePath encoding = 1 + iota
+	encodePathSegment
+	encodeHost
+	encodeZone
+	encodeUserPassword
+	encodeQueryComponent
+	encodeFragment
+)
+
+type EscapeError string
+
+func (e EscapeError) Error() string {
+	return "invalid URL escape " + strconv.Quote(string(e))
+}
+
+type InvalidHostError string
+
+func (e InvalidHostError) Error() string {
+	return "invalid character " + strconv.Quote(string(e)) + " in host name"
+}
+
 // GetFieldsFromFile fetches the first line from the contents of the file
 // at "path"
 func GetFieldsFromFile(path string) ([]string, error) {
@@ -42,11 +99,11 @@
 }
 
 func EscapeCollectionName(collName string) string {
-	return url.PathEscape(collName)
+	return PathEscape(collName)
 }
 
 func UnescapeCollectionName(escapedCollName string) (string, error) {
-	return url.PathUnescape(escapedCollName)
+	return PathUnescape(escapedCollName)
 }
 
 type WrappedReadCloser struct {
@@ -76,3 +133,238 @@
 	}
 	return innerErr
 }
+
+// Return true if the specified character should be escaped when
+// appearing in a URL string, according to RFC 3986.
+//
+// Please be informed that for now shouldEscape does not check all
+// reserved characters correctly. See golang.org/issue/5684.
+func shouldEscape(c byte, mode encoding) bool {
+	// §2.3 Unreserved characters (alphanum)
+	if 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' {
+		return false
+	}
+
+	if mode == encodeHost || mode == encodeZone {
+		// §3.2.2 Host allows
+		//	sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
+		// as part of reg-name.
+		// We add : because we include :port as part of host.
+		// We add [ ] because we include [ipv6]:port as part of host.
+		// We add < > because they're the only characters left that
+		// we could possibly allow, and Parse will reject them if we
+		// escape them (because hosts can't use %-encoding for
+		// ASCII bytes).
+		switch c {
+		case '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=', ':', '[', ']', '<', '>', '"':
+			return false
+		}
+	}
+
+	switch c {
+	case '-', '_', '.', '~': // §2.3 Unreserved characters (mark)
+		return false
+
+	case '$', '&', '+', ',', '/', ':', ';', '=', '?', '@': // §2.2 Reserved characters (reserved)
+		// Different sections of the URL allow a few of
+		// the reserved characters to appear unescaped.
+		switch mode {
+		case encodePath: // §3.3
+			// The RFC allows : @ & = + $ but saves / ; , for assigning
+			// meaning to individual path segments. This package
+			// only manipulates the path as a whole, so we allow those
+			// last three as well. That leaves only ? to escape.
+			return c == '?'
+
+		case encodePathSegment: // §3.3
+			// The RFC allows : @ & = + $ but saves / ; , for assigning
+			// meaning to individual path segments.
+			return c == '/' || c == ';' || c == ',' || c == '?'
+
+		case encodeUserPassword: // §3.2.1
+			// The RFC allows ';', ':', '&', '=', '+', '$', and ',' in
+			// userinfo, so we must escape only '@', '/', and '?'.
+			// The parsing of userinfo treats ':' as special so we must escape
+			// that too.
+			return c == '@' || c == '/' || c == '?' || c == ':'
+
+		case encodeQueryComponent: // §3.4
+			// The RFC reserves (so we must escape) everything.
+			return true
+
+		case encodeFragment: // §4.1
+			// The RFC text is silent but the grammar allows
+			// everything, so escape nothing.
+			return false
+		}
+	}
+
+	if mode == encodeFragment {
+		// RFC 3986 §2.2 allows not escaping sub-delims. A subset of sub-delims are
+		// included in reserved from RFC 2396 §2.2. The remaining sub-delims do not
+		// need to be escaped. To minimize potential breakage, we apply two restrictions:
+		// (1) we always escape sub-delims outside of the fragment, and (2) we always
+		// escape single quote to avoid breaking callers that had previously assumed that
+		// single quotes would be escaped. See issue #19917.
+		switch c {
+		case '!', '(', ')', '*':
+			return false
+		}
+	}
+
+	// Everything else must be escaped.
+	return true
+}
+
+// PathUnescape does the inverse transformation of PathEscape,
+// converting each 3-byte encoded substring of the form "%AB" into the
+// hex-decoded byte 0xAB. It returns an error if any % is not followed
+// by two hexadecimal digits.
+//
+// PathUnescape is identical to QueryUnescape except that it does not
+// unescape '+' to ' ' (space).
+func PathUnescape(s string) (string, error) {
+	return unescape(s, encodePathSegment)
+}
+
+// unescape unescapes a string; the mode specifies
+// which section of the URL string is being unescaped.
+func unescape(s string, mode encoding) (string, error) {
+	// Count %, check that they're well-formed.
+	n := 0
+	hasPlus := false
+	for i := 0; i < len(s); {
+		switch s[i] {
+		case '%':
+			n++
+			if i+2 >= len(s) || !ishex(s[i+1]) || !ishex(s[i+2]) {
+				s = s[i:]
+				if len(s) > 3 {
+					s = s[:3]
+				}
+				return "", EscapeError(s)
+			}
+			// Per https://tools.ietf.org/html/rfc3986#page-21
+			// in the host component %-encoding can only be used
+			// for non-ASCII bytes.
+			// But https://tools.ietf.org/html/rfc6874#section-2
+			// introduces %25 being allowed to escape a percent sign
+			// in IPv6 scoped-address literals. Yay.
+			if mode == encodeHost && unhex(s[i+1]) < 8 && s[i:i+3] != "%25" {
+				return "", EscapeError(s[i : i+3])
+			}
+			if mode == encodeZone {
+				// RFC 6874 says basically "anything goes" for zone identifiers
+				// and that even non-ASCII can be redundantly escaped,
+				// but it seems prudent to restrict %-escaped bytes here to those
+				// that are valid host name bytes in their unescaped form.
+				// That is, you can use escaping in the zone identifier but not
+				// to introduce bytes you couldn't just write directly.
+				// But Windows puts spaces here! Yay.
+				v := unhex(s[i+1])<<4 | unhex(s[i+2])
+				if s[i:i+3] != "%25" && v != ' ' && shouldEscape(v, encodeHost) {
+					return "", EscapeError(s[i : i+3])
+				}
+			}
+			i += 3
+		case '+':
+			hasPlus = mode == encodeQueryComponent
+			i++
+		default:
+			if (mode == encodeHost || mode == encodeZone) && s[i] < 0x80 && shouldEscape(s[i], mode) {
+				return "", InvalidHostError(s[i : i+1])
+			}
+			i++
+		}
+	}
+
+	if n == 0 && !hasPlus {
+		return s, nil
+	}
+
+	t := make([]byte, len(s)-2*n)
+	j := 0
+	for i := 0; i < len(s); {
+		switch s[i] {
+		case '%':
+			t[j] = unhex(s[i+1])<<4 | unhex(s[i+2])
+			j++
+			i += 3
+		case '+':
+			if mode == encodeQueryComponent {
+				t[j] = ' '
+			} else {
+				t[j] = '+'
+			}
+			j++
+			i++
+		default:
+			t[j] = s[i]
+			j++
+			i++
+		}
+	}
+	return string(t), nil
+}
+
+// PathEscape escapes the string so it can be safely placed
+// inside a URL path segment.
+func PathEscape(s string) string {
+	return escape(s, encodePathSegment)
+}
+
+func escape(s string, mode encoding) string {
+	spaceCount, hexCount := 0, 0
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		if shouldEscape(c, mode) {
+			if c == ' ' && mode == encodeQueryComponent {
+				spaceCount++
+			} else {
+				hexCount++
+			}
+		}
+	}
+
+	if spaceCount == 0 && hexCount == 0 {
+		return s
+	}
+
+	var buf [64]byte
+	var t []byte
+
+	required := len(s) + 2*hexCount
+	if required <= len(buf) {
+		t = buf[:required]
+	} else {
+		t = make([]byte, required)
+	}
+
+	if hexCount == 0 {
+		copy(t, s)
+		for i := 0; i < len(s); i++ {
+			if s[i] == ' ' {
+				t[i] = '+'
+			}
+		}
+		return string(t)
+	}
+
+	j := 0
+	for i := 0; i < len(s); i++ {
+		switch c := s[i]; {
+		case c == ' ' && mode == encodeQueryComponent:
+			t[j] = '+'
+			j++
+		case shouldEscape(c, mode):
+			t[j] = '%'
+			t[j+1] = "0123456789ABCDEF"[c>>4]
+			t[j+2] = "0123456789ABCDEF"[c&15]
+			j += 3
+		default:
+			t[j] = s[i]
+			j++
+		}
+	}
+	return string(t)
+}

Line 0 Link Here

(-)databases/mongodb40-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go (+9 lines)
	1	--- vendor/github.com/10gen/openssl/build.go.orig 2018-11-21 19:00:22 UTC
	2	+++ vendor/github.com/10gen/openssl/build.go
	3	@@ -20,5 +20,6 @@
	4	// #cgo CFLAGS: -Wno-deprecated-declarations
	5	// #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN -I"c:/openssl/include"
	6	// #cgo windows LDFLAGS: -lssleay32 -llibeay32 -lcrypt32 -L "c:/openssl/bin"
	7	+// #cgo freebsd LDFLAGS: -lssl -lcrypto
	8	// #cgo darwin LDFLAGS: -framework CoreFoundation -framework Foundation -framework Security
	9	import "C"

Line 0 Link Here

(-)databases/mongodb40-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go (+11 lines)
	1	--- vendor/github.com/10gen/openssl/init_posix.go.orig 2018-11-21 17:52:58 UTC
	2	+++ vendor/github.com/10gen/openssl/init_posix.go
	3	@@ -12,7 +12,7 @@
	4	// See the License for the specific language governing permissions and
	5	// limitations under the License.
	6
	7	-// +build linux darwin cgo
	8	+// +build linux darwin freebsd cgo
	9	// +build !windows
	10
	11	package openssl

Line 0 Link Here

(-)databases/mongodb40-tools/pkg-descr (+6 lines)
	1	Since MongoDB 3.2, the tools bsondump, mongoimport, mongoexport, mongodump,
	2	mongorestore, mongostat, mongofiles and mongotop have been placed
	3	in a separate package and rewritten in Go. These are useful utilities for
	4	managing a MongoDB instance.
	5
	6	WWW: https://github.com/mongodb/mongo-tools




%%BSONDUMP%%bin/bsondump
%%MONGODUMP%%bin/mongodump
%%MONGOEXPORT%%bin/mongoexport
%%MONGOFILES%%bin/mongofiles
%%MONGOIMPORT%%bin/mongoimport
%%MONGORESTORE%%bin/mongorestore
%%MONGOTOP%%bin/mongoreplay
%%MONGOSTAT%%bin/mongostat
%%MONGOTOP%%bin/mongotop
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES

Return to bug 237352

Line 0 Link Here

(-)databases/mongodb40-tools/Makefile (+106 lines)
		1	# $FreeBSD$
		2
		3	PORTNAME= mongodb40-tools
		4	DISTVERSIONPREFIX= r
		5	DISTVERSION= 4.0.8
		6	CATEGORIES= databases
		7
		8	MAINTAINER= dev.ashevchuk@gmail.com
		9	COMMENT= Tools for MongoDB
		10
		11	LICENSE= APACHE20
		12
		13	ONLY_FOR_ARCHS= amd64 i386
		14	ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than i386 and amd64"
		15
		16	BUILD_DEPENDS= ${LOCALBASE}/go${GO_LANG_VER_PATH_STR}/bin/go:lang/go${GO_LANG_VER_PATH_STR}
		17
		18	USES= compiler:c++14-lang localbase
		19
		20	GO_LANG_VERSION= 1.4
		21	GO_LANG_VER_PATH_STR= ${GO_LANG_VERSION:S/.//}
		22
		23	GO_LANG_PATH_DIR= .gopath
		24
		25	CONFLICTS_INSTALL= mongodb3[46] mongodb3[46]-tools
		26
		27	USE_LDCONFIG= yes
		28
		29	CC= clang
		30
		31	USE_GITHUB= yes
		32	GH_ACCOUNT= mongodb
		33	GH_PROJECT= mongo-tools
		34	GH_TAG= 5db0b4a18cc1366ebd368eed8e7c4d426d851f13
		35
		36	OPTIONS_SUB= yes
		37	NO_OPTIONS_SORT= yes
		38
		39	OPTIONS_DEFINE= DOCS
		40	OPTIONS_DEFAULT= SSL SASL MONGOFILES MONGOEXPORT MONGOIMPORT MONGORESTORE MONGODUMP
		41
		42	OPTIONS_MULTI= TOOLS SECURITY
		43	OPTIONS_MULTI_TOOLS= BSONDUMP MONGOSTAT MONGOFILES MONGOEXPORT MONGOIMPORT MONGORESTORE MONGODUMP MONGOTOP MONGOREPLAY
		44	OPTIONS_MULTI_SECURITY=SSL SASL
		45
		46	BSONDUMP_DESC= BSON files into human-readable formats
		47	MONGOSTAT_DESC= Status of a running mongod or mongos instance
		48	MONGOFILES_DESC= Interface to GridFS in a MongoDB instance
		49	MONGOEXPORT_DESC= JSON or CSV export of MongoDB instance data
		50	MONGOIMPORT_DESC= Importing JSON, CSV, or TSV into a MongoDB instance
		51	MONGORESTORE_DESC= BSON data to a MongoDB instance
		52	MONGODUMP_DESC= BSON data from the contents of a MongoDB instance
		53	MONGOTOP_DESC= Track the amount of data I/O time
		54	MONGOREPLAY_DESC= Traffic capture and replay tool
		55
		56	BSONDUMP_VARS= tool_build+=bsondump
		57	MONGOSTAT_VARS= tool_build+=mongostat
		58	MONGOFILES_VARS= tool_build+=mongofiles
		59	MONGOEXPORT_VARS= tool_build+=mongoexport
		60	MONGOIMPORT_VARS= tool_build+=mongoimport
		61	MONGORESTORE_VARS= tool_build+=mongorestore
		62	MONGODUMP_VARS= tool_build+=mongodump
		63	MONGOTOP_VARS= tool_build+=mongotop
		64	MONGOREPLAY_VARS= tool_build+=mongoreplay
65
66	SSL_USE= my_tags=ssl
67	SSL_USES= ssl
68
69	SASL_USE= my_tags=sasl
70	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
71
72	.include <bsd.port.options.mk>
73
74	post-patch:
75	@${ECHO_MSG} "Preparing hierarchy"
76	${MKDIR} ${WRKSRC}/${GO_LANG_PATH_DIR} && \
77	${LN} -sf ${WRKSRC}/vendor ${WRKSRC}/${GO_LANG_PATH_DIR}/src && \
78	${MKDIR} ${WRKSRC}/${GO_LANG_PATH_DIR}/src/github.com/${GH_ACCOUNT} && \
79	${LN} -sf ${WRKSRC} ${WRKSRC}/${GO_LANG_PATH_DIR}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
80
81	do-build:
82	.for tool in ${TOOL_BUILD}
83	@${ECHO_MSG} "Building ${tool}"
84	${SETENV} ${MAKE_ENV} \
85	GOPATH="${WRKSRC}/${GO_LANG_PATH_DIR}:${WRKSRC}/vendor" \
86	CGO_CPPFLAGS="-isystem ${LOCALBASE}/include" \
87	CGO_LDFLAGS="-L${LOCALBASE}/lib" \
88	${LOCALBASE}/go${GO_LANG_VER_PATH_STR}/bin/go build \
89	-o ${WRKSRC}/bin/${tool} \
90	-tags "${USE_MY_TAGS}" \
91	${WRKSRC}/${tool}/main/${tool}.go
92	.endfor
93
94	do-install:
95	.for tool in ${TOOL_BUILD}
96	@${ECHO_MSG} "Installing ${tool}"
97	${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${STAGEDIR}${PREFIX}/bin/
98	.endfor
99
100	${MKDIR} ${STAGEDIR}${DOCSDIR}
101	.for doc in README.md CONTRIBUTING.md LICENSE.md THIRD-PARTY-NOTICES
102	@${ECHO_MSG} "Installing ${doc}"
103	${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
104	.endfor
105
106	.include <bsd.port.mk>

Line 0 Link Here

(-)databases/mongodb40-tools/files/patch-common_util_file.go (+325 lines)
		1	--- common/util/file.go.orig 2018-11-21 17:52:58 UTC
		2	+++ common/util/file.go
		3	@@ -9,11 +9,68 @@
		4	import (
		5	"bufio"
		6	"io"
		7	- "net/url"
		8	"os"
		9	"path/filepath"
		10	+ "strconv"
		11	)
		12
		13	+// Error reports an error and the operation and URL that caused it.
		14	+type Error struct {
		15	+ Op string
		16	+ URL string
		17	+ Err error
		18	+}
		19	+
		20	+func (e *Error) Error() string { return e.Op + " " + e.URL + ": " + e.Err.Error() }
		21	+
		22	+func ishex(c byte) bool {
		23	+ switch {
		24	+ case '0' <= c && c <= '9':
		25	+ return true
		26	+ case 'a' <= c && c <= 'f':
		27	+ return true
		28	+ case 'A' <= c && c <= 'F':
		29	+ return true
		30	+ }
		31	+ return false
		32	+}
		33	+
		34	+func unhex(c byte) byte {
		35	+ switch {
		36	+ case '0' <= c && c <= '9':
		37	+ return c - '0'
		38	+ case 'a' <= c && c <= 'f':
		39	+ return c - 'a' + 10
		40	+ case 'A' <= c && c <= 'F':
		41	+ return c - 'A' + 10
		42	+ }
		43	+ return 0
		44	+}
		45	+
		46	+type encoding int
		47	+
		48	+const (
		49	+ encodePath encoding = 1 + iota
		50	+ encodePathSegment
		51	+ encodeHost
		52	+ encodeZone
		53	+ encodeUserPassword
		54	+ encodeQueryComponent
		55	+ encodeFragment
		56	+)
		57	+
		58	+type EscapeError string
		59	+
		60	+func (e EscapeError) Error() string {
		61	+ return "invalid URL escape " + strconv.Quote(string(e))
		62	+}
		63	+
		64	+type InvalidHostError string
65	+
66	+func (e InvalidHostError) Error() string {
67	+ return "invalid character " + strconv.Quote(string(e)) + " in host name"
68	+}
69	+
70	// GetFieldsFromFile fetches the first line from the contents of the file
71	// at "path"
72	func GetFieldsFromFile(path string) ([]string, error) {
73	@@ -42,11 +99,11 @@
74	}
75
76	func EscapeCollectionName(collName string) string {
77	- return url.PathEscape(collName)
78	+ return PathEscape(collName)
79	}
80
81	func UnescapeCollectionName(escapedCollName string) (string, error) {
82	- return url.PathUnescape(escapedCollName)
83	+ return PathUnescape(escapedCollName)
84	}
85
86	type WrappedReadCloser struct {
87	@@ -76,3 +133,238 @@
88	}
89	return innerErr
90	}
91	+
92	+// Return true if the specified character should be escaped when
93	+// appearing in a URL string, according to RFC 3986.
94	+//
95	+// Please be informed that for now shouldEscape does not check all
96	+// reserved characters correctly. See golang.org/issue/5684.
97	+func shouldEscape(c byte, mode encoding) bool {
98	+ // §2.3 Unreserved characters (alphanum)
99	+ if 'A' <= c && c <= 'Z' \|\| 'a' <= c && c <= 'z' \|\| '0' <= c && c <= '9' {
100	+ return false
101	+ }
102	+
103	+ if mode == encodeHost \|\| mode == encodeZone {
104	+ // §3.2.2 Host allows
105	+ // sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
106	+ // as part of reg-name.
107	+ // We add : because we include :port as part of host.
108	+ // We add [ ] because we include [ipv6]:port as part of host.
109	+ // We add < > because they're the only characters left that
110	+ // we could possibly allow, and Parse will reject them if we
111	+ // escape them (because hosts can't use %-encoding for
112	+ // ASCII bytes).
113	+ switch c {
114	+ case '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=', ':', '[', ']', '<', '>', '"':
115	+ return false
116	+ }
117	+ }
118	+
119	+ switch c {
120	+ case '-', '_', '.', '~': // §2.3 Unreserved characters (mark)
121	+ return false
122	+
123	+ case '$', '&', '+', ',', '/', ':', ';', '=', '?', '@': // §2.2 Reserved characters (reserved)
124	+ // Different sections of the URL allow a few of
125	+ // the reserved characters to appear unescaped.
126	+ switch mode {
127	+ case encodePath: // §3.3
128	+ // The RFC allows : @ & = + $ but saves / ; , for assigning
129	+ // meaning to individual path segments. This package
130	+ // only manipulates the path as a whole, so we allow those
131	+ // last three as well. That leaves only ? to escape.
132	+ return c == '?'
133	+
134	+ case encodePathSegment: // §3.3
135	+ // The RFC allows : @ & = + $ but saves / ; , for assigning
136	+ // meaning to individual path segments.
137	+ return c == '/' \|\| c == ';' \|\| c == ',' \|\| c == '?'
138	+
139	+ case encodeUserPassword: // §3.2.1
140	+ // The RFC allows ';', ':', '&', '=', '+', '$', and ',' in
141	+ // userinfo, so we must escape only '@', '/', and '?'.
142	+ // The parsing of userinfo treats ':' as special so we must escape
143	+ // that too.
144	+ return c == '@' \|\| c == '/' \|\| c == '?' \|\| c == ':'
145	+
146	+ case encodeQueryComponent: // §3.4
147	+ // The RFC reserves (so we must escape) everything.
148	+ return true
149	+
150	+ case encodeFragment: // §4.1
151	+ // The RFC text is silent but the grammar allows
152	+ // everything, so escape nothing.
153	+ return false
154	+ }
155	+ }
156	+
157	+ if mode == encodeFragment {
158	+ // RFC 3986 §2.2 allows not escaping sub-delims. A subset of sub-delims are
159	+ // included in reserved from RFC 2396 §2.2. The remaining sub-delims do not
160	+ // need to be escaped. To minimize potential breakage, we apply two restrictions:
161	+ // (1) we always escape sub-delims outside of the fragment, and (2) we always
162	+ // escape single quote to avoid breaking callers that had previously assumed that
163	+ // single quotes would be escaped. See issue #19917.
164	+ switch c {
165	+ case '!', '(', ')', '*':
166	+ return false
167	+ }
168	+ }
169	+
170	+ // Everything else must be escaped.
171	+ return true
172	+}
173	+
174	+// PathUnescape does the inverse transformation of PathEscape,
175	+// converting each 3-byte encoded substring of the form "%AB" into the
176	+// hex-decoded byte 0xAB. It returns an error if any % is not followed
177	+// by two hexadecimal digits.
178	+//
179	+// PathUnescape is identical to QueryUnescape except that it does not
180	+// unescape '+' to ' ' (space).
181	+func PathUnescape(s string) (string, error) {
182	+ return unescape(s, encodePathSegment)
183	+}
184	+
185	+// unescape unescapes a string; the mode specifies
186	+// which section of the URL string is being unescaped.
187	+func unescape(s string, mode encoding) (string, error) {
188	+ // Count %, check that they're well-formed.
189	+ n := 0
190	+ hasPlus := false
191	+ for i := 0; i < len(s); {
192	+ switch s[i] {
193	+ case '%':
194	+ n++
195	+ if i+2 >= len(s) \|\| !ishex(s[i+1]) \|\| !ishex(s[i+2]) {
196	+ s = s[i:]
197	+ if len(s) > 3 {
198	+ s = s[:3]
199	+ }
200	+ return "", EscapeError(s)
201	+ }
202	+ // Per https://tools.ietf.org/html/rfc3986#page-21
203	+ // in the host component %-encoding can only be used
204	+ // for non-ASCII bytes.
205	+ // But https://tools.ietf.org/html/rfc6874#section-2
206	+ // introduces %25 being allowed to escape a percent sign
207	+ // in IPv6 scoped-address literals. Yay.
208	+ if mode == encodeHost && unhex(s[i+1]) < 8 && s[i:i+3] != "%25" {
209	+ return "", EscapeError(s[i : i+3])
210	+ }
211	+ if mode == encodeZone {
212	+ // RFC 6874 says basically "anything goes" for zone identifiers
213	+ // and that even non-ASCII can be redundantly escaped,
214	+ // but it seems prudent to restrict %-escaped bytes here to those
215	+ // that are valid host name bytes in their unescaped form.
216	+ // That is, you can use escaping in the zone identifier but not
217	+ // to introduce bytes you couldn't just write directly.
218	+ // But Windows puts spaces here! Yay.
219	+ v := unhex(s[i+1])<<4 \| unhex(s[i+2])
220	+ if s[i:i+3] != "%25" && v != ' ' && shouldEscape(v, encodeHost) {
221	+ return "", EscapeError(s[i : i+3])
222	+ }
223	+ }
224	+ i += 3
225	+ case '+':
226	+ hasPlus = mode == encodeQueryComponent
227	+ i++
228	+ default:
229	+ if (mode == encodeHost \|\| mode == encodeZone) && s[i] < 0x80 && shouldEscape(s[i], mode) {
230	+ return "", InvalidHostError(s[i : i+1])
231	+ }
232	+ i++
233	+ }
234	+ }
235	+
236	+ if n == 0 && !hasPlus {
237	+ return s, nil
238	+ }
239	+
240	+ t := make([]byte, len(s)-2*n)
241	+ j := 0
242	+ for i := 0; i < len(s); {
243	+ switch s[i] {
244	+ case '%':
245	+ t[j] = unhex(s[i+1])<<4 \| unhex(s[i+2])
246	+ j++
247	+ i += 3
248	+ case '+':
249	+ if mode == encodeQueryComponent {
250	+ t[j] = ' '
251	+ } else {
252	+ t[j] = '+'
253	+ }
254	+ j++
255	+ i++
256	+ default:
257	+ t[j] = s[i]
258	+ j++
259	+ i++
260	+ }
261	+ }
262	+ return string(t), nil
263	+}
264	+
265	+// PathEscape escapes the string so it can be safely placed
266	+// inside a URL path segment.
267	+func PathEscape(s string) string {
268	+ return escape(s, encodePathSegment)
269	+}
270	+
271	+func escape(s string, mode encoding) string {
272	+ spaceCount, hexCount := 0, 0
273	+ for i := 0; i < len(s); i++ {
274	+ c := s[i]
275	+ if shouldEscape(c, mode) {
276	+ if c == ' ' && mode == encodeQueryComponent {
277	+ spaceCount++
278	+ } else {
279	+ hexCount++
280	+ }
281	+ }
282	+ }
283	+
284	+ if spaceCount == 0 && hexCount == 0 {
285	+ return s
286	+ }
287	+
288	+ var buf [64]byte
289	+ var t []byte
290	+
291	+ required := len(s) + 2*hexCount
292	+ if required <= len(buf) {
293	+ t = buf[:required]
294	+ } else {
295	+ t = make([]byte, required)
296	+ }
297	+
298	+ if hexCount == 0 {
299	+ copy(t, s)
300	+ for i := 0; i < len(s); i++ {
301	+ if s[i] == ' ' {
302	+ t[i] = '+'
303	+ }
304	+ }
305	+ return string(t)
306	+ }
307	+
308	+ j := 0
309	+ for i := 0; i < len(s); i++ {
310	+ switch c := s[i]; {
311	+ case c == ' ' && mode == encodeQueryComponent:
312	+ t[j] = '+'
313	+ j++
314	+ case shouldEscape(c, mode):
315	+ t[j] = '%'
316	+ t[j+1] = "0123456789ABCDEF"[c>>4]
317	+ t[j+2] = "0123456789ABCDEF"[c&15]
318	+ j += 3
319	+ default:
320	+ t[j] = s[i]
321	+ j++
322	+ }
323	+ }
324	+ return string(t)
325	+}

Line 0 Link Here

(-)databases/mongodb40-tools/pkg-plist (+13 lines)
	1	%%BSONDUMP%%bin/bsondump
	2	%%MONGODUMP%%bin/mongodump
	3	%%MONGOEXPORT%%bin/mongoexport
	4	%%MONGOFILES%%bin/mongofiles
	5	%%MONGOIMPORT%%bin/mongoimport
	6	%%MONGORESTORE%%bin/mongorestore
	7	%%MONGOTOP%%bin/mongoreplay
	8	%%MONGOSTAT%%bin/mongostat
	9	%%MONGOTOP%%bin/mongotop
	10	%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
	11	%%PORTDOCS%%%%DOCSDIR%%/README.md
	12	%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
	13	%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES