7 files changed, 69 insertions, 29 deletions

diff --git a/databases/arangodb32/Makefile b/databases/arangodb32/Makefile
index ae463d154737..5111dd7afde3 100644
--- a/databases/arangodb32/Makefile
+++ b/databases/arangodb32/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	arangodb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.10
+DISTVERSION=	3.2.13
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	32
 
-MAINTAINER=	galu@packetdam.com
+MAINTAINER=	dev@dudu.ro
 COMMENT=	ArangoDB is a distributed NoSQL database with multiple data models
 
 LICENSE=	APACHE20
diff --git a/databases/arangodb32/distinfo b/databases/arangodb32/distinfo
index cafa47f8b4f2..f8a020816194 100644
--- a/databases/arangodb32/distinfo
+++ b/databases/arangodb32/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517870228
-SHA256 (arangodb-arangodb-v3.2.10_GH0.tar.gz) = e8b2f8b66805a07ddf959362d6b2c2bb4df7056c213abe0c45080846b30e7a89
-SIZE (arangodb-arangodb-v3.2.10_GH0.tar.gz) = 144581079
+TIMESTAMP = 1524145771
+SHA256 (arangodb-arangodb-v3.2.13_GH0.tar.gz) = 83784358c91f7163a47ec509ac4e527dc659182cfa8678b044da1b50c3e381fd
+SIZE (arangodb-arangodb-v3.2.13_GH0.tar.gz) = 144636599
diff --git a/databases/arangodb32/files/patch-CMakeLists.txt b/databases/arangodb32/files/patch-CMakeLists.txt
index cac21d531523..05d422b21018 100644
--- a/databases/arangodb32/files/patch-CMakeLists.txt
+++ b/databases/arangodb32/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2017-11-15 11:23:07 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
-@@ -364,7 +364,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,27 +21,23 @@
      set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++")
      add_definitions("-Wno-deprecated-declarations")
    else ()
-@@ -498,7 +498,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")
-@@ -573,7 +577,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)
+   endif ()
+ endif ()
diff --git a/databases/arangodb32/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp b/databases/arangodb32/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp
new file mode 100644
index 000000000000..1b8be3c36734
--- /dev/null
+++ b/databases/arangodb32/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp
@@ -0,0 +1,25 @@
+--- arangod/RocksDBEngine/RocksDBThrottle.cpp.orig	2018-01-05 13:56:52 UTC
++++ arangod/RocksDBEngine/RocksDBThrottle.cpp
+@@ -515,8 +515,8 @@ void RocksDBThrottle::AdjustThreadPriori
+     pid_t tid;
+     int ret_val;
+ 
+-    tid = syscall(SYS_gettid);
+-    if (-1!=(int)tid)
++    ret_val = syscall(SYS_thr_self, &tid);
++    if (-1!=ret_val)
+     {
+       errno=0;
+       ret_val=getpriority(PRIO_PROCESS, tid);
+@@ -534,8 +534,9 @@ void RocksDBThrottle::AdjustThreadPriori
+       && (gThreadPriority._basePriority+Adjustment)!=gThreadPriority._currentPriority) {
+ 
+     pid_t tid;
+-    tid = syscall(SYS_gettid);
+-    if (-1!=(int)tid)
++    int ret_val;
++    ret_val = syscall(SYS_thr_self, &tid);
++    if (-1!=(int)ret_val)
+     {
+       gThreadPriority._currentPriority = gThreadPriority._basePriority + Adjustment;
+       setpriority(PRIO_PROCESS, tid, gThreadPriority._currentPriority);
diff --git a/databases/arangodb32/files/patch-lib_Basics_ArangoGlobalContext.cpp b/databases/arangodb32/files/patch-lib_Basics_ArangoGlobalContext.cpp
new file mode 100644
index 000000000000..1e656e16fc88
--- /dev/null
+++ b/databases/arangodb32/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/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp b/databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp
index 976c757c8338..8d31e1dd1545 100644
--- a/databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp
+++ b/databases/arangodb32/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) {
diff --git a/databases/arangodb32/pkg-plist b/databases/arangodb32/pkg-plist
index 08cb997ea52d..840d584b46df 100644
--- a/databases/arangodb32/pkg-plist
+++ b/databases/arangodb32/pkg-plist
@@ -747,6 +747,7 @@ sbin/arangod
 %%DATADIR%%/js/node/node_modules/chai/lib/chai/config.js
 %%DATADIR%%/js/node/node_modules/chai/lib/chai/core/assertions.js
 %%DATADIR%%/js/node/node_modules/chai/lib/chai/interface/assert.js
+%%DATADIR%%/js/node/node_modules/chai/lib/chai/interface/expect.js
 %%DATADIR%%/js/node/node_modules/chai/lib/chai/interface/should.js
 %%DATADIR%%/js/node/node_modules/chai/lib/chai/utils/addChainableMethod.js
 %%DATADIR%%/js/node/node_modules/chai/lib/chai/utils/addMethod.js
@@ -853,6 +854,10 @@ sbin/arangod
 %%DATADIR%%/js/node/node_modules/error-stack-parser/node_modules/stackframe/package.json
 %%DATADIR%%/js/node/node_modules/error-stack-parser/node_modules/stackframe/stackframe.js
 %%DATADIR%%/js/node/node_modules/error-stack-parser/package.json
+%%DATADIR%%/js/node/node_modules/expect.js/History.md
+%%DATADIR%%/js/node/node_modules/expect.js/README.md
+%%DATADIR%%/js/node/node_modules/expect.js/index.js
+%%DATADIR%%/js/node/node_modules/expect.js/package.json
 %%DATADIR%%/js/node/node_modules/extendible/.travis.yml
 %%DATADIR%%/js/node/node_modules/extendible/README.md
 %%DATADIR%%/js/node/node_modules/extendible/example/index.js