From nobody Sat Aug 24 20:20:03 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WrpFv4Q6Mz5TlyG; Sat, 24 Aug 2024 20:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WrpFv3sG2z4l6h; Sat, 24 Aug 2024 20:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724530803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vqxzBoGB5qpCO43MsEJ5A0o5JorqErLDDL8DoIm90+w=; b=BJC7PP3dAMRc8IEMRjC5fOkF6FIht60+aaipMOpsWQRwkaEYpyhbNb+fYHUnl2O2Ry3nmz M/pIJiLWnNP2irydKFRkm/mrjsfyMV/5ImfNDSRDMIXY1b+wti69HoP2VhkLmXTvLfrZ2l Cc61pxRJ4U9b25SRJbABA6MDKJKfOeBLxSNSwqvcS2GhJL4YCSYvsfVKj9F+9ZoJJmw1Vt j2IADWjss/1XNO03mYsrRd3gG6bo6n/KIMkExTwOiX644egTP+d167l7iF0K1nYPlzkfew IfVgGpylk1S5RG5ZfDvGBDcOMYH3mjVJVYEzgYeO92QCkbflQa7TVDPFRASmgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724530803; a=rsa-sha256; cv=none; b=O+hwDKnYfc2BRddih9qMuBZFGFI7rrVk6GY3ViP2kS9VPKgw/cogIB0Q6cIi+3htvvst0w i7qQHI4IkF6vI7sJZ+5KjVVO8WaLYxjRFHdiOuM2kTgHoKZFzpIxoXoeJsSakm5eHdtl2m dQuUELUzKy0/7mUEuIBE7lICFebQarYRdMmWVTPL0/aFTZ3qrYGDeGq6xzjmku/g2+RvGW iVMvImG07E5TtHAeeqyoW2zzPeGUYoaTdlYR3wTV8htNjqy4eWaWTnEC4GzDO2CWr1s0zB Fvpe3fiFndHX5qDN/07gGKfuZsq6p2hZfL3a+OVyfTfutWE8OLajv4ZBBkB5aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724530803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vqxzBoGB5qpCO43MsEJ5A0o5JorqErLDDL8DoIm90+w=; b=IFLPw/+dxQw4r0rNPf9/u3NRe+wZiz7s5qNX+ETGPu3xXI9ABdTlEkmvlOWG9RGuaQ070I L8YqriavLs1BSaWCarXC4pW6h+7ynMT4loP30zOFQ8+KbrpXmqZsSnzxoFt/DoCAx3hCav r+0UHO7QWBTu99hKpLf6iSWzSHU8uycW6Pp8X/rcSOeElwt+bJmijL/wd084RNDlhUr1E0 foFT1LHo7qGJvcjZnL8fLKWUVBaGOSzxbRplk1+rQTQdMufMoG6U2wSwMQe4K6m7OeagkC 9MWfUL1PoEuwXzDDZmUIRc2f+1wtZ8CifUacgH++rhB68XA1vFjzuzdwg6+zPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WrpFv3Sc8z17vy; Sat, 24 Aug 2024 20:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47OKK3Wh081321; Sat, 24 Aug 2024 20:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47OKK32v081316; Sat, 24 Aug 2024 20:20:03 GMT (envelope-from git) Date: Sat, 24 Aug 2024 20:20:03 GMT Message-Id: <202408242020.47OKK32v081316@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: edda5a64b63c - main - databases/mongodb60: update to 6.0.17 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edda5a64b63c4abc5a45a1926d43925a1df2599f Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=edda5a64b63c4abc5a45a1926d43925a1df2599f commit edda5a64b63c4abc5a45a1926d43925a1df2599f Author: Ronald Klop AuthorDate: 2024-08-21 11:17:57 +0000 Commit: Ronald Klop CommitDate: 2024-08-24 20:19:40 +0000 databases/mongodb60: update to 6.0.17 Changes: https://www.mongodb.com/docs/manual/release-notes/6.0/#6.0.17---aug-21--2024 Sync with improvements in mongodb80: commit b44fe228ca : Removed SSL from OPTIONS. It was inherited from the first versions of databases/mongodb, long before I became maintainer. Currently disabling the SSL option does not disable ssl as ssl is auto-detected and disabling ssl needs explicit --ssl=off which is not implemented in the port. I never had a request for this in years so I decided to just remove the option and have ssl enabled always. commit 5d8274d264 : Also found some manual pages in the src tree. commit f2c9ba7c53 : add pre-configure check if downloaded mozjs version matches get-sources.sh. --- databases/mongodb60/Makefile | 20 ++++++++++++-------- databases/mongodb60/distinfo | 6 +++--- databases/mongodb60/files/make.test.sh | 4 ++-- databases/mongodb60/files/patch-SConstruct | 8 +++----- databases/mongodb60/pkg-plist | 3 +++ 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile index 264d4320c3f7..35d8e71366df 100644 --- a/databases/mongodb60/Makefile +++ b/databases/mongodb60/Makefile @@ -1,7 +1,6 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 6.0.16 -PORTREVISION= 1 +DISTVERSION= 6.0.17 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} @@ -36,7 +35,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libyaml-cpp.so:devel/yaml-cpp \ libzstd.so:archivers/zstd -USES= compiler:c++17-lang cpe python:build scons shebangfix +USES= compiler:c++17-lang cpe python:build scons shebangfix ssl # gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh USES+= gmake pkgconfig @@ -66,6 +65,7 @@ MAKE_ARGS= --cxx-std=17 \ --disable-warnings-as-errors \ --libc++ \ --runtime-hardening=on \ + --ssl \ --use-system-icu \ --use-system-libunwind \ --use-system-pcre \ @@ -86,8 +86,8 @@ CONFLICTS_INSTALL= mongodb[0-9][0-9] USERS= mongodb GROUPS= mongodb -OPTIONS_DEFINE= LTO SASL SSL NOAVX -OPTIONS_DEFAULT= SASL SSL NOAVX +OPTIONS_DEFINE= LTO NOAVX SASL +OPTIONS_DEFAULT= NOAVX SASL NOAVX_DESC= "Disable AVX instructions on amd64 (Sandybridge+)" @@ -98,9 +98,6 @@ NOAVX_MAKE_ARGS= --experimental-optimization="-sandybridge" SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client -SSL_USES= ssl -SSL_MAKE_ARGS= --ssl - .include ALL_TARGET= install-core @@ -126,6 +123,10 @@ post-patch: ${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/backend/base.py ${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py +pre-configure: + # Verify we downloaded the proper mozjs git tag. + sh -c "test \"X`grep -E '^LIB_GIT_REVISION=' ${WRKSRC}/src/third_party/mozjs/get-sources.sh`\" = \"XLIB_GIT_REVISION=${MOZJS_TAG}\"" + do-configure: # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh ${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release @@ -144,6 +145,9 @@ do-install: .for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES ${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/ .endfor + ${INSTALL_MAN} ${WRKSRC}/debian/mongod.1 ${STAGEDIR}${PREFIX}/share/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/debian/mongos.1 ${STAGEDIR}${PREFIX}/share/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/debian/mongodb-parameters.5 ${STAGEDIR}${PREFIX}/share/man/man5/ ${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py do-test: diff --git a/databases/mongodb60/distinfo b/databases/mongodb60/distinfo index ea02dfcff5d4..97fcb242d8da 100644 --- a/databases/mongodb60/distinfo +++ b/databases/mongodb60/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1719396179 -SHA256 (mongodb-mongo-r6.0.16_GH0.tar.gz) = 8426949b47e8b0d6b8a048b698c2f80c856464bef4344752dc16f20efd6b10cf -SIZE (mongodb-mongo-r6.0.16_GH0.tar.gz) = 91499982 +TIMESTAMP = 1724200537 +SHA256 (mongodb-mongo-r6.0.17_GH0.tar.gz) = 4ff208ae7f702165e178f56bd908d4792716f3f30aae984f8e98187fd4d5ee68 +SIZE (mongodb-mongo-r6.0.17_GH0.tar.gz) = 91534894 SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0 SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901 diff --git a/databases/mongodb60/files/make.test.sh b/databases/mongodb60/files/make.test.sh index 3d74258a446a..c42bb1973e6b 100755 --- a/databases/mongodb60/files/make.test.sh +++ b/databases/mongodb60/files/make.test.sh @@ -18,8 +18,8 @@ DBDIR=$( mktemp -d -t tmp.mongodb ) trap 'rm -rf "$DBDIR"' EXIT # Trivial check if the binaries execute at all. -mongod -version -mongos -version +mongod --version +mongos --version # Check if an empty database can be created. mkdir "$DBDIR/db" diff --git a/databases/mongodb60/files/patch-SConstruct b/databases/mongodb60/files/patch-SConstruct index 84d453d69e95..ff903d7c8a83 100644 --- a/databases/mongodb60/files/patch-SConstruct +++ b/databases/mongodb60/files/patch-SConstruct @@ -4,12 +4,10 @@ print(env_vars.GenerateHelpText(env)) Exit(0) --unknown_vars = env_vars.UnknownVariables() --if unknown_vars: + unknown_vars = env_vars.UnknownVariables() + if unknown_vars: - env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) -+#unknown_vars = env_vars.UnknownVariables() -+#if unknown_vars: -+# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) ++ print("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) if get_option('install-action') != 'default' and get_option('ninja') != "disabled": env.FatalError("Cannot use non-default install actions when generating Ninja.") diff --git a/databases/mongodb60/pkg-plist b/databases/mongodb60/pkg-plist index feaf3313657d..46587b510b14 100644 --- a/databases/mongodb60/pkg-plist +++ b/databases/mongodb60/pkg-plist @@ -5,3 +5,6 @@ bin/mongos %%DOCSDIR%%/MPL-2 %%DOCSDIR%%/README %%DOCSDIR%%/THIRD-PARTY-NOTICES +share/man/man1/mongod.1.gz +share/man/man1/mongos.1.gz +share/man/man5/mongodb-parameters.5.gz