databases/arangodb33: Update 3.3.3 -> 3.3.7

Port changes:
* Update maintaner e-mail galu@packetdam.com -> dev@dudu.ro
* Patch updates and additions

PR:		227637
Submitted by:	Vlad Galu <dev@dudu.ro> (mantainer)

4 files changed, 38 insertions, 84 deletions

diff --git a/databases/arangodb33/files/patch-CMakeLists.txt b/databases/arangodb33/files/patch-CMakeLists.txt
index b5e7720bcd0d..05d422b21018 100644
--- a/databases/arangodb33/files/patch-CMakeLists.txt
+++ b/databases/arangodb33/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2018-01-05 13:56:52 UTC
+--- CMakeLists.txt.orig	2018-04-11 15:16:11 UTC
 +++ CMakeLists.txt
 @@ -38,9 +38,9 @@ if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
  endif ()
@@ -12,7 +12,7 @@
  endif ()
  
  # required for clang completion in editors
-@@ -370,7 +370,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE)
+@@ -377,7 +377,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE)
  endif ()
  
  if (CMAKE_COMPILER_IS_CLANG)
@@ -21,83 +21,23 @@
      set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++")
      add_definitions("-Wno-deprecated-declarations")
    else ()
-@@ -505,7 +505,11 @@ if (USE_BACKTRACE)
-   if (MSVC)
-     set(BT_LIBS "Dbghelp" CACHE path "Debug Helper libraries")
-   else ()
--    set(BT_LIBS "" CACHE path "Debug Helper libraries")
-+    if (FREEBSD)
-+      set(BT_LIBS execinfo)
-+    else ()
-+      set(BT_LIBS "" CACHE path "Debug Helper libraries")
-+    endif ()
-   endif ()
+@@ -483,7 +483,7 @@ else ()
+ 
+   include(VcMacros)
+ 
+-  option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" ON)
++  option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" OFF)
  
-   add_definitions("-DARANGODB_ENABLE_BACKTRACE=1")
-@@ -580,7 +584,9 @@ endif ()
+   if (USE_OPTIMIZE_FOR_ARCHITECTURE)
+     # mop: core2 (merom) is our absolute minimum!
+@@ -594,9 +594,7 @@ endif ()
  ################################################################################
  
  if (NOT WINDOWS)
 -  set(SYS_LIBS ${SYS_LIBS} resolv)
-+  if (NOT FREEBSD)
-+    set(SYS_LIBS ${SYS_LIBS} resolv)
-+  endif ()
- 
-   if (NOT DARWIN)
+-
+-  if (NOT DARWIN)
++  if (NOT DARWIN OR FREEBSD)
      set(SYS_LIBS ${SYS_LIBS} rt)
-@@ -651,17 +657,17 @@ if (CMAKE_COMPILER_IS_GNUCC)
- 
-   set(BASE_FLAGS "-Wall -Wextra -Wno-unused-parameter ${BASE_FLAGS}")
- 
--  set(CMAKE_C_FLAGS                "-g"                             CACHE INTERNAL "default C compiler flags")
--  set(CMAKE_C_FLAGS_DEBUG          "-O0 -g -D_DEBUG=1"              CACHE INTERNAL "C debug flags")
--  set(CMAKE_C_FLAGS_MINSIZEREL     "-Os"                            CACHE INTERNAL "C minimal size flags")
--  set(CMAKE_C_FLAGS_RELEASE        "-O3 -fomit-frame-pointer"       CACHE INTERNAL "C release flags")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C release with debug info flags")
-+  #set(CMAKE_C_FLAGS                "-g"                            CACHE INTERNAL "default C compiler flags")
-+  set(CMAKE_C_FLAGS_DEBUG          ${CMAKE_C_FLAGS}                 CACHE INTERNAL "C debug flags")
-+  set(CMAKE_C_FLAGS_MINSIZEREL     ${CMAKE_C_FLAGS}                 CACHE INTERNAL "C minimal size flags")
-+  set(CMAKE_C_FLAGS_RELEASE        ${CMAKE_C_FLAGS}                 CACHE INTERNAL "C release flags")
-+  set(CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS}                 CACHE INTERNAL "C release with debug info flags")
- 
--  set(CMAKE_CXX_FLAGS                "-g -Wnon-virtual-dtor"          CACHE INTERNAL "default C++ compiler flags")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -D_DEBUG=1"              CACHE INTERNAL "C++ debug flags")
--  set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os"                            CACHE INTERNAL "C++ minimal size flags")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -fomit-frame-pointer"       CACHE INTERNAL "C++ release flags")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C++ release with debug info flags")
-+  #set(CMAKE_CXX_FLAGS                "-g -Wnon-virtual-dtor"       CACHE INTERNAL "default C++ compiler flags")
-+  set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -D_DEBUG=1"            CACHE INTERNAL "C++ debug flags")
-+  set(CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS}             CACHE INTERNAL "C++ minimal size flags")
-+  set(CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS}             CACHE INTERNAL "C++ release flags")
-+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS}             CACHE INTERNAL "C++ release with debug info flags")
- 
- elseif (CMAKE_COMPILER_IS_CLANG)
-   if (VERBOSE)
-@@ -670,17 +676,17 @@ elseif (CMAKE_COMPILER_IS_CLANG)
- 
-   set(BASE_FLAGS "-Wall -Wextra -Wno-unused-parameter ${BASE_FLAGS}")
- 
--  set(CMAKE_C_FLAGS                "-g"                             CACHE INTERNAL "default C compiler flags")
--  set(CMAKE_C_FLAGS_DEBUG          "-O0 -g -D_DEBUG=1"              CACHE INTERNAL "C debug flags")
--  set(CMAKE_C_FLAGS_MINSIZEREL     "-Os"                            CACHE INTERNAL "C minimal size flags")
--  set(CMAKE_C_FLAGS_RELEASE        "-O3 -fomit-frame-pointer"       CACHE INTERNAL "C release flags")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C release with debug info flags")
-+  #set(CMAKE_C_FLAGS                "-g"                            CACHE INTERNAL "default C compiler flags")
-+  set(CMAKE_C_FLAGS_DEBUG          ${CMAKE_C_FLAGS}                 CACHE INTERNAL "C debug flags")
-+  set(CMAKE_C_FLAGS_MINSIZEREL     ${CMAKE_C_FLAGS}                 CACHE INTERNAL "C minimal size flags")
-+  set(CMAKE_C_FLAGS_RELEASE        ${CMAKE_C_FLAGS}                 CACHE INTERNAL "C release flags")
-+  set(CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS}                 CACHE INTERNAL "C release with debug info flags")
- 
--  set(CMAKE_CXX_FLAGS                "-g -Wnon-virtual-dtor"          CACHE INTERNAL "default C++ compiler flags")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -D_DEBUG=1"              CACHE INTERNAL "C++ debug flags")
--  set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os"                            CACHE INTERNAL "C++ minimal size flags")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -fomit-frame-pointer"       CACHE INTERNAL "C++ release flags")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C++ release with debug info flags")
-+  #set(CMAKE_CXX_FLAGS                "-g -Wnon-virtual-dtor"       CACHE INTERNAL "default C++ compiler flags")
-+  set(CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS}             CACHE INTERNAL "C++ debug flags")
-+  set(CMAKE_CXX_FLAGS_MINSIZEREL     ${CMAKE_CXX_FLAGS}             CACHE INTERNAL "C++ minimal size flags")
-+  set(CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS}             CACHE INTERNAL "C++ release flags")
-+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS}             CACHE INTERNAL "C++ release with debug info flags")
- 
- elseif (MSVC)
-   if (VERBOSE)
+   endif ()
+ endif ()
diff --git a/databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp b/databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp
index b3134688347a..df9643a70ff3 100644
--- a/databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp
+++ b/databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp
@@ -1,11 +1,11 @@
---- arangod/RestHandler/RestAuthHandler.cpp.orig	2017-11-15 11:23:07 UTC
+--- arangod/RestHandler/RestAuthHandler.cpp.orig	2018-04-06 22:44:29 UTC
 +++ arangod/RestHandler/RestAuthHandler.cpp
-@@ -59,7 +59,7 @@ std::string RestAuthHandler::generateJwt
+@@ -54,7 +54,7 @@ std::string RestAuthHandler::generateJwt
      VPackObjectBuilder p(&bodyBuilder);
      bodyBuilder.add("preferred_username", VPackValue(username));
      bodyBuilder.add("iss", VPackValue("arangodb"));
 -    bodyBuilder.add("exp", VPackValue(exp.count()));
 +    bodyBuilder.add("exp", VPackValue((int64_t)exp.count()));
    }
-   return authentication->authInfo()->generateJwt(bodyBuilder);
- }
+   AuthenticationFeature* af = AuthenticationFeature::instance();
+   TRI_ASSERT(af != nullptr);
diff --git a/databases/arangodb33/files/patch-lib_Basics_ArangoGlobalContext.cpp b/databases/arangodb33/files/patch-lib_Basics_ArangoGlobalContext.cpp
new file mode 100644
index 000000000000..1e656e16fc88
--- /dev/null
+++ b/databases/arangodb33/files/patch-lib_Basics_ArangoGlobalContext.cpp
@@ -0,0 +1,14 @@
+--- lib/Basics/ArangoGlobalContext.cpp.orig	2018-04-12 13:04:01 UTC
++++ lib/Basics/ArangoGlobalContext.cpp
+@@ -145,10 +145,9 @@ ArangoGlobalContext::ArangoGlobalContext
+ #ifndef __GLIBC__
+   // Increase default stack size for libmusl:
+   pthread_attr_t a;
+-  memset(&a, 0, sizeof(pthread_attr_t));
++  pthread_attr_init(&a);
+   pthread_attr_setstacksize(&a, 8*1024*1024);  // 8MB as in glibc
+   pthread_attr_setguardsize(&a, 4096);         // one page
+-  pthread_setattr_default_np(&a);
+ #endif
+ #endif
+ #endif
diff --git a/databases/arangodb33/files/patch-lib_Logger_LogAppenderSyslog.cpp b/databases/arangodb33/files/patch-lib_Logger_LogAppenderSyslog.cpp
index 976c757c8338..8d31e1dd1545 100644
--- a/databases/arangodb33/files/patch-lib_Logger_LogAppenderSyslog.cpp
+++ b/databases/arangodb33/files/patch-lib_Logger_LogAppenderSyslog.cpp
@@ -1,11 +1,11 @@
---- lib/Logger/LogAppenderSyslog.cpp.orig	2017-11-15 11:23:07 UTC
+--- lib/Logger/LogAppenderSyslog.cpp.orig	2018-04-12 15:37:36 UTC
 +++ lib/Logger/LogAppenderSyslog.cpp
-@@ -64,7 +64,7 @@ LogAppenderSyslog::LogAppenderSyslog(std
+@@ -62,7 +62,7 @@ LogAppenderSyslog::LogAppenderSyslog(std
    if ('0' <= facility[0] && facility[0] <= '9') {
      value = StringUtils::int32(facility);
    } else {
--    CODE* ptr = reinterpret_cast<CODE*>(TRI_facilitynames);
-+    const CODE* ptr = reinterpret_cast<const CODE*>(TRI_facilitynames);
+-    CODE* ptr = reinterpret_cast<CODE*>(facilitynames);
++    const CODE* ptr = reinterpret_cast<const CODE*>(facilitynames);
  
      while (ptr->c_name != 0) {
        if (strcmp(ptr->c_name, facility.c_str()) == 0) {