diff options
Diffstat (limited to 'databases/mongodb80')
-rw-r--r-- | databases/mongodb80/Makefile | 1 | ||||
-rw-r--r-- | databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/databases/mongodb80/Makefile b/databases/mongodb80/Makefile index 9ec9b060287f..1b37c5f0dd39 100644 --- a/databases/mongodb80/Makefile +++ b/databases/mongodb80/Makefile @@ -1,6 +1,7 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r DISTVERSION= 8.0.12 +PORTREVISION= 2 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} diff --git a/databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp b/databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp index e2c815567836..73e0befd876d 100644 --- a/databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp +++ b/databases/mongodb80/files/patch-src_mongo_platform_waitable__atomic.cpp @@ -1,3 +1,9 @@ +# 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 @@ @@ -46,7 +52,7 @@ + } + + int umtxOpRet; -+ if ((umtxOpRet = _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAIT_UINT_PRIVATE, old, (void*)sizeof(struct _umtx_time), uaddr2)) != 0) { ++ if ((umtxOpRet = _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAIT_UINT_PRIVATE, old, (void*)sizeof(struct _umtx_time), uaddr2)) == -1) { + if (errno == ETIMEDOUT) { + return false; + } |