Drop/Refresh patches

+ Drop patches for architectures no longer built:
  - 0001-Create-kfreebsd-like-linux-in-most-respects.patch
  - 0002-kfreebsd-has-dev-urandom.patch
  - 0012-support-gnu.patch
  - use-mmapv1-on-i386
+ Drop obsolete/merged patches:
  - fix-boost-1.62-build.patch
  - fix-gcc-6-ftbfs.patch
  - use-std::regex.patch
  - fix-build-with-openssl-1.1.patch
  - fix-mozjs-38-segfaults.patch
  - arm64-48bit-va-compat.patch
  - scons-3.0-compat.patch
+ Refresh fix-ftbfs-with-gcc-7.patch

Git-Dch: Full

13 files changed, 5 insertions, 467 deletions

diff --git a/debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch b/debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch
deleted file mode 100644
index 7bc81aca077..00000000000
--- a/debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Jeff Epler <jepler@unpythonic.net>
-Date: Fri, 19 Apr 2013 08:15:18 -0500
-Subject: Create kfreebsd like linux in most respects
-
----
- SConstruct | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -38,7 +38,7 @@
- # command-line. Treat this output as the value of HOST_OS
- def get_running_os_name():
-     running_os = os.sys.platform
--    if running_os.startswith('linux'):
-+    if running_os.startswith('linux') or running_os.startswith('gnukfreebsd'):
-         running_os = 'linux'
-     elif running_os.startswith('freebsd'):
-         running_os = 'freebsd'
diff --git a/debian/patches/0002-kfreebsd-has-dev-urandom.patch b/debian/patches/0002-kfreebsd-has-dev-urandom.patch
deleted file mode 100644
index 2bc9e77a524..00000000000
--- a/debian/patches/0002-kfreebsd-has-dev-urandom.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Jeff Epler <jepler@unpythonic.net>
-Date: Fri, 19 Apr 2013 08:16:19 -0500
-Subject: kfreebsd has /dev/urandom
-
----
- src/mongo/platform/random.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/mongo/platform/random.cpp
-+++ b/src/mongo/platform/random.cpp
-@@ -145,7 +145,7 @@
-     return new WinSecureRandom();
- }
- 
--#elif defined(__linux__) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__)
-+#elif defined(__linux__) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 
- class InputStreamSecureRandom : public SecureRandom {
- public:
diff --git a/debian/patches/0012-support-gnu.patch b/debian/patches/0012-support-gnu.patch
deleted file mode 100644
index 2f2b0905737..00000000000
--- a/debian/patches/0012-support-gnu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -38,7 +38,9 @@
- # command-line. Treat this output as the value of HOST_OS
- def get_running_os_name():
-     running_os = os.sys.platform
--    if running_os.startswith('linux') or running_os.startswith('gnukfreebsd'):
-+    if (running_os.startswith('linux')
-+        or running_os.startswith('gnukfreebsd')
-+        or running_os.startswith('gnu0')):
-         running_os = 'linux'
-     elif running_os.startswith('freebsd'):
-         running_os = 'freebsd'
---- a/src/mongo/platform/random.cpp
-+++ b/src/mongo/platform/random.cpp
-@@ -145,7 +145,7 @@
-     return new WinSecureRandom();
- }
- 
--#elif defined(__linux__) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#elif defined(__linux__) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
- 
- class InputStreamSecureRandom : public SecureRandom {
- public:
diff --git a/debian/patches/arm64-48bit-va-compat.patch b/debian/patches/arm64-48bit-va-compat.patch
deleted file mode 100644
index 7cea6be14a9..00000000000
--- a/debian/patches/arm64-48bit-va-compat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Author: Zheng Xu <zheng.xu@linaro.org>
- Description: Manually mmap on arm64 to ensure high 17 bits are clear. r=ehoogeveen
- There might be 48-bit VA on arm64 depending on kernel configuration.
- Manually mmap heap memory to align with the assumption made by JS engine.
-Comment: Obtained from https://hg.mozilla.org/mozilla-central/raw-rev/dfaafbaaa291
-Last-Update: 2017-09-25
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/871906
---- a/src/third_party/mozjs-38/extract/js/src/gc/Memory.cpp
-+++ b/src/third_party/mozjs-38/extract/js/src/gc/Memory.cpp
-@@ -379,7 +379,7 @@
- MapMemoryAt(void* desired, size_t length, int prot = PROT_READ | PROT_WRITE,
-             int flags = MAP_PRIVATE | MAP_ANON, int fd = -1, off_t offset = 0)
- {
--#if defined(__ia64__) || (defined(__sparc64__) && defined(__NetBSD__))
-+#if defined(__ia64__) || (defined(__sparc64__) && defined(__NetBSD__)) || defined(__aarch64__)
-     MOZ_ASSERT(0xffff800000000000ULL & (uintptr_t(desired) + length - 1) == 0);
- #endif
-     void* region = mmap(desired, length, prot, flags, fd, offset);
-@@ -429,6 +429,41 @@
-         return nullptr;
-     }
-     return region;
-+#elif defined(__aarch64__)
-+   /*
-+    * There might be similar virtual address issue on arm64 which depends on
-+    * hardware and kernel configurations. But the work around is slightly
-+    * different due to the different mmap behavior.
-+    *
-+    * TODO: Merge with the above code block if this implementation works for
-+    * ia64 and sparc64.
-+    */
-+    const uintptr_t start = UINT64_C(0x0000070000000000);
-+    const uintptr_t end   = UINT64_C(0x0000800000000000);
-+    const uintptr_t step  = ChunkSize;
-+   /*
-+    * Optimization options if there are too many retries in practice:
-+    * 1. Examine /proc/self/maps to find an available address. This file is
-+    *    not always available, however. In addition, even if we examine
-+    *    /proc/self/maps, we may still need to retry several times due to
-+    *    racing with other threads.
-+    * 2. Use a global/static variable with lock to track the addresses we have
-+    *    allocated or tried.
-+    */
-+    uintptr_t hint;
-+    void* region = MAP_FAILED;
-+    for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) {
-+        region = mmap((void*)hint, length, prot, flags, fd, offset);
-+        if (region != MAP_FAILED) {
-+            if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
-+                if (munmap(region, length)) {
-+                    MOZ_ASSERT(errno == ENOMEM);
-+                }
-+                region = MAP_FAILED;
-+            }
-+        }
-+    }
-+    return region == MAP_FAILED ? nullptr : region;
- #else
-     void* region = MozTaggedAnonymousMmap(nullptr, length, prot, flags, fd, offset, "js-gc-heap");
-     if (region == MAP_FAILED)
diff --git a/debian/patches/fix-boost-1.62-build.patch b/debian/patches/fix-boost-1.62-build.patch
deleted file mode 100644
index 3123c81a622..00000000000
--- a/debian/patches/fix-boost-1.62-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/databases/mongodb/patches/patch-src_mongo_db_fts_unicode_string.cpp?rev=1.1&content-type=text/x-cvsweb-markup
-Description: Fix FTBFS with boost 1.62
-Last-Update: 2016-12-14
-Forwarded: no
-Index: mongodb-3.2.11/src/mongo/db/fts/unicode/string.cpp
-===================================================================
---- mongodb-3.2.11.orig/src/mongo/db/fts/unicode/string.cpp
-+++ mongodb-3.2.11/src/mongo/db/fts/unicode/string.cpp
-@@ -274,7 +274,7 @@ bool String::substrMatch(const std::stri
- 
-     // Case sensitive and diacritic sensitive.
-     return boost::algorithm::boyer_moore_search(
--               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != haystack.end();
-+               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != std::make_pair(haystack.end(), haystack.end());
- }
- 
- }  // namespace unicode
diff --git a/debian/patches/fix-build-with-openssl-1.1.patch b/debian/patches/fix-build-with-openssl-1.1.patch
deleted file mode 100644
index 77cc5560dce..00000000000
--- a/debian/patches/fix-build-with-openssl-1.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 557c0a3ca5f55ae3ca8ff26918fe94113c403390 Mon Sep 17 00:00:00 2001
-From: Apollon Oikonomopoulos <apoikos@debian.org>
-Date: Tue, 26 Sep 2017 12:25:06 +0300
-Subject: [PATCH] Fix build with OpenSSL 1.1
-
-Upstream merged a commit that pre-dated OpenSSL 1.1 support in 3.2.16,
-effectively removing parts of 1.1 support. Fix this by restoring the
-correct declarations.
----
- src/mongo/crypto/sha1_block_openssl.cpp | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/mongo/crypto/sha1_block_openssl.cpp b/src/mongo/crypto/sha1_block_openssl.cpp
-index ce0cab8e9e..4514c6afc3 100644
---- a/src/mongo/crypto/sha1_block_openssl.cpp
-+++ b/src/mongo/crypto/sha1_block_openssl.cpp
-@@ -70,14 +70,13 @@ namespace mongo {
- SHA1Block SHA1Block::computeHash(const uint8_t* input, size_t inputLen) {
-     HashType output;
- 
--    EVP_MD_CTX digestCtx;
--    EVP_MD_CTX_init(&digestCtx);
--    ON_BLOCK_EXIT(EVP_MD_CTX_cleanup, &digestCtx);
-+    std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> digestCtx(EVP_MD_CTX_new(),
-+                                                                      EVP_MD_CTX_free);
- 
-     fassert(40379,
--            EVP_DigestInit_ex(&digestCtx, EVP_sha1(), NULL) == 1 &&
--                EVP_DigestUpdate(&digestCtx, input, inputLen) == 1 &&
--                EVP_DigestFinal_ex(&digestCtx, output.data(), NULL) == 1);
-+            EVP_DigestInit_ex(digestCtx.get(), EVP_sha1(), NULL) == 1 &&
-+                EVP_DigestUpdate(digestCtx.get(), input, inputLen) == 1 &&
-+                EVP_DigestFinal_ex(digestCtx.get(), output.data(), NULL) == 1);
-     return SHA1Block(output);
- }
- 
--- 
-2.14.1
-
diff --git a/debian/patches/fix-ftbfs-with-gcc-7.patch b/debian/patches/fix-ftbfs-with-gcc-7.patch
index 1375fb57919..7ca2dc3d6fd 100644
--- a/debian/patches/fix-ftbfs-with-gcc-7.patch
+++ b/debian/patches/fix-ftbfs-with-gcc-7.patch
@@ -9,18 +9,18 @@ Description: Fix FTBFS with GCC 7
  Additionally turn format truncation errors back to warnings again for the time
  being.
 Bug-Debian: https://bugs.debian.org/853556
-Last-Update: 2017-08-10
+Last-Update: 2018-03-22
 Forwarded: no
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1568,6 +1568,10 @@
+@@ -1567,6 +1567,10 @@
+                          "-Wall",
                           "-Wsign-compare",
                           "-Wno-unknown-pragmas",
- 			 "-Wno-nonnull-compare",
 +			 "-Wno-error=c++1z-compat",
 +			 "-Wno-error=noexcept-type",
 +			 "-Wno-error=format-truncation",
 +			 "-Wno-error=int-in-bool-context",
- 			 "-Wno-overflow",
                           "-Winvalid-pch"] )
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+     if env.TargetOSIs('linux', 'osx', 'solaris'):
diff --git a/debian/patches/fix-gcc-6-ftbfs.patch b/debian/patches/fix-gcc-6-ftbfs.patch
deleted file mode 100644
index a4c22167f53..00000000000
--- a/debian/patches/fix-gcc-6-ftbfs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Apollon Oikonomopoulos <apoikos@debian.org>
-Description: Fix FTBFS with GCC6
- Disable newly-introduced warnings in GCC6 (misleading-indentation,
- deprecated-declarations and nonnull-compare) to have mongodb build with GCC6.
- Also fix some C++11 pointer-to-bool casting errors by explicitly fetching the
- pointers (cherry-picked upstream from 3.2).
-Last-Update: 2017-07-01
-Forwarded: no
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -1567,6 +1567,8 @@
-                          "-Wall",
-                          "-Wsign-compare",
-                          "-Wno-unknown-pragmas",
-+			 "-Wno-nonnull-compare",
-+			 "-Wno-overflow",
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if env.TargetOSIs('linux', 'osx', 'solaris'):
---- a/src/mongo/base/parse_number_test.cpp
-+++ b/src/mongo/base/parse_number_test.cpp
-@@ -292,7 +292,7 @@
- 
-     ASSERT_PARSES(double, "0xff", 0xff);
-     ASSERT_PARSES(double, "-0xff", -0xff);
--    ASSERT_PARSES(double, "0xabcab.defdefP-10", 0xabcab.defdefP-10);
-+    //ASSERT_PARSES(double, "0xabcab.defdefP-10", 0xabcab.defdefP-10);
- #endif
- }
- 
diff --git a/debian/patches/fix-mozjs-38-segfaults.patch b/debian/patches/fix-mozjs-38-segfaults.patch
deleted file mode 100644
index fbcd1511381..00000000000
--- a/debian/patches/fix-mozjs-38-segfaults.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Apollon Oikonomopoulos <apoikos@debian.org>
-Description: Fix mozjs-related segfaults when built with GCC >=6
- Apparently, mozjs 38 and up to 49 is prone to segfaults at GC time when built
- using GCC 6 or later. I've seen MongoDB crash a number of times with only
- mozjs GC operations in the stack trace. We're also currently having a segfault
- on ARM64 that is probably related (#871906).
- .
- According to https://trac.wildfiregames.com/ticket/4053 and
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70526#c14, disabling a couple of
- optimizations should fix this.
-Last-Update: 2017-09-25
-Forwarded: no
---- a/src/third_party/mozjs-38/SConscript
-+++ b/src/third_party/mozjs-38/SConscript
-@@ -92,6 +92,14 @@
-     'platform/' + env["TARGET_ARCH"] + "/" + env["TARGET_OS"] + "/include",
- ])
- 
-+# Debian
-+# Apparently, Spidermonkey 38 (and up to 49) is prone to segfaults at GC time
-+# when built with GCC 6 or later. Disabling the following optimizations fixes
-+# this.
-+# See https://trac.wildfiregames.com/ticket/4053 and
-+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70526#c14 for more information
-+env.Append(CXXFLAGS=["-fno-schedule-insns2", "-fno-delete-null-pointer-checks"])
-+
- sources = [
-     "extract/js/src/builtin/RegExp.cpp",
-     "extract/js/src/frontend/Parser.cpp",
diff --git a/debian/patches/scons-3.0-compat.patch b/debian/patches/scons-3.0-compat.patch
deleted file mode 100644
index fdecdd438c3..00000000000
--- a/debian/patches/scons-3.0-compat.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 7e0157c3bacd96e7b871f309280e1b26760c43cf Mon Sep 17 00:00:00 2001
-From: William Deegan <bill@baddogconsulting.com>
-Date: Mon, 24 Jul 2017 08:34:32 -0700
-Subject: [PATCH] SERVER-30300 Changes to allow build to work with SCons 3.0.
-
-Entirely changes to print calls.
-
-Signed-off-by: Andrew Morrow <acm@mongodb.com>
-(cherry picked from commit e9570ae0bc9dae3823ee2ef815251c02ff50e2bc and
-adjusted for 3.2 by Apollon Oikonomopoulos <apoikos@debian.org>)
----
- SConstruct                                              | 17 ++++++++---------
- .../scons-local-2.5.0/SCons/Script/SConscript.py        |  7 ++++---
- src/third_party/wiredtiger/SConscript                   |  2 +-
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -481,7 +481,7 @@
-         version_data = json.load(version_fp)
- 
-     if 'version' not in version_data:
--        print "version.json does not contain a version string"
-+        print("version.json does not contain a version string")
-         Exit(1)
-     if 'githash' not in version_data:
-         version_data['githash'] = utils.getGitVersion()
-@@ -489,7 +489,7 @@
- except IOError as e:
-     # If the file error wasn't because the file is missing, error out
-     if e.errno != errno.ENOENT:
--        print "Error opening version.json: {0}".format(e.strerror)
-+        print("Error opening version.json: {0}".format(e.strerror))
-         Exit(1)
- 
-     version_data = {
-@@ -498,7 +498,7 @@
-     }
- 
- except ValueError as e:
--    print "Error decoding version.json: {0}".format(e)
-+    print("Error decoding version.json: {0}".format(e))
-     Exit(1)
- 
- # Setup the command-line variables
-@@ -568,7 +568,7 @@
- 
- variables_files = variable_shlex_converter(get_option('variables-files'))
- for file in variables_files:
--    print "Using variable customization file %s" % file
-+    print("Using variable customization file %s" % file)
- 
- env_vars = Variables(
-     files=variables_files,
-@@ -853,13 +853,12 @@
- env.AddMethod(env_get_os_name_wrapper, 'GetTargetOSName')
- 
- def fatal_error(env, msg, *args):
--    print msg.format(*args)
-+    print(msg.format(*args))
-     Exit(1)
- 
- def conf_error(env, msg, *args):
--    print msg.format(*args)
--    print "See {0} for details".format(env['CONFIGURELOG'].abspath)
--
-+    print(msg.format(*args))
-+    print("See {0} for details".format(env['CONFIGURELOG'].abspath))
-     Exit(1)
- 
- env.AddMethod(fatal_error, 'FatalError')
-@@ -878,7 +877,7 @@
- env.AddMethod(lambda env: env['VERBOSE'], 'Verbose')
- 
- if has_option('variables-help'):
--    print env_vars.GenerateHelpText(env)
-+    print(env_vars.GenerateHelpText(env))
-     Exit(0)
- 
- unknown_vars = env_vars.UnknownVariables()
-@@ -1050,7 +1049,7 @@
-     env['TARGET_ARCH'] = detected_processor
- 
- if env['TARGET_OS'] not in os_macros:
--    print "No special config for [{0}] which probably means it won't work".format(env['TARGET_OS'])
-+    print("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS']))
- elif not detectConf.CheckForOS(env['TARGET_OS']):
-     env.FatalError("TARGET_OS ({0}) is not supported by compiler", env['TARGET_OS'])
- 
-@@ -2237,7 +2236,7 @@
-             myenv.SetConfigHeaderDefine(macro_name)
-     conf.Finish()
-     if not haveTriviallyConstructibleThreadLocals:
--        print "Compiler must support a thread local storage class for trivially constructible types"
-+        print("Compiler must support a thread local storage class for trivially constructible types")
-         Exit(1)
- 
-     # not all C++11-enabled gcc versions have type properties
---- a/src/third_party/scons-2.5.0/scons-local-2.5.0/SCons/Script/SConscript.py
-+++ b/src/third_party/scons-2.5.0/scons-local-2.5.0/SCons/Script/SConscript.py
-@@ -27,6 +27,7 @@
- # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- from __future__ import division
-+from __future__ import print_function
- 
- __revision__ = "src/engine/SCons/Script/SConscript.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
- 
-@@ -462,15 +463,15 @@
-                 scons_ver_string = '%d.%d.%d' % (major, minor, revision)
-             else:
-                 scons_ver_string = '%d.%d' % (major, minor)
--            print "SCons %s or greater required, but you have SCons %s" % \
--                  (scons_ver_string, SCons.__version__)
-+            print ("SCons %s or greater required, but you have SCons %s" % \
-+                  (scons_ver_string, SCons.__version__))
-             sys.exit(2)
- 
-     def EnsurePythonVersion(self, major, minor):
-         """Exit abnormally if the Python version is not late enough."""
-         if sys.version_info < (major, minor):
-             v = sys.version.split()[0]
--            print "Python %d.%d or greater required, but you have Python %s" %(major,minor,v)
-+            print ("Python %d.%d or greater required, but you have Python %s" %(major,minor,v))
-             sys.exit(2)
- 
-     def Exit(self, value=0):
---- a/src/third_party/wiredtiger/SConscript
-+++ b/src/third_party/wiredtiger/SConscript
-@@ -87,7 +87,7 @@
-     VERSION_MINOR == None or
-     VERSION_PATCH == None or
-     VERSION_STRING == None):
--    print "Failed to find version variables in " + version_file
-+    print("Failed to find version variables in " + version_file)
-     Exit(1)
- 
- wiredtiger_includes = """
---- a/src/mongo/installer/msi/SConscript
-+++ b/src/mongo/installer/msi/SConscript
-@@ -69,8 +69,8 @@
-       upgrade_code = '54BEB8CC-C8F7-4292-A411-BDE0A9F21CA3'
- 
- if 'msi' in BUILD_TARGETS and msi_edition == 'SSL' and msi_flavor != '2008R2Plus':
--  print "Building the MongoDB SSL MSI is only supported on Windows 2008 R2+ or Windows 7+ platforms."
--  print "You must add --win-version-min=ws08r2 to your scons flags"
-+  print("Building the MongoDB SSL MSI is only supported on Windows 2008 R2+ or Windows 7+ platforms.")
-+  print("You must add --win-version-min=ws08r2 to your scons flags")
-   exit(1)
- 
- if msi_platform == 'x64':
diff --git a/debian/patches/series b/debian/patches/series
index fe4986291ae..85239e2fc55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,6 @@
-#0001-Create-kfreebsd-like-linux-in-most-respects.patch
-#0002-kfreebsd-has-dev-urandom.patch
-#0012-support-gnu.patch
 hardened-build.patch
-fix-gcc-6-ftbfs.patch
-fix-boost-1.62-build.patch
 CVE-2016-6494.patch
-#use-mmapv1-on-i386
 fix-wt-checksum-on-arm64
-use-std::regex.patch
 disable-hw-crc32-on-arm64-s390x.patch
 fix-ftbfs-with-gcc-7.patch
+asio-openssl-1.1-support.patch
diff --git a/debian/patches/use-mmapv1-on-i386 b/debian/patches/use-mmapv1-on-i386
deleted file mode 100644
index 6b56b43111a..00000000000
--- a/debian/patches/use-mmapv1-on-i386
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Apollon Oikonomopoulos <apoikos@debian.org>
-Description: Use MMAPv1 by default on i386
- Since wiredTiger does not build on i386, make sure mongod won't try to use it
- by default.
-Last-Update: 2016-12-15
-Forwarded: no
---- a/src/mongo/db/storage/storage_options.h
-+++ b/src/mongo/db/storage/storage_options.h
-@@ -52,7 +52,11 @@
- 
-     // --storageEngine
-     // storage engine for this instance of mongod.
-+#if defined(__i386__)
-+    std::string engine = "mmapv1";
-+#else
-     std::string engine = "wiredTiger";
-+#endif
- 
-     // True if --storageEngine was passed on the command line, and false otherwise.
-     bool engineSetByUser = false;
---- a/src/mongo/dbtests/framework_options.cpp
-+++ b/src/mongo/dbtests/framework_options.cpp
-@@ -104,7 +104,11 @@
-     options
-         ->addOptionChaining(
-             "storage.engine", "storageEngine", moe::String, "what storage engine to use")
-+#if defined(__i386__)
-+        .setDefault(moe::Value(std::string("mmapv1")));
-+#else
-         .setDefault(moe::Value(std::string("wiredTiger")));
-+#endif
- 
-     options->addOptionChaining("suites", "suites", moe::StringVector, "test suites to run")
-         .hidden()
diff --git a/debian/patches/use-std::regex.patch b/debian/patches/use-std::regex.patch
deleted file mode 100644
index ddd23b6f0d4..00000000000
--- a/debian/patches/use-std::regex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Apollon Oikonomopoulos <apoikos@debian.org>
-Description: Use std::regex instead of boost::regex
- Fixes FTBFS due to C++ ABI mismatch between system boost and mongodb.
- std::regex is part of C++11.
-Forwarded: no (further investigation needed)
-Last-Update: 2016-12-23
---- a/src/mongo/client/mongo_uri.cpp
-+++ b/src/mongo/client/mongo_uri.cpp
-@@ -43,7 +43,8 @@
- #include <boost/algorithm/string/classification.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/algorithm/string/split.hpp>
--#include <boost/regex.hpp>
-+
-+#include <regex>
- 
- namespace mongo {
- 
-@@ -85,10 +86,10 @@
-         return MongoURI(cs_status.getValue());
-     }
- 
--    const boost::regex mongoUrlRe(kMongoDBURL);
-+    const std::regex mongoUrlRe(kMongoDBURL);
- 
--    boost::smatch matches;
--    if (!boost::regex_match(url, matches, mongoUrlRe)) {
-+    std::smatch matches;
-+    if (!std::regex_match(url, matches, mongoUrlRe)) {
-         return Status(ErrorCodes::FailedToParse,
-                       str::stream() << "Failed to parse mongodb:// URL: " << url);
-     }