databases/galera: Update to 25.3.33

Changelog http://releases.galeracluster.com/galera-3.33/release-notes-galera-25.3.33.txt

PR:		254876
Approved by:	devel@galeracluster.com (maintainer)

6 files changed, 4 insertions, 88 deletions

diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index d1c9956d46bd..15456a71942c 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -1,7 +1,7 @@
 # Created by: Horia Racoviceanu <horia@racoviceanu.com>
 
 PORTNAME=	galera
-PORTVERSION?=	25.3.32
+PORTVERSION?=	25.3.33
 DISTVERSIONPREFIX?=	release_
 CATEGORIES=	databases
 
diff --git a/databases/galera/distinfo b/databases/galera/distinfo
index 59fad78f3dfa..b55d3de70e37 100644
--- a/databases/galera/distinfo
+++ b/databases/galera/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1610105381
-SHA256 (codership-galera-release_25.3.32_GH0.tar.gz) = 6be3d3f8e912261e8f9634fba5302b2dcc5ffb70f5ab670752d8d21087432c1b
-SIZE (codership-galera-release_25.3.32_GH0.tar.gz) = 3335638
+TIMESTAMP = 1617277707
+SHA256 (codership-galera-release_25.3.33_GH0.tar.gz) = d38ea040a55d7427fda8be3e944d9045a61803773a4b3e9a6d48bf86d26e2af3
+SIZE (codership-galera-release_25.3.33_GH0.tar.gz) = 3336112
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/galera/files/patch-CMakeLists.txt b/databases/galera/files/patch-CMakeLists.txt
deleted file mode 100644
index 0cd56f7453ba..000000000000
--- a/databases/galera/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- CMakeLists.txt.orig	2020-12-29 14:45:24 UTC
-+++ CMakeLists.txt
-@@ -105,17 +105,19 @@ add_subdirectory(galera)
- add_subdirectory(scripts/packages)
- add_subdirectory(wsrep/tests)
- 
--install(FILES
--  ${CMAKE_SOURCE_DIR}/AUTHORS
--  ${CMAKE_SOURCE_DIR}/COPYING
--  ${CMAKE_SOURCE_DIR}/README
--  DESTINATION doc)
--install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
--  DESTINATION doc
--  RENAME LICENSE.asio)
--install(FILES ${CMAKE_SOURCE_DIR}/chromium/LICENSE
--  DESTINATION doc
--  RENAME LICENSE.chromium)
-+if (NOT CMAKE_SYSTEM MATCHES ".*BSD")
-+  install(FILES
-+    ${CMAKE_SOURCE_DIR}/AUTHORS
-+    ${CMAKE_SOURCE_DIR}/COPYING
-+    ${CMAKE_SOURCE_DIR}/README
-+    DESTINATION doc)
-+  install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
-+    DESTINATION doc
-+    RENAME LICENSE.asio)
-+  install(FILES ${CMAKE_SOURCE_DIR}/chromium/LICENSE
-+    DESTINATION doc
-+    RENAME LICENSE.chromium)
-+endif()
- 
- message(STATUS "")
- message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
diff --git a/databases/galera/files/patch-cmake_compiler.cmake b/databases/galera/files/patch-cmake_compiler.cmake
deleted file mode 100644
index ea9e16da9caf..000000000000
--- a/databases/galera/files/patch-cmake_compiler.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/compiler.cmake.orig	2021-01-12 07:58:44 UTC
-+++ cmake/compiler.cmake
-@@ -41,6 +41,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_ASSERTIONS")
-   # Enable debug sync points
-   add_definitions(-DGU_DBUG_ON)
-+else()
-+  # Due to liberal use of assert() in some modules, make sure that
-+  # non-debug builds have -DNDEBUG enabled.
-+  add_definitions(-DNDEBUG)
- endif()
- 
- if (GALERA_GU_DEBUG_MUTEX)
diff --git a/databases/galera/files/patch-galerautils_src_gu__byteswap.h b/databases/galera/files/patch-galerautils_src_gu__byteswap.h
deleted file mode 100644
index e91b329a6b22..000000000000
--- a/databases/galera/files/patch-galerautils_src_gu__byteswap.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- galerautils/src/gu_byteswap.h.orig	2020-10-12 06:33:51 UTC
-+++ galerautils/src/gu_byteswap.h
-@@ -53,11 +53,6 @@ static GU_FORCE_INLINE uint64_t GU_ROTL64 (uint64_t x,
- #  define gu_bswap16 _OSSwapInt16
- #  define gu_bswap32 _OSSwapInt32
- #  define gu_bswap64 _OSSwapInt64
--#elif defined(__FreeBSD__)
--/* do not use bswapXX, because gcc44 gives old-style cast warnings */
--#  define gu_bswap16 __bswap16_var
--#  define gu_bswap32 __bswap32_var
--#  define gu_bswap64 __bswap64_var
- #elif defined(__sun__)
- #  define gu_bswap16 BSWAP_16
- #  define gu_bswap32 BSWAP_32
diff --git a/databases/galera/files/patch-garb_CMakeLists.txt b/databases/galera/files/patch-garb_CMakeLists.txt
deleted file mode 100644
index 5d89c2afe3b2..000000000000
--- a/databases/galera/files/patch-garb_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- garb/CMakeLists.txt.orig	2021-01-08 11:51:42 UTC
-+++ garb/CMakeLists.txt
-@@ -32,11 +32,13 @@ target_link_libraries(garbd gcs4garb gcomm gcache
-   ${Boost_PROGRAM_OPTIONS_LIBRARIES})
- 
- install(TARGETS garbd DESTINATION bin)
--install(FILES
--  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
--  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
--  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
--  DESTINATION share)
--install(FILES
--  ${CMAKE_SOURCE_DIR}/man/garbd.8
--  DESTINATION man/man8)
-+if (NOT CMAKE_SYSTEM MATCHES ".*BSD")
-+  install(FILES
-+    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
-+    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
-+    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
-+    DESTINATION share)
-+  install(FILES
-+    ${CMAKE_SOURCE_DIR}/man/garbd.8
-+    DESTINATION man/man8)
-+endif()