Imported Debian patch 1:2.4.8-2debian/2.4.8-2

7 files changed, 90 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 6df334c497b..670e9314582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+mongodb (1:2.4.8-2) unstable; urgency=low
+
+  * Sync with Ubuntu (closes: #730203).
+
+  [ James Page <james.page@ubuntu.com> ]
+  * d/control: Enable armhf across all binary packages.
+  * d/control,tests: Add DEP-8 tests.
+  * d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
+    build failure on ARM due to missing signed'ness of char cast.
+
+  [ Rogério Brito <rbrito@ime.usp.br> ]
+  * debian/control: Add more details to the long descriptions.
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Fri, 22 Nov 2013 18:09:38 +0100
+
 mongodb (1:2.4.8-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index f074ffc56f0..101488a17bd 100644
--- a/debian/control
+++ b/debian/control
@@ -25,9 +25,10 @@ Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/collab-maint/mongodb.git
 Vcs-Browser: http://anonscm.debian.org/git/collab-maint/mongodb.git
 Homepage: http://www.mongodb.org
+XS-Testsuite: autopkgtest
 
 Package: mongodb
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf
 Depends:
  mongodb-dev,
  mongodb-server (>= 1:2.4.1-2),
@@ -53,7 +54,7 @@ Description: object/document-oriented database (metapackage)
  the server, the clients and the development files (headers and library).
 
 Package: mongodb-server
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf
 Depends:
  adduser,
  mongodb-clients,
@@ -77,7 +78,8 @@ Description: object/document-oriented database (server package)
  High performance, scalability, and reasonable depth of
  functionality are the goals for the project.
  .
- This package contains the server itself.
+ This package contains the server itself  (mongod) and the sharding
+ server/load-balancer (mongos).
 
 Package: mongodb-clients
 Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf
@@ -102,7 +104,8 @@ Description: object/document-oriented database (client apps)
  High performance, scalability, and reasonable depth of
  functionality are the goals for the project.
  .
- This package contains the various client applications.
+ This package contains the standard administrative shell (mongo) and other
+ utilities for administration or analysis of performance of the server.
 
 Package: mongodb-dev
 Section: libdevel
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
new file mode 100644
index 00000000000..12a270ed5a4
--- /dev/null
+++ b/debian/patches/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch
@@ -0,0 +1,35 @@
+From a1689790db10139d09c4fb29f500470564faabde Mon Sep 17 00:00:00 2001
+From: Robie Basak <robie.basak@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/series b/debian/patches/series
index 824d8f5aab1..e34c0a40b2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 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
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 00000000000..63aef5926e5
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: mongod mongo-client
+Depends: mongodb-server, mongodb-clients, nmap
diff --git a/debian/tests/mongo-client b/debian/tests/mongo-client
new file mode 100644
index 00000000000..7a5d4eaac24
--- /dev/null
+++ b/debian/tests/mongo-client
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+TIMEOUT=120
+
+echo -n "Waiting for mongod to start: "
+count=0
+while (! nc -z 127.0.0.1 27017); do
+    echo -n "."
+    count=$((count+1))
+    if test $count -gt $TIMEOUT; then
+        echo "mongod failed to start?"
+        pgrep mongod
+        exit 1
+    fi
+    sleep 1
+done
+echo "mongod listening"
+
+echo "Performing basic test using mongo client: "
+mongo --verbose jstests/basic1.js 2>&1
+echo "OK"
diff --git a/debian/tests/mongod b/debian/tests/mongod
new file mode 100644
index 00000000000..fabe09505e8
--- /dev/null
+++ b/debian/tests/mongod
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+echo -n "Checking for running mongod process: "
+pgrep mongod 2>/dev/null
+echo "OK"