[pkgsrc/trunk]: pkgsrc/databases/mongodb3 databases/mongodb3: Add patches for...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b93ffe1e4a5
branches:  trunk
changeset: 412348:3b93ffe1e4a5
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Mar 05 01:41:51 2020 +0000

description:
databases/mongodb3: Add patches for C++ fussiness and fdatasync

For fdatasync, skip erroring on EBADF, rather than never trying it.
The issue might be use on a directory, but that's unclear.

It remains to document the patches, file them upstream, and record the
upstream tracker URLs.

Patches are due to Paul Ripke via pkgsrc-users.

diffstat:

 databases/mongodb3/Makefile                                                         |   3 +-
 databases/mongodb3/distinfo                                                         |   5 +-
 databases/mongodb3/patches/patch-src_mongo_db_storage_mmap__v1_durop.h              |  16 ++++++++
 databases/mongodb3/patches/patch-src_third__party_wiredtiger_src_os__posix_os__fs.c |  19 +++++----
 4 files changed, 32 insertions(+), 11 deletions(-)

diffs (89 lines):

diff -r c69e0ceda5e1 -r 3b93ffe1e4a5 databases/mongodb3/Makefile
--- a/databases/mongodb3/Makefile       Wed Mar 04 22:25:13 2020 +0000
+++ b/databases/mongodb3/Makefile       Thu Mar 05 01:41:51 2020 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2020/02/01 20:05:54 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/03/05 01:41:51 gdt Exp $
 
 # This package is intentionally old to avoid:
 #   Server Side Public License
 #   c++17 (and c++14 if 3.4.4 does not already need it)
 DISTNAME=      mongodb-src-r3.4.24
 PKGNAME=       ${DISTNAME:S/src-r//}
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://fastdl.mongodb.org/src/
 
diff -r c69e0ceda5e1 -r 3b93ffe1e4a5 databases/mongodb3/distinfo
--- a/databases/mongodb3/distinfo       Wed Mar 04 22:25:13 2020 +0000
+++ b/databases/mongodb3/distinfo       Thu Mar 05 01:41:51 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2020/02/01 20:05:54 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/03/05 01:41:51 gdt Exp $
 
 SHA1 (mongodb-src-r3.4.24.tar.gz) = 86909b211998f0cbc8104df774aecb3d00a01763
 RMD160 (mongodb-src-r3.4.24.tar.gz) = f7e4bfe1e2bd046f1a6c0f2695762076ffee5ae5
@@ -11,6 +11,7 @@
 SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
 SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726
 SHA1 (patch-src_mongo_db_repl_oplog__fetcher.cpp) = e12dbfbd4e70ee210cdd4eb0582661666e8eb06a
+SHA1 (patch-src_mongo_db_storage_mmap__v1_durop.h) = def5e3455a58ece20e4db0251536ff0a3b7be0b4
 SHA1 (patch-src_mongo_installer_msi_SConscript) = 78424fa10f90470dd941b900ef8fd131d28f6e65
 SHA1 (patch-src_mongo_platform_random.cpp) = 9af0fd82a653bf4f273ce107e54c5e63eaeb3b85
 SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3f67bbae82c0f3cae410a21219589bc082e7b9b1
@@ -26,4 +27,4 @@
 SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_include_js-config.h) = 7ddbb4e3bf4126a1be2195acc82ff859e8130a01
 SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
 SHA1 (patch-src_third__party_wiredtiger_SConscript) = 71fd2326a4e95fec674326225bce5ccf5793aa5a
-SHA1 (patch-src_third__party_wiredtiger_src_os__posix_os__fs.c) = aefd45bcbb854fd9877fcd0e96f1351d2ee6c3c2
+SHA1 (patch-src_third__party_wiredtiger_src_os__posix_os__fs.c) = 4480b5f3a58dbaa9c205925e3a67a3235917b90e
diff -r c69e0ceda5e1 -r 3b93ffe1e4a5 databases/mongodb3/patches/patch-src_mongo_db_storage_mmap__v1_durop.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mongodb3/patches/patch-src_mongo_db_storage_mmap__v1_durop.h    Thu Mar 05 01:41:51 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_mongo_db_storage_mmap__v1_durop.h,v 1.1 2020/03/05 01:41:52 gdt Exp $
+
+\todo Explain this patch.
+
+\todo File upstream and add upstream bugtracker URL.
+
+--- src/mongo/db/storage/mmap_v1/durop.h.orig  2020-01-08 16:30:41.000000000 +0000
++++ src/mongo/db/storage/mmap_v1/durop.h
+@@ -30,6 +30,7 @@
+ 
+ #pragma once
+ 
++#include <memory>
+ 
+ #include "mongo/db/storage/mmap_v1/dur_journalformat.h"
+ #include "mongo/db/storage/paths.h"
diff -r c69e0ceda5e1 -r 3b93ffe1e4a5 databases/mongodb3/patches/patch-src_third__party_wiredtiger_src_os__posix_os__fs.c
--- a/databases/mongodb3/patches/patch-src_third__party_wiredtiger_src_os__posix_os__fs.c       Wed Mar 04 22:25:13 2020 +0000
+++ b/databases/mongodb3/patches/patch-src_third__party_wiredtiger_src_os__posix_os__fs.c       Thu Mar 05 01:41:51 2020 +0000
@@ -1,15 +1,18 @@
-$NetBSD: patch-src_third__party_wiredtiger_src_os__posix_os__fs.c,v 1.1 2020/02/01 20:05:54 adam Exp $
+$NetBSD: patch-src_third__party_wiredtiger_src_os__posix_os__fs.c,v 1.2 2020/03/05 01:41:52 gdt Exp $
 
 On NetBSD, fdatasync() fails with "Bad file descriptor".
+\todo Explain if this is only for fdatasync on directories vs files.
+
+\todo File upstream and add upstream bugtracker URL.
 
 --- src/third_party/wiredtiger/src/os_posix/os_fs.c.orig       2020-01-08 16:30:41.000000000 +0000
 +++ src/third_party/wiredtiger/src/os_posix/os_fs.c
-@@ -100,7 +100,7 @@ __posix_sync(
-                   ret, "%s: %s: fcntl(F_FULLFSYNC)", name, func);
-       }
- #endif
--#if defined(HAVE_FDATASYNC)
-+#if defined(HAVE_FDATASYNC) && !defined(__NetBSD__)
+@@ -103,7 +103,7 @@ __posix_sync(
+ #if defined(HAVE_FDATASYNC)
        /* See comment in __posix_sync(): sync cannot be retried or fail. */
        WT_SYSCALL(fdatasync(fd), ret);
-       if (ret == 0)
+-      if (ret == 0)
++      if (ret == 0 || errno == EBADF)
+               return (0);
+       WT_PANIC_RET(session, ret, "%s: %s: fdatasync", name, func);
+ #else