[Pkg-mongodb-maintainers] [pkg-mongodb] 08/11: Refresh patches
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Mon Oct 2 07:55:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository pkg-mongodb.
commit 827d18dfb33b51bbfdb628a2513fbf454d580359
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Sat Aug 12 12:17:16 2017 -0400
Refresh patches
---
debian/patches/CVE-2016-6494.patch | 14 ++++++++++----
debian/patches/fix-boost-1.60-build.patch | 27 ++++++++-------------------
debian/patches/fix-ftbfs-with-gcc-7.patch | 2 +-
debian/patches/fix-gcc-6-ftbfs.patch | 16 ++++++----------
debian/patches/hardened-build.patch | 2 +-
5 files changed, 26 insertions(+), 35 deletions(-)
diff --git a/debian/patches/CVE-2016-6494.patch b/debian/patches/CVE-2016-6494.patch
index 915e74c..f2df96f 100644
--- a/debian/patches/CVE-2016-6494.patch
+++ b/debian/patches/CVE-2016-6494.patch
@@ -17,18 +17,24 @@ Last-Update: 2016-08-04
#include <sys/ioctl.h>
#include <cctype>
#include <wctype.h>
-@@ -2765,7 +2766,10 @@
- /* Save the history in the specified file. On success 0 is returned
+@@ -2766,6 +2767,8 @@
* otherwise -1 is returned. */
int linenoiseHistorySave(const char* filename) {
+ FILE* fp;
+ mode_t old_umask;
+ old_umask = umask(S_IRWXG | S_IRWXO);
- FILE* fp = fopen(filename, "wt");
+ #if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE || defined(__APPLE__)
+ int fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR);
+ if (fd == -1) {
+@@ -2776,6 +2779,7 @@
+ #else
+ fp = fopen(filename, "wt");
+ #endif // _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE || defined(__APPLE__)
+ umask(old_umask);
if (fp == NULL) {
return -1;
}
-@@ -2790,6 +2794,8 @@
+@@ -2800,6 +2804,8 @@
return -1;
}
diff --git a/debian/patches/fix-boost-1.60-build.patch b/debian/patches/fix-boost-1.60-build.patch
index 4952e9b..05ca3fb 100644
--- a/debian/patches/fix-boost-1.60-build.patch
+++ b/debian/patches/fix-boost-1.60-build.patch
@@ -10,11 +10,9 @@ Subject: [PATCH] SERVER-17294 Boost 1.60 Mongo compilation fixes
src/mongo/util/concurrency/shared_mutex_win.hpp | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/src/mongo/db/ftdc/compressor.cpp b/src/mongo/db/ftdc/compressor.cpp
-index 1c4bfca..ecf9c7e 100644
--- a/src/mongo/db/ftdc/compressor.cpp
+++ b/src/mongo/db/ftdc/compressor.cpp
-@@ -47,7 +47,7 @@ FTDCCompressor::addSample(const BSONObj& sample, Date_t date) {
+@@ -47,7 +47,7 @@
if (_referenceDoc.isEmpty()) {
FTDCBSONUtil::extractMetricsFromDocument(sample, sample, &_metrics);
_reset(sample, date);
@@ -23,7 +21,7 @@ index 1c4bfca..ecf9c7e 100644
}
_metrics.resize(0);
-@@ -107,7 +107,7 @@ FTDCCompressor::addSample(const BSONObj& sample, Date_t date) {
+@@ -107,7 +107,7 @@
}
// The buffer is not full, inform the caller
@@ -32,11 +30,9 @@ index 1c4bfca..ecf9c7e 100644
}
StatusWith<std::tuple<ConstDataRange, Date_t>> FTDCCompressor::getCompressedSamples() {
-diff --git a/src/mongo/db/ftdc/compressor_test.cpp b/src/mongo/db/ftdc/compressor_test.cpp
-index 518e5e8..6950dd9 100644
--- a/src/mongo/db/ftdc/compressor_test.cpp
+++ b/src/mongo/db/ftdc/compressor_test.cpp
-@@ -122,7 +122,7 @@ public:
+@@ -122,7 +122,7 @@
TestTie() : _compressor(&_config) {}
~TestTie() {
@@ -45,11 +41,9 @@ index 518e5e8..6950dd9 100644
}
StatusWith<boost::optional<std::tuple<ConstDataRange, FTDCCompressor::CompressorState, Date_t>>>
-diff --git a/src/mongo/db/ftdc/file_writer.cpp b/src/mongo/db/ftdc/file_writer.cpp
-index 576f946..7ab7ee7 100644
--- a/src/mongo/db/ftdc/file_writer.cpp
+++ b/src/mongo/db/ftdc/file_writer.cpp
-@@ -205,7 +205,7 @@ Status FTDCFileWriter::flush(const boost::optional<ConstDataRange>& range, Date_
+@@ -211,7 +211,7 @@
Status FTDCFileWriter::close() {
if (_archiveStream.is_open()) {
@@ -58,11 +52,9 @@ index 576f946..7ab7ee7 100644
_archiveStream.close();
-diff --git a/src/mongo/util/concurrency/shared_mutex_win.hpp b/src/mongo/util/concurrency/shared_mutex_win.hpp
-index a51afaf..86ad659 100644
--- a/src/mongo/util/concurrency/shared_mutex_win.hpp
+++ b/src/mongo/util/concurrency/shared_mutex_win.hpp
-@@ -175,7 +175,7 @@ namespace boost
+@@ -175,7 +175,7 @@
return true;
}
@@ -71,7 +63,7 @@ index a51afaf..86ad659 100644
if(res==detail::win32::timeout)
{
for(;;)
-@@ -328,7 +328,7 @@ namespace boost
+@@ -328,7 +328,7 @@
{
return true;
}
@@ -80,7 +72,7 @@ index a51afaf..86ad659 100644
if(wait_res==detail::win32::timeout)
{
for(;;)
-@@ -421,7 +421,7 @@ namespace boost
+@@ -421,7 +421,7 @@
return;
}
@@ -89,7 +81,7 @@ index a51afaf..86ad659 100644
}
}
-@@ -502,7 +502,7 @@ namespace boost
+@@ -502,7 +502,7 @@
{
if(!last_reader)
{
@@ -98,6 +90,3 @@ index a51afaf..86ad659 100644
}
break;
}
---
-2.8.1
-
diff --git a/debian/patches/fix-ftbfs-with-gcc-7.patch b/debian/patches/fix-ftbfs-with-gcc-7.patch
index cfeaad6..2979fd1 100644
--- a/debian/patches/fix-ftbfs-with-gcc-7.patch
+++ b/debian/patches/fix-ftbfs-with-gcc-7.patch
@@ -13,7 +13,7 @@ Last-Update: 2017-08-10
Forwarded: no
--- a/SConstruct
+++ b/SConstruct
-@@ -1457,6 +1457,10 @@
+@@ -1462,6 +1462,10 @@
"-Wsign-compare",
"-Wno-unknown-pragmas",
"-Wno-nonnull-compare",
diff --git a/debian/patches/fix-gcc-6-ftbfs.patch b/debian/patches/fix-gcc-6-ftbfs.patch
index a292239..79d83b3 100644
--- a/debian/patches/fix-gcc-6-ftbfs.patch
+++ b/debian/patches/fix-gcc-6-ftbfs.patch
@@ -7,11 +7,9 @@ Description: Fix FTBFS with GCC6
Last-Update: 2017-07-01
Forwarded: no
-Index: mongodb-3.2.9/SConstruct
-===================================================================
---- mongodb-3.2.9.orig/SConstruct
-+++ mongodb-3.2.9/SConstruct
-@@ -1433,6 +1433,8 @@ if env.TargetOSIs('posix'):
+--- a/SConstruct
++++ b/SConstruct
+@@ -1461,6 +1461,8 @@
"-Wall",
"-Wsign-compare",
"-Wno-unknown-pragmas",
@@ -20,11 +18,9 @@ Index: mongodb-3.2.9/SConstruct
"-Winvalid-pch"] )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if env.TargetOSIs('linux', 'osx', 'solaris'):
-Index: mongodb-3.2.9/src/mongo/base/parse_number_test.cpp
-===================================================================
---- mongodb-3.2.9.orig/src/mongo/base/parse_number_test.cpp
-+++ mongodb-3.2.9/src/mongo/base/parse_number_test.cpp
-@@ -294,7 +294,7 @@ TEST(Double, TestParsingNormal) {
+--- a/src/mongo/base/parse_number_test.cpp
++++ b/src/mongo/base/parse_number_test.cpp
+@@ -294,7 +294,7 @@
ASSERT_PARSES(double, "0xff", 0xff);
ASSERT_PARSES(double, "-0xff", -0xff);
diff --git a/debian/patches/hardened-build.patch b/debian/patches/hardened-build.patch
index 4fdc8e6..f05ff2c 100644
--- a/debian/patches/hardened-build.patch
+++ b/debian/patches/hardened-build.patch
@@ -1,6 +1,6 @@
--- a/SConstruct
+++ b/SConstruct
-@@ -831,6 +831,11 @@
+@@ -839,6 +839,11 @@
INSTALL_DIR=installDir,
CONFIG_HEADER_DEFINES={},
LIBDEPS_TAG_EXPANSIONS=[],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git
More information about the Pkg-mongodb-maintainers
mailing list