[Pkg-mongodb-maintainers] [pkg-mongodb] 278/394: Patches for 2.4.5-1

Apollon Oikonomopoulos apoikos at moszumanska.debian.org
Wed Sep 21 13:59:41 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 0f01a8b145b96905ef1b4dd5c4b5933767e83136
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Thu Jul 18 19:17:55 2013 +0200

    Patches for 2.4.5-1
---
 ...ate-kfreebsd-like-linux-in-most-respects.patch} | 10 +++++-----
 ...se-libstemmer-when-using-system-libraries.patch | 23 ----------------------
 ...m.patch => 0002-kfreebsd-has-dev-urandom.patch} |  2 +-
 ...atforms-but-Windows-find-hash-in-std-tr1.patch} |  2 +-
 ... 0004-kfreebsd-does-not-have-sys-prctl.h.patch} |  2 +-
 ...RM-support-for-ASM-operations-in-MongoDB.patch} |  4 ++--
 ...patch => 0006-Fix-ARM-alignment-problems.patch} |  8 ++++----
 debian/patches/0007-Use-TIME_UTC_-macro.patch      | 23 ++++++++++++++++++++++
 debian/patches/0008-Use-system-libstemmer.patch    | 20 +++++++++++++++++++
 debian/patches/series                              | 15 +++++++-------
 10 files changed, 65 insertions(+), 44 deletions(-)

diff --git a/debian/patches/0002-Treate-kfreebsd-like-linux-in-most-respects.patch b/debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch
similarity index 78%
rename from debian/patches/0002-Treate-kfreebsd-like-linux-in-most-respects.patch
rename to debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch
index b9ffb42..721a855 100644
--- a/debian/patches/0002-Treate-kfreebsd-like-linux-in-most-respects.patch
+++ b/debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch
@@ -1,16 +1,16 @@
 From: Jeff Epler <jepler at unpythonic.net>
 Date: Fri, 19 Apr 2013 08:15:18 -0500
-Subject: Treate kfreebsd like linux in most respects
+Subject: Create kfreebsd like linux in most respects
 
 ---
- SConstruct |    4 +++-
+ SConstruct | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/SConstruct b/SConstruct
-index bdc9876..7d83ea2 100644
+index 5fb0e83..f3ac3f9 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -326,6 +326,8 @@ libdeps.setup_environment( env )
+@@ -344,6 +344,8 @@ libdeps.setup_environment( env )
  
  if env['PYSYSPLATFORM'] == 'linux3':
      env['PYSYSPLATFORM'] = 'linux2'
@@ -19,7 +19,7 @@ index bdc9876..7d83ea2 100644
  if 'freebsd' in env['PYSYSPLATFORM']:
      env['PYSYSPLATFORM'] = 'freebsd'
  
-@@ -506,7 +508,7 @@ if "darwin" == os.sys.platform:
+@@ -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"]) )
  
diff --git a/debian/patches/0001-Use-libstemmer-when-using-system-libraries.patch b/debian/patches/0001-Use-libstemmer-when-using-system-libraries.patch
deleted file mode 100644
index 8479348..0000000
--- a/debian/patches/0001-Use-libstemmer-when-using-system-libraries.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Fri, 12 Apr 2013 23:50:07 -0300
-Subject: Use libstemmer when using system libraries.
-
----
- SConstruct |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 219f270..bdc9876 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -785,7 +785,9 @@ 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'])
-+
-+if not use_system_version_of_library("stemmer"):
-+    env.Prepend(CPPPATH=['$BUILD_DIR/third_party/libstemmer_c/include'])
- 
- env.Append( CPPPATH=['$EXTRACPPPATH'],
-             LIBPATH=['$EXTRALIBPATH'] )
diff --git a/debian/patches/0003-kfreebsd-has-dev-urandom.patch b/debian/patches/0002-kfreebsd-has-dev-urandom.patch
similarity index 94%
rename from debian/patches/0003-kfreebsd-has-dev-urandom.patch
rename to debian/patches/0002-kfreebsd-has-dev-urandom.patch
index b46e00a..3585d89 100644
--- a/debian/patches/0003-kfreebsd-has-dev-urandom.patch
+++ b/debian/patches/0002-kfreebsd-has-dev-urandom.patch
@@ -3,7 +3,7 @@ Date: Fri, 19 Apr 2013 08:16:19 -0500
 Subject: kfreebsd has /dev/urandom
 
 ---
- src/mongo/platform/random.cpp |    2 +-
+ src/mongo/platform/random.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/mongo/platform/random.cpp b/src/mongo/platform/random.cpp
diff --git a/debian/patches/0004-All-platforms-but-Windows-find-hash-in-std-tr1.patch b/debian/patches/0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch
similarity index 95%
rename from debian/patches/0004-All-platforms-but-Windows-find-hash-in-std-tr1.patch
rename to debian/patches/0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch
index 324c006..5655d9f 100644
--- a/debian/patches/0004-All-platforms-but-Windows-find-hash-in-std-tr1.patch
+++ b/debian/patches/0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch
@@ -3,7 +3,7 @@ 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 ++--
+ 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
diff --git a/debian/patches/0005-kfreebsd-does-not-have-sys-prctl.h.patch b/debian/patches/0004-kfreebsd-does-not-have-sys-prctl.h.patch
similarity index 94%
rename from debian/patches/0005-kfreebsd-does-not-have-sys-prctl.h.patch
rename to debian/patches/0004-kfreebsd-does-not-have-sys-prctl.h.patch
index 362927c..00e73ab 100644
--- a/debian/patches/0005-kfreebsd-does-not-have-sys-prctl.h.patch
+++ b/debian/patches/0004-kfreebsd-does-not-have-sys-prctl.h.patch
@@ -11,7 +11,7 @@ This change was reviewed by Pino Toscano in:
 
 and edited by Rogério Theodoro de Brito accordingly.
 ---
- src/third_party/v8/src/platform-linux.cc |    2 ++
+ src/third_party/v8/src/platform-linux.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/src/third_party/v8/src/platform-linux.cc b/src/third_party/v8/src/platform-linux.cc
diff --git a/debian/patches/0006-ARM-support-for-ASM-operations-in-MongoDB.patch b/debian/patches/0005-ARM-support-for-ASM-operations-in-MongoDB.patch
similarity index 97%
rename from debian/patches/0006-ARM-support-for-ASM-operations-in-MongoDB.patch
rename to debian/patches/0005-ARM-support-for-ASM-operations-in-MongoDB.patch
index f707674..2f17496 100644
--- a/debian/patches/0006-ARM-support-for-ASM-operations-in-MongoDB.patch
+++ b/debian/patches/0005-ARM-support-for-ASM-operations-in-MongoDB.patch
@@ -10,8 +10,8 @@ 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 +-
+ 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
diff --git a/debian/patches/0007-Fix-ARM-alignment-problems.patch b/debian/patches/0006-Fix-ARM-alignment-problems.patch
similarity index 92%
rename from debian/patches/0007-Fix-ARM-alignment-problems.patch
rename to debian/patches/0006-Fix-ARM-alignment-problems.patch
index 3e59a1a..e137d4d 100644
--- a/debian/patches/0007-Fix-ARM-alignment-problems.patch
+++ b/debian/patches/0006-Fix-ARM-alignment-problems.patch
@@ -7,12 +7,12 @@ memcpy to make sure that all doubles are aligned before accessing them.
 
 Last-Update: 2013-03-15
 ---
- src/mongo/bson/bsonelement.h |   16 +++++++++++++++-
- src/mongo/db/key.cpp         |    2 +-
+ src/mongo/bson/bsonelement.h | 16 +++++++++++++++-
+ 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 a4e51b7..8e38ee4 100644
+index f094ab9..1ecb47f 100644
 --- a/src/mongo/bson/bsonelement.h
 +++ b/src/mongo/bson/bsonelement.h
 @@ -17,7 +17,7 @@
@@ -24,7 +24,7 @@ index a4e51b7..8e38ee4 100644
  #include <string>
  #include <vector>
  
-@@ -528,13 +528,27 @@ namespace mongo {
+@@ -529,13 +529,27 @@ namespace mongo {
      }
  
      inline double BSONElement::numberDouble() const {
diff --git a/debian/patches/0007-Use-TIME_UTC_-macro.patch b/debian/patches/0007-Use-TIME_UTC_-macro.patch
new file mode 100644
index 0000000..3bf898c
--- /dev/null
+++ b/debian/patches/0007-Use-TIME_UTC_-macro.patch
@@ -0,0 +1,23 @@
+From: Antonin Kral <a.kral at bobek.cz>
+Date: Wed, 17 Jul 2013 17:07:36 +0200
+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 {
+     struct tm *gmtime(const time_t *timep);
+     struct tm *localtime(const time_t *timep);
+ 
+-#if defined(MONGO_BOOST_TIME_UTC_HACK) || (BOOST_VERSION >= 105000)
+ #define MONGO_BOOST_TIME_UTC boost::TIME_UTC_
+-#else
+-#define MONGO_BOOST_TIME_UTC boost::TIME_UTC
+-#endif
+ 
+ }  // namespace mongo
diff --git a/debian/patches/0008-Use-system-libstemmer.patch b/debian/patches/0008-Use-system-libstemmer.patch
new file mode 100644
index 0000000..efcc71d
--- /dev/null
+++ b/debian/patches/0008-Use-system-libstemmer.patch
@@ -0,0 +1,20 @@
+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/series b/debian/patches/series
index 9b0e8fb..cbb5198 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,8 @@
-0001-Use-libstemmer-when-using-system-libraries.patch
-0002-Treate-kfreebsd-like-linux-in-most-respects.patch
-0003-kfreebsd-has-dev-urandom.patch
-0004-All-platforms-but-Windows-find-hash-in-std-tr1.patch
-0005-kfreebsd-does-not-have-sys-prctl.h.patch
-0006-ARM-support-for-ASM-operations-in-MongoDB.patch
-0007-Fix-ARM-alignment-problems.patch
+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

-- 
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