From nobody Fri Jun 9 11:34:59 2023 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 4QczX36cKtz4bgBY; Fri, 9 Jun 2023 11:34:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QczX35yWMz4Hll; Fri, 9 Jun 2023 11:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686310499; 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=KFqCP9Rq28LLki8I3Mh24RAXviV0GVwgWw4G45XBC3M=; b=SKWnO9piosWiBZavxv1MDoSI6+sG7nprxcUTid1UyDsoXGx1QXfOhO4mEmLOODrYGrx11Y T/ooFZ92qsybug9AFw/9BLOBFJ9scQIB8JzmM+6loDpoGXPFC7/E09R/p7tor3X3v+JuTI tJAPEmptHxUbbjgw511JN3zEEhqN2H8+yNWeRjZZg747kO8PzLWxkZ6JwSnDS+1bkVoa3i NNPK21IktZ5iZ8ab4A1tihLX38H+4+lJDHhlXyNIpWTPG4GFR7ecLnMiES0JuCCwBaGmRi GmPrwiPECgPJRT7OvYjCK1YECfAL6ddxGAXwyXkHbTqtfSsrh/emraprDxoqLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686310499; 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=KFqCP9Rq28LLki8I3Mh24RAXviV0GVwgWw4G45XBC3M=; b=YsPttr3JrZoP1ndTVZsyBOJlzQhDUhdh64snIR5vmSKz7EHc5zESDdrCloLEwu8KHOIOYT owrLUKE+4QJgYIHv3HeQ8XuFvUhI99QWAoz0vsSsb5YT7TEKjNRStyzbrc8uQMqdrYqpjG L9GcefzYuTWbxMSixbh6K2dkB1A8SpuMt9O2fC4EliWPqbdrQ1DGts7nQtQVKMDs9bdF5z ob/a0luEm7s2vGcNy8jzMvOIidiTJRjwae8IBfta+Ae5F2BbYeCt7rryeAjETTnxQMYVtu XW0ZfBVL476LNeZhE5zB1IRPl6n7nSpxJ4H2egicA+4wv3ArWzXzH7LI24JFnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686310499; a=rsa-sha256; cv=none; b=CC/VxZphY0hsfKsVC5Wmbf2aspgzF6gP8uhJTfICSC83iyK44zWVPxRHq+aNK11NxqDazO 8M2RLK3RppfBkH+dYBM5qr1BYUVmJdldJGdmsX8xrgwsPlCz0y1Tn3mID5/unv33aTiIzt tocTL7m7+UTcvIyU6OGAcpwPvcQkNzpwYXVK9Tl7vI9xJkkWihzr8waeX4qIjawUENXMcq 9o9OpH4sEdIz7FlyMid9g2Xh3QFg8HDQfjTYNyj1xDFvQvZkdq/DvnNpFL0CV797YjYt3S dxKaR/p9fgnZXUJWTpRJs0qNkCcHuIjYN/uVvTHpRGxorScWRp2p5+SMqTUlQw== 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 4QczX352pzzYPY; Fri, 9 Jun 2023 11:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 359BYxD7045356; Fri, 9 Jun 2023 11:34:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359BYxJD045355; Fri, 9 Jun 2023 11:34:59 GMT (envelope-from git) Date: Fri, 9 Jun 2023 11:34:59 GMT Message-Id: <202306091134.359BYxJD045355@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: be053ac53fd5 - main - databases/mongodb70: update to 7.0.0 RC3 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: be053ac53fd5068f7c2ac260566b40b2ecb483ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=be053ac53fd5068f7c2ac260566b40b2ecb483ad commit be053ac53fd5068f7c2ac260566b40b2ecb483ad Author: Ronald Klop AuthorDate: 2023-06-09 11:32:28 +0000 Commit: Ronald Klop CommitDate: 2023-06-09 11:34:43 +0000 databases/mongodb70: update to 7.0.0 RC3 Still Release Candidate status. Read the notes: https://www.mongodb.com/docs/v7.0/release-notes/7.0/ I had no time to test fixes for FreeBSD 14 yet. So 14 is broken still. --- databases/mongodb70/Makefile | 2 +- databases/mongodb70/distinfo | 6 +-- databases/mongodb70/files/patch-SConstruct | 67 +++++++++--------------------- 3 files changed, 24 insertions(+), 51 deletions(-) diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile index b320bb3de52f..2740ada64698 100644 --- a/databases/mongodb70/Makefile +++ b/databases/mongodb70/Makefile @@ -1,6 +1,6 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 7.0.0-rc2 +DISTVERSION= 7.0.0-rc3 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} diff --git a/databases/mongodb70/distinfo b/databases/mongodb70/distinfo index 2ed103aa1215..7add7a5609ff 100644 --- a/databases/mongodb70/distinfo +++ b/databases/mongodb70/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1684994747 -SHA256 (mongodb-mongo-r7.0.0-rc2_GH0.tar.gz) = ed6abfbf4ad410e958ce89cc898bcd7570aceeb795935a5e8762db7623e65372 -SIZE (mongodb-mongo-r7.0.0-rc2_GH0.tar.gz) = 113451210 +TIMESTAMP = 1686214843 +SHA256 (mongodb-mongo-r7.0.0-rc3_GH0.tar.gz) = 21af02667bbf7fecc3f78a5f7dc6fa2008b9865a7be3c4882e479042d16b1391 +SIZE (mongodb-mongo-r7.0.0-rc3_GH0.tar.gz) = 113471331 SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0 SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901 diff --git a/databases/mongodb70/files/patch-SConstruct b/databases/mongodb70/files/patch-SConstruct index 1a7673bdce1c..b5998fcb4a52 100644 --- a/databases/mongodb70/files/patch-SConstruct +++ b/databases/mongodb70/files/patch-SConstruct @@ -1,58 +1,31 @@ ---- SConstruct.orig 2023-04-24 16:15:19 UTC +--- SConstruct.orig 2023-06-07 17:07:38 UTC +++ SConstruct -@@ -23,9 +23,9 @@ import SCons.Script +@@ -23,7 +23,6 @@ import SCons.Script import SCons import SCons.Script --from mongo_tooling_metrics.client import get_mongo_metrics_client --from mongo_tooling_metrics.errors import ExternalHostException -from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics -+#from mongo_tooling_metrics.client import get_mongo_metrics_client -+#from mongo_tooling_metrics.errors import ExternalHostException -+#from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics from site_scons.mongo import build_profiles # This must be first, even before EnsureSConsVersion, if -@@ -1659,22 +1659,22 @@ env.AddMethod(lambda env, name, **kwargs: add_option(n - - # The placement of this is intentional. Here we setup an atexit method to store tooling metrics. - # We should only register this function after env, env_vars and the parser have been properly initialized. --try: -- metrics_client = get_mongo_metrics_client() -- metrics_client.register_metrics( -- SConsToolingMetrics, -- utc_starttime=datetime.utcnow(), -- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), -- env_vars=env_vars, -- env=env, -- parser=_parser, -- ) --except ExternalHostException as _: -- pass --except Exception as _: -- print( -- "This MongoDB Virtual Workstation could not connect to the internal cluster\nThis is a non-issue, but if this message persists feel free to reach out in #server-dev-platform" -- ) -+#try: -+# metrics_client = get_mongo_metrics_client() -+# metrics_client.register_metrics( -+# SConsToolingMetrics, -+# utc_starttime=datetime.utcnow(), -+# artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), -+# env_vars=env_vars, -+# env=env, -+# parser=_parser, -+# ) -+#except ExternalHostException as _: -+# pass -+#except Exception as _: -+# print( -+# "This MongoDB Virtual Workstation could not connect to the internal cluster\nThis is a non-issue, but if this message persists feel free to reach out in #server-dev-platform" -+# ) +@@ -1655,16 +1654,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(n + del envDict + env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption') +-# The placement of this is intentional. Here we setup an atexit method to store tooling metrics. +-# We should only register this function after env, env_vars and the parser have been properly initialized. +-SConsToolingMetrics.register_metrics( +- utc_starttime=datetime.utcnow(), +- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), +- env_vars=env_vars, +- env=env, +- parser=_parser, +-) +- if get_option('build-metrics'): env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR' -@@ -1812,9 +1812,9 @@ if has_option('variables-help'): + env.Tool('build_metrics') +@@ -1801,9 +1790,9 @@ if has_option('variables-help'): print(env_vars.GenerateHelpText(env)) Exit(0) @@ -65,7 +38,7 @@ install_actions.setup(env, get_option('install-action')) -@@ -3033,7 +3033,7 @@ if env.TargetOSIs('posix'): +@@ -3026,7 +3015,7 @@ if env.TargetOSIs('posix'): # If runtime hardening is requested, then build anything # destined for an executable with the necessary flags for PIE. env.AppendUnique( @@ -74,7 +47,7 @@ PROGLINKFLAGS=['-pie'], ) -@@ -3041,7 +3041,6 @@ if env.TargetOSIs('posix'): +@@ -3034,7 +3023,6 @@ if env.TargetOSIs('posix'): env.Append( CCFLAGS=[ "-fasynchronous-unwind-tables", @@ -82,7 +55,7 @@ "-Wall", "-Wsign-compare", "-Wno-unknown-pragmas", -@@ -3224,8 +3223,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too +@@ -3217,8 +3205,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too # setting it for both C and C++ by setting both of CFLAGS and # CXXFLAGS.