openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: arangodb 3.0.3 -> 3.0.4

master
Dr. Ralf S. Engelschall 10 years ago
parent
855b82e235
commit
4c998599bb
2 changed files with 91 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 172
      arangodb/arangodb.patch
  2. 6
      arangodb/arangodb.spec

172
arangodb/arangodb.patch
Unescape View File

@ -1,6 +1,6 @@
Index: 3rdParty/V8/CMakeLists.txt
--- 3rdParty/V8/CMakeLists.txt.orig 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/V8/CMakeLists.txt 2016-07-17 11:26:37.212072877 +0200
--- 3rdParty/V8/CMakeLists.txt.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/V8/CMakeLists.txt 2016-08-01 19:05:25.192150244 +0200
@@ -121,7 +121,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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/V8/V8-5.0.71.39/build/all.gyp 2016-07-17 11:26:37.212072877 +0200
--- 3rdParty/V8/V8-5.0.71.39/build/all.gyp.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/V8/V8-5.0.71.39/build/all.gyp 2016-08-01 19:05:25.192150244 +0200
@@ -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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc 2016-08-01 19:05:25.192150244 +0200
@@ -8,6 +8,7 @@
#include <pthread.h>
#include <semaphore.h>
@ -65,8 +65,8 @@ Index: 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-freebsd.cc
#include <sys/resource.h>
#include <sys/time.h>
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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/V8/V8-5.0.71.39/src/base/platform/platform-posix.cc 2016-08-01 19:05:25.192150244 +0200
@@ -26,6 +26,9 @@
defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/sysctl.h> // 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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/V8/V8-5.0.71.39/tools/gyp/v8.gyp 2016-08-01 19:05:25.192150244 +0200
@@ -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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/CMakeLists.txt 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/CMakeLists.txt.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/CMakeLists.txt 2016-08-01 19:05:25.192150244 +0200
@@ -169,11 +169,7 @@
message(STATUS "Compiler type GNU: ${CMAKE_CXX_COMPILER}")
endif ()
@ -114,8 +114,8 @@ Index: 3rdParty/rocksdb/rocksdb/CMakeLists.txt
set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags")
Index: 3rdParty/rocksdb/rocksdb/Makefile
--- 3rdParty/rocksdb/rocksdb/Makefile.orig 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/Makefile 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/Makefile.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/Makefile 2016-08-01 19:05:25.192150244 +0200
@@ -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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/port/port_posix.h 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/port/port_posix.h.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/port/port_posix.h 2016-08-01 19:05:25.192150244 +0200
@@ -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 <sys/types.h>
#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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/tools/ldb_cmd.cc 2016-08-01 19:05:25.192150244 +0200
@@ -213,7 +213,7 @@
map<string, string>::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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/env_posix.cc 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/util/env_posix.cc.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/env_posix.cc 2016-08-01 19:05:25.192150244 +0200
@@ -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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/options_builder.cc 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/util/options_builder.cc.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/options_builder.cc 2016-08-01 19:05:25.192150244 +0200
@@ -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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/options_helper.cc 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/util/options_helper.cc.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/options_helper.cc 2016-08-01 19:05:25.192150244 +0200
@@ -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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/string_util.h 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/util/string_util.h.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/string_util.h 2016-08-01 19:05:25.202130703 +0200
@@ -16,7 +16,7 @@
template <typename T>
@ -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 2016-07-17 10:23:26.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/thread_posix.cc 2016-07-17 11:26:37.222038878 +0200
--- 3rdParty/rocksdb/rocksdb/util/thread_posix.cc.orig 2016-08-01 13:49:49.000000000 +0200
+++ 3rdParty/rocksdb/rocksdb/util/thread_posix.cc 2016-08-01 19:05:25.202130703 +0200
@@ -10,6 +10,7 @@
#include "util/thread_posix.h"
#include <atomic>
@ -282,8 +282,8 @@ Index: 3rdParty/rocksdb/rocksdb/util/thread_posix.cc
#include <sys/syscall.h>
#endif
Index: CMakeLists.txt
--- CMakeLists.txt.orig 2016-07-17 10:23:26.000000000 +0200
+++ CMakeLists.txt 2016-07-17 11:26:37.222038878 +0200
--- CMakeLists.txt.orig 2016-08-01 13:49:49.000000000 +0200
+++ CMakeLists.txt 2016-08-01 19:05:25.202130703 +0200
@@ -475,9 +475,10 @@
################################################################################
@ -311,8 +311,8 @@ Index: CMakeLists.txt
${BT_LIBS}
${ZLIB_LIBS}
Index: Installation/file-list-js.sh
--- Installation/file-list-js.sh.orig 2016-07-17 10:23:26.000000000 +0200
+++ Installation/file-list-js.sh 2016-07-17 11:26:37.222038878 +0200
--- Installation/file-list-js.sh.orig 2016-08-01 13:49:49.000000000 +0200
+++ Installation/file-list-js.sh 2016-08-01 19:05:25.202130703 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
@ -320,8 +320,8 @@ Index: Installation/file-list-js.sh
SRCDIR=$1
Index: arangod/Aql/Condition.cpp
--- arangod/Aql/Condition.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Aql/Condition.cpp 2016-07-17 11:26:37.222038878 +0200
--- arangod/Aql/Condition.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Aql/Condition.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -32,6 +32,8 @@
#include "Basics/JsonHelper.h"
#include "Utils/Transaction.h"
@ -332,8 +332,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 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Aql/Expression.cpp 2016-07-17 11:26:37.222038878 +0200
--- arangod/Aql/Expression.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Aql/Expression.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -583,7 +583,7 @@
try {
@ -344,8 +344,8 @@ Index: arangod/Aql/Expression.cpp
} catch (...) {
// no number found.
Index: arangod/Aql/Functions.cpp
--- arangod/Aql/Functions.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Aql/Functions.cpp 2016-07-17 11:26:37.232128079 +0200
--- arangod/Aql/Functions.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Aql/Functions.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -267,10 +267,10 @@
isValid = true;
return 0.0;
@ -361,7 +361,7 @@ Index: arangod/Aql/Functions.cpp
if (c != ' ' && c != '\t' && c != '\r' && c != '\n' && c != '\f') {
isValid = false;
return 0.0;
@@ -2643,7 +2643,7 @@
@@ -2652,7 +2652,7 @@
bool failed = false; // we're intentionally ignoring this variable here
double input = value.toDouble(failed);
@ -370,7 +370,7 @@ Index: arangod/Aql/Functions.cpp
}
/// @brief function LOG10
@@ -2685,7 +2685,7 @@
@@ -2694,7 +2694,7 @@
bool failed = false; // we're intentionally ignoring this variable here
double input = value.toDouble(failed);
@ -380,8 +380,8 @@ Index: arangod/Aql/Functions.cpp
/// @brief function SIN
Index: arangod/Aql/TraversalNode.cpp
--- arangod/Aql/TraversalNode.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Aql/TraversalNode.cpp 2016-07-17 11:26:37.232128079 +0200
--- arangod/Aql/TraversalNode.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Aql/TraversalNode.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -444,7 +444,7 @@
std::vector<arangodb::traverser::TraverserExpression*> oneExpressionSet;
@ -392,8 +392,8 @@ Index: arangod/Aql/TraversalNode.cpp
auto it = _expressions.find(n);
Index: arangod/Indexes/Index.cpp
--- arangod/Indexes/Index.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Indexes/Index.cpp 2016-07-17 11:26:37.232128079 +0200
--- arangod/Indexes/Index.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Indexes/Index.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -494,7 +494,7 @@
// by default, no sort conditions are supported
coveredAttributes = 0;
@ -404,8 +404,8 @@ Index: arangod/Indexes/Index.cpp
estimatedCost = 0.0;
}
Index: arangod/Indexes/RocksDBIndex.cpp
--- arangod/Indexes/RocksDBIndex.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Indexes/RocksDBIndex.cpp 2016-07-17 11:26:37.232128079 +0200
--- arangod/Indexes/RocksDBIndex.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Indexes/RocksDBIndex.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -849,7 +849,7 @@
return true;
} else if (coveredAttributes > 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 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Indexes/SkiplistIndex.cpp 2016-07-17 11:26:37.232128079 +0200
--- arangod/Indexes/SkiplistIndex.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Indexes/SkiplistIndex.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -34,6 +34,8 @@
#include <velocypack/Iterator.h>
#include <velocypack/velocypack-aliases.h>
@ -455,8 +455,8 @@ Index: arangod/Indexes/SkiplistIndex.cpp
estimatedCost = 0.0;
}
Index: arangod/Scheduler/ListenTask.cpp
--- arangod/Scheduler/ListenTask.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Scheduler/ListenTask.cpp 2016-07-17 11:26:37.232128079 +0200
--- arangod/Scheduler/ListenTask.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Scheduler/ListenTask.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -26,6 +26,11 @@
#include <errno.h>
@ -470,8 +470,8 @@ Index: arangod/Scheduler/ListenTask.cpp
#include "Basics/win-utils.h"
#include <WinSock2.h>
Index: arangod/Utils/Transaction.cpp
--- arangod/Utils/Transaction.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ arangod/Utils/Transaction.cpp 2016-07-17 11:26:37.232128079 +0200
--- arangod/Utils/Transaction.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ arangod/Utils/Transaction.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -103,7 +103,7 @@
// index does not support the sort condition
@ -482,9 +482,9 @@ Index: arangod/Utils/Transaction.cpp
estimatedCost = 0.0;
}
Index: cmake/ArangoDBMacros.cmake
--- cmake/ArangoDBMacros.cmake.orig 2016-07-17 10:23:26.000000000 +0200
+++ cmake/ArangoDBMacros.cmake 2016-07-17 12:35:21.272304694 +0200
@@ -13,11 +13,11 @@
--- cmake/ArangoDBMacros.cmake.orig 2016-08-01 13:49:49.000000000 +0200
+++ cmake/ArangoDBMacros.cmake 2016-08-01 19:06:36.462171365 +0200
@@ -19,11 +19,11 @@
# /etc -------------------------------
if (ETCDIR STREQUAL "")
@ -500,7 +500,7 @@ Index: cmake/ArangoDBMacros.cmake
endif ()
# MS stuff ---------------------------
@@ -34,7 +34,7 @@
@@ -40,7 +40,7 @@
# /var
set(VARDIR ""
CACHE path
@ -509,7 +509,7 @@ Index: cmake/ArangoDBMacros.cmake
)
if (VARDIR STREQUAL "")
@@ -48,13 +48,13 @@
@@ -54,13 +54,13 @@
file(TO_NATIVE_PATH "${VARDIR_NATIVE}" VARDIR_NATIVE)
# database directory
@ -526,7 +526,7 @@ Index: cmake/ArangoDBMacros.cmake
# resources
set(TRI_RESOURCEDIR "resources")
@@ -106,15 +106,15 @@
@@ -112,15 +112,15 @@
# Global macros ----------------------------------------------------------------
macro (generate_root_config name)
FILE(READ ${PROJECT_SOURCE_DIR}/etc/arangodb3/${name}.conf.in FileContent)
@ -543,9 +543,9 @@ Index: cmake/ArangoDBMacros.cmake
- STRING(REPLACE "@SYSCONFDIR@" "@ROOTDIR@/etc/arangodb3"
+ STRING(REPLACE "@SYSCONFDIR@" "@ROOTDIR@/etc/arangodb"
FileContent "${FileContent}")
if (MSVC)
STRING(REPLACE "@PROGRAM_SUFFIX@" ".exe"
@@ -122,17 +122,17 @@
if (ENABLE_UID_CFG)
STRING(REPLACE "@DEFINEUID@" ""
@@ -135,13 +135,13 @@
STRING(REGEX REPLACE "[\r\n]file =" "\n# file ="
FileContent "${FileContent}")
endif ()
@ -561,12 +561,16 @@ Index: cmake/ArangoDBMacros.cmake
FileContent "${FileContent}")
STRING(REPLACE "@LOCALSTATEDIR@" "${VARDIR_NATIVE}"
FileContent "${FileContent}")
@@ -152,7 +152,7 @@
STRING(REPLACE "@DEFINEUID@" "# "
FileContent "${FileContent}")
endif ()
- FILE(WRITE ${PROJECT_BINARY_DIR}/etc/arangodb3/${name}.conf "${FileContent}")
+ FILE(WRITE ${PROJECT_BINARY_DIR}/etc/arangodb/${name}.conf "${FileContent}")
endmacro ()
# installs a config file -------------------------------------------------------
@@ -143,7 +143,7 @@
@@ -163,7 +163,7 @@
generate_path_config(${name})
endif ()
install(
@ -575,7 +579,7 @@ Index: cmake/ArangoDBMacros.cmake
DESTINATION ${ETCDIR_INSTALL})
endmacro ()
@@ -212,7 +212,7 @@
@@ -232,7 +232,7 @@
# install ----------------------------------------------------------------------
install(DIRECTORY ${PROJECT_SOURCE_DIR}/Documentation/man/
@ -584,7 +588,7 @@ Index: cmake/ArangoDBMacros.cmake
if (MSVC)
install_readme(README . README.txt)
@@ -286,7 +286,7 @@
@@ -306,7 +306,7 @@
if (DARWIN)
set(CPACK_PACKAGE_NAME "ArangoDB-CLI")
else ()
@ -593,7 +597,7 @@ Index: cmake/ArangoDBMacros.cmake
endif ()
set(CPACK_PACKAGE_VENDOR "ArangoDB GmbH")
@@ -395,7 +395,7 @@
@@ -415,7 +415,7 @@
install(
DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -602,7 +606,7 @@ Index: cmake/ArangoDBMacros.cmake
FILES_MATCHING PATTERN "*.js"
REGEX "^.*/common/test-data$" EXCLUDE
REGEX "^.*/common/tests$" EXCLUDE
@@ -407,7 +407,7 @@
@@ -427,7 +427,7 @@
install(
DIRECTORY ${PROJECT_SOURCE_DIR}/js/actions ${PROJECT_SOURCE_DIR}/js/apps ${PROJECT_SOURCE_DIR}/js/contrib ${PROJECT_SOURCE_DIR}/js/node ${PROJECT_SOURCE_DIR}/js/server
@ -611,7 +615,7 @@ Index: cmake/ArangoDBMacros.cmake
REGEX "^.*/server/tests$" EXCLUDE
REGEX "^.*/aardvark/APP/node_modules$" EXCLUDE
)
@@ -417,7 +417,7 @@
@@ -437,7 +437,7 @@
################################################################################
install(
@ -620,7 +624,7 @@ Index: cmake/ArangoDBMacros.cmake
DESTINATION ${VARDIR_INSTALL}/log)
################################################################################
@@ -425,13 +425,13 @@
@@ -445,13 +445,13 @@
################################################################################
install(
@ -639,8 +643,8 @@ Index: cmake/ArangoDBMacros.cmake
+ DIRECTORY ${PROJECT_BINARY_DIR}/lib/arangodb/apps
+ DESTINATION ${VARDIR_INSTALL}/lib/arangodb/apps)
Index: lib/Basics/JsonHelper.cpp
--- lib/Basics/JsonHelper.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ lib/Basics/JsonHelper.cpp 2016-07-17 11:26:37.232128079 +0200
--- lib/Basics/JsonHelper.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ lib/Basics/JsonHelper.cpp 2016-08-01 19:05:25.202130703 +0200
@@ -74,7 +74,7 @@
TRI_AtVector(&json->_value._objects, i));
@ -651,8 +655,8 @@ Index: lib/Basics/JsonHelper.cpp
}
}
Index: lib/Basics/operating-system.h
--- lib/Basics/operating-system.h.orig 2016-07-17 10:23:26.000000000 +0200
+++ lib/Basics/operating-system.h 2016-07-17 11:26:37.232128079 +0200
--- lib/Basics/operating-system.h.orig 2016-08-01 13:49:49.000000000 +0200
+++ lib/Basics/operating-system.h 2016-08-01 19:05:25.212067999 +0200
@@ -457,6 +457,7 @@
#define TRI_GCC_THREAD_LOCAL_STORAGE 1
@ -662,8 +666,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 2016-07-17 10:23:26.000000000 +0200
+++ lib/Basics/socket-utils.h 2016-07-17 11:26:37.232128079 +0200
--- lib/Basics/socket-utils.h.orig 2016-08-01 13:49:49.000000000 +0200
+++ lib/Basics/socket-utils.h 2016-08-01 19:05:25.212067999 +0200
@@ -26,6 +26,11 @@
#include "Basics/Common.h"
@ -677,8 +681,8 @@ Index: lib/Basics/socket-utils.h
#include <WinSock2.h>
#include <WS2tcpip.h>
Index: lib/Endpoint/EndpointIp.cpp
--- lib/Endpoint/EndpointIp.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ lib/Endpoint/EndpointIp.cpp 2016-07-17 11:26:37.232128079 +0200
--- lib/Endpoint/EndpointIp.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ lib/Endpoint/EndpointIp.cpp 2016-08-01 19:05:25.212067999 +0200
@@ -29,6 +29,10 @@
#include "Endpoint/Endpoint.h"
@ -691,8 +695,8 @@ Index: lib/Endpoint/EndpointIp.cpp
using namespace arangodb::basics;
Index: lib/JsonParser/json-parser.cpp
--- lib/JsonParser/json-parser.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ lib/JsonParser/json-parser.cpp 2016-07-17 11:26:37.232128079 +0200
--- lib/JsonParser/json-parser.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ lib/JsonParser/json-parser.cpp 2016-08-01 19:05:25.212067999 +0200
@@ -36,6 +36,7 @@
#ifndef __FreeBSD__
int fileno(FILE *stream);
@ -702,8 +706,8 @@ Index: lib/JsonParser/json-parser.cpp
#define YY_NO_INPUT
Index: lib/JsonParser/json-parser.ll
--- lib/JsonParser/json-parser.ll.orig 2016-07-17 10:23:26.000000000 +0200
+++ lib/JsonParser/json-parser.ll 2016-07-17 11:26:37.232128079 +0200
--- lib/JsonParser/json-parser.ll.orig 2016-08-01 13:49:49.000000000 +0200
+++ lib/JsonParser/json-parser.ll 2016-08-01 19:05:25.212067999 +0200
@@ -36,6 +36,7 @@
#ifndef __FreeBSD__
int fileno(FILE *stream);
@ -713,8 +717,8 @@ Index: lib/JsonParser/json-parser.ll
#define YY_NO_INPUT
Index: lib/SimpleHttpClient/SimpleHttpClient.cpp
--- lib/SimpleHttpClient/SimpleHttpClient.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ lib/SimpleHttpClient/SimpleHttpClient.cpp 2016-07-17 11:26:37.232128079 +0200
--- lib/SimpleHttpClient/SimpleHttpClient.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ lib/SimpleHttpClient/SimpleHttpClient.cpp 2016-08-01 19:05:25.212067999 +0200
@@ -808,7 +808,7 @@
try {
@ -725,8 +729,8 @@ Index: lib/SimpleHttpClient/SimpleHttpClient.cpp
setErrorMessage("found invalid content-length", true);
// reset connection
Index: lib/Ssl/SslFeature.cpp
--- lib/Ssl/SslFeature.cpp.orig 2016-07-17 10:23:26.000000000 +0200
+++ lib/Ssl/SslFeature.cpp 2016-07-17 11:26:37.242048544 +0200
--- lib/Ssl/SslFeature.cpp.orig 2016-08-01 13:49:49.000000000 +0200
+++ lib/Ssl/SslFeature.cpp 2016-08-01 19:05:25.212067999 +0200
@@ -34,10 +34,6 @@
#include "Random/UniformCharacter.h"
#include "Ssl/ssl-helper.h"

6
arangodb/arangodb.spec
Unescape View File

@ -22,8 +22,8 @@
##
# package version
%define V_opkg 3.0.3
%define V_tarball 3.0.3
%define V_opkg 3.0.4
%define V_tarball 3.0.4
# package information
Name: arangodb
@ -36,7 +36,7 @@ Class: EVAL
Group: Database
License: Apache
Version: %{V_opkg}
Release: 20160717
Release: 20160801
# list of sources
Source0: https://github.com/arangodb/arangodb/archive/v%{V_tarball}.tar.gz

Write Preview
Loading…
Cancel
Save