diff options
Diffstat (limited to 'databases/mongodb70')
| -rw-r--r-- | databases/mongodb70/Makefile | 5 | ||||
| -rw-r--r-- | databases/mongodb70/distinfo | 10 | ||||
| -rw-r--r-- | databases/mongodb70/files/patch-src_mongo_platform_waitable__atomic.cpp | 64 |
3 files changed, 71 insertions, 8 deletions
diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile index 0b54ffa2fa64..44cf0365bf58 100644 --- a/databases/mongodb70/Makefile +++ b/databases/mongodb70/Makefile @@ -1,7 +1,6 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 7.0.21 -PORTREVISION= 1 +DISTVERSION= 7.0.23 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} @@ -45,7 +44,7 @@ USES+= gmake pkgconfig CPE_PRODUCT= mongodb # mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh -MOZJS_TAG= 98c8be22bec7bb650156e0d389b425322d8c323c +MOZJS_TAG= 5acd3be6c9563ad3e7ca6182285c69a38de47bab USE_GITHUB= yes GH_ACCOUNT= mongodb mongodb-forks:mozjs diff --git a/databases/mongodb70/distinfo b/databases/mongodb70/distinfo index cacda4db225b..bf5b39db08b1 100644 --- a/databases/mongodb70/distinfo +++ b/databases/mongodb70/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1748467171 -SHA256 (mongodb-mongo-r7.0.21_GH0.tar.gz) = 9a79bd9e0ffa80c092624bec331865475ebb47b2648cf8bb14d83419a4b1f9a6 -SIZE (mongodb-mongo-r7.0.21_GH0.tar.gz) = 87745814 -SHA256 (mongodb-forks-spidermonkey-98c8be22bec7bb650156e0d389b425322d8c323c_GH0.tar.gz) = 9c266a0b13e1352d410e4c0b985c4f31cea0bcc81631f2a38af9291f676434bf -SIZE (mongodb-forks-spidermonkey-98c8be22bec7bb650156e0d389b425322d8c323c_GH0.tar.gz) = 280427824 +TIMESTAMP = 1754633156 +SHA256 (mongodb-mongo-r7.0.23_GH0.tar.gz) = 31a59b83ecdf65ba26453eb244682f18aa02204a0017e872dd28008b8d471bde +SIZE (mongodb-mongo-r7.0.23_GH0.tar.gz) = 87871275 +SHA256 (mongodb-forks-spidermonkey-5acd3be6c9563ad3e7ca6182285c69a38de47bab_GH0.tar.gz) = 1420533e23970171ff7a420e3ded1ea493e1976fb8896a5fd6f35e5b2d75733b +SIZE (mongodb-forks-spidermonkey-5acd3be6c9563ad3e7ca6182285c69a38de47bab_GH0.tar.gz) = 280439685 diff --git a/databases/mongodb70/files/patch-src_mongo_platform_waitable__atomic.cpp b/databases/mongodb70/files/patch-src_mongo_platform_waitable__atomic.cpp new file mode 100644 index 000000000000..6f1b397699a3 --- /dev/null +++ b/databases/mongodb70/files/patch-src_mongo_platform_waitable__atomic.cpp @@ -0,0 +1,64 @@ +# Original upstream implementation: +# https://jira.mongodb.org/browse/SERVER-81797 +# Attempt to upstream this patch: +# https://github.com/mongodb/mongo/pull/1607 +# https://jira.mongodb.org/browse/SERVER-99225 +# +--- src/mongo/platform/waitable_atomic.cpp.orig 2024-11-20 23:53:48 UTC ++++ src/mongo/platform/waitable_atomic.cpp +@@ -34,6 +34,9 @@ + #ifdef __linux__ + #include <linux/futex.h> + #include <sys/syscall.h> ++#elif defined(__FreeBSD__) ++#include <sys/types.h> ++#include <sys/umtx.h> + #elif defined(_WIN32) + #include <synchapi.h> + #endif +@@ -233,6 +236,45 @@ bool waitUntil(const void* uaddr, + // There isn't a good list of possible errors, so assuming that anything other than a timeout + // error is a possible spurious wakeup. + return timeoutOverflow || errno != ETIMEDOUT; ++} ++ ++#elif defined(__FreeBSD__) ++ ++void notifyOne(const void* uaddr) { ++ _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAKE_PRIVATE, 1, NULL, NULL); ++} ++ ++void notifyMany(const void* uaddr, int nToWake) { ++ _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAKE_PRIVATE, nToWake, NULL, NULL); ++} ++ ++void notifyAll(const void* uaddr) { ++ _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAKE_PRIVATE, INT_MAX, NULL, NULL); ++} ++ ++bool waitUntil(const void* uaddr, ++ uint32_t old, ++ boost::optional<system_clock::time_point> deadline) { ++ struct _umtx_time umtx_deadline; ++ void* uaddr2 = nullptr; ++ ++ if (deadline) { ++ umtx_deadline._timeout.tv_sec = durationCount<Seconds>(deadline->time_since_epoch()); ++ umtx_deadline._timeout.tv_nsec = durationCount<Nanoseconds>( ++ deadline->time_since_epoch() - stdx::chrono::seconds(umtx_deadline._timeout.tv_sec)); ++ umtx_deadline._flags = UMTX_ABSTIME; ++ umtx_deadline._clockid = CLOCK_REALTIME_FAST; ++ uaddr2 = &umtx_deadline; ++ } ++ ++ int umtxOpRet; ++ if ((umtxOpRet = _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAIT_UINT_PRIVATE, old, (void*)sizeof(struct _umtx_time), uaddr2)) != 0) { ++ if (errno == ETIMEDOUT) { ++ return false; ++ } ++ invariant(umtxOpRet == 0, errorMessage(lastSystemError())); ++ } ++ return true; + } + + #else |