commit 685ba50022926bccb19ad635ee8c0be51c32d587 Author: Juergen Daubert <jue@jue.li> Date: Thu Aug 24 12:38:14 2023 +0200 mariadb: update to 11.1.2 diff --git a/mariadb/.footprint b/mariadb/.footprint index cd1bb6140..fd6049867 100644 --- a/mariadb/.footprint +++ b/mariadb/.footprint @@ -284,6 +284,7 @@ drwxr-xr-x root/root usr/include/mysql/server/private/atomic/ -rw-r--r-- root/root usr/include/mysql/server/private/grant.h -rw-r--r-- root/root usr/include/mysql/server/private/group_by_handler.h -rw-r--r-- root/root usr/include/mysql/server/private/gstream.h +-rw-r--r-- root/root usr/include/mysql/server/private/ha_handler_stats.h -rw-r--r-- root/root usr/include/mysql/server/private/ha_partition.h -rw-r--r-- root/root usr/include/mysql/server/private/ha_sequence.h -rw-r--r-- root/root usr/include/mysql/server/private/handle_connections_win.h @@ -309,6 +310,8 @@ drwxr-xr-x root/root usr/include/mysql/server/private/atomic/ -rw-r--r-- root/root usr/include/mysql/server/private/item_vers.h -rw-r--r-- root/root usr/include/mysql/server/private/item_windowfunc.h -rw-r--r-- root/root usr/include/mysql/server/private/item_xmlfunc.h +-rw-r--r-- root/root usr/include/mysql/server/private/json_schema.h +-rw-r--r-- root/root usr/include/mysql/server/private/json_schema_helper.h -rw-r--r-- root/root usr/include/mysql/server/private/json_table.h -rw-r--r-- root/root usr/include/mysql/server/private/key.h -rw-r--r-- root/root usr/include/mysql/server/private/keycaches.h @@ -367,6 +370,7 @@ drwxr-xr-x root/root usr/include/mysql/server/private/atomic/ -rw-r--r-- root/root usr/include/mysql/server/private/mysys_err.h -rw-r--r-- root/root usr/include/mysql/server/private/opt_histogram_json.h -rw-r--r-- root/root usr/include/mysql/server/private/opt_range.h +-rw-r--r-- root/root usr/include/mysql/server/private/opt_rewrite_date_cmp.h -rw-r--r-- root/root usr/include/mysql/server/private/opt_subselect.h -rw-r--r-- root/root usr/include/mysql/server/private/opt_trace.h -rw-r--r-- root/root usr/include/mysql/server/private/opt_trace_context.h @@ -653,6 +657,7 @@ drwxr-xr-x root/root usr/lib/mysql/plugin/auth_pam_tool_dir/ -rwxr-xr-x root/root usr/lib/mysql/plugin/test_sql_service.so -rwxr-xr-x root/root usr/lib/mysql/plugin/test_versioning.so -rwxr-xr-x root/root usr/lib/mysql/plugin/type_mysql_json.so +-rwxr-xr-x root/root usr/lib/mysql/plugin/type_mysql_timestamp.so -rwxr-xr-x root/root usr/lib/mysql/plugin/type_test.so -rwxr-xr-x root/root usr/lib/mysql/plugin/wsrep_info.so -rwxr-xr-x root/root usr/lib/mysql/plugin/zstd.so @@ -887,54 +892,54 @@ drwxr-xr-x root/root usr/share/man/man3/ drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/mariadbd.8.gz -rw-r--r-- root/root usr/share/man/man8/mysqld.8.gz -drwxr-xr-x root/root usr/share/mysql/ --rwxr-xr-x root/root usr/share/mysql/binary-configure -drwxr-xr-x root/root usr/share/mysql/charsets/ --rw-r--r-- root/root usr/share/mysql/charsets/Index.xml --rw-r--r-- root/root usr/share/mysql/charsets/README --rw-r--r-- root/root usr/share/mysql/charsets/armscii8.xml --rw-r--r-- root/root usr/share/mysql/charsets/ascii.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp1250.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp1251.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp1256.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp1257.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp850.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp852.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp866.xml --rw-r--r-- root/root usr/share/mysql/charsets/dec8.xml --rw-r--r-- root/root usr/share/mysql/charsets/geostd8.xml --rw-r--r-- root/root usr/share/mysql/charsets/greek.xml --rw-r--r-- root/root usr/share/mysql/charsets/hebrew.xml --rw-r--r-- root/root usr/share/mysql/charsets/hp8.xml --rw-r--r-- root/root usr/share/mysql/charsets/keybcs2.xml --rw-r--r-- root/root usr/share/mysql/charsets/koi8r.xml --rw-r--r-- root/root usr/share/mysql/charsets/koi8u.xml --rw-r--r-- root/root usr/share/mysql/charsets/latin1.xml --rw-r--r-- root/root usr/share/mysql/charsets/latin2.xml --rw-r--r-- root/root usr/share/mysql/charsets/latin5.xml --rw-r--r-- root/root usr/share/mysql/charsets/latin7.xml --rw-r--r-- root/root usr/share/mysql/charsets/macce.xml --rw-r--r-- root/root usr/share/mysql/charsets/macroman.xml --rw-r--r-- root/root usr/share/mysql/charsets/swe7.xml -drwxr-xr-x root/root usr/share/mysql/english/ --rw-r--r-- root/root usr/share/mysql/english/errmsg.sys --rw-r--r-- root/root usr/share/mysql/errmsg-utf8.txt --rw-r--r-- root/root usr/share/mysql/fill_help_tables.sql --rw-r--r-- root/root usr/share/mysql/magic --rw-r--r-- root/root usr/share/mysql/maria_add_gis_sp.sql --rw-r--r-- root/root usr/share/mysql/maria_add_gis_sp_bootstrap.sql --rwxr-xr-x root/root usr/share/mysql/mariadb.logrotate --rwxr-xr-x root/root usr/share/mysql/mini-benchmark --rwxr-xr-x root/root usr/share/mysql/mysql.server --rw-r--r-- root/root usr/share/mysql/mysql_performance_tables.sql --rw-r--r-- root/root usr/share/mysql/mysql_sys_schema.sql --rw-r--r-- root/root usr/share/mysql/mysql_system_tables.sql --rw-r--r-- root/root usr/share/mysql/mysql_system_tables_data.sql --rw-r--r-- root/root usr/share/mysql/mysql_test_data_timezone.sql --rw-r--r-- root/root usr/share/mysql/mysql_test_db.sql --rwxr-xr-x root/root usr/share/mysql/mysqld_multi.server --rw-r--r-- root/root usr/share/mysql/wsrep.cnf --rwxr-xr-x root/root usr/share/mysql/wsrep_notify +drwxr-xr-x root/root usr/share/mariadb/ +-rwxr-xr-x root/root usr/share/mariadb/binary-configure +drwxr-xr-x root/root usr/share/mariadb/charsets/ +-rw-r--r-- root/root usr/share/mariadb/charsets/Index.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/README +-rw-r--r-- root/root usr/share/mariadb/charsets/armscii8.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/ascii.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/cp1250.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/cp1251.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/cp1256.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/cp1257.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/cp850.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/cp852.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/cp866.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/dec8.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/geostd8.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/greek.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/hebrew.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/hp8.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/keybcs2.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/koi8r.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/koi8u.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/latin1.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/latin2.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/latin5.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/latin7.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/macce.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/macroman.xml +-rw-r--r-- root/root usr/share/mariadb/charsets/swe7.xml +drwxr-xr-x root/root usr/share/mariadb/english/ +-rw-r--r-- root/root usr/share/mariadb/english/errmsg.sys +-rw-r--r-- root/root usr/share/mariadb/errmsg-utf8.txt +-rw-r--r-- root/root usr/share/mariadb/fill_help_tables.sql +-rw-r--r-- root/root usr/share/mariadb/magic +-rw-r--r-- root/root usr/share/mariadb/maria_add_gis_sp.sql +-rw-r--r-- root/root usr/share/mariadb/maria_add_gis_sp_bootstrap.sql +-rwxr-xr-x root/root usr/share/mariadb/mariadb.logrotate +-rw-r--r-- root/root usr/share/mariadb/mariadb_performance_tables.sql +-rw-r--r-- root/root usr/share/mariadb/mariadb_sys_schema.sql +-rw-r--r-- root/root usr/share/mariadb/mariadb_system_tables.sql +-rw-r--r-- root/root usr/share/mariadb/mariadb_system_tables_data.sql +-rw-r--r-- root/root usr/share/mariadb/mariadb_test_data_timezone.sql +-rw-r--r-- root/root usr/share/mariadb/mariadb_test_db.sql +-rwxr-xr-x root/root usr/share/mariadb/mini-benchmark +-rwxr-xr-x root/root usr/share/mariadb/mysql.server +-rwxr-xr-x root/root usr/share/mariadb/mysqld_multi.server +-rw-r--r-- root/root usr/share/mariadb/wsrep.cnf +-rwxr-xr-x root/root usr/share/mariadb/wsrep_notify drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwx------ mysql/mysql var/lib/mysql/ diff --git a/mariadb/.signature b/mariadb/.signature index 97d99c7b2..d64635469 100644 --- a/mariadb/.signature +++ b/mariadb/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bzLBLx/u2GbN/8d6Zpi9qzwUoMthpbR0PAne+LJNULee9IfIdUt0aizioZHrGAi5hQC/K73VEvD2dE1QO+E3AI= -SHA256 (Pkgfile) = 8359317cf98f374d5b663dd80ef240f8c08b2360f94fe0a581fa331e750bc6b4 -SHA256 (.footprint) = c19be49d62ba2b97c523d4db3526f97fcd585bb84e978127fe0bd3bdea56be81 -SHA256 (mariadb-11.0.3.tar.gz) = 529f08a064ee7733a136ec474a4239e8ac9bd6db139b8ba70bff8a7f1303839a -SHA256 (mariadb.rc) = f0b6fe3b360fcc03c4fae19d5505859b475d8db1630d95e521e5da7b7561bf04 +RWSE3ohX2g5d/Q2VfxevJL5FO3y6W1lcNhhYSVJVgrVUZo9PPfnVN3VD7e/6CsCcTGHdTlpSv82awf2c7WMjXlyLMr3/SWT+vAc= +SHA256 (Pkgfile) = c1d8128ab2d43583e2c6285935dfe31b1e446a51376af4da4f388b1258b9c0de +SHA256 (.footprint) = 8a5a858d9ef0e0b8a25d00353fddaa7b949649dc6c9c1324e165266d00bf9b1c +SHA256 (mariadb-11.1.2.tar.gz) = 19a9e980e57fa332931f643b48ad7390528c889ff6ea8b0e16fd306aa3088238 +SHA256 (mariadb.rc) = b3d961298be090b0ade59b66e05b0e9c4f48bde43e38506cdaba9191fe78fd09 SHA256 (mariadb.pam) = 962b53d37719ed4798643a8fe3557454d23f74c2b14f1dfc1c1c67d361cab891 SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c diff --git a/mariadb/Pkgfile b/mariadb/Pkgfile index ff6fa1042..19e10f019 100644 --- a/mariadb/Pkgfile +++ b/mariadb/Pkgfile @@ -4,7 +4,7 @@ # Depends on: fmt libaio libpcre2 linux-pam ncurses openssl zlib name=mariadb -version=11.0.3 +version=11.1.2 release=1 source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.... mariadb.rc mariadb.pam @@ -37,10 +37,10 @@ build() { DESTDIR=$PKG cmake --install build rm -r $PKG/etc/{init.d,logrotate.d} - rm -r $PKG/usr/share/{doc,groonga*,mysql-test} + rm -r $PKG/usr/share/{doc,groonga*,mariadb-test} rm $PKG/usr/sbin/rcmysql rm $PKG/usr/share/man/man1/mysql-test-run.pl.1 - find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \; + find $PKG/usr/share/mariadb/* -type d ! -name english ! -name charsets | xargs rm -rf {} \; install -d -m 700 -o mysql -g mysql $PKG/var/{lib,log}/mysql diff --git a/mariadb/mariadb.rc b/mariadb/mariadb.rc index 74c7bb8cd..8f5fbbabc 100644 --- a/mariadb/mariadb.rc +++ b/mariadb/mariadb.rc @@ -4,7 +4,7 @@ # SSD=/sbin/start-stop-daemon -PROG=/usr/sbin/mysqld +PROG=/usr/sbin/mariadbd NAME=mysqld PID=/run/mysqld/mysqld.pid OPTS="--pid-file=$PID --user=mysql"