Attachment 192653 Details for Bug 225698 – 3.2.13 patch

[patch] 3.2.13 patch

arangodb3213.diff (text/plain), 7.58 KB, created by dev on 2018-04-19 14:28:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dev

Created: 2018-04-19 14:28:12 UTC

Size: 7.58 KB

patch

obsolete

>Index: databases/arangodb32/Makefile
>===================================================================
>--- databases/arangodb32/Makefile	(revision 467140)
>+++ databases/arangodb32/Makefile	(working copy)
>@@ -1,13 +1,13 @@
>-# Created by: Vlad Galu <galu@packetdam.com>
>+# Created by: Vlad Galu <dev@dudu.ro>
> # $FreeBSD$
> 
> 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
>Index: databases/arangodb32/distinfo
>===================================================================
>--- databases/arangodb32/distinfo	(revision 467140)
>+++ databases/arangodb32/distinfo	(working copy)
>@@ -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
>Index: databases/arangodb32/files/patch-CMakeLists.txt
>===================================================================
>--- databases/arangodb32/files/patch-CMakeLists.txt	(revision 467140)
>+++ databases/arangodb32/files/patch-CMakeLists.txt	(working copy)
>@@ -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 ()
>  
>-   add_definitions("-DARANGODB_ENABLE_BACKTRACE=1")
>-@@ -573,7 +577,9 @@ endif ()
>+   include(VcMacros)
>+ 
>+-  option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" ON)
>++  option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" OFF)
>+ 
>+   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 ()
>Index: databases/arangodb32/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp
>===================================================================
>--- databases/arangodb32/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp	(nonexistent)
>+++ databases/arangodb32/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp	(working copy)
>@@ -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);
>Index: databases/arangodb32/files/patch-lib_Basics_ArangoGlobalContext.cpp
>===================================================================
>--- databases/arangodb32/files/patch-lib_Basics_ArangoGlobalContext.cpp	(nonexistent)
>+++ databases/arangodb32/files/patch-lib_Basics_ArangoGlobalContext.cpp	(working copy)
>@@ -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
>Index: databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp
>===================================================================
>--- databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp	(revision 467140)
>+++ databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp	(working copy)
>@@ -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) {
>Index: databases/arangodb32/pkg-plist
>===================================================================
>--- databases/arangodb32/pkg-plist	(revision 467140)
>+++ databases/arangodb32/pkg-plist	(working copy)
>@@ -747,6 +747,7 @@
> %%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 @@
> %%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

Actions: View | Diff

Attachments on bug 225698: 192653