Date: Fri, 30 Jun 2023 04:27:13 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: eab0472402e4 - main - databases/mongodb40-tools: Remove expired port Message-ID: <202306300427.35U4RDxs079480@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=eab0472402e40c90a3161e365477af527834a132 commit eab0472402e40c90a3161e365477af527834a132 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-06-30 03:50:47 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-06-30 03:50:53 +0000 databases/mongodb40-tools: Remove expired port 2023-06-30 databases/mongodb40-tools: Upstream EOL reached on 2022-04-30 Approved by: portmgr (blanket) --- MOVED | 1 + databases/Makefile | 1 - databases/mongodb40-tools/Makefile | 68 ----- databases/mongodb40-tools/distinfo | 3 - .../files/patch-common_util_file.go | 325 --------------------- .../patch-vendor_github.com_10gen_openssl_build.go | 9 - ...-vendor_github.com_10gen_openssl_init__posix.go | 11 - databases/mongodb40-tools/pkg-descr | 13 - databases/mongodb40-tools/pkg-plist | 12 - 9 files changed, 1 insertion(+), 442 deletions(-) diff --git a/MOVED b/MOVED index 7e0acce36f4f..d243f896c899 100644 --- a/MOVED +++ b/MOVED @@ -7676,3 +7676,4 @@ audio/glurp||2023-06-30|Has expired: Unmaintained for years and depends on depre finance/R-cran-ccgarch||2023-06-30|Has expired: Fails to build with R 4.3.0+ and abandoned upstream www/redmine42||2023-06-30|Has expired: Broken with all supported Ruby versions www/tomcat10||2023-06-30|Has expired: EOLd, potential security issues (https://tomcat.apache.org/tomcat-10.0-eol.html), use www/tomcat101 instead +databases/mongodb40-tools||2023-06-30|Has expired: Upstream EOL reached on 2022-04-30 diff --git a/databases/Makefile b/databases/Makefile index 787ba533a642..c734d3e0fcd5 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -190,7 +190,6 @@ SUBDIR += metabase SUBDIR += mongodb-tools SUBDIR += mongodb40 - SUBDIR += mongodb40-tools SUBDIR += mongodb42 SUBDIR += mongodb42-tools SUBDIR += mongodb44 diff --git a/databases/mongodb40-tools/Makefile b/databases/mongodb40-tools/Makefile deleted file mode 100644 index 96e779f8af8b..000000000000 --- a/databases/mongodb40-tools/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -PORTNAME= mongodb40-tools -DISTVERSIONPREFIX= r -DISTVERSION= 4.0.28 -PORTREVISION= 12 -CATEGORIES= databases - -MAINTAINER= dev.ashevchuk@gmail.com -COMMENT= Tools for MongoDB -WWW= https://github.com/mongodb/mongo-tools - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.md - -DEPRECATED= Upstream EOL reached on 2022-04-30 -EXPIRATION_DATE= 2023-06-30 -ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 -ONLY_FOR_ARCHS_REASON= not yet ported to other architectures - -USES= compiler:c++14-lang go localbase -USE_GITHUB= yes -GH_ACCOUNT= mongodb -GH_PROJECT= mongo-tools - -GO_BUILDFLAGS= -tags "${USE_MY_TAGS}" -GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} - -CONFLICTS_INSTALL= mongodb36-tools mongodb42-tools mongodb-tools - -OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT= MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \ - MONGORESTORE SASL SSL -OPTIONS_MULTI= SECURITY TOOLS -OPTIONS_MULTI_TOOLS= BSONDUMP MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \ - MONGOREPLAY MONGORESTORE MONGOSTAT MONGOTOP -OPTIONS_MULTI_SECURITY= SASL SSL -OPTIONS_SUB= yes - -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= go_target+=./bsondump/main:bsondump -MONGOSTAT_VARS= go_target+=./mongostat/main:mongostat -MONGOFILES_VARS= go_target+=./mongofiles/main:mongofiles -MONGOEXPORT_VARS= go_target+=./mongoexport/main:mongoexport -MONGOIMPORT_VARS= go_target+=./mongoimport/main:mongoimport -MONGORESTORE_VARS= go_target+=./mongorestore/main:mongorestore -MONGODUMP_VARS= go_target+=./mongodump/main:mongodump -MONGOTOP_VARS= go_target+=./mongotop/main:mongotop -MONGOREPLAY_VARS= go_target+=./mongoreplay/main:mongoreplay -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL_USE= my_tags=sasl -SSL_USES= ssl -SSL_USE= my_tags=ssl - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in README.md CONTRIBUTING.md THIRD-PARTY-NOTICES - ${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} -.endfor - -.include <bsd.port.mk> diff --git a/databases/mongodb40-tools/distinfo b/databases/mongodb40-tools/distinfo deleted file mode 100644 index af463369dd71..000000000000 --- a/databases/mongodb40-tools/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1643098994 -SHA256 (mongodb-mongo-tools-r4.0.28_GH0.tar.gz) = e0902f44ca49a40e522d3c2a7af2c09e40ac966b32207a92ec0800f3eb844745 -SIZE (mongodb-mongo-tools-r4.0.28_GH0.tar.gz) = 11149261 diff --git a/databases/mongodb40-tools/files/patch-common_util_file.go b/databases/mongodb40-tools/files/patch-common_util_file.go deleted file mode 100644 index c80484150d59..000000000000 --- a/databases/mongodb40-tools/files/patch-common_util_file.go +++ /dev/null @@ -1,325 +0,0 @@ ---- 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) -+} diff --git a/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go b/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go deleted file mode 100644 index e0190c61259f..000000000000 --- a/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go +++ /dev/null @@ -1,9 +0,0 @@ ---- vendor/github.com/10gen/openssl/build.go.orig 2018-11-21 19:00:22 UTC -+++ vendor/github.com/10gen/openssl/build.go -@@ -20,5 +20,6 @@ - // #cgo CFLAGS: -Wno-deprecated-declarations - // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN -I"c:/openssl/include" - // #cgo windows LDFLAGS: -lssleay32 -llibeay32 -lcrypt32 -L "c:/openssl/bin" -+// #cgo freebsd LDFLAGS: -lssl -lcrypto - // #cgo darwin LDFLAGS: -framework CoreFoundation -framework Foundation -framework Security - import "C" diff --git a/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go b/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go deleted file mode 100644 index 07c593cf0018..000000000000 --- a/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/github.com/10gen/openssl/init_posix.go.orig 2018-11-21 17:52:58 UTC -+++ vendor/github.com/10gen/openssl/init_posix.go -@@ -12,7 +12,7 @@ - // See the License for the specific language governing permissions and - // limitations under the License. - --// +build linux darwin cgo -+// +build linux darwin freebsd cgo - // +build !windows - - package openssl diff --git a/databases/mongodb40-tools/pkg-descr b/databases/mongodb40-tools/pkg-descr deleted file mode 100644 index f2400809a1ab..000000000000 --- a/databases/mongodb40-tools/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -Useful utilities for managing a MongoDB instance written in Go. - -- bsondump - display BSON files in a human-readable format -- mongoimport - Convert data from JSON, TSV or CSV and insert them - into a collection -- mongoexport - Write an existing collection to CSV or JSON format -- mongodump/mongorestore - Dump MongoDB backups to disk in .BSON - format, or restore them to a live database -- mongostat - Monitor live MongoDB servers, replica sets, or sharded - clusters -- mongofiles - Read, write, delete, or update files in GridFS -- mongotop - Monitor read/write activity on a mongo server -- mongoreplay - Capture, observe, and replay traffic for MongoDB diff --git a/databases/mongodb40-tools/pkg-plist b/databases/mongodb40-tools/pkg-plist deleted file mode 100644 index 4fc11536871b..000000000000 --- a/databases/mongodb40-tools/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -%%BSONDUMP%%bin/bsondump -%%MONGODUMP%%bin/mongodump -%%MONGOEXPORT%%bin/mongoexport -%%MONGOFILES%%bin/mongofiles -%%MONGOIMPORT%%bin/mongoimport -%%MONGORESTORE%%bin/mongorestore -%%MONGOREPLAY%%bin/mongoreplay -%%MONGOSTAT%%bin/mongostat -%%MONGOTOP%%bin/mongotop -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306300427.35U4RDxs079480>