Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mariadb: Update to version 10.4.21

Browse source 
Update to the latest stable version. Also contains minor Makefile
polishing - better source RL and correctly formatted license.

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
This commit is contained in:
Michal Hrusecky 2021-10-29 11:18:13 +02:00
parent 6b2535230a
commit fdda9ff98b
No known key found for this signature in database
GPG key ID: 7B7562FE6F4D91EF
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
utils/mariadb/Makefile
View file

@ -1,5 +1,6 @@
# #
# Copyright (C) 2018 Sebastian Kemper <sebastian_ml@gmx.net> # Copyright (C) 2018 Sebastian Kemper <sebastian_ml@gmx.net>
# Copyright (C) 2021 Michal Hrusecky <michal@hrusecky.net>
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,19 +9,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mariadb PKG_NAME:=mariadb
PKG_VERSION:=10.4.18 PKG_VERSION:=10.4.21
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL := \ PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source
https://mirror.netcologne.de/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \
https://mirror.lstn.net/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \
https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \
https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source
PKG_HASH:=330d9e8273002fc92f0f3f3f9b08157a3cab1265a0f114adeb6235e4283a0d3e PKG_HASH:=94dd2e6f5d286de8a7dccffe984015d4253a0568281c7440e772cfbe098a291d
PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net> PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING THIRDPARTY PKG_LICENSE_FILES:=COPYING THIRDPARTY
PKG_CPE_ID:=cpe:/a:mariadb:mariadb PKG_CPE_ID:=cpe:/a:mariadb:mariadb

2
utils/mariadb/patches/130-c11_atomics.patch
View file

@ -9,7 +9,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200
--- a/configure.cmake --- a/configure.cmake
+++ b/configure.cmake +++ b/configure.cmake
@@ -863,7 +863,25 @@ int main() @@ -866,7 +866,25 @@ int main()
long long int *ptr= &var; long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}" }"

6
utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch
View file

@ -1,6 +1,6 @@
--- a/scripts/mysqld_safe.sh --- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh
@@ -244,7 +244,7 @@ wsrep_recover_position() { @@ -246,7 +246,7 @@ wsrep_recover_position() {
return 1 return 1
fi fi
@ -9,7 +9,7 @@
local wr_options="--disable-log-error --pid-file='$wr_pidfile'" local wr_options="--disable-log-error --pid-file='$wr_pidfile'"
@@ -664,7 +664,7 @@ then @@ -666,7 +666,7 @@ then
* ) err_log="$DATADIR/$err_log" ;; * ) err_log="$DATADIR/$err_log" ;;
esac esac
else else
@ -18,7 +18,7 @@
fi fi
fi fi
@@ -743,7 +743,7 @@ fi @@ -745,7 +745,7 @@ fi
if test -z "$pid_file" if test -z "$pid_file"
then then