diff --git a/arangodb/arangodb.patch b/arangodb/arangodb.patch index 5632d52d58..c68101b542 100644 --- a/arangodb/arangodb.patch +++ b/arangodb/arangodb.patch @@ -1,6 +1,6 @@ Index: 3rdParty/V8/CMakeLists.txt ---- 3rdParty/V8/CMakeLists.txt.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/V8/CMakeLists.txt 2017-02-02 23:22:45.176464000 +0100 +--- 3rdParty/V8/CMakeLists.txt.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/V8/CMakeLists.txt 2017-03-20 22:43:27.035007000 +0100 @@ -209,7 +209,7 @@ list(APPEND V8_GYP_ARGS --format ninja) list(APPEND V8_GYP_ARGS -S.${V8_TARGET_ARCH}) @@ -38,8 +38,8 @@ Index: 3rdParty/V8/CMakeLists.txt set(ICU_LIBS "icui18n;icuuc;icudata" Index: 3rdParty/V8/V8-5.0.71.39/build/all.gyp ---- 3rdParty/V8/V8-5.0.71.39/build/all.gyp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/V8/V8-5.0.71.39/build/all.gyp 2017-02-02 23:22:45.176677000 +0100 +--- 3rdParty/V8/V8-5.0.71.39/build/all.gyp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/V8/V8-5.0.71.39/build/all.gyp 2017-03-20 22:43:27.035150000 +0100 @@ -8,11 +8,7 @@ 'target_name': 'All', 'type': 'none', @@ -54,8 +54,8 @@ Index: 3rdParty/V8/V8-5.0.71.39/build/all.gyp 'conditions': [ ['component!="shared_library"', { Index: 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc ---- 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc 2017-02-02 23:22:45.176904000 +0100 +--- 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc 2017-03-20 22:43:27.035311000 +0100 @@ -8,6 +8,7 @@ #include #include @@ -65,8 +65,8 @@ Index: 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc #include #include Index: 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc ---- 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc 2017-02-02 23:22:45.177179000 +0100 +--- 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc 2017-03-20 22:43:27.035505000 +0100 @@ -26,6 +26,9 @@ defined(__NetBSD__) || defined(__OpenBSD__) #include // NOLINT, for sysctl @@ -86,8 +86,8 @@ Index: 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc #include "src/base/lazy-instance.h" #include "src/base/macros.h" Index: 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp ---- 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp 2017-02-02 23:22:45.177676000 +0100 +--- 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp 2017-03-20 22:43:27.035868000 +0100 @@ -438,6 +438,9 @@ 'V8_IMMINENT_DEPRECATION_WARNINGS', ], @@ -99,8 +99,8 @@ Index: 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp '../../include/v8-experimental.h', '../../include/v8-platform.h', Index: 3rdParty/rocksdb/rocksdb/CMakeLists.txt ---- 3rdParty/rocksdb/rocksdb/CMakeLists.txt.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/CMakeLists.txt 2017-02-02 23:22:45.177964000 +0100 +--- 3rdParty/rocksdb/rocksdb/CMakeLists.txt.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/CMakeLists.txt 2017-03-20 22:43:27.036198000 +0100 @@ -189,11 +189,7 @@ @@ -114,8 +114,8 @@ Index: 3rdParty/rocksdb/rocksdb/CMakeLists.txt Index: 3rdParty/rocksdb/rocksdb/Makefile ---- 3rdParty/rocksdb/rocksdb/Makefile.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/Makefile 2017-02-02 23:22:45.178323000 +0100 +--- 3rdParty/rocksdb/rocksdb/Makefile.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/Makefile 2017-03-20 22:43:27.036694000 +0100 @@ -138,13 +138,7 @@ include make_config.mk CLEAN_FILES += make_config.mk @@ -140,8 +140,8 @@ Index: 3rdParty/rocksdb/rocksdb/Makefile static_lib: $(LIBRARY) Index: 3rdParty/rocksdb/rocksdb/port/port_posix.h ---- 3rdParty/rocksdb/rocksdb/port/port_posix.h.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/port/port_posix.h 2017-02-02 23:22:45.178525000 +0100 +--- 3rdParty/rocksdb/rocksdb/port/port_posix.h.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/port/port_posix.h 2017-03-20 22:43:27.036934000 +0100 @@ -27,7 +27,7 @@ #define PLATFORM_IS_LITTLE_ENDIAN \ (__DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN) @@ -161,8 +161,8 @@ Index: 3rdParty/rocksdb/rocksdb/port/port_posix.h #include #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN) Index: 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc ---- 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc 2017-02-02 23:22:45.179024000 +0100 +--- 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc 2017-03-20 22:43:27.037539000 +0100 @@ -213,7 +213,7 @@ map::const_iterator itr = option_map_.find(option); if (itr != option_map_.end()) { @@ -191,8 +191,8 @@ Index: 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc #else max_keys_scanned_ = stoi(itr->second); Index: 3rdParty/rocksdb/rocksdb/util/env_posix.cc ---- 3rdParty/rocksdb/rocksdb/util/env_posix.cc.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/util/env_posix.cc 2017-02-02 23:22:45.179289000 +0100 +--- 3rdParty/rocksdb/rocksdb/util/env_posix.cc.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/util/env_posix.cc 2017-03-20 22:43:27.037877000 +0100 @@ -52,6 +52,11 @@ #include "util/thread_local.h" #include "util/thread_status_updater.h" @@ -206,8 +206,8 @@ Index: 3rdParty/rocksdb/rocksdb/util/env_posix.cc #define TMPFS_MAGIC 0x01021994 #endif Index: 3rdParty/rocksdb/rocksdb/util/options_builder.cc ---- 3rdParty/rocksdb/rocksdb/util/options_builder.cc.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/util/options_builder.cc 2017-02-02 23:22:45.179493000 +0100 +--- 3rdParty/rocksdb/rocksdb/util/options_builder.cc.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/util/options_builder.cc 2017-03-20 22:43:27.038094000 +0100 @@ -27,7 +27,7 @@ // Otherwise, calculate a score based on threshold and expected value of // two styles, weighing reads 4X important than writes. @@ -229,8 +229,8 @@ Index: 3rdParty/rocksdb/rocksdb/util/options_builder.cc int level0_stop_writes_trigger = read_amplification_threshold - expected_levels_one_level0_file; Index: 3rdParty/rocksdb/rocksdb/util/options_helper.cc ---- 3rdParty/rocksdb/rocksdb/util/options_helper.cc.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/util/options_helper.cc 2017-02-02 23:22:45.179855000 +0100 +--- 3rdParty/rocksdb/rocksdb/util/options_helper.cc.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/util/options_helper.cc 2017-03-20 22:43:27.038469000 +0100 @@ -160,7 +160,7 @@ uint64_t ParseUint64(const std::string& value) { @@ -259,8 +259,8 @@ Index: 3rdParty/rocksdb/rocksdb/util/options_helper.cc #else return std::strtod(value.c_str(), 0); Index: 3rdParty/rocksdb/rocksdb/util/string_util.h ---- 3rdParty/rocksdb/rocksdb/util/string_util.h.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/util/string_util.h 2017-02-02 23:22:45.180044000 +0100 +--- 3rdParty/rocksdb/rocksdb/util/string_util.h.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/util/string_util.h 2017-03-20 22:43:27.038655000 +0100 @@ -16,7 +16,7 @@ template @@ -271,8 +271,8 @@ Index: 3rdParty/rocksdb/rocksdb/util/string_util.h #else // Andorid or cygwin doesn't support all of C++11, std::to_string() being Index: 3rdParty/rocksdb/rocksdb/util/thread_posix.cc ---- 3rdParty/rocksdb/rocksdb/util/thread_posix.cc.orig 2017-02-02 18:50:53.000000000 +0100 -+++ 3rdParty/rocksdb/rocksdb/util/thread_posix.cc 2017-02-02 23:22:45.180242000 +0100 +--- 3rdParty/rocksdb/rocksdb/util/thread_posix.cc.orig 2017-03-20 15:39:58.000000000 +0100 ++++ 3rdParty/rocksdb/rocksdb/util/thread_posix.cc 2017-03-20 22:43:27.038879000 +0100 @@ -10,6 +10,7 @@ #include "util/thread_posix.h" #include @@ -282,9 +282,9 @@ Index: 3rdParty/rocksdb/rocksdb/util/thread_posix.cc #include #endif Index: CMakeLists.txt ---- CMakeLists.txt.orig 2017-02-02 18:50:53.000000000 +0100 -+++ CMakeLists.txt 2017-02-02 23:22:45.180534000 +0100 -@@ -507,9 +507,10 @@ +--- CMakeLists.txt.orig 2017-03-20 15:39:58.000000000 +0100 ++++ CMakeLists.txt 2017-03-20 22:43:27.039211000 +0100 +@@ -511,9 +511,10 @@ ################################################################################ if (NOT WINDOWS) @@ -298,7 +298,7 @@ Index: CMakeLists.txt set(SYS_LIBS ${SYS_LIBS} rt) endif () endif () -@@ -885,6 +886,11 @@ +@@ -889,6 +890,11 @@ ## SUB-PROJECTS ################################################################################ @@ -311,8 +311,8 @@ Index: CMakeLists.txt ${BT_LIBS} ${ZLIB_LIBS} Index: arangod/Aql/Condition.cpp ---- arangod/Aql/Condition.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Aql/Condition.cpp 2017-02-02 23:22:45.180908000 +0100 +--- arangod/Aql/Condition.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Aql/Condition.cpp 2017-03-20 22:43:27.039560000 +0100 @@ -32,6 +32,8 @@ #include "Logger/Logger.h" #include "Utils/Transaction.h" @@ -323,8 +323,8 @@ Index: arangod/Aql/Condition.cpp // turn off warnings about too long type name for debug symbols blabla in MSVC // only... Index: arangod/Aql/Expression.cpp ---- arangod/Aql/Expression.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Aql/Expression.cpp 2017-02-02 23:22:45.181290000 +0100 +--- arangod/Aql/Expression.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Aql/Expression.cpp 2017-03-20 22:43:27.039914000 +0100 @@ -594,7 +594,7 @@ try { @@ -335,8 +335,8 @@ Index: arangod/Aql/Expression.cpp } catch (...) { // no number found. Index: arangod/Aql/Functions.cpp ---- arangod/Aql/Functions.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Aql/Functions.cpp 2017-02-02 23:22:45.182044000 +0100 +--- arangod/Aql/Functions.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Aql/Functions.cpp 2017-03-20 22:43:27.040676000 +0100 @@ -299,10 +299,10 @@ isValid = true; return 0.0; @@ -352,7 +352,7 @@ Index: arangod/Aql/Functions.cpp if (c != ' ' && c != '\t' && c != '\r' && c != '\n' && c != '\f') { isValid = false; return 0.0; -@@ -2917,7 +2917,7 @@ +@@ -2920,7 +2920,7 @@ AqlValue value = ExtractFunctionParameterValue(trx, parameters, 0); double input = value.toDouble(trx); @@ -361,7 +361,7 @@ Index: arangod/Aql/Functions.cpp } /// @brief function LOG10 -@@ -2953,7 +2953,7 @@ +@@ -2956,7 +2956,7 @@ AqlValue value = ExtractFunctionParameterValue(trx, parameters, 0); double input = value.toDouble(trx); @@ -371,8 +371,8 @@ Index: arangod/Aql/Functions.cpp /// @brief function SIN Index: arangod/Aql/ShortestPathNode.cpp ---- arangod/Aql/ShortestPathNode.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Aql/ShortestPathNode.cpp 2017-02-02 23:22:45.182273000 +0100 +--- arangod/Aql/ShortestPathNode.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Aql/ShortestPathNode.cpp 2017-03-20 22:43:27.040930000 +0100 @@ -437,6 +437,6 @@ edgesCount += edges; @@ -382,8 +382,8 @@ Index: arangod/Aql/ShortestPathNode.cpp return depCost + nrItems; } Index: arangod/Aql/SortNode.cpp ---- arangod/Aql/SortNode.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Aql/SortNode.cpp 2017-02-02 23:22:45.182456000 +0100 +--- arangod/Aql/SortNode.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Aql/SortNode.cpp 2017-03-20 22:43:27.041155000 +0100 @@ -196,5 +196,5 @@ if (nrItems <= 3.0) { return depCost + nrItems; @@ -392,8 +392,8 @@ Index: arangod/Aql/SortNode.cpp + return depCost + nrItems * log2(static_cast(nrItems)); } Index: arangod/Indexes/Index.cpp ---- arangod/Indexes/Index.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Indexes/Index.cpp 2017-02-02 23:22:45.182719000 +0100 +--- arangod/Indexes/Index.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Indexes/Index.cpp 2017-03-20 22:43:27.041517000 +0100 @@ -534,7 +534,7 @@ // by default, no sort conditions are supported coveredAttributes = 0; @@ -404,9 +404,9 @@ Index: arangod/Indexes/Index.cpp estimatedCost = 0.0; } Index: arangod/Indexes/RocksDBIndex.cpp ---- arangod/Indexes/RocksDBIndex.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Indexes/RocksDBIndex.cpp 2017-02-02 23:22:45.183020000 +0100 -@@ -833,7 +833,7 @@ +--- arangod/Indexes/RocksDBIndex.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Indexes/RocksDBIndex.cpp 2017-03-20 22:43:27.041932000 +0100 +@@ -834,7 +834,7 @@ return true; } else if (coveredAttributes > 0) { estimatedCost = (itemsInIndex / coveredAttributes) * @@ -415,7 +415,7 @@ Index: arangod/Indexes/RocksDBIndex.cpp if (sortCondition->isAscending()) { // reverse iteration is more expensive estimatedCost *= 4; -@@ -846,7 +846,7 @@ +@@ -847,7 +847,7 @@ coveredAttributes = 0; // by default no sort conditions are supported if (itemsInIndex > 0) { @@ -425,8 +425,8 @@ Index: arangod/Indexes/RocksDBIndex.cpp // are in memory estimatedCost *= 1.05; Index: arangod/Indexes/SkiplistIndex.cpp ---- arangod/Indexes/SkiplistIndex.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Indexes/SkiplistIndex.cpp 2017-02-02 23:22:45.183342000 +0100 +--- arangod/Indexes/SkiplistIndex.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Indexes/SkiplistIndex.cpp 2017-03-20 22:43:27.042433000 +0100 @@ -35,6 +35,8 @@ #include #include @@ -455,8 +455,8 @@ Index: arangod/Indexes/SkiplistIndex.cpp estimatedCost = 0.0; } Index: arangod/Scheduler/ListenTask.cpp ---- arangod/Scheduler/ListenTask.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Scheduler/ListenTask.cpp 2017-02-02 23:22:45.183512000 +0100 +--- arangod/Scheduler/ListenTask.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Scheduler/ListenTask.cpp 2017-03-20 22:43:27.042636000 +0100 @@ -22,6 +22,11 @@ /// @author Achim Brandt //////////////////////////////////////////////////////////////////////////////// @@ -470,8 +470,8 @@ Index: arangod/Scheduler/ListenTask.cpp #include "GeneralServer/GeneralServerFeature.h" Index: arangod/Utils/Transaction.cpp ---- arangod/Utils/Transaction.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ arangod/Utils/Transaction.cpp 2017-02-02 23:22:45.184142000 +0100 +--- arangod/Utils/Transaction.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ arangod/Utils/Transaction.cpp 2017-03-20 22:43:27.043315000 +0100 @@ -119,7 +119,7 @@ // index does not support the sort condition @@ -482,8 +482,8 @@ Index: arangod/Utils/Transaction.cpp estimatedCost = 0.0; } Index: etc/arangodb3/arango-dfdb.conf.in ---- etc/arangodb3/arango-dfdb.conf.in.orig 2017-02-02 18:50:53.000000000 +0100 -+++ etc/arangodb3/arango-dfdb.conf.in 2017-02-02 23:22:45.184316000 +0100 +--- etc/arangodb3/arango-dfdb.conf.in.orig 2017-03-20 15:39:58.000000000 +0100 ++++ etc/arangodb3/arango-dfdb.conf.in 2017-03-20 22:43:27.043532000 +0100 @@ -3,7 +3,7 @@ [database] auto-upgrade = false @@ -503,8 +503,8 @@ Index: etc/arangodb3/arango-dfdb.conf.in v8-contexts = 1 Index: etc/arangodb3/arangod.conf.in ---- etc/arangodb3/arangod.conf.in.orig 2017-02-02 18:50:53.000000000 +0100 -+++ etc/arangodb3/arangod.conf.in 2017-02-02 23:22:45.184476000 +0100 +--- etc/arangodb3/arangod.conf.in.orig 2017-03-20 15:39:58.000000000 +0100 ++++ etc/arangodb3/arangod.conf.in 2017-03-20 22:44:45.950071000 +0100 @@ -5,7 +5,7 @@ # @@ -527,15 +527,15 @@ Index: etc/arangodb3/arangod.conf.in [log] level = info --file = @LOCALSTATEDIR@/log/arangodb3/arangod.log -+file = @LOCALSTATEDIR@/arangodb/log/arangod.log +-@COMMENT_LOGFILE@file = @LOCALSTATEDIR@/log/arangodb3/arangod.log ++@COMMENT_LOGFILE@file = @LOCALSTATEDIR@/arangodb/log/arangod.log -[cluster] \ No newline at end of file +[cluster] Index: lib/Basics/operating-system.h ---- lib/Basics/operating-system.h.orig 2017-02-02 18:50:53.000000000 +0100 -+++ lib/Basics/operating-system.h 2017-02-02 23:22:45.184737000 +0100 +--- lib/Basics/operating-system.h.orig 2017-03-20 15:39:58.000000000 +0100 ++++ lib/Basics/operating-system.h 2017-03-20 22:43:27.044175000 +0100 @@ -436,6 +436,7 @@ #define TRI_GCC_THREAD_LOCAL_STORAGE 1 @@ -545,8 +545,8 @@ Index: lib/Basics/operating-system.h #define ARANGODB_HAVE_DOMAIN_SOCKETS 1 #define TRI_HAVE_POSIX_MMAP 1 Index: lib/Basics/socket-utils.h ---- lib/Basics/socket-utils.h.orig 2017-02-02 18:50:53.000000000 +0100 -+++ lib/Basics/socket-utils.h 2017-02-02 23:22:45.184915000 +0100 +--- lib/Basics/socket-utils.h.orig 2017-03-20 15:39:58.000000000 +0100 ++++ lib/Basics/socket-utils.h 2017-03-20 22:43:27.044369000 +0100 @@ -26,6 +26,11 @@ #include "Basics/Common.h" @@ -560,8 +560,8 @@ Index: lib/Basics/socket-utils.h #include #include Index: lib/Endpoint/EndpointIp.cpp ---- lib/Endpoint/EndpointIp.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ lib/Endpoint/EndpointIp.cpp 2017-02-02 23:22:45.185110000 +0100 +--- lib/Endpoint/EndpointIp.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ lib/Endpoint/EndpointIp.cpp 2017-03-20 22:43:27.044608000 +0100 @@ -29,6 +29,10 @@ #include "Endpoint/Endpoint.h" @@ -574,8 +574,8 @@ Index: lib/Endpoint/EndpointIp.cpp using namespace arangodb::basics; Index: lib/Logger/LogAppenderSyslog.cpp ---- lib/Logger/LogAppenderSyslog.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ lib/Logger/LogAppenderSyslog.cpp 2017-02-02 23:22:45.185269000 +0100 +--- lib/Logger/LogAppenderSyslog.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ lib/Logger/LogAppenderSyslog.cpp 2017-03-20 22:43:27.044817000 +0100 @@ -64,7 +64,7 @@ if ('0' <= facility[0] && facility[0] <= '9') { value = StringUtils::int32(facility); @@ -586,8 +586,8 @@ Index: lib/Logger/LogAppenderSyslog.cpp while (ptr->c_name != 0) { if (strcmp(ptr->c_name, facility.c_str()) == 0) { Index: lib/SimpleHttpClient/SimpleHttpClient.cpp ---- lib/SimpleHttpClient/SimpleHttpClient.cpp.orig 2017-02-02 23:22:45.185671000 +0100 -+++ lib/SimpleHttpClient/SimpleHttpClient.cpp 2017-02-03 21:45:38.194739000 +0100 +--- lib/SimpleHttpClient/SimpleHttpClient.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ lib/SimpleHttpClient/SimpleHttpClient.cpp 2017-03-20 22:43:27.045118000 +0100 @@ -835,7 +835,7 @@ uint32_t contentLength; @@ -598,8 +598,8 @@ Index: lib/SimpleHttpClient/SimpleHttpClient.cpp setErrorMessage("found invalid content-length", true); // reset connection Index: lib/Ssl/SslFeature.cpp ---- lib/Ssl/SslFeature.cpp.orig 2017-02-02 18:50:53.000000000 +0100 -+++ lib/Ssl/SslFeature.cpp 2017-02-02 23:22:45.185965000 +0100 +--- lib/Ssl/SslFeature.cpp.orig 2017-03-20 15:39:58.000000000 +0100 ++++ lib/Ssl/SslFeature.cpp 2017-03-20 22:43:27.045305000 +0100 @@ -34,10 +34,6 @@ #include "Random/UniformCharacter.h" #include "Ssl/ssl-helper.h" diff --git a/arangodb/arangodb.spec b/arangodb/arangodb.spec index 1cdedf6bf3..3098501447 100644 --- a/arangodb/arangodb.spec +++ b/arangodb/arangodb.spec @@ -22,8 +22,8 @@ ## # package version -%define V_opkg 3.1.14 -%define V_tarball 3.1.14 +%define V_opkg 3.1.15 +%define V_tarball 3.1.15 # package information Name: arangodb @@ -36,7 +36,7 @@ Class: EVAL Group: Database License: Apache Version: %{V_opkg} -Release: 20170313 +Release: 20170321 # list of sources Source0: https://github.com/arangodb/arangodb/archive/v%{V_tarball}.tar.gz