Updated mariadb to 10.5.11

Makefile

@@ -26,14 +26,14 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
 	ln -sv /data/etc/shadow /etc/shadow
 	mv -v /etc/gshadow /data/etc/gshadow
 	ln -sv /data/etc/gshadow /etc/gshadow
-	tar xf mariadb-10.5.8.tar.gz
-	patch -Np1 -d mariadb-10.5.8 < mariadb-10.5.8-fix_pcre2_download.patch
-	cd mariadb-10.5.8 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
-	mkdir mariadb-10.5.8/build
-	cd mariadb-10.5.8/build && cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_LAYOUT=DEB -DINSTALL_SYSCONF2DIR=/etc/my.cnf.d -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DTOKUDB_OK=0 -DWITH_WSREP=ON -DWITH_INNODB_DISALLOW_WRITES=ON ..
-	$(MAKE) -C mariadb-10.5.8/build
-	$(MAKE) -C mariadb-10.5.8/build test
-	$(MAKE) -C mariadb-10.5.8/build install
+	tar xf mariadb-10.5.11.tar.gz
+	patch -Np1 -d mariadb-10.5.11 < mariadb-10.5.11-fix_pcre2_download.patch
+	cd mariadb-10.5.11 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
+	mkdir mariadb-10.5.11/build
+	cd mariadb-10.5.11/build && cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_LAYOUT=DEB -DINSTALL_SYSCONF2DIR=/etc/my.cnf.d -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DTOKUDB_OK=0 -DWITH_WSREP=ON -DWITH_INNODB_DISALLOW_WRITES=ON ..
+	$(MAKE) -C mariadb-10.5.11/build
+	$(MAKE) -C mariadb-10.5.11/build test
+	$(MAKE) -C mariadb-10.5.11/build install
 	rm -rf /usr/mysql-test
 	@echo "$$CLIENT_CNF" > /etc/my.cnf.d/client.cnf
 	@echo "$$MYSQL_CLIENTS_CNF" > /etc/my.cnf.d/mysql-clients.cnf
@@ -60,7 +60,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
 	sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.size[*],bash -c '\''echo "select sum($$(case "$$3" in both|"") echo "data_length+index_length";; data|index) echo "$$3_length";; free) echo "data_free";; esac)) from information_schema.tables$$([[ "$$1" = "all" || ! "$$1" ]] || echo " where table_schema=\\"$$1\\"")$$([[ "$$2" = "all" || ! "$$2" ]] || echo "and table_name=\\"$$2\\"");" | mysql -u root -N'\''' -i /etc/zabbix_agentd.conf
 	sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.discovery,l=$$(echo "show databases" | mysql -u root -N);echo -n '\''{"data":['\'';for i in $${l};do echo -n "{\\"{#DBNAME}\\": \\"$$i\\"},";done|sed -e '\''s:\\},$$:\\}:'\'';echo -n '\'']}'\'';' -i /etc/zabbix_agentd.conf
 	sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.status[*],echo "show global status where Variable_name='\''\$$1'\'';" | mysql -u root -N | awk '\''{print $$$$2}'\''' -i /etc/zabbix_agentd.conf
-	rm -rf mariadb-10.5.8
+	rm -rf mariadb-10.5.11
 
 	swapoff swap
 	rm -rf swap
@@ -166,15 +166,15 @@ client: mysql-config
 	mkswap swap
 	swapon swap
 
-	tar xf mariadb-10.5.8.tar.gz
-	patch -Np1 -d mariadb-10.5.8 < mariadb-10.5.8-fix_pcre2_download.patch
-	patch -Np1 -d mariadb-10.5.8 < mariadb-10.5.8-without_server_fix.patch
-	cd mariadb-10.5.8 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
-	mkdir mariadb-10.5.8/build
-	cd mariadb-10.5.8/build && cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_LAYOUT=DEB -DINSTALL_SYSCONF2DIR=/etc/my.cnf.d -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DWITHOUT_SERVER=ON -DTOKUDB_OK=0 ..
-	$(MAKE) -C mariadb-10.5.8/build
-	$(MAKE) -C mariadb-10.5.8/build test
-	$(MAKE) -C mariadb-10.5.8/build install
+	tar xf mariadb-10.5.11.tar.gz
+	patch -Np1 -d mariadb-10.5.11 < mariadb-10.5.11-fix_pcre2_download.patch
+	patch -Np1 -d mariadb-10.5.11 < mariadb-10.5.11-without_server_fix.patch
+	cd mariadb-10.5.11 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
+	mkdir mariadb-10.5.11/build
+	cd mariadb-10.5.11/build && cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_LAYOUT=DEB -DINSTALL_SYSCONF2DIR=/etc/my.cnf.d -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DWITHOUT_SERVER=ON -DTOKUDB_OK=0 ..
+	$(MAKE) -C mariadb-10.5.11/build
+	$(MAKE) -C mariadb-10.5.11/build test
+	$(MAKE) -C mariadb-10.5.11/build install
 	rm -rf /usr/mysql-test
 	rm -f /usr/lib/tmpfiles.d/mariadb.conf
 	rm -rf /lib/systemd/system/mariadb@bootstrap.service.d
@@ -182,7 +182,7 @@ client: mysql-config
 	rm -f /lib/systemd/system/mariadb.service
 	@echo "$$MYSQL_CONFIG" > /etc/config/mysql
 	install -v -Dm755 mysql /usr/share/easycwmp/functions
-	rm -rf mariadb-10.5.8
+	rm -rf mariadb-10.5.11
 
 	swapoff swap
 	rm -rf swap
@@ -204,16 +204,16 @@ temporary:
 	mkswap swap
 	swapon swap
 
-	tar xf mariadb-10.5.8.tar.gz
-	patch -Np1 -d mariadb-10.5.8 < mariadb-10.5.8-fix_pcre2_download.patch
-	cd mariadb-10.5.8 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
-	mkdir mariadb-10.5.8/build
-	cd mariadb-10.5.8/build && cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/build/usr -DINSTALL_DOCDIR=share/doc/mariadb-10.5.8 -DINSTALL_DOCREADMEDIR=share/doc/mariadb-10.5.8 -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_MYSQLTESTDIR=share/mysql/test -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SBINDIR=sbin -DINSTALL_SCRIPTDIR=bin -DINSTALL_SQLBENCHDIR=share/mysql/bench -DINSTALL_SUPPORTFILESDIR=share/mysql -DMYSQL_DATADIR=/build/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysql.sock -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DTOKUDB_OK=0 ..
-	$(MAKE) -C mariadb-10.5.8/build
-	-$(MAKE) -C mariadb-10.5.8/build test
-	$(MAKE) -C mariadb-10.5.8/build install
+	tar xf mariadb-10.5.11.tar.gz
+	patch -Np1 -d mariadb-10.5.11 < mariadb-10.5.11-fix_pcre2_download.patch
+	cd mariadb-10.5.11 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
+	mkdir mariadb-10.5.11/build
+	cd mariadb-10.5.11/build && cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/build/usr -DINSTALL_DOCDIR=share/doc/mariadb-10.5.11 -DINSTALL_DOCREADMEDIR=share/doc/mariadb-10.5.11 -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_MYSQLTESTDIR=share/mysql/test -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SBINDIR=sbin -DINSTALL_SCRIPTDIR=bin -DINSTALL_SQLBENCHDIR=share/mysql/bench -DINSTALL_SUPPORTFILESDIR=share/mysql -DMYSQL_DATADIR=/build/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysql.sock -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DTOKUDB_OK=0 ..
+	$(MAKE) -C mariadb-10.5.11/build
+	-$(MAKE) -C mariadb-10.5.11/build test
+	$(MAKE) -C mariadb-10.5.11/build install
 	rm -rf /build/usr/share/mysql/test
-	rm -rf mariadb-10.5.8
+	rm -rf mariadb-10.5.11
 
 	/build/usr/bin/mysql_install_db --basedir=/build/usr --datadir=/build/var/lib/mysql --user=nobody
 	install -v -m755 -o nobody -g nobody -d /build/run/mysqld

mariadb-10.5.11-fix_pcre2_download.patch

+diff -uNr mariadb-10.5.11/cmake/pcre.cmake mariadb-10.5.11-fix_pcre2_download/cmake/pcre.cmake
+--- mariadb-10.5.11/cmake/pcre.cmake	2021-06-18 19:49:10.000000000 +0930
++++ mariadb-10.5.11-fix_pcre2_download/cmake/pcre.cmake	2023-07-07 17:04:49.975289791 +0930
+@@ -43,7 +43,7 @@
+   ExternalProject_Add(
+     pcre2
+     PREFIX   "${dir}"
+-    URL      "http://ftp.pcre.org/pub/pcre/pcre2-10.36.zip"
++    URL      "https://sourceforge.net/projects/pcre/files/pcre2/10.36/pcre2-10.36.zip"
+     URL_MD5  ba9e743af42aac5642f7504b12af4116
+     INSTALL_COMMAND ""
+     CMAKE_ARGS

mariadb-10.5.8-without_server_fix.patch → mariadb-10.5.11-without_server_fix.patch

-diff -uNr mariadb-10.5.8/plugin/handler_socket/libhsclient/auto_addrinfo.hpp mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp
---- mariadb-10.5.8/plugin/handler_socket/libhsclient/auto_addrinfo.hpp	2020-11-10 23:44:59.000000000 +1030
-+++ mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp	2021-01-22 18:51:43.799497705 +1030
+diff -uNr mariadb-10.5.11/plugin/handler_socket/libhsclient/auto_addrinfo.hpp mariadb-10.5.11-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp
+--- mariadb-10.5.11/plugin/handler_socket/libhsclient/auto_addrinfo.hpp	2021-06-18 19:49:11.000000000 +0930
++++ mariadb-10.5.11-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp	2023-07-07 17:07:47.177629036 +0930
 @@ -9,7 +9,8 @@
  #ifndef DENA_AUTO_ADDRINFO_HPP
  #define DENA_AUTO_ADDRINFO_HPP
@@ -11,9 +11,9 @@ diff -uNr mariadb-10.5.8/plugin/handler_socket/libhsclient/auto_addrinfo.hpp mar
  #include <sys/socket.h>
  #include <netdb.h>
  #include <string.h>
-diff -uNr mariadb-10.5.8/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp
---- mariadb-10.5.8/plugin/handler_socket/libhsclient/hstcpcli.cpp	2020-11-10 23:44:59.000000000 +1030
-+++ mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp	2021-01-22 18:51:43.800497708 +1030
+diff -uNr mariadb-10.5.11/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb-10.5.11-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp
+--- mariadb-10.5.11/plugin/handler_socket/libhsclient/hstcpcli.cpp	2021-06-18 19:49:11.000000000 +0930
++++ mariadb-10.5.11-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp	2023-07-07 17:07:47.177629036 +0930
 @@ -6,7 +6,8 @@
   * See COPYRIGHT.txt for details.
   */
@@ -24,9 +24,9 @@ diff -uNr mariadb-10.5.8/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb-
  #include <stdexcept>
  
  #include "hstcpcli.hpp"
-diff -uNr mariadb-10.5.8/plugin/handler_socket/libhsclient/socket.cpp mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp
---- mariadb-10.5.8/plugin/handler_socket/libhsclient/socket.cpp	2020-11-10 23:44:59.000000000 +1030
-+++ mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp	2021-01-22 18:51:43.800497708 +1030
+diff -uNr mariadb-10.5.11/plugin/handler_socket/libhsclient/socket.cpp mariadb-10.5.11-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp
+--- mariadb-10.5.11/plugin/handler_socket/libhsclient/socket.cpp	2021-06-18 19:49:11.000000000 +0930
++++ mariadb-10.5.11-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp	2023-07-07 17:07:47.177629036 +0930
 @@ -6,10 +6,13 @@
   * See COPYRIGHT.txt for details.
   */

mariadb-10.5.8-fix_pcre2_download.patch

-diff -uNr mariadb-10.5.8/cmake/pcre.cmake mariadb-10.5.8-fix_pcre2_download/cmake/pcre.cmake
---- mariadb-10.5.8/cmake/pcre.cmake	2020-11-10 23:44:53.000000000 +1030
-+++ mariadb-10.5.8-fix_pcre2_download/cmake/pcre.cmake	2021-11-05 20:12:37.509572882 +1030
-@@ -36,7 +36,7 @@
-   ExternalProject_Add(
-     pcre2
-     PREFIX   "${dir}"
--    URL      "http://ftp.pcre.org/pub/pcre/pcre2-10.34.zip"
-+    URL      "https://sourceforge.net/projects/pcre/files/pcre2/10.34/pcre2-10.34.zip"
-     URL_MD5  fdb10dba7f3be43730966bebdd3755ef
-     INSTALL_COMMAND ""
-     CMAKE_ARGS