[Pkg-mongodb-maintainers] [pkg-mongodb] 326/394: Refresh patches
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Wed Sep 21 14:00:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository pkg-mongodb.
commit 741fc12d1f46a73328042e085b67376e63abf559
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Thu Jan 14 12:06:38 2016 +0200
Refresh patches
---
...eate-kfreebsd-like-linux-in-most-respects.patch | 22 ++++++++---------
debian/patches/0004-Support-ppc64el-builds.patch | 4 ++--
.../patches/0006-Fix-ARM-alignment-problems.patch | 12 ++++------
debian/patches/0007-Use-TIME_UTC_-macro.patch | 5 ++--
.../0009-ignore-unused-local-typedefs.patch | 20 ++++------------
debian/patches/0010-fix-integer-signs.patch | 27 +++++++--------------
debian/patches/0012-support-gnu.patch | 28 +++++++++++-----------
debian/patches/0099-Pagesize-hacks.patch | 11 ++++-----
debian/patches/no-unused-function.patch | 6 ++---
debian/patches/no-unused-variable.patch | 6 ++---
10 files changed, 55 insertions(+), 86 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
index 721a855..a3af8a5 100644
--- a/debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch
+++ b/debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch
@@ -6,11 +6,18 @@ Subject: Create kfreebsd like linux in most respects
SConstruct | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/SConstruct b/SConstruct
-index 5fb0e83..f3ac3f9 100644
--- a/SConstruct
+++ b/SConstruct
-@@ -344,6 +344,8 @@ libdeps.setup_environment( env )
+@@ -66,7 +66,7 @@
+ if "darwin" == platform:
+ darwin = True
+ platform = "osx" # prettier than darwin
+-elif platform.startswith("linux"):
++elif platform.startswith("linux") or platform.startswith("gnukfreebsd"):
+ linux = True
+ platform = "linux"
+ elif "sunos5" == platform:
+@@ -526,6 +526,8 @@
if env['PYSYSPLATFORM'] == 'linux3':
env['PYSYSPLATFORM'] = 'linux2'
@@ -19,12 +26,3 @@ index 5fb0e83..f3ac3f9 100644
if 'freebsd' in env['PYSYSPLATFORM']:
env['PYSYSPLATFORM'] = 'freebsd'
-@@ -524,7 +526,7 @@ if "darwin" == os.sys.platform:
- env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
- env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
-
--elif os.sys.platform.startswith("linux"):
-+elif os.sys.platform.startswith("linux") or os.sys.platform.startswith("gnukfreebsd"):
- linux = True
- platform = "linux"
-
diff --git a/debian/patches/0004-Support-ppc64el-builds.patch b/debian/patches/0004-Support-ppc64el-builds.patch
index fffd62c..c8cc969 100644
--- a/debian/patches/0004-Support-ppc64el-builds.patch
+++ b/debian/patches/0004-Support-ppc64el-builds.patch
@@ -8,8 +8,8 @@ Forwarded: no
// figure out if we're on a 64 or 32 bit system
--#if defined(__x86_64__) || defined(__amd64__) || defined(_WIN64)
-+#if defined(__x86_64__) || defined(__amd64__) || defined(_WIN64) || defined(__powerpc64__)
+-#if defined(__x86_64__) || defined(__amd64__) || defined(_WIN64) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__amd64__) || defined(_WIN64) || defined(__aarch64__) || defined(__powerpc64__)
#define MONGO_PLATFORM_64
#elif defined(__i386__) || defined(_WIN32) || defined(__arm__)
#define MONGO_PLATFORM_32
diff --git a/debian/patches/0006-Fix-ARM-alignment-problems.patch b/debian/patches/0006-Fix-ARM-alignment-problems.patch
index e137d4d..184f4b5 100644
--- a/debian/patches/0006-Fix-ARM-alignment-problems.patch
+++ b/debian/patches/0006-Fix-ARM-alignment-problems.patch
@@ -11,8 +11,6 @@ Last-Update: 2013-03-15
src/mongo/db/key.cpp | 2 +-
2 files changed, 16 insertions(+), 2 deletions(-)
-diff --git a/src/mongo/bson/bsonelement.h b/src/mongo/bson/bsonelement.h
-index f094ab9..1ecb47f 100644
--- a/src/mongo/bson/bsonelement.h
+++ b/src/mongo/bson/bsonelement.h
@@ -17,7 +17,7 @@
@@ -24,7 +22,7 @@ index f094ab9..1ecb47f 100644
#include <string>
#include <vector>
-@@ -529,13 +529,27 @@ namespace mongo {
+@@ -550,13 +550,27 @@
}
inline double BSONElement::numberDouble() const {
@@ -52,11 +50,9 @@ index f094ab9..1ecb47f 100644
default:
return 0;
}
-diff --git a/src/mongo/db/key.cpp b/src/mongo/db/key.cpp
-index 3d9eaa7..95959d8 100644
---- a/src/mongo/db/key.cpp
-+++ b/src/mongo/db/key.cpp
-@@ -406,7 +406,7 @@ namespace mongo {
+--- a/src/mongo/db/structure/btree/key.cpp
++++ b/src/mongo/db/structure/btree/key.cpp
+@@ -418,7 +418,7 @@
p += 8;
break;
case cdouble:
diff --git a/debian/patches/0007-Use-TIME_UTC_-macro.patch b/debian/patches/0007-Use-TIME_UTC_-macro.patch
index 3bf898c..fbe4b1a 100644
--- a/debian/patches/0007-Use-TIME_UTC_-macro.patch
+++ b/debian/patches/0007-Use-TIME_UTC_-macro.patch
@@ -6,11 +6,9 @@ Subject: Use TIME_UTC_ macro
src/mongo/util/time_support.h | 4 ----
1 file changed, 4 deletions(-)
-diff --git a/src/mongo/util/time_support.h b/src/mongo/util/time_support.h
-index 47c7d87..9df70e1 100644
--- a/src/mongo/util/time_support.h
+++ b/src/mongo/util/time_support.h
-@@ -96,10 +96,6 @@ namespace mongo {
+@@ -150,11 +150,7 @@
struct tm *gmtime(const time_t *timep);
struct tm *localtime(const time_t *timep);
@@ -21,3 +19,4 @@ index 47c7d87..9df70e1 100644
-#endif
} // namespace mongo
+
diff --git a/debian/patches/0009-ignore-unused-local-typedefs.patch b/debian/patches/0009-ignore-unused-local-typedefs.patch
index 5ffbdd4..1c801e7 100644
--- a/debian/patches/0009-ignore-unused-local-typedefs.patch
+++ b/debian/patches/0009-ignore-unused-local-typedefs.patch
@@ -5,21 +5,11 @@ Description: Disable unused-local-typedefs errors
Author: James Page <james.page at ubuntu.com>
Origin: https://github.com/mongodb/mongo/commit/2d30f0b562c1925a52670e767c2c0222189fb8f0
---- mongodb-2.4.14.orig/SConstruct
-+++ mongodb-2.4.14/SConstruct
-@@ -723,6 +723,7 @@ if nix:
- env.Append( CCFLAGS=["-Werror"] )
- if not has_option('clang'):
- env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
-+ env.Append( CXXFLAGS=["-Wno-unused-local-typedefs"] ) # New in gcc 4.8
-
- env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
---- mongodb-2.4.14.orig/src/third_party/v8/SConscript
-+++ mongodb-2.4.14/src/third_party/v8/SConscript
-@@ -51,7 +51,8 @@ LIBRARY_FLAGS = {
- '-W',
- '-Wno-unused-parameter',
+--- a/src/third_party/v8/SConscript
++++ b/src/third_party/v8/SConscript
+@@ -48,7 +48,8 @@
+ 'all': {
+ 'CCFLAGS': ['-Wno-unused-parameter',
'-Woverloaded-virtual',
- '-Wnon-virtual-dtor']
+ '-Wnon-virtual-dtor',
diff --git a/debian/patches/0010-fix-integer-signs.patch b/debian/patches/0010-fix-integer-signs.patch
index 30137de..9755105 100644
--- a/debian/patches/0010-fix-integer-signs.patch
+++ b/debian/patches/0010-fix-integer-signs.patch
@@ -6,20 +6,9 @@ Last-Update: 2013-10-13
---
---- mongodb-2.4.6.orig/src/mongo/db/auth/privilege_set.cpp
-+++ mongodb-2.4.6/src/mongo/db/auth/privilege_set.cpp
-@@ -79,7 +79,7 @@ namespace mongo {
- resourceSearchList[1] = nsToDatabaseSubstring(desiredPrivilege.getResource());
-
- ActionSet unmetRequirements = desiredPrivilege.getActions();
-- for (int i = 0; i < boost::size(resourceSearchList); ++i) {
-+ for (unsigned int i = 0; i < boost::size(resourceSearchList); ++i) {
- ResourcePrivilegeCacheEntry* entry = _lookupEntry(resourceSearchList[i]);
- if (NULL == entry)
- continue;
---- mongodb-2.4.6.orig/src/mongo/db/cmdline_test.cpp
-+++ mongodb-2.4.6/src/mongo/db/cmdline_test.cpp
-@@ -71,7 +71,7 @@ namespace {
+--- a/src/mongo/util/cmdline_utils/censor_cmdline_test.cpp
++++ b/src/mongo/util/cmdline_utils/censor_cmdline_test.cpp
+@@ -85,7 +85,7 @@
"KEEP",
"--servicePasswordFake=KEEP"
};
@@ -28,7 +17,7 @@ Last-Update: 2013-10-13
testCensoringArgv(argv, argv, argc);
}
-@@ -88,7 +88,7 @@ namespace {
+@@ -102,7 +102,7 @@
"--servicePassword",
"get out of dodge"
};
@@ -37,7 +26,7 @@ Last-Update: 2013-10-13
const char* const expected[] = {
"first",
-@@ -120,7 +120,7 @@ namespace {
+@@ -134,7 +134,7 @@
"-servicePassword",
"get out of dodge"
};
@@ -46,7 +35,7 @@ Last-Update: 2013-10-13
const char* const expected[] = {
"first",
-@@ -152,7 +152,7 @@ namespace {
+@@ -166,7 +166,7 @@
"KEEP",
"--servicePasswordFake=KEEP"
};
@@ -55,7 +44,7 @@ Last-Update: 2013-10-13
testCensoringVector(argv, argv, argc);
}
-@@ -169,7 +169,7 @@ namespace {
+@@ -183,7 +183,7 @@
"--servicePassword",
"get out of dodge"
};
@@ -64,7 +53,7 @@ Last-Update: 2013-10-13
const char* const expected[] = {
"first",
-@@ -201,7 +201,7 @@ namespace {
+@@ -215,7 +215,7 @@
"-servicePassword",
"get out of dodge"
};
diff --git a/debian/patches/0012-support-gnu.patch b/debian/patches/0012-support-gnu.patch
index f2c69e7..4439b4e 100644
--- a/debian/patches/0012-support-gnu.patch
+++ b/debian/patches/0012-support-gnu.patch
@@ -1,6 +1,15 @@
---- a/SConstruct 2014-05-09 00:54:25.000000000 +0200
-+++ b/SConstruct 2014-05-09 13:27:08.000000000 +0200
-@@ -348,6 +348,8 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -66,7 +66,7 @@
+ if "darwin" == platform:
+ darwin = True
+ platform = "osx" # prettier than darwin
+-elif platform.startswith("linux") or platform.startswith("gnukfreebsd"):
++elif platform.startswith("linux") or platform.startswith("gnukfreebsd") or platform.startswith("gnu0"):
+ linux = True
+ platform = "linux"
+ elif "sunos5" == platform:
+@@ -530,6 +530,8 @@
env['PYSYSPLATFORM'] = 'linux2'
if 'freebsd' in env['PYSYSPLATFORM']:
env['PYSYSPLATFORM'] = 'freebsd'
@@ -9,17 +18,8 @@
if os.sys.platform == 'win32':
env['OS_FAMILY'] = 'win'
-@@ -526,7 +528,7 @@
- env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
- env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
-
--elif os.sys.platform.startswith("linux") or os.sys.platform.startswith("gnukfreebsd"):
-+elif os.sys.platform.startswith("linux") or os.sys.platform.startswith("gnukfreebsd") or os.sys.platform.startswith("gnu0"):
- linux = True
- platform = "linux"
-
---- a/src/mongo/platform/random.cpp 2014-05-09 00:54:25.000000000 +0200
-+++ b/src/mongo/platform/random.cpp 2014-05-09 01:30:24.000000000 +0200
+--- a/src/mongo/platform/random.cpp
++++ b/src/mongo/platform/random.cpp
@@ -105,7 +105,7 @@
return new WinSecureRandom();
}
diff --git a/debian/patches/0099-Pagesize-hacks.patch b/debian/patches/0099-Pagesize-hacks.patch
index a821fba..64efd45 100644
--- a/debian/patches/0099-Pagesize-hacks.patch
+++ b/debian/patches/0099-Pagesize-hacks.patch
@@ -1,8 +1,6 @@
-diff --git a/src/mongo/util/logfile.cpp b/src/mongo/util/logfile.cpp
-index fa53690..28562b2 100644
--- a/src/mongo/util/logfile.cpp
+++ b/src/mongo/util/logfile.cpp
-@@ -26,6 +26,7 @@
+@@ -38,6 +38,7 @@
#include "mongo/util/startup_test.h"
#include "mongo/util/text.h"
@@ -10,7 +8,7 @@ index fa53690..28562b2 100644
using namespace mongoutils;
-@@ -36,16 +41,16 @@ namespace mongo {
+@@ -48,16 +49,16 @@
if( 0 && debug ) {
try {
LogFile f("logfile_test");
@@ -33,15 +31,14 @@ index fa53690..28562b2 100644
free(p);
}
catch(DBException& e ) {
-@@ -226,7 +231,11 @@ namespace mongo {
+@@ -238,7 +239,11 @@
fassert( 16144, charsToWrite >= 0 );
fassert( 16142, _fd >= 0 );
-- fassert( 16143, reinterpret_cast<ssize_t>( buf ) % g_minOSPageSizeBytes == 0 ); // aligned
+
+// Disabling alignment test on PPC64 due to a 64kB page size on PPC64 instead of 4kB on x86
+#ifndef __PPC64__
-+ fassert( 16143, reinterpret_cast<ssize_t>( buf ) % g_minOSPageSizeBytes == 0 ); // aligned
+ fassert( 16143, reinterpret_cast<ssize_t>( buf ) % g_minOSPageSizeBytes == 0 ); // aligned
+#endif
#ifdef POSIX_FADV_DONTNEED
diff --git a/debian/patches/no-unused-function.patch b/debian/patches/no-unused-function.patch
index e6dd4a4..3257b46 100644
--- a/debian/patches/no-unused-function.patch
+++ b/debian/patches/no-unused-function.patch
@@ -6,9 +6,9 @@ Bug-Debian: http://bugs.debian.org/746887
Forwarded: no
Last-Update: 2014-06-16
---- mongodb-2.4.10.orig/SConstruct
-+++ mongodb-2.4.10/SConstruct
-@@ -708,6 +708,7 @@ if nix:
+--- a/SConstruct
++++ b/SConstruct
+@@ -825,6 +825,7 @@
"-pthread",
"-Wall",
"-Wsign-compare",
diff --git a/debian/patches/no-unused-variable.patch b/debian/patches/no-unused-variable.patch
index 31a572a..fc7ebc4 100644
--- a/debian/patches/no-unused-variable.patch
+++ b/debian/patches/no-unused-variable.patch
@@ -7,9 +7,9 @@ Last-Update: 2015-07-04
---
---- mongodb-2.4.14.orig/SConstruct
-+++ mongodb-2.4.14/SConstruct
-@@ -714,6 +714,7 @@ if nix:
+--- a/SConstruct
++++ b/SConstruct
+@@ -826,6 +826,7 @@
"-Wall",
"-Wsign-compare",
"-Wno-unused-function",
--
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