[Pkg-mongodb-maintainers] [pkg-mongodb] 325/394: Drop patches merged upstream
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 6a04250c77116655e3c18c92c57a149ce79a2923
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Thu Jan 14 11:47:36 2016 +0200
Drop patches merged upstream
---
...latforms-but-Windows-find-hash-in-std-tr1.patch | 25 ---
...ARM-support-for-ASM-operations-in-MongoDB.patch | 181 ---------------------
debian/patches/0008-Use-system-libstemmer.patch | 20 ---
...igned-char-to-store-BSONType-enumerations.patch | 35 ----
debian/patches/0013-pymongo.patch | 67 --------
debian/patches/series | 5 -
6 files changed, 333 deletions(-)
diff --git a/debian/patches/0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch b/debian/patches/0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch
deleted file mode 100644
index 5655d9f..0000000
--- a/debian/patches/0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jeff Epler <jepler at unpythonic.net>
-Date: Fri, 19 Apr 2013 08:16:31 -0500
-Subject: All platforms but Windows find hash in std::tr1
-
----
- src/third_party/s2/hash.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/third_party/s2/hash.h b/src/third_party/s2/hash.h
-index a255f2c..d399bb8 100644
---- a/src/third_party/s2/hash.h
-+++ b/src/third_party/s2/hash.h
-@@ -7,10 +7,10 @@
- #include "mongo/platform/unordered_set.h"
- #define hash_set mongo::unordered_set
-
--#if defined OS_LINUX || defined OS_MACOSX || defined __sunos__ || defined __freebsd__
-+#if ! defined OS_WINDOWS
- #define HASH_NAMESPACE_START namespace std { namespace tr1 {
- #define HASH_NAMESPACE_END }}
--#elif defined OS_WINDOWS
-+#else
- #define HASH_NAMESPACE_START namespace std {
- #define HASH_NAMESPACE_END }
- #endif
diff --git a/debian/patches/0005-ARM-support-for-ASM-operations-in-MongoDB.patch b/debian/patches/0005-ARM-support-for-ASM-operations-in-MongoDB.patch
deleted file mode 100644
index 2f17496..0000000
--- a/debian/patches/0005-ARM-support-for-ASM-operations-in-MongoDB.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From: Robie Basak <robie.basak at canonical.com>
-Date: Sat, 20 Apr 2013 22:05:50 -0300
-Subject: ARM support for ASM operations in MongoDB
-
-This is a modified version of Jon Masters' ARM patch. I have replaced some of
-the calls whose return value semantics didn't quite match the existing x86
-assembler.
-
-Original-Author: Jon Masters <jcm at redhat.com>
-Origin: http://lists.fedoraproject.org/pipermail/arm/2013-February/005388.html
-Last-Update: 2013-03-15
----
- src/mongo/platform/atomic_intrinsics_gcc.h | 69 +++++++++++++++++++++++++++++-
- src/mongo/platform/bits.h | 2 +-
- 2 files changed, 68 insertions(+), 3 deletions(-)
-
-diff --git a/src/mongo/platform/atomic_intrinsics_gcc.h b/src/mongo/platform/atomic_intrinsics_gcc.h
-index f8f96f0..da36685 100644
---- a/src/mongo/platform/atomic_intrinsics_gcc.h
-+++ b/src/mongo/platform/atomic_intrinsics_gcc.h
-@@ -14,14 +14,19 @@
- */
-
- /**
-- * Implementation of the AtomicIntrinsics<T>::* operations for IA-32 and AMD64 systems using a
-- * GCC-compatible compiler toolchain.
-+ * Implementation of the AtomicIntrinsics<T>::* operations for IA-32, AMD64, and 32-bit ARM
-+ * systems using a GCC-compatible compiler toolchain.
- */
-
- #pragma once
-
- #include <boost/utility.hpp>
-
-+#if defined(__arm__)
-+typedef int (__kuser_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
-+#define __kuser_cmpxchg (*(__kuser_cmpxchg_t *)0xffff0fc0)
-+#endif
-+
- namespace mongo {
-
- /**
-@@ -37,31 +42,58 @@ namespace mongo {
- static T compareAndSwap(volatile T* dest, T expected, T newValue) {
-
- T result;
-+
-+#if defined(__i386__) || defined(__x86_64__)
- asm volatile ("lock cmpxchg %[src], %[dest]"
- : [dest] "+m" (*dest),
- "=a" (result)
- : [src] "r" (newValue),
- "a" (expected)
- : "memory", "cc");
-+#endif
-+
-+#if defined(__arm__)
-+ result = __sync_val_compare_and_swap(dest, expected, newValue);
-+#endif
-+
- return result;
- }
-
- static T swap(volatile T* dest, T newValue) {
-
- T result = newValue;
-+
-+#if defined(__i386__) || defined(__x86_64__)
- // No need for "lock" prefix on "xchg".
- asm volatile ("xchg %[r], %[dest]"
- : [dest] "+m" (*dest),
- [r] "+r" (result)
- :
- : "memory");
-+#endif
-+
-+#if defined(__arm__)
-+ __sync_synchronize();
-+ result = __sync_lock_test_and_set(dest, newValue);
-+#endif
-+
- return result;
- }
-
- static T load(volatile const T* value) {
-+
-+#if defined(__i386__) || defined(__x86_64__)
- asm volatile ("mfence" ::: "memory");
- T result = *value;
- asm volatile ("mfence" ::: "memory");
-+#endif
-+
-+#if defined(__arm__)
-+ asm volatile("mcr p15, 0, r0, c7, c10, 5");
-+ T result = *value;
-+ asm volatile("mcr p15, 0, r0, c7, c10, 5");
-+#endif
-+
- return result;
- }
-
-@@ -70,19 +102,44 @@ namespace mongo {
- }
-
- static void store(volatile T* dest, T newValue) {
-+
-+#if defined(__i386__) || defined(__x86_64__)
- asm volatile ("mfence" ::: "memory");
- *dest = newValue;
- asm volatile ("mfence" ::: "memory");
-+#endif
-+
-+#if defined(__arm__)
-+ asm volatile("mcr p15, 0, r0, c7, c10, 5");
-+ *dest = newValue;
-+ asm volatile("mcr p15, 0, r0, c7, c10, 5");
-+#endif
-+
- }
-
- static T fetchAndAdd(volatile T* dest, T increment) {
-
- T result = increment;
-+
-+#if defined(__i386__) || defined(__x86_64__)
- asm volatile ("lock xadd %[src], %[dest]"
- : [dest] "+m" (*dest),
- [src] "+r" (result)
- :
- : "memory", "cc");
-+#endif
-+
-+#if defined(__arm__)
-+ int old;
-+
-+ do {
-+ old = (int)(*dest);
-+ } while(__kuser_cmpxchg((int)old, (int)(old+increment),
-+ (volatile int *)dest));
-+
-+ result = old;
-+#endif
-+
- return result;
- }
-
-@@ -105,6 +162,8 @@ namespace mongo {
- public:
- static T compareAndSwap(volatile T* dest, T expected, T newValue) {
- T result = expected;
-+
-+#if defined(__i386__) || defined(__x86_64__)
- asm volatile ("push %%eax\n"
- "push %%ebx\n"
- "push %%ecx\n"
-@@ -125,6 +184,12 @@ namespace mongo {
- "D" (&result),
- "d" (&newValue)
- : "memory", "cc");
-+#endif
-+
-+#if defined(__arm__)
-+ result = __sync_val_compare_and_swap(dest, expected, newValue);
-+#endif
-+
- return result;
- }
-
-diff --git a/src/mongo/platform/bits.h b/src/mongo/platform/bits.h
-index 7afc428..75343dd 100644
---- a/src/mongo/platform/bits.h
-+++ b/src/mongo/platform/bits.h
-@@ -21,7 +21,7 @@
-
- #if defined(__x86_64__) || defined(__amd64__) || defined(_WIN64)
- #define MONGO_PLATFORM_64
--#elif defined(__i386__) || defined(_WIN32)
-+#elif defined(__i386__) || defined(_WIN32) || defined(__arm__)
- #define MONGO_PLATFORM_32
- #else
- #error "unknown platform"
diff --git a/debian/patches/0008-Use-system-libstemmer.patch b/debian/patches/0008-Use-system-libstemmer.patch
deleted file mode 100644
index efcc71d..0000000
--- a/debian/patches/0008-Use-system-libstemmer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Antonin Kral <a.kral at bobek.cz>
-Date: Wed, 17 Jul 2013 19:35:02 +0200
-Subject: Use system libstemmer
-
----
- SConstruct | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index f3ac3f9..2c888f3 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -802,7 +802,6 @@ if not use_system_version_of_library("boost"):
- CPPDEFINES=['BOOST_ALL_NO_LIB'])
-
- env.Prepend(CPPPATH=['$BUILD_DIR/third_party/s2'])
--env.Prepend(CPPPATH=['$BUILD_DIR/third_party/libstemmer_c/include'])
-
- env.Append( CPPPATH=['$EXTRACPPPATH'],
- LIBPATH=['$EXTRALIBPATH'] )
diff --git a/debian/patches/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch b/debian/patches/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch
deleted file mode 100644
index 12a270e..0000000
--- a/debian/patches/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a1689790db10139d09c4fb29f500470564faabde Mon Sep 17 00:00:00 2001
-From: Robie Basak <robie.basak at canonical.com>
-Date: Mon, 6 May 2013 23:01:56 +0100
-Subject: [PATCH] SERVER-9680 Use a signed char to store BSONType enumerations
-
-MinKey is defined as -1, so a signed char must be used to store BSONType
-enumerations. Using a char to store a negative value results in
-undefined behaviour. On i386 and amd64 architectures it happens to work
-because on these platforms a char is generally signed, but this is not
-guaranteed.
-
-This fixes a build failure on ARM, where chars are unsigned by default,
-and using MinKey (defined as -1) results in a compiler error.
----
- src/mongo/bson/bson_validate.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/mongo/bson/bson_validate.cpp b/src/mongo/bson/bson_validate.cpp
-index 9ac0bcb..88e6d48 100644
---- a/src/mongo/bson/bson_validate.cpp
-+++ b/src/mongo/bson/bson_validate.cpp
-@@ -130,8 +130,8 @@
- Status validateElementInfo(Buffer* buffer, ValidationState::State* nextState) {
- Status status = Status::OK();
-
-- char type;
-- if ( !buffer->readNumber<char>(&type) )
-+ signed char type;
-+ if ( !buffer->readNumber<signed char>(&type) )
- return Status( ErrorCodes::InvalidBSON, "invalid bson" );
-
- if ( type == EOO ) {
---
-1.8.1.6
-
diff --git a/debian/patches/0013-pymongo.patch b/debian/patches/0013-pymongo.patch
deleted file mode 100644
index 8e849dc..0000000
--- a/debian/patches/0013-pymongo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: mongodb-2.4.10/buildscripts/smoke.py
-===================================================================
---- mongodb-2.4.10.orig/buildscripts/smoke.py
-+++ mongodb-2.4.10/buildscripts/smoke.py
-@@ -49,7 +49,7 @@ from subprocess import (Popen,
- import sys
- import time
-
--from pymongo import Connection
-+from pymongo import MongoClient
- from pymongo.errors import OperationFailure
-
- import utils
-@@ -166,7 +166,7 @@ class mongod(object):
-
- def setup_admin_user(self, port=mongod_port):
- try:
-- Connection( "localhost" , int(port) ).admin.add_user("admin","password")
-+ MomgoClient( "localhost" , int(port) ).admin.add_user("admin","password")
- except OperationFailure, e:
- if e.message == 'need to login':
- pass # SERVER-4225
-@@ -230,7 +230,7 @@ class mongod(object):
- self.setup_admin_user(self.port)
-
- if self.slave:
-- local = Connection(port=self.port, slave_okay=True).local
-+ local = MongoClient(port=self.port, slave_okay=True).local
- synced = False
- while not synced:
- synced = True
-@@ -289,7 +289,7 @@ class mongod(object):
- sys.stdout.flush()
-
- def wait_for_repl(self):
-- Connection(port=self.port).test.smokeWait.insert({}, w=2, wtimeout=5*60*1000)
-+ MongoClient(port=self.port).test.smokeWait.insert({}, w=2, wtimeout=5*60*1000)
-
- class Bug(Exception):
- def __str__(self):
-@@ -325,7 +325,7 @@ def check_db_hashes(master, slave):
-
- # FIXME: maybe make this run dbhash on all databases?
- for mongod in [master, slave]:
-- mongod.dbhash = Connection(port=mongod.port, slave_okay=True).test.command("dbhash")
-+ mongod.dbhash = MongoClient(port=mongod.port, slave_okay=True).test.command("dbhash")
- mongod.dict = mongod.dbhash["collections"]
-
- global lost_in_slave, lost_in_master, screwy_in_slave, replicated_collections
-@@ -512,7 +512,7 @@ def runTest(test):
-
- if start_mongod:
- try:
-- c = Connection(host="127.0.0.1", port=int(mongod_port), ssl=use_ssl)
-+ c = MongoClient(host="127.0.0.1", port=int(mongod_port), ssl=use_ssl)
- except Exception,e:
- print "Exception from pymongo: ", e
- raise TestServerFailure(path)
-@@ -550,7 +550,7 @@ def run_tests(tests):
- auth=auth,
- authMechanism=authMechanism,
- use_ssl=use_ssl).__enter__()
-- primary = Connection(port=master.port, slave_okay=True);
-+ primary = MongoClient(port=master.port, slave_okay=True);
-
- primary.admin.command({'replSetInitiate' : {'_id' : 'foo', 'members' : [
- {'_id': 0, 'host':'localhost:%s' % master.port},
diff --git a/debian/patches/series b/debian/patches/series
index 8736bda..ca13c21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,18 +1,13 @@
0001-Create-kfreebsd-like-linux-in-most-respects.patch
0002-kfreebsd-has-dev-urandom.patch
-0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch
0004-kfreebsd-does-not-have-sys-prctl.h.patch
-0005-ARM-support-for-ASM-operations-in-MongoDB.patch
0006-Fix-ARM-alignment-problems.patch
0007-Use-TIME_UTC_-macro.patch
-0008-Use-system-libstemmer.patch
0009-ignore-unused-local-typedefs.patch
0010-fix-integer-signs.patch
-0011-Use-a-signed-char-to-store-BSONType-enumerations.patch
0099-Pagesize-hacks.patch
0004-Support-ppc64el-builds.patch
0012-support-gnu.patch
-0013-pymongo.patch
no-unused-function.patch
no-unused-variable.patch
0014-Fix-GCC-5-FTBFS.patch
--
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