From f24905319d5b7c7daa43e9174d33941830ad1e74 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 21:36:09 +0100 Subject: [PATCH] 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 ebaf844a55c..149e9bb59f8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -558,8 +558,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.]+'