From 3dae174e7eb98191610df7a5a7e5a9bd6ca03d66 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 22 Jul 2021 20:19:28 +0200 Subject: [PATCH] package/mariadb: bump version to 10.3.30 - rebase 001-add-extra-check-for-librt.patch - for changelog see [1], [2] Fixes: CMake Error at libmariadb/cmake/ConnectorName.cmake:30 (ENDMACRO): Flow control statements are not properly nested. Call Stack (most recent call first): libmariadb/CMakeLists.txt:423 (INCLUDE) [1] https://mariadb.com/kb/en/mariadb-10329-changelog/ [2] https://mariadb.com/kb/en/mariadb-10330-changelog/ Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/mariadb/0001-add-extra-check-for-librt.patch | 12 +++++++----- package/mariadb/mariadb.hash | 6 +++--- package/mariadb/mariadb.mk | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/mariadb/0001-add-extra-check-for-librt.patch b/package/mariadb/0001-add-extra-check-for-librt.patch index 90aa626a0b..0dd4c546fb 100644 --- a/package/mariadb/0001-add-extra-check-for-librt.patch +++ b/package/mariadb/0001-add-extra-check-for-librt.patch @@ -1,4 +1,4 @@ -From e6244400dfd3547531a3a3289fadbbe19873f096 Mon Sep 17 00:00:00 2001 +From 960c74ec60962f707bd41724edaa2640c0324400 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Thu, 27 Oct 2016 20:33:21 -0700 Subject: [PATCH] add extra check for librt @@ -6,24 +6,26 @@ Subject: [PATCH] add extra check for librt https://jira.mariadb.org/browse/MDEV-10841 Signed-off-by: Ryan Coe +[Rebased on mariadb-10.3.30] +Signed-off-by: Peter Seiderer --- configure.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.cmake b/configure.cmake -index 896226de954f4642a238ca6a72e0930590dc1681..77ca485fb05e6b63bb69f9561b4eabfaa208a419 100644 +index 1b85c31b..4a1cd847 100644 --- a/configure.cmake +++ b/configure.cmake -@@ -126,6 +126,9 @@ IF(UNIX) +@@ -134,6 +134,9 @@ IF(UNIX) IF(NOT LIBRT) MY_SEARCH_LIBS(clock_gettime rt LIBRT) ENDIF() + IF(NOT LIBRT) + MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT) + ENDIF() + set(THREADS_PREFER_PTHREAD_FLAG ON) FIND_PACKAGE(Threads) - SET(CMAKE_REQUIRED_LIBRARIES -- -2.9.3 +2.32.0 diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 26faf529c2..4025be317f 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,6 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.28 -sha256 e8c912cae2e5800d0da364cc23437907ed4be767f2cbdf198cf3afc03db6a6a3 mariadb-10.3.28.tar.gz -sha512 f6941bcc818f9b3640e4b5fdbdd3a32b45c62c04087e583f1f0e1c0258b09a21c7639abd1c902e183c057838308ad5eedc00ffee76d44a02043e8e349015fb20 mariadb-10.3.28.tar.gz +# From https://downloads.mariadb.org/mariadb/10.3.30 +sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz +sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz # Hash for license files sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 56d6afab17..ade73ccfe0 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.28 +MARIADB_VERSION = 10.3.30 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text -- 2.30.2