maxscale: next work

Martinfx · Oct 13, 2023 · bc05826 · bc05826
1 parent 4189bd2
commit bc05826
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 86 deletions.
diff --git a/maxscale/Makefile b/maxscale/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=       MaxScale
-DISTVERSION=    22.08.1
+DISTVERSION=    23.08.1
 
 CATEGORIES=     databases
 
@@ -16,7 +16,7 @@ LICENSE_PERMS_BUSINESS=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 BUILD_DEPENDS=	libepoll-shim>0:devel/libepoll-shim
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
-USES=           compiler:c++11-lang cmake:noninja gmake
+USES=           compiler:c++17-lang cmake:noninja gmake
 USE_GCC=	yes
 USE_GITHUB=     yes
 GH_ACCOUNT=     mariadb-corporation
@@ -26,7 +26,7 @@ MAKE_ENV+=	CPATH="${LOCALBASE}/include/libepoll-shim"
 CFLAGS+=	-I${LOCALBASE}/include/libepoll-shim
 LDFLAGS+=	-L${LOCALBASE}/lib -lepoll-shim
 
-CMAKE_ARGS+=	SS_DEBUG=0
+CMAKE_ARGS+=	SS_DEBUG=0 MAXSCALE_DEVELOP=1
 #REINPLACE_ARGS=	-i ''
 
 post-patch:

diff --git a/maxscale/distinfo b/maxscale/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665252841
-SHA256 (mariadb-corporation-MaxScale-22.08.1_GH0.tar.gz) = daacae3b139d41d1731cf8ec17ae1207bb4fb409d7b4b0fb91e67f96a086a169
-SIZE (mariadb-corporation-MaxScale-22.08.1_GH0.tar.gz) = 34597191
+TIMESTAMP = 1695932702
+SHA256 (mariadb-corporation-MaxScale-23.08.1_GH0.tar.gz) = 77b3450c6571c8b70ad6a02e68d00422eca2612908a49c8f7cc7d4ff2d37488b
+SIZE (mariadb-corporation-MaxScale-23.08.1_GH0.tar.gz) = 36112786
diff --git a/.../patch-maxutils_maxbase_src_stacktrace.cc → ..._patch-maxutils_maxbase_src_stacktrace.cc b/.../patch-maxutils_maxbase_src_stacktrace.cc → ..._patch-maxutils_maxbase_src_stacktrace.cc
diff --git a/maxscale/files/patch-CMakeLists.txt b/maxscale/files/patch-CMakeLists.txt
diff --git a/maxscale/files/patch-cmake_BuildMicroHttpd.cmake b/maxscale/files/patch-cmake_BuildMicroHttpd.cmake
@@ -1,6 +1,6 @@
---- cmake/BuildMicroHttpd.cmake.orig	2022-09-12 06:23:56 UTC
+--- cmake/BuildMicroHttpd.cmake.orig	2023-09-22 06:15:26 UTC
 +++ cmake/BuildMicroHttpd.cmake
-@@ -18,8 +18,8 @@ ExternalProject_Add(libmicrohttpd
+@@ -14,8 +14,8 @@ ExternalProject_Add(libmicrohttpd
    SOURCE_DIR ${CMAKE_BINARY_DIR}/libmicrohttpd/
    CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/libmicrohttpd//configure --prefix=${CMAKE_BINARY_DIR}/libmicrohttpd/ --enable-shared --with-pic --libdir=${CMAKE_BINARY_DIR}/libmicrohttpd/lib/
    BINARY_DIR ${CMAKE_BINARY_DIR}/libmicrohttpd/

diff --git a/maxscale/files/patch-cmake_BuildPCRE2.cmake b/maxscale/files/patch-cmake_BuildPCRE2.cmake
@@ -1,8 +1,8 @@
---- cmake/BuildPCRE2.cmake.orig	2022-10-08 18:17:57 UTC
+--- cmake/BuildPCRE2.cmake.orig	2023-09-22 06:15:26 UTC
 +++ cmake/BuildPCRE2.cmake
-@@ -8,7 +8,7 @@
- ExternalProject_Add(pcre2 SOURCE_DIR ${CMAKE_SOURCE_DIR}/pcre2/
-   CMAKE_ARGS -DCMAKE_C_FLAGS=-fPIC -DBUILD_SHARED_LIBS=N -DPCRE2_BUILD_PCRE2GREP=N  -DPCRE2_BUILD_TESTS=N -DPCRE2_SUPPORT_JIT=Y
+@@ -9,7 +9,7 @@ ExternalProject_Add(pcre2 SOURCE_DIR ${CMAKE_SOURCE_DI
+   CMAKE_ARGS -DCMAKE_C_FLAGS=-fPIC -DBUILD_SHARED_LIBS=N -DPCRE2_BUILD_PCRE2GREP=N -DPCRE2_BUILD_TESTS=N
+   -DPCRE2_SUPPORT_JIT=Y -DPCRE2_HEAP_LIMIT=1000000 -DPCRE2_MATCH_LIMIT=500000
    BINARY_DIR ${CMAKE_BINARY_DIR}/pcre2/
 -  BUILD_COMMAND make
 +  BUILD_COMMAND gmake

diff --git a/maxscale/files/patch-cmake_BuildRdkafka.cmake b/maxscale/files/patch-cmake_BuildRdkafka.cmake
diff --git a/maxscale/files/patch-include_maxscale_protocol_mariadb_mysql.hh b/maxscale/files/patch-include_maxscale_protocol_mariadb_mysql.hh
diff --git a/maxscale/files/patch-maxutils_maxbase_include_maxbase_string.hh b/maxscale/files/patch-maxutils_maxbase_include_maxbase_string.hh
@@ -1,6 +1,6 @@
---- maxutils/maxbase/include/maxbase/string.hh.orig	2022-09-12 06:23:56 UTC
+--- maxutils/maxbase/include/maxbase/string.hh.orig	2023-09-22 06:15:26 UTC
 +++ maxutils/maxbase/include/maxbase/string.hh
-@@ -123,7 +123,7 @@ inline void ltrim(std::string& s)
+@@ -169,7 +169,7 @@ inline void ltrim(std::string& s)
      s.erase(s.begin(),
              std::find_if(s.begin(),
                           s.end(),
@@ -9,7 +9,7 @@
  }
 
  /**
-@@ -135,7 +135,8 @@ inline void rtrim(std::string& s)
+@@ -181,7 +181,8 @@ inline void rtrim(std::string& s)
  {
      s.erase(std::find_if(s.rbegin(),
                           s.rend(),

diff --git a/maxscale/files/patch-maxutils_maxbase_src_filesystem.cc b/maxscale/files/patch-maxutils_maxbase_src_filesystem.cc
@@ -1,6 +1,6 @@
---- maxutils/maxbase/src/filesystem.cc.orig	2022-10-08 19:19:13 UTC
+--- maxutils/maxbase/src/filesystem.cc.orig	2023-09-22 06:15:26 UTC
 +++ maxutils/maxbase/src/filesystem.cc
-@@ -13,7 +13,8 @@
+@@ -14,7 +14,8 @@
 
  #include <maxbase/filesystem.hh>
 

diff --git a/maxscale/files/patch-maxutils_maxbase_src_host.cc b/maxscale/files/patch-maxutils_maxbase_src_host.cc
@@ -1,6 +1,6 @@
---- maxutils/maxbase/src/host.cc.orig	2022-10-09 10:59:31 UTC
+--- maxutils/maxbase/src/host.cc.orig	2023-09-22 06:15:26 UTC
 +++ maxutils/maxbase/src/host.cc
-@@ -16,6 +16,8 @@
+@@ -17,6 +17,8 @@
  #include <vector>
  #include <algorithm>
  #include <arpa/inet.h>

diff --git a/maxscale/files/patch-maxutils_maxbase_src_log.cc b/maxscale/files/patch-maxutils_maxbase_src_log.cc
@@ -1,6 +1,6 @@
---- maxutils/maxbase/src/log.cc.orig	2022-10-18 19:57:28 UTC
+--- maxutils/maxbase/src/log.cc.orig	2023-09-22 06:15:26 UTC
 +++ maxutils/maxbase/src/log.cc
-@@ -487,7 +487,7 @@ bool mxb_log_init(const char* ident,
+@@ -497,7 +497,7 @@ bool mxb_log_init(const char* ident,
          if (!filename)
          {
  #ifdef __GNUC__

diff --git a/maxscale/files/patch-maxutils_maxbase_src_logger.cc b/maxscale/files/patch-maxutils_maxbase_src_logger.cc
@@ -1,14 +1,14 @@
---- maxutils/maxbase/src/logger.cc.orig	2022-09-12 06:23:56 UTC
+--- maxutils/maxbase/src/logger.cc.orig	2023-09-22 06:15:26 UTC
 +++ maxutils/maxbase/src/logger.cc
-@@ -17,6 +17,7 @@
+@@ -18,6 +18,7 @@
  #include <syslog.h>
  #include <fcntl.h>
  #include <unistd.h>
 +#include <sys/stat.h>
 
  #include <cassert>
  #include <chrono>
-@@ -83,7 +84,7 @@ std::string get_ident()
+@@ -84,7 +85,7 @@ std::string get_ident()
      if (!this_unit.ident[0])
      {
  #ifdef __GNUC__

diff --git a/maxscale/files/patch-maxutils_maxbase_src_shareddata.cc b/maxscale/files/patch-maxutils_maxbase_src_shareddata.cc
@@ -1,6 +1,6 @@
---- maxutils/maxbase/src/shareddata.cc.orig	2022-10-09 11:46:05 UTC
+--- maxutils/maxbase/src/shareddata.cc.orig	2023-09-22 06:15:26 UTC
 +++ maxutils/maxbase/src/shareddata.cc
-@@ -13,6 +13,7 @@
+@@ -14,6 +14,7 @@
 
  #include <maxbase/shareddata.hh>
  #include <iostream>

diff --git a/maxscale/files/patch-query__classifier_qc__sqlite_CMakeLists.txt b/maxscale/files/patch-query__classifier_qc__sqlite_CMakeLists.txt