From owner-svn-ports-all@freebsd.org Sun Jan 17 18:40:40 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D9B4E4D3E07; Sun, 17 Jan 2021 18:40:40 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DJkJ85smSz3rJQ; Sun, 17 Jan 2021 18:40:40 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC73D2613C; Sun, 17 Jan 2021 18:40:40 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10HIeeiC029256; Sun, 17 Jan 2021 18:40:40 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10HIedkA029250; Sun, 17 Jan 2021 18:40:39 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202101171840.10HIedkA029250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 17 Jan 2021 18:40:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561858 - in head/databases/galera: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/databases/galera: . files X-SVN-Commit-Revision: 561858 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2021 18:40:40 -0000 Author: swills Date: Sun Jan 17 18:40:39 2021 New Revision: 561858 URL: https://svnweb.freebsd.org/changeset/ports/561858 Log: databases/galera: Update to 25.3.32 PR: 252603 Submitted by: devel@galeracluster.com (maintainer) Added: head/databases/galera/files/patch-CMakeLists.txt (contents, props changed) head/databases/galera/files/patch-cmake_compiler.cmake (contents, props changed) head/databases/galera/files/patch-garb_CMakeLists.txt (contents, props changed) Modified: head/databases/galera/Makefile (contents, props changed) head/databases/galera/distinfo (contents, props changed) head/databases/galera/files/patch-gcomm_src_asio__tcp.cpp (contents, props changed) Modified: head/databases/galera/Makefile ============================================================================== --- head/databases/galera/Makefile Sun Jan 17 18:32:20 2021 (r561857) +++ head/databases/galera/Makefile Sun Jan 17 18:40:39 2021 (r561858) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= galera -PORTVERSION?= 25.3.31 +PORTVERSION?= 25.3.32 DISTVERSIONPREFIX?= release_ CATEGORIES= databases @@ -32,7 +32,7 @@ BUILD_DEPENDS= checkmk:devel/check \ objdump:devel/binutils LIB_DEPENDS= libboost_date_time.so:devel/boost-libs -USES= compiler:c++11-lang python:build scons ssl +USES= compiler:c++11-lang python:build cmake ssl USE_LDCONFIG= yes @@ -40,34 +40,15 @@ USE_GITHUB= yes GH_TUPLE?= codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \ codership:wsrep-API:eab2d5d5a31672c0b7d116ef1629ff18392fd7d0:dummy/wsrep/src -LDFLAGS+= -lboost_program_options -lboost_system -MAKE_ARGS+= revno=${GH_TAGNAME} system_asio=0 tests=0 +CMAKE_ARGS+= -DGALERA_REVISION=${GH_TAGNAME} USE_RC_SUBR= garb.sh -# Abuse TEST_TARGET to append tests=1 (which is not a target, strictly -# speaking) at the end of the "scons ..." command so that it overrides -# tests=0 from ${MAKE_ARGS}. To rerun the tests a second time, remove -# all *.passed files: find ./work -name *.passed -print -delete -TEST_TARGET= deterministic_tests=1 tests=1 - PLIST_FILES= bin/garbd \ lib/libgalera.so \ lib/libgalera_smm.so -OPTIONS_DEFINE= BOOSTPOOL BPOSTATIC DEBUG - -BOOSTPOOL_DESC= Use boost pool allocator -BPOSTATIC_DESC= Use static boost_program_options - -BOOSTPOOL_MAKE_ARGS= boost_pool=1 -BPOSTATIC_MAKE_ARGS= bpostatic=${LOCALBASE}/lib/libboost_program_options.a -DEBUG_MAKE_ARGS= debug=0 - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_LIB} ${WRKSRC}/libgalera_smm.so ${STAGEDIR}${PREFIX}/lib/ - @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \ - libgalera.so) +post-install: + ${RLN} ${STAGEDIR}/${PREFIX}/lib/libgalera_smm.so ${STAGEDIR}/${PREFIX}/lib/libgalera.so .include Modified: head/databases/galera/distinfo ============================================================================== --- head/databases/galera/distinfo Sun Jan 17 18:32:20 2021 (r561857) +++ head/databases/galera/distinfo Sun Jan 17 18:40:39 2021 (r561858) @@ -1,5 +1,5 @@ -TIMESTAMP = 1603459107 -SHA256 (codership-galera-release_25.3.31_GH0.tar.gz) = b0843b8190b48bbbb6596997a221e08cf51eca0213ef709f9009c4c8f26b370d -SIZE (codership-galera-release_25.3.31_GH0.tar.gz) = 3321870 +TIMESTAMP = 1610105381 +SHA256 (codership-galera-release_25.3.32_GH0.tar.gz) = 6be3d3f8e912261e8f9634fba5302b2dcc5ffb70f5ab670752d8d21087432c1b +SIZE (codership-galera-release_25.3.32_GH0.tar.gz) = 3335638 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 Added: head/databases/galera/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/galera/files/patch-CMakeLists.txt Sun Jan 17 18:40:39 2021 (r561858) @@ -0,0 +1,33 @@ +--- 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}") Added: head/databases/galera/files/patch-cmake_compiler.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/galera/files/patch-cmake_compiler.cmake Sun Jan 17 18:40:39 2021 (r561858) @@ -0,0 +1,13 @@ +--- 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) Added: head/databases/galera/files/patch-garb_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/galera/files/patch-garb_CMakeLists.txt Sun Jan 17 18:40:39 2021 (r561858) @@ -0,0 +1,24 @@ +--- 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() Modified: head/databases/galera/files/patch-gcomm_src_asio__tcp.cpp ============================================================================== --- head/databases/galera/files/patch-gcomm_src_asio__tcp.cpp Sun Jan 17 18:32:20 2021 (r561857) +++ head/databases/galera/files/patch-gcomm_src_asio__tcp.cpp Sun Jan 17 18:40:39 2021 (r561858) @@ -1,4 +1,4 @@ ---- gcomm/src/asio_tcp.cpp.orig 2020-01-23 13:38:58 UTC +--- gcomm/src/asio_tcp.cpp.orig 2020-12-29 14:45:24 UTC +++ gcomm/src/asio_tcp.cpp @@ -775,7 +775,7 @@ void gcomm::AsioTcpSocket::assign_remote_addr() gcomm::SocketStats gcomm::AsioTcpSocket::stats() const @@ -9,7 +9,7 @@ struct tcp_info tcpi; memset(&tcpi, 0, sizeof(tcpi)); socklen_t tcpi_len(sizeof(tcpi)); -@@ -798,7 +798,7 @@ gcomm::SocketStats gcomm::AsioTcpSocket::stats() const +@@ -807,7 +807,7 @@ gcomm::SocketStats gcomm::AsioTcpSocket::stats() const ret.send_queue_bytes = send_q_.queued_bytes(); ret.send_queue_segments = send_q_.segments(); }