From 11ebd5c1181db6b5e1335cc0e256b337c98729f7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:36:09 +0100 Subject: [PATCH 01/31] Remove package: mysql --- common/shlibs | 4 +- srcpkgs/libmysqlclient | 1 - srcpkgs/libmysqlclient-devel | 1 - srcpkgs/mysql-client | 1 - srcpkgs/mysql/INSTALL | 9 -- srcpkgs/mysql/files/my.cnf | 145 ------------------ srcpkgs/mysql/files/mysqld/log/run | 2 - srcpkgs/mysql/files/mysqld/run | 4 - .../mysql/patches/gcc7-compare-pointer.patch | 12 -- srcpkgs/mysql/patches/musl.patch | 13 -- srcpkgs/mysql/template | 131 ---------------- srcpkgs/mysql/update | 2 - 12 files changed, 2 insertions(+), 323 deletions(-) delete mode 120000 srcpkgs/libmysqlclient delete mode 120000 srcpkgs/libmysqlclient-devel delete mode 120000 srcpkgs/mysql-client delete mode 100644 srcpkgs/mysql/INSTALL delete mode 100644 srcpkgs/mysql/files/my.cnf delete mode 100755 srcpkgs/mysql/files/mysqld/log/run delete mode 100755 srcpkgs/mysql/files/mysqld/run delete mode 100644 srcpkgs/mysql/patches/gcc7-compare-pointer.patch delete mode 100644 srcpkgs/mysql/patches/musl.patch delete mode 100644 srcpkgs/mysql/template delete mode 100644 srcpkgs/mysql/update diff --git a/common/shlibs b/common/shlibs index 1523374f949..eb793e1ed1a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -582,8 +582,8 @@ libecpg.so.6 postgresql-libs-8.4.2_1 libpgtypes.so.3 postgresql-libs-8.4.2_1 libpq.so.5 postgresql-libs-8.4.2_1 libmypaint-1.5.so.1 libmypaint-1.5.1_1 -libmysqlclient_r.so.18 libmysqlclient-5.5.27_1 -libmysqlclient.so.18 libmysqlclient-5.5.27_1 +libmysqlclient_r.so.18 libmariadbclient-10.1.47_1 +libmysqlclient.so.18 libmariadbclient-10.1.47_1 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1 libgssrpc.so.4 mit-krb5-libs-1.8_1 libk5crypto.so.3 mit-krb5-libs-1.8_1 diff --git a/srcpkgs/libmysqlclient b/srcpkgs/libmysqlclient deleted file mode 120000 index 0d46ca32142..00000000000 --- a/srcpkgs/libmysqlclient +++ /dev/null @@ -1 +0,0 @@ -mysql \ No newline at end of file diff --git a/srcpkgs/libmysqlclient-devel b/srcpkgs/libmysqlclient-devel deleted file mode 120000 index 0d46ca32142..00000000000 --- a/srcpkgs/libmysqlclient-devel +++ /dev/null @@ -1 +0,0 @@ -mysql \ No newline at end of file diff --git a/srcpkgs/mysql-client b/srcpkgs/mysql-client deleted file mode 120000 index 0d46ca32142..00000000000 --- a/srcpkgs/mysql-client +++ /dev/null @@ -1 +0,0 @@ -mysql \ No newline at end of file diff --git a/srcpkgs/mysql/INSTALL b/srcpkgs/mysql/INSTALL deleted file mode 100644 index 4ce513cca4a..00000000000 --- a/srcpkgs/mysql/INSTALL +++ /dev/null @@ -1,9 +0,0 @@ -# *-*-shell-*-* -# -case ${ACTION} in -post) - install -dm0700 var/lib/mysql - usr/bin/mysql_install_db --user=mysql --keep-my-cnf --basedir=/usr --datadir=/var/lib/mysql - chown -R mysql:mysql var/lib/mysql - ;; -esac diff --git a/srcpkgs/mysql/files/my.cnf b/srcpkgs/mysql/files/my.cnf deleted file mode 100644 index 3870208583f..00000000000 --- a/srcpkgs/mysql/files/my.cnf +++ /dev/null @@ -1,145 +0,0 @@ -# MySQL config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) -# -# MySQL programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, see: -# http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /run/mysqld/mysqld.sock - -# Here follows entries for some specific programs - -# The MySQL server -[mysqld] -port = 3306 -socket = /run/mysqld/mysqld.sock -datadir = /var/lib/mysql -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, -# MASTER_USER=, MASTER_PASSWORD= ; -# -# where you replace , , by quoted strings and -# by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /var/lib/mysql -#innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -#innodb_buffer_pool_size = 16M -#innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -#innodb_log_file_size = 5M -#innodb_log_buffer_size = 8M -#innodb_flush_log_at_trx_commit = 1 -#innodb_lock_wait_timeout = 50 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/srcpkgs/mysql/files/mysqld/log/run b/srcpkgs/mysql/files/mysqld/log/run deleted file mode 100755 index b36c4dafa40..00000000000 --- a/srcpkgs/mysql/files/mysqld/log/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec logger -p daemon.notice diff --git a/srcpkgs/mysql/files/mysqld/run b/srcpkgs/mysql/files/mysqld/run deleted file mode 100755 index bc16a07883e..00000000000 --- a/srcpkgs/mysql/files/mysqld/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -[ ! -d /run/mysqld ] && mkdir -p /run/mysqld -chown mysql:mysql /run/mysqld -exec chpst -u mysql:mysql mysqld --user=mysql 2>&1 diff --git a/srcpkgs/mysql/patches/gcc7-compare-pointer.patch b/srcpkgs/mysql/patches/gcc7-compare-pointer.patch deleted file mode 100644 index 0b01a6ea719..00000000000 --- a/srcpkgs/mysql/patches/gcc7-compare-pointer.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- sql-common/client_authentication.cc 2016-03-03 16:35:33.000000000 +0100 -+++ sql-common/client_authentication.cc 2017-05-09 16:14:10.298254686 +0200 -@@ -83,8 +83,7 @@ - FILE *pub_key_file= NULL; - - if (mysql->options.extension != NULL && -- mysql->options.extension->server_public_key_path != NULL && -- mysql->options.extension->server_public_key_path != '\0') -+ mysql->options.extension->server_public_key_path != NULL) - { - pub_key_file= fopen(mysql->options.extension->server_public_key_path, - "r"); diff --git a/srcpkgs/mysql/patches/musl.patch b/srcpkgs/mysql/patches/musl.patch deleted file mode 100644 index f22b7c90383..00000000000 --- a/srcpkgs/mysql/patches/musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -musl only support NPTL, so that remove that old stuff. - ---- mysys/stacktrace.c.orig 2015-05-08 18:43:01.661343605 +0200 -+++ mysys/stacktrace.c 2015-05-08 18:43:13.669331612 +0200 -@@ -355,7 +355,7 @@ void my_print_stacktrace(uchar* stack_bo - #endif /* __alpha__ */ - - /* We are 1 frame above signal frame with NPTL and 2 frames above with LT */ -- sigreturn_frame_count = thd_lib_detected == THD_LIB_LT ? 2 : 1; -+ sigreturn_frame_count = 2; - - while (fp < (uchar**) stack_bottom) - { diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template deleted file mode 100644 index 9cf9de53b7f..00000000000 --- a/srcpkgs/mysql/template +++ /dev/null @@ -1,131 +0,0 @@ -# Template file for 'mysql' -pkgname=mysql -version=5.6.43 -revision=4 -build_style=cmake -configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql - -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 - -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON - -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man - -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin - -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql - -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql - -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql - -DWITH_ZLIB=system -DWITH_SSL=system -DWITH_LIBWRAP=OFF - -DWITH_EXTRA_CHARSETS=complex -DWITH_EMBEDDED_SERVER=ON - -DWITH_INNOBASE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 - -DSTACK_DIRECTION=1 -DHAVE_LLVM_LIBCPP_EXITCODE=0" -hostmakedepends="perl bison ncurses-devel" -makedepends="zlib-devel libressl-devel readline-devel" -depends="mysql-client" -conf_files="/etc/mysql/my.cnf" -short_desc="World's most popular open source database" -maintainer="Orphaned " -license="GPL-2.0-only" -homepage="https://www.mysql.com/products/community/" -distfiles="http://dev.mysql.com/get/Downloads/MySQL-${version%.*}/mysql-${version}.tar.gz" -checksum=1c95800bf0e1b7a19a37d37fbc5023af85c6bc0b41532433b3a886263a1673ef -system_accounts="mysql" -mysql_homedir="/var/lib/mysql" -lib32disabled=yes - -CFLAGS="-D__STDC_ISO_10646__" -if [ "$CROSS_BUILD" ]; then - configure_args+=" -DHAVE_LLVM_LIBCPP_EXITCODE=1" - configure_args+=" -DHAVE_LLVM_LIBCPP_EXITCODE__TRYRUN_OUTPUT=0" -fi - -pre_configure() { - # libressl major detection. - sed -i '/OPENSSL_MAJOR_VERSION/s/1/2/' cmake/ssl.cmake - sed -i 's/sys\/poll\.h/poll.h/' include/my_net.h - - # We need some host binaries before starting cross compilation. - if [ "$CROSS_BUILD" ]; then - CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake . - make comp_err comp_sql gen_lex_hash gen_lex_token - mkdir -p bin.host/{extra,scripts,sql} - cp extra/comp_err bin.host/extra - cp scripts/comp_sql bin.host/scripts - cp sql/gen_lex_hash bin.host/sql - cp sql/gen_lex_token bin.host/sql - make clean - # Remove the rules for the host binaries to not - # have them overwritten with target binaries - rm CMakeCache.txt - vsed -i ${wrksrc}/scripts/CMakeLists.txt \ - -e "/ADD_EXECUTABLE(comp_sql/d" - vsed -i ${wrksrc}/sql/CMakeLists.txt \ - -e "/ADD_EXECUTABLE(gen_lex_hash/d" \ - -e "/ADD_EXECUTABLE(gen_lex_token/d" \ - -e "/ADD_DEPENDENCIES(gen_lex_token/d" - fi -} - -pre_build() { - if [ "$CROSS_BUILD" ]; then - mkdir -p ${wrksrc}/build - cp -a ${wrksrc}/bin.host/* ${wrksrc}/build - mkdir -p ${wrksrc}/build/libmysqld - cp ${wrksrc}/bin.host/sql/gen_lex_token ${wrksrc}/build/libmysqld - export PATH=${PATH}:${wrksrc}/build/extra:${wrksrc}/build/scripts:${wrksrc}/build/sql - fi -} - -post_install() { - # Remove unneeded stuff. - rm -rf ${DESTDIR}/usr/{sql-bench,mysql-test,data} - rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1 - - # Configuration file. - vinstall ${FILESDIR}/my.cnf 640 etc/mysql - - # runit service - vsv mysqld -} - -libmysqlclient_package() { - short_desc+=" - client library" - pkg_install() { - vmove "usr/lib/libmysqlclient*.so.*" - } -} - -libmysqlclient-devel_package() { - depends="libmysqlclient>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/mysql_config - vmove usr/share/man/man1/mysql_config.1 - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - } -} - -mysql-client_package() { - depends="perl" - short_desc+=" - database client binaries" - pkg_install() { - for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \ - mysql_client_test_embedded mysqldumpslow mysqlbinlog \ - mysql_find_rows mysql_fix_extensions mysql_waitpid mysqlaccess \ - mysqladmin mysqlanalyze mysqlbug mysqlcheck mysqldump \ - mysqlimport mysqloptimize mysqlrepair mysqlreport mysqlshow \ - mysqlslap mysqltest_embedded mysqlmanager mysqltest \ - mysqlhotcopy mysql_upgrade mysql_zap; do - if [ -f ${DESTDIR}/usr/bin/${f} ]; then - vmove usr/bin/${f} - elif [ -f ${DESTDIR}/usr/sbin/${f} ]; then - vmove usr/sbin/${f} - fi - if [ -f ${DESTDIR}/usr/share/man/man1/${f}.1 ]; then - vmove usr/share/man/man1/${f}.1 - elif [ -f ${DESTDIR}/usr/share/man/man8/${f}.8 ]; then - vmove usr/share/man/man8/${f}.8 - fi - done - } -} diff --git a/srcpkgs/mysql/update b/srcpkgs/mysql/update deleted file mode 100644 index da80797cf4a..00000000000 --- a/srcpkgs/mysql/update +++ /dev/null @@ -1,2 +0,0 @@ -site='http://dev.mysql.com/downloads/mysql/' -pattern='MySQL Community Server \K[\d.]+' From 99891b3bf98058821787562ac3975a7e6c2dd762 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:37:41 +0100 Subject: [PATCH 02/31] ampache: depend on mariadb instead of mysql --- srcpkgs/ampache/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template index f7f50a256aa..b54f6386506 100644 --- a/srcpkgs/ampache/template +++ b/srcpkgs/ampache/template @@ -4,7 +4,7 @@ version=4.2.3 revision=1 create_wrksrc=yes hostmakedepends="unzip" -depends="php mysql" +depends="php mariadb" short_desc="Web-based tool for managing your audio/video files" maintainer="Steve Prybylski " license="AGPL-3.0-or-later" From d4e8b15704742ba4a0e10276dc3d557b15992aef Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:39:12 +0100 Subject: [PATCH 03/31] collectd: build against mariadbclient instead of mysql --- srcpkgs/collectd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 993f60e0b55..531f2e3a72f 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,7 +1,7 @@ # Template file for 'collectd' pkgname=collectd version=5.12.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt @@ -13,7 +13,7 @@ conf_files="/etc/collectd.conf" hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel" makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel - libgcrypt-devel libmysqlclient-devel libltdl-devel libvirt-devel + libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel) $(vopt_if prometheus 'protobuf-c-devel libmicrohttpd-devel')" short_desc="Daemon which collects system performance statistics periodically" From 70a48bf7984dd42f203a5b3370012e83f181c5c6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:40:01 +0100 Subject: [PATCH 04/31] apr-util: build against mariadbclient instead of mysql --- srcpkgs/apr-util/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index e78d1ee2714..db439b515e4 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -1,7 +1,7 @@ # Template file for 'apr-util' pkgname=apr-util version=1.6.1 -revision=9 +revision=10 build_style=gnu-configure configure_args=" --with-pgsql --with-ldap @@ -11,7 +11,7 @@ configure_args=" --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso" hostmakedepends="libtool apr-devel" makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel - gdbm-devel libldap-devel libmysqlclient-devel unixodbc-devel + gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel postgresql-libs-devel sqlite-devel" short_desc="Apache Portable Runtime Utility Library" maintainer="Orphaned " From f72687bee5f74091bfa7da188b1885d9bf31b0e7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:42:14 +0100 Subject: [PATCH 05/31] cyrus-sasl: build against mariadbclient instead of mysql --- srcpkgs/cyrus-sasl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index 5ee15f8355b..48221b0789f 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -1,7 +1,7 @@ # Template file for 'cyrus-sasl' pkgname=cyrus-sasl version=2.1.27 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-static --enable-shared --enable-checkapop --enable-cram --enable-digest --disable-otp --disable-srp @@ -14,7 +14,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop hostmakedepends="automake libtool groff pkg-config" makedepends="libsasl-devel libressl-devel db-devel libldap-devel mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel - libmysqlclient-devel" + libmariadbclient-devel" depends="libsasl>=${version}" short_desc="Cyrus SASL - auth daemon and administration tools" maintainer="Orphaned " From 8c3ba37e9469ac48440d1b8b046a67f08cc2d6e9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:43:03 +0100 Subject: [PATCH 06/31] dovecot: build against mariadbclient instead of mysql --- srcpkgs/dovecot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index b3e60a74614..815ef8f2546 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -11,7 +11,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin" hostmakedepends="pkg-config perl" makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel - mit-krb5-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel + mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel libsodium-devel" short_desc="IMAP and POP3 server written with security primarily in mind" From e757e72f4f38a237933589d04166cfe87a589948 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:43:46 +0100 Subject: [PATCH 07/31] icinga2: build against mariadbclient instead of mysql --- srcpkgs/icinga2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index 5d657999287..20fe23ad04d 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -1,14 +1,14 @@ # Template file for 'icinga2' pkgname=icinga2 version=2.9.3 -revision=3 +revision=4 build_style=cmake build_helper="qemu" configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/" hostmakedepends="flex git" -makedepends="libressl-devel boost-devel libmysqlclient-devel libedit-devel +makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel yajl-devel postgresql-libs-devel" depends="monitoring-plugins" conf_files="/etc/${pkgname}/*.conf From 8b6d962f883d7e04d38cabefba95cc0c094dc5c1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:44:41 +0100 Subject: [PATCH 08/31] kexi: build against mariadbclient instead of mysql --- srcpkgs/kexi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kexi/template b/srcpkgs/kexi/template index e6818b5ce0f..28d4a358ac6 100644 --- a/srcpkgs/kexi/template +++ b/srcpkgs/kexi/template @@ -1,11 +1,11 @@ # Template file for 'kexi' pkgname=kexi version=3.2.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules gettext kdoctools doxygen pkg-config" makedepends="ktexteditor-devel kdb-devel kreport-devel qt5-webkit-devel - breeze-icons postgresql-libs-devel libmysqlclient-devel marble5-devel" + breeze-icons postgresql-libs-devel libmariadbclient-devel marble5-devel" depends="breeze-icons" short_desc="Visual database applications creator" maintainer="John " From 578ae033d504f35069b3471206be0135d17975c5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:45:21 +0100 Subject: [PATCH 09/31] kmail: depend on mariadb instead of mysql --- srcpkgs/kmail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template index 5e98eb1b862..aebe27f995e 100644 --- a/srcpkgs/kmail/template +++ b/srcpkgs/kmail/template @@ -8,7 +8,7 @@ hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel" -depends="kdepim-runtime kmail-account-wizard mysql akonadi-import-wizard +depends="kdepim-runtime kmail-account-wizard mariadb akonadi-import-wizard pim-data-exporter" short_desc="KDE Mail Client" maintainer="John " From 4248958ccf5008f466640f9b48e51ff9c079f95c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:46:04 +0100 Subject: [PATCH 10/31] kodi-rpi: build against mariadbclient instead of mysql --- srcpkgs/kodi-rpi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 3d1cc29102d..d69ef928f5b 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -20,12 +20,12 @@ archs="armv6l* armv7l*" hostmakedepends=" automake libtool pkg-config gperf cmake zip unzip nasm yasm - gettext-devel libltdl-devel python-devel libmysqlclient-devel + gettext-devel libltdl-devel python-devel libmariadbclient-devel SDL2_image-devel lzo-devel flatbuffers swig openjdk11" makedepends=" libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel - libmysqlclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel + libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel From b6c6de5a1ac4dc9896aaba00a86093446ed32c41 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:47:15 +0100 Subject: [PATCH 11/31] kodi: build against mariadbclient instead of mysql --- srcpkgs/kodi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index e40e41eb06e..f82aa332575 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=18.9 -revision=4 +revision=5 _codename="Leia" wrksrc="xbmc-${version}-${_codename}" build_style=cmake @@ -27,7 +27,7 @@ hostmakedepends=" makedepends=" eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel - libmysqlclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel + libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel @@ -45,7 +45,7 @@ depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo" case "$XBPS_TARGET_MACHINE" in aarch64*) - hostmakedepends+=" libmysqlclient-devel SDL2_image-devel lzo-devel" + hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel" makedepends+=" python-devel ffmpeg-devel" configure_args+=" -DENABLE_VAAPI=OFF" ;; From c544cb963e92a7538410cfb0453193abecc619af Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:48:51 +0100 Subject: [PATCH 12/31] libgda: build against mariadbclient instead of mysql --- srcpkgs/libgda/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template index 1f774bc71ff..e9b9b05a776 100644 --- a/srcpkgs/libgda/template +++ b/srcpkgs/libgda/template @@ -1,7 +1,7 @@ # Template file for 'libgda' pkgname=libgda version=5.2.9 -revision=2 +revision=3 build_style=gnu-configure build_helper="gir" configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json @@ -10,7 +10,7 @@ hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recod makedepends="gtk+3-devel libxml2-devel libxslt-devel libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel - json-glib-devel readline-devel libmysqlclient-devel" + json-glib-devel readline-devel libmariadbclient-devel" conf_files="/etc/libgda-5.0/config" short_desc="Database and data abstraction layer" maintainer="Orphaned " From c176cb4e7ee850e1ceddef335a7776616cd1eff1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:50:22 +0100 Subject: [PATCH 13/31] lua54-luadbi: build against mariadbclient instead of mysql --- srcpkgs/lua54-luadbi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template index 36c0f892501..b1c4bb6070b 100644 --- a/srcpkgs/lua54-luadbi/template +++ b/srcpkgs/lua54-luadbi/template @@ -5,7 +5,7 @@ revision=4 wrksrc="luadbi-${version}" create_wrksrc="yes" makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel - postgresql-libs-devel libmysqlclient-devel" + postgresql-libs-devel libmariadbclient-devel" _desc="Lua database interface library" short_desc="${_desc} (5.4.x)" maintainer="John Regan " From a678b9934928700ac399829592736180aeebf2cd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:51:42 +0100 Subject: [PATCH 14/31] mysql++: build against mariadbclient instead of mysql --- srcpkgs/mysql++/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template index ddd35bf816d..4f0a3619ad0 100644 --- a/srcpkgs/mysql++/template +++ b/srcpkgs/mysql++/template @@ -1,7 +1,7 @@ # Template file for 'mysql++' pkgname=mysql++ version=3.2.5 -revision=1 +revision=2 build_style=gnu-configure make_install_target="install_mysqlpp" makedepends="libmariadbclient-devel" @@ -17,7 +17,7 @@ if [ -n "$CROSS_BUILD" ]; then fi mysql++-devel_package() { - depends="mysql++>=${version}_${revision} libmysqlclient-devel" + depends="mysql++>=${version}_${revision} libmariadbclient-devel" short_desc+=" - development files" pkg_install() { vmkdir usr/include/mysql++ From 886159ada7cefe7e98d98d66e7f3adcb47d37d7b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:52:57 +0100 Subject: [PATCH 15/31] opensmtpd-extras: build against mariadbclient instead of mysql --- srcpkgs/opensmtpd-extras/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template index c20c3842830..164eaf6dfc5 100644 --- a/srcpkgs/opensmtpd-extras/template +++ b/srcpkgs/opensmtpd-extras/template @@ -1,14 +1,14 @@ # Template file for 'opensmtpd-extras' pkgname=opensmtpd-extras version=6.6.0 -revision=1 +revision=2 wrksrc="OpenSMTPD-extras-${version}" build_style=gnu-configure configure_args="--with-table-passwd --with-table-ldap --with-table-mysql --with-table-postgres --with-table-socketmap --with-table-sqlite" hostmakedepends="automake libtool" makedepends="libressl-devel libevent-devel postgresql-libs-devel - libmysqlclient-devel sqlite-devel" + libmariadbclient-devel sqlite-devel" depends="opensmtpd" short_desc="Free implementation of the server-side SMTP protocol - extras" maintainer="Denis Revin " From f963da69f0a9e2f2f89bd0d1a91b8ca0eadc0349 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:53:42 +0100 Subject: [PATCH 16/31] perl-DBD-mysql: build against mariadbclient instead of mysql --- srcpkgs/perl-DBD-mysql/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template index d49129716c6..a647f5bd13c 100644 --- a/srcpkgs/perl-DBD-mysql/template +++ b/srcpkgs/perl-DBD-mysql/template @@ -1,11 +1,11 @@ # Template file for 'perl-DBD-mysql' pkgname=perl-DBD-mysql version=4.050 -revision=5 +revision=6 wrksrc="DBD-mysql-${version}" build_style=perl-module hostmakedepends="perl perl-DBI perl-Devel-CheckLib" -makedepends="${hostmakedepends} libmysqlclient-devel libressl-devel zlib-devel" +makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel" depends="perl-DBI" checkdepends="perl-Test-Deep" short_desc="DBD::mysql - MySQL DBI driver" From 3cf49a860730977e80e1b63cc088911bc520cf20 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:54:06 +0100 Subject: [PATCH 17/31] php: build against mariadbclient instead of mysql --- srcpkgs/php/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 5dcb53d2c6e..3b0789d3560 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,10 +1,10 @@ # Template file for 'php' pkgname=php version=7.4.14 -revision=1 +revision=2 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel - gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel + gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel libffi-devel oniguruma-devel gd-devel" From 269c678112066fdb317a0a386462c17495e21202 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:54:29 +0100 Subject: [PATCH 18/31] postfix: build against mariadbclient instead of mysql --- srcpkgs/postfix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index 5722fe15adb..6ea99b0c26c 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,9 +1,9 @@ # Template file for 'postfix' pkgname=postfix version=3.5.9 -revision=1 +revision=2 hostmakedepends="perl m4" -makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel +makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel postgresql-libs-devel sqlite-devel" short_desc="High-performance mail transport agent" maintainer="Benjamín Albiñana " From c4c9ec4fd7a132bcb3dd8cf157e0033df77f3f1a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:55:11 +0100 Subject: [PATCH 19/31] qt5: build against mariadbclient instead of mysql --- srcpkgs/qt5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 16cf6898075..9eae8fff5b7 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -9,7 +9,7 @@ hostmakedepends="cmake clang flex perl glib-devel pkg-config makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel - libinput-devel libmng-devel libmysqlclient-devel libproxy-devel + libinput-devel libmng-devel libmariadbclient-devel libproxy-devel libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel opus-devel pciutils-devel pcre2-devel postgresql-libs-devel protobuf-devel pulseaudio-devel tslib-devel libressl-devel From 0a11d552b9cb84b80874b985790212c154f932cd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:56:01 +0100 Subject: [PATCH 20/31] rsyslog: build against mariadbclient instead of mysql --- srcpkgs/rsyslog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 07caecb9fef..3b1b62e164b 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,7 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=8.2010.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp @@ -11,7 +11,7 @@ configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql --enable-testbench" hostmakedepends="pkg-config postgresql-libs-devel" makedepends="gnutls-devel libcurl-devel libestr-devel libfastjson-devel - liblogging-devel libmysqlclient-devel mit-krb5-devel postgresql-libs-devel" + liblogging-devel libmariadbclient-devel mit-krb5-devel postgresql-libs-devel" short_desc="Enhanced multi-threaded syslog daemon" maintainer="Orphaned " license="GPL-3.0-or-later, Apache-2.0" From 675b0c82707b66c715622622ffc8f2f671bd216f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:56:39 +0100 Subject: [PATCH 21/31] slurm-wlm: build against mariadbclient instead of mysql --- srcpkgs/slurm-wlm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index d5b5880370d..4d19c3ff527 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -9,7 +9,7 @@ configure_args="--disable-static" hostmakedepends="perl cgit python pkg-config" # XXX: ofed, DataWarp, netloc, blcr makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel - ncurses-devel readline-devel libmysqlclient-devel json-c-devel libhwloc-devel + ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel freeipmi-devel" short_desc="Workload manager for Linux clusters of all sizes" maintainer="Toyam Cox " From 9f2a2d0262eb95e69e3644c2fa710f288087d471 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:57:06 +0100 Subject: [PATCH 22/31] zabbix: build against mariadbclient instead of mysql --- srcpkgs/zabbix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template index cbc49634215..a284bc590d8 100644 --- a/srcpkgs/zabbix/template +++ b/srcpkgs/zabbix/template @@ -8,8 +8,8 @@ configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp --enable-proxy" hostmakedepends="automake libtool pkg-config which" makedepends="gnutls-devel libcurl-devel libxml2-devel libevent-devel - libmysqlclient-devel net-snmp-devel pcre-devel" -depends="fping mysql" + libmariadbclient-devel net-snmp-devel pcre-devel" +depends="fping mariadb" short_desc="IT Infrastructure components availability and performance monitoring" maintainer="Orphaned " license="GPL-2.0-or-later" From 4130cd2577df997327d2958efbb47c56829ac112 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:57:48 +0100 Subject: [PATCH 23/31] kea: update mysql buildoption to use mariadb --- srcpkgs/kea/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index 78ec7c0f956..0a9c0b03ea2 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -10,7 +10,7 @@ hostmakedepends="flex bison perl pkg-config automake libtool doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme" makedepends="boost-devel log4cplus-devel python3-devel $(vopt_if botan botan-devel libressl-devel) - $(vopt_if mysql libmysqlclient-devel) + $(vopt_if mysql libmariadbclient-devel) $(vopt_if pgsql postgresql-libs-devel)" depends="libkea>=0" checkdepends="procps-ng" #needs pgrep From a22c7d6c5a5f9aac9e44b21cd53d5f874b1dfc29 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:59:05 +0100 Subject: [PATCH 24/31] monitoring-plugins: build against mariadbclient instead of mysql --- srcpkgs/monitoring-plugins/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template index fef6c01ec22..403fb939bda 100644 --- a/srcpkgs/monitoring-plugins/template +++ b/srcpkgs/monitoring-plugins/template @@ -1,11 +1,11 @@ # Template file for 'monitoring-plugins' pkgname=monitoring-plugins version=2.2 -revision=5 +revision=6 build_style=gnu-configure configure_args="--libexecdir=/usr/lib/monitoring-plugins" hostmakedepends="fping openssh postfix procps-ng smbclient" -makedepends="libldap-devel libmysqlclient-devel postgresql-libs-devel +makedepends="libldap-devel libmariadbclient-devel postgresql-libs-devel zlib-devel" depends="iputils procps-ng" #checkdepends="perl" From 2a616d199044fc80b6edcde00dc20a5840720c06 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:59:41 +0100 Subject: [PATCH 25/31] python3-mysqlclient: build against mariadbclient instead of mysql --- srcpkgs/python3-mysqlclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template index 12b06f20d65..efbda51472b 100644 --- a/srcpkgs/python3-mysqlclient/template +++ b/srcpkgs/python3-mysqlclient/template @@ -5,7 +5,7 @@ revision=4 wrksrc="mysqlclient-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -makedepends="libmysqlclient-devel python3-devel zlib-devel libressl-devel" +makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel" short_desc="Python3 interface to MySQL/MariaDB" maintainer="Alin Dobre " license="GPL-2.0-or-later" From 60f0b523f0130c5679f7f4631295f564e3e34dd2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 22:00:07 +0100 Subject: [PATCH 26/31] redland: build against mariadbclient instead of mysql --- srcpkgs/redland/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template index f5c6ce862a6..44c897bd53e 100644 --- a/srcpkgs/redland/template +++ b/srcpkgs/redland/template @@ -8,7 +8,7 @@ build_style=gnu-configure configure_args="--disable-static --enable-release --with-raptor=system --with-rasqal=system --with-sqlite=3" hostmakedepends="pkg-config perl postgresql-libs-devel" -makedepends="libltdl-devel db-devel rasqal-devel libmysqlclient-devel +makedepends="libltdl-devel db-devel rasqal-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel unixodbc-devel" maintainer="Orphaned " short_desc="${_desc} - Utilities" From 8416724d9d017272a4631ba5ec5ac85f013d4f04 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 22:00:33 +0100 Subject: [PATCH 27/31] thc-hydra: build against mariadbclient instead of mysql --- srcpkgs/thc-hydra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template index 36ca7e046e2..19a37248d13 100644 --- a/srcpkgs/thc-hydra/template +++ b/srcpkgs/thc-hydra/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure make_install_args="MANDIR=/share/man/man1" makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel - postgresql-libs-devel libmysqlclient-devel libssh-devel" + postgresql-libs-devel libmariadbclient-devel libssh-devel" short_desc="Tool to guess/crack valid login/password pairs" maintainer="Michael Aldridge " license="AGPL-3.0-or-later" From ac7b56493907c96cf6ea3d5979f4df7e3451f46d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 22:26:24 +0100 Subject: [PATCH 28/31] mariadb: add mysql dummy packages --- srcpkgs/libmysqlclient | 1 + srcpkgs/libmysqlclient-devel | 1 + srcpkgs/mariadb/template | 28 ++++++++++++++++++++++++++-- srcpkgs/mysql | 1 + srcpkgs/mysql-client | 1 + 5 files changed, 30 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/libmysqlclient create mode 120000 srcpkgs/libmysqlclient-devel create mode 120000 srcpkgs/mysql create mode 120000 srcpkgs/mysql-client diff --git a/srcpkgs/libmysqlclient b/srcpkgs/libmysqlclient new file mode 120000 index 00000000000..45f92cdb790 --- /dev/null +++ b/srcpkgs/libmysqlclient @@ -0,0 +1 @@ +mariadb \ No newline at end of file diff --git a/srcpkgs/libmysqlclient-devel b/srcpkgs/libmysqlclient-devel new file mode 120000 index 00000000000..45f92cdb790 --- /dev/null +++ b/srcpkgs/libmysqlclient-devel @@ -0,0 +1 @@ +mariadb \ No newline at end of file diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 66d9038a2bc..865627d2183 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb version=10.1.47 -revision=2 +revision=3 build_style=cmake configure_args="-DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -95,7 +95,7 @@ libmariadbclient_package() { } } libmariadbclient-devel_package() { - depends="libmariadbclient>=${version}_${revision}" + depends="libmariadbclient>=${version}_${revision} libatomic-devel" provides="libmysqlclient-devel-${version}_${revision}" replaces="libmysqlclient-devel>=0" short_desc+=" - client development files" @@ -140,3 +140,27 @@ mytop_package() { vmove usr/bin/mytop } } + +libmysqlclient_package() { + build_style=meta + depends="libmariadbclient" + short_desc="MySQL - (transitional dummy package)" +} + +libmysqlclient-devel_package() { + build_style=meta + depends="libmariadbclient-devel" + short_desc="MySQL - (transitional dummy package)" +} + +mysql-client_package() { + build_style=meta + depends="mariadb" + short_desc="MySQL - (transitional dummy package)" +} + +mysql_package() { + build_style=meta + depends="mariadb" + short_desc="MySQL - (transitional dummy package)" +} diff --git a/srcpkgs/mysql b/srcpkgs/mysql new file mode 120000 index 00000000000..45f92cdb790 --- /dev/null +++ b/srcpkgs/mysql @@ -0,0 +1 @@ +mariadb \ No newline at end of file diff --git a/srcpkgs/mysql-client b/srcpkgs/mysql-client new file mode 120000 index 00000000000..45f92cdb790 --- /dev/null +++ b/srcpkgs/mysql-client @@ -0,0 +1 @@ +mariadb \ No newline at end of file From b092c97e3219f7d2982c1ddec72793cb41e023ac Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 22:45:21 +0100 Subject: [PATCH 29/31] maridb: split mytop into it's own package this is done to ensure, that there is no cyclic dep betwenn mariadb and perl-DBD-mysql --- srcpkgs/mariadb/template | 8 +------- srcpkgs/mytop | 1 - srcpkgs/mytop/template | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) delete mode 120000 srcpkgs/mytop create mode 100644 srcpkgs/mytop/template diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 865627d2183..60c37cf5ef2 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -78,6 +78,7 @@ post_install() { # Remove unneeded stuff. rm -rf ${DESTDIR}/usr/{sql-bench,mysql-test,data} rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1 + rm -f ${DESTDIR}/usr/bin/mytop # Configuration file. install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf @@ -133,13 +134,6 @@ mariadb-client_package() { done } } -mytop_package() { - depends="${sourcepkg}>=${version}_${revision} perl-Term-ReadKey perl-DBD-mysql" - short_desc="Top-like query monitor for MariaDB" - pkg_install() { - vmove usr/bin/mytop - } -} libmysqlclient_package() { build_style=meta diff --git a/srcpkgs/mytop b/srcpkgs/mytop deleted file mode 120000 index 45f92cdb790..00000000000 --- a/srcpkgs/mytop +++ /dev/null @@ -1 +0,0 @@ -mariadb \ No newline at end of file diff --git a/srcpkgs/mytop/template b/srcpkgs/mytop/template new file mode 100644 index 00000000000..ee3cb21aeff --- /dev/null +++ b/srcpkgs/mytop/template @@ -0,0 +1,17 @@ +# Template file for 'mytop' +pkgname=mytop +version=10.1.47 +revision=3 +create_wrksrc=yes +depends="mariadb perl-Term-ReadKey perl-DBD-mysql" +short_desc="Top-like query monitor for MariaDB" +maintainer="John " +license="GPL-2.0-or-later" +homepage="https://mariadb.org/" +distfiles="https://raw.githubusercontent.com/MariaDB/server/mariadb-${version}/scripts/mytop.sh" +checksum=69c200bd7a03a454f2e314eb94396686e78d59aa8d089d8a0defef9287ec8950 +skip_extraction="mytop.sh" + +do_install() { + vbin ${XBPS_SRCDISTDIR}/${pkgname}-${version}/mytop.sh mytop +} From f490a78071d7fb675052c9158eae44668cefbf31 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 21:33:22 +0100 Subject: [PATCH 30/31] mariadb: update to 10.1.48. --- srcpkgs/mariadb/INSTALL.msg | 3 +++ srcpkgs/mariadb/template | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/mariadb/INSTALL.msg diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg new file mode 100644 index 00000000000..32f7ba8b8b5 --- /dev/null +++ b/srcpkgs/mariadb/INSTALL.msg @@ -0,0 +1,3 @@ +If you come from a System that used the MySQL package, +than restart your mysql service and upgrade your database +wtih mysql_upgrade(1) diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 60c37cf5ef2..20dff57fcea 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb -version=10.1.47 -revision=3 +version=10.1.48 +revision=1 build_style=cmake configure_args="-DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -27,7 +27,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://mariadb.org/" distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz" -checksum=a4267487dbddf1dc1faed6e2a322c50a3e80d5d271cb487e8bdad6840e003227 +checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9 lib32disabled=yes provides="mysql-${version}_${revision}" replaces="mysql>=0" From 23ba29b48db7b3a1d1036f1d4657505c2440ecd0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 3 Feb 2021 19:52:11 +0100 Subject: [PATCH 31/31] mytop: update to 10.1.48. --- srcpkgs/mytop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mytop/template b/srcpkgs/mytop/template index ee3cb21aeff..1137a834b51 100644 --- a/srcpkgs/mytop/template +++ b/srcpkgs/mytop/template @@ -1,7 +1,7 @@ # Template file for 'mytop' pkgname=mytop -version=10.1.47 -revision=3 +version=10.1.48 +revision=1 create_wrksrc=yes depends="mariadb perl-Term-ReadKey perl-DBD-mysql" short_desc="Top-like query monitor for MariaDB" @@ -9,7 +9,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://mariadb.org/" distfiles="https://raw.githubusercontent.com/MariaDB/server/mariadb-${version}/scripts/mytop.sh" -checksum=69c200bd7a03a454f2e314eb94396686e78d59aa8d089d8a0defef9287ec8950 +checksum=e639a6113740fe10c3f3a609feb08a71344e0ed6f6a8364bc4f4f751746f6ee3 skip_extraction="mytop.sh" do_install() {