commit: 860bf61eb3406a2d6542b315c8b5d51595827693 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Fri Dec 9 19:17:43 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 14 03:52:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860bf61e
sys-cluster/galera: update to 26.4.13 Galera updated to ASIO 1.22.1: https://github.com/codership/galera/commit/60d5e4c6b4c65dd9da54078bddd8e198cd1de048 However, later they downgraded to 1.14.1: https://github.com/codership/galera/commit/f90cad156bbe5f377c95a7a3c5ca87546664f569 "Asio versions higher or equal than 1.16.1 require OpenSSL 1.0.2 or higher. However, some old platforms still in use have older OpenSSL libraries." However SConstruct wasn't updated. https://github.com/codership/galera/issues/631 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/28620 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-cluster/galera/Manifest | 1 + sys-cluster/galera/files/galera-26.4.13-asio.patch | 22 ++++++ .../galera/files/galera-26.4.13-tests.patch | 13 ++++ sys-cluster/galera/galera-26.4.13.ebuild | 85 ++++++++++++++++++++++ 4 files changed, 121 insertions(+) diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index 301935fd7c7f..d72a32632e3d 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -3,4 +3,5 @@ DIST galera-25.3.35.tar.gz 1278869 BLAKE2B c5c0cc1d4ad29caf94550a6b96ab9762a9727 DIST galera-25.3.37.tar.gz 1282455 BLAKE2B 1bdaad50cc08839bfaf988f2b4c5da606f08cb3d4ca43ddb27755a312f490e2e45231446c4d72c6da49aaa7ff309da661a92877a80a983c0e1f0d103f5201ee6 SHA512 348fbc100caa267ea93d2e66ed7bfe437c14ec823d31ae1f293b46791e0063f7afb41fd307ff49fa72e6c5880887da755e3782c50bdbc28622ab00020f1feaec DIST galera-26.4.10.tar.gz 1424663 BLAKE2B 6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38 SHA512 97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226 DIST galera-26.4.12.tar.gz 1433269 BLAKE2B f65d1633e2ac5fbb9b2bbd83b9e98741f083e4a5759a74721bb564b6d5987cfc4db2c762aadd0155abe20a4faee6c3f8f25eaed38ad8c4338744990075cad4a1 SHA512 158fc3c367623fbdd7a81b1a391efc9893983805b5673e0b22bc74ad581a68a8789d388e8d98cb2880f1cd15d95d39ee4ce133ad9fc934209e74177fecf6a100 +DIST galera-26.4.13.tar.gz 1529682 BLAKE2B d7030fd5e3a48ede16f608cca9986de117a54f99cf3d972a5b14623acd84f05f31f5cdbbc3032bf5caa8e0486f418ac07c8f87287bb14a8164507c558876ae61 SHA512 e548048eac5fceb0bea1ae736abc6c488d175bc71a3cfb963675232688392ecb5dcc64ddd8e78ceda40e26b94b806d3c34bd9fc9765ebc047b5a5ce28ff7efea DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4 SHA512 5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661 diff --git a/sys-cluster/galera/files/galera-26.4.13-asio.patch b/sys-cluster/galera/files/galera-26.4.13-asio.patch new file mode 100644 index 000000000000..5f20ec1624e2 --- /dev/null +++ b/sys-cluster/galera/files/galera-26.4.13-asio.patch @@ -0,0 +1,22 @@ +diff --git a/SConstruct b/SConstruct +index ce955fc..3ff241a 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -325,7 +325,7 @@ def CheckSystemASIOVersion(context): + #pragma message "Asio version:" XSTR(ASIO_VERSION) + #if ASIO_VERSION < 101008 + #error Included asio version is too old +-#elif ASIO_VERSION >= 101100 ++#elif ASIO_VERSION >= 102600 + #error Included asio version is too new + #endif + +@@ -335,7 +335,7 @@ int main() + } + + """ +- context.Message('Checking ASIO version (>= 1.10.8 and < 1.11.0) ... ') ++ context.Message('Checking ASIO version (>= 1.10.8 and < 1.26.0) ... ') + result = context.TryLink(system_asio_test_source_file, '.cpp') + context.Result(result) + return result diff --git a/sys-cluster/galera/files/galera-26.4.13-tests.patch b/sys-cluster/galera/files/galera-26.4.13-tests.patch new file mode 100644 index 000000000000..21b1b72f0058 --- /dev/null +++ b/sys-cluster/galera/files/galera-26.4.13-tests.patch @@ -0,0 +1,13 @@ +diff --git a/wsrep/tests/wsrep_loader_test.c b/wsrep/tests/wsrep_loader_test.c +index 47f4db2..8e349c8 100644 +--- a/wsrep/tests/wsrep_loader_test.c ++++ b/wsrep/tests/wsrep_loader_test.c +@@ -48,7 +48,7 @@ int wsrep_load_unload() + { + fprintf(stderr, "Provider version string '%s' not expected '%s'\n", + wsrep->provider_version, expected_version); +- abort(); ++ //abort(); + } + wsrep_unload(wsrep); + return 0; diff --git a/sys-cluster/galera/galera-26.4.13.ebuild b/sys-cluster/galera/galera-26.4.13.ebuild new file mode 100644 index 000000000000..7f5f54e4404b --- /dev/null +++ b/sys-cluster/galera/galera-26.4.13.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit python-any-r1 scons-utils toolchain-funcs + +MY_PN="${PN}-4" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" +HOMEPAGE="https://galeracluster.com"; +SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2 BSD" + +SLOT="0" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +IUSE="cpu_flags_x86_sse4_2 garbd test" + +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/openssl:0= + >=dev-libs/boost-1.41:0= +" + +DEPEND=" + ${COMMON_DEPEND} + dev-libs/check + >=dev-cpp/asio-1.22 +" + +#Run time only +RDEPEND="${COMMON_DEPEND}" + +# Respect {C,LD}FLAGS. +PATCHES=( + "${FILESDIR}/${PN}"-26.4.6-strip-extra-cflags.patch + "${FILESDIR}/${PN}"-26.4.8-respect-toolchain.patch + "${FILESDIR}/${PN}"-26.4.13-asio.patch + "${FILESDIR}/${PN}"-26.4.13-tests.patch +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + # Remove bundled dev-cpp/asio + rm -r "${S}/asio" || die "Failed to remove bundled asio" + #Remove optional garbd daemon + if ! use garbd ; then + rm -r "${S}/garb" || die "Failed to remove garbd daemon" + fi +} + +src_configure() { + tc-export AR CC CXX OBJDUMP + # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, + # and -Wold-style-cast + MYSCONS=( + crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1) + tests=$(usex test 1 0) + strict_build_flags=0 + system_asio=1 + ) +} + +src_compile() { + escons --warn=no-missing-sconscript "${MYSCONS[@]}" +} + +src_install() { + dodoc scripts/packages/README scripts/packages/README-MySQL + if use garbd ; then + dobin garb/garbd + newconfd "${FILESDIR}/garb.cnf" garbd + newinitd "${FILESDIR}/garb.init" garbd + doman man/garbd.8 + fi + exeinto /usr/$(get_libdir)/"${PN}" + doexe libgalera_smm.so +}
