Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/mariadb55-server Commit mistake fix
details: https://anonhg.NetBSD.org/pkgsrc/rev/fd31f15cf3aa
branches: trunk
changeset: 429088:fd31f15cf3aa
user: manu <manu%pkgsrc.org@localhost>
date: Thu Apr 16 09:08:46 2020 +0000
description:
Commit mistake fix
In previous commit, I imported the mariadb55-client files into the
mariadb55-server. This changes fixes that and brings the MariaDB 5.5.67
update I meant to commit.
diffstat:
databases/mariadb55-server/DESCR | 2 +-
databases/mariadb55-server/MESSAGE | 20 +-
databases/mariadb55-server/Makefile | 127 +-
databases/mariadb55-server/PLIST | 8439 +++++++++++++++++++++++++++++-
databases/mariadb55-server/buildlink3.mk | 29 +-
5 files changed, 8349 insertions(+), 268 deletions(-)
diffs (truncated from 8662 to 300 lines):
diff -r 5f0bb5fa946e -r fd31f15cf3aa databases/mariadb55-server/DESCR
--- a/databases/mariadb55-server/DESCR Thu Apr 16 09:03:46 2020 +0000
+++ b/databases/mariadb55-server/DESCR Thu Apr 16 09:08:46 2020 +0000
@@ -1,4 +1,4 @@
MariaDB is a fork of MySQL relational database management system.
It is an enhanced, drop-in replacement for MySQL.
-This package contains client libraries.
+This package contains server programs.
diff -r 5f0bb5fa946e -r fd31f15cf3aa databases/mariadb55-server/MESSAGE
--- a/databases/mariadb55-server/MESSAGE Thu Apr 16 09:03:46 2020 +0000
+++ b/databases/mariadb55-server/MESSAGE Thu Apr 16 09:08:46 2020 +0000
@@ -1,9 +1,21 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2020/04/16 09:03:47 manu Exp $
+$NetBSD: MESSAGE,v 1.3 2020/04/16 09:08:46 manu Exp $
+
+After the tables are set up and the MySQL server is running,
+please remember to set a password for the MySQL root user!
+This is done by running both:
+
+ ${PREFIX}/bin/mysqladmin -u root -p password 'new-password'
+ ${PREFIX}/bin/mysqladmin -h `hostname` -u root -p password 'new-password'
-To use the ``mysqlhotcopy'' script, you'll have to install the following
-package:
+The "Enter password:" prompt is asking for the existing password.
+As there is no existing password, just press the Return key.
- databases/p5-DBD-mysql
+There is a script distributed with MySQL that can help you lock down
+an installation. This script has been installed to
+
+ ${PREFIX}/bin/mysql_secure_installation.
+
+Please see the manual and the MySQL web site for more instructions.
===========================================================================
diff -r 5f0bb5fa946e -r fd31f15cf3aa databases/mariadb55-server/Makefile
--- a/databases/mariadb55-server/Makefile Thu Apr 16 09:03:46 2020 +0000
+++ b/databases/mariadb55-server/Makefile Thu Apr 16 09:08:46 2020 +0000
@@ -1,52 +1,99 @@
-# $NetBSD: Makefile,v 1.11 2020/04/16 09:03:47 manu Exp $
+# $NetBSD: Makefile,v 1.12 2020/04/16 09:08:46 manu Exp $
-PKGNAME= ${DISTNAME:S/-/-client-/}
-#PKGREVISION= 1
-COMMENT= MariaDB 5.5, a free SQL database (client)
+PKGNAME= ${DISTNAME:S/-/-server-/}
+PKGREVISION= 3
+COMMENT= MariaDB 5.5, a free SQL database (server)
-CONFLICTS= mysql3-client-[0-9]*
-CONFLICTS= mysql-client-[0-9]*
+CONFLICTS= mysql3-server-[0-9]*
+CONFLICTS= mysql-server-[0-9]*
-.include "Makefile.common"
+.include "../../databases/mariadb55-client/Makefile.common"
-CMAKE_ARGS+= -DWITHOUT_SERVER=ON
-CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF
+CMAKE_ARGS+= -DWITH_LIBWRAP=ON
+CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
# MariaDB uses internal OpenSSL structure made opaque with later versions
CMAKE_ARGS+= -DWITH_SSL=bundled
-UNWRAP_FILES+= scripts/mysql_config
-INFO_FILES= yes
-INSTALL_DIRS+= client include libmysql man scripts tests
+# Avoid build error on NetBSD/amd64 7.99.9
+# and TokuDB is available only on amd64.
+CMAKE_ARGS+= -DWITHOUT_TOKUDB=1
+
+# for O_DIRECT in fcntl.h
+CFLAGS.NetBSD= -D_NETBSD_SOURCE
+
+.if !empty(PKG_OPTIONS:Membedded-server)
+CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
+PLIST.embedded= yes
+.else
+# We only need readline to placate the configure script if we don't build
+# the embedded server as it is the only binary linked against "readline".
+BUILDLINK_DEPMETHOD.readline= build
+.endif
-REPLACE_PERL+= scripts/mysql_convert_table_format.sh
-REPLACE_PERL+= scripts/mysql_find_rows.sh
-REPLACE_PERL+= scripts/mysql_fix_extensions.sh
-REPLACE_PERL+= scripts/mysql_fix_privilege_tables.sh
-REPLACE_PERL+= scripts/mysql_setpermission.sh
-REPLACE_PERL+= scripts/mysql_zap.sh
-REPLACE_PERL+= scripts/mysqlaccess.sh
-REPLACE_PERL+= scripts/mysqld_multi.sh
-REPLACE_PERL+= scripts/mysqldumpslow.sh
-REPLACE_PERL+= scripts/mysqlhotcopy.sh
-REPLACE_PERL+= scripts/mytop.sh
+# ndb-cluster does not configure with cmake
+#.if !empty(PKG_OPTIONS:Mndb-cluster)
+#CMAKE_ARGS+= -DWITH_NDBCLUSTER_STORAGE_ENGINE=ON
+#REPLACE_PERL+= storage/ndb/tools/ndb_error_reporter
+#REPLACE_PERL+= storage/ndb/tools/ndb_size.pl
+#PLIST.ndb= yes
+#.endif
+
+PLIST_VARS+= embedded ndb auth_socket
+
+.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+PLIST.auth_socket= yes
+.endif
+
+PTHREAD_OPTS+= require
+
+PKG_GROUPS= ${MYSQL_GROUP}
+PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}
+
+PKG_GECOS.${MYSQL_USER}= MySQL database administrator
+PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR}
+PKG_SHELL.${MYSQL_USER}= ${SH}
-# REPLACE_PERL doesn't replace @PERL_PATH@, which is what's found in these
-# files now.
-SUBST_CLASSES+= perlpath
-SUBST_STAGE.perlpath= pre-configure
-SUBST_FILES.perlpath= ${REPLACE_PERL}
-SUBST_SED.perlpath= -e s,@PERL_PATH@,perl,
+RCD_SCRIPTS= mysqld
+SMF_NAME= mysql
+SMF_METHODS= ${RCD_SCRIPTS}
+
+FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
+FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
+FILES_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+= MYSQL_PIDFILE=${MYSQL_PIDFILE}
+MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
+MESSAGE_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+BUILD_DEFS+= MYSQL_DATADIR
-SUBST_CLASSES+= fixwrap
-SUBST_STAGE.fixwrap= post-build
-SUBST_FILES.fixwrap= scripts/mysqlbug
-SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/,,g"
+REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl
+REPLACE_PERL+= mysql-test/lib/process-purecov-annotations.pl
+REPLACE_PERL+= mysql-test/lib/v1/mysql-test-run.pl
+REPLACE_PERL+= mysql-test/mtr
+REPLACE_PERL+= mysql-test/mysql-stress-test.pl
+REPLACE_PERL+= mysql-test/mysql-test-run.pl
+REPLACE_PERL+= mysql-test/std_data/checkDBI_DBD-mysql.pl
+REPLACE_PERL+= mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl
+REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_local.pl
+REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_modify.pl
+REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
+REPLACE_PERL+= mysql-test/suite/rpl/extension/checksum.pl
+REPLACE_PERL+= sql-bench/*.sh
+
+REPLACE_SH+= mysql-test/t/long_tmpdir-master.sh
+REPLACE_SH+= mysql-test/t/lowercase_mixed_tmpdir-master.sh
-# Replace manual pages which only include other ones with a symbolic link.
-# It is for manual compression is activated or mandoc(1) is used.
-post-install:
-.for mf in mysql_client_test_embedded.1 mysqltest_embedded.1
- ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf}
- ${LN} -s ${mf:S/_embedded//} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf}
-.endfor
+INSTALLATION_DIRS+= bin
+
+post-extract:
+ ${CHMOD} -R g-w ${WRKSRC}
+
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Msunpro)
+CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+.endif
+
+BUILDLINK_AUTO_DIRS.mariadb-client= no
+.include "../../databases/mariadb55-client/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5f0bb5fa946e -r fd31f15cf3aa databases/mariadb55-server/PLIST
--- a/databases/mariadb55-server/PLIST Thu Apr 16 09:03:46 2020 +0000
+++ b/databases/mariadb55-server/PLIST Thu Apr 16 09:08:46 2020 +0000
@@ -1,205 +1,8234 @@
-@comment $NetBSD: PLIST,v 1.6 2020/04/16 09:03:47 manu Exp $
-bin/msql2mysql
-bin/mysql
-bin/mysql_client_test
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_upgrade
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlbug
-bin/mysqlcheck
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldump
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/mysqltest
-bin/mytop
-include/mysql/auth_dialog_client.h
-include/mysql/client_plugin.h
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/handler_ername.h
-include/mysql/handler_state.h
-include/mysql/keycache.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/ma_dyncol.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_decimal_limits.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_valgrind.h
-include/mysql/my_xml.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_auth.h
-include/mysql/plugin_auth_common.h
-include/mysql/plugin_ftparser.h
-include/mysql/private/atomic/gcc_builtins.h
-include/mysql/private/atomic/generic-msvc.h
-include/mysql/private/atomic/nolock.h
-include/mysql/private/atomic/rwlock.h
-include/mysql/private/atomic/solaris.h
-include/mysql/private/atomic/x86-gcc.h
-include/mysql/private/base64.h
-include/mysql/private/config.h
-include/mysql/private/ft_global.h
-include/mysql/private/hash.h
-include/mysql/private/heap.h
-include/mysql/private/lf.h
-include/mysql/private/maria.h
-include/mysql/private/my_aes.h
-include/mysql/private/my_alarm.h
-include/mysql/private/my_atomic.h
-include/mysql/private/my_base.h
-include/mysql/private/my_bit.h
-include/mysql/private/my_bitmap.h
-include/mysql/private/my_check_opt.h
-include/mysql/private/my_compare.h
-include/mysql/private/my_context.h
-include/mysql/private/my_cpu.h
-include/mysql/private/my_libwrap.h
-include/mysql/private/my_md5.h
-include/mysql/private/my_nosys.h
-include/mysql/private/my_rdtsc.h
-include/mysql/private/my_stacktrace.h
-include/mysql/private/my_time.h
-include/mysql/private/my_tree.h
-include/mysql/private/my_uctype.h
-include/mysql/private/my_user.h
-include/mysql/private/myisam.h
-include/mysql/private/myisamchk.h
-include/mysql/private/myisammrg.h
-include/mysql/private/myisampack.h
-include/mysql/private/mysql_async.h
-include/mysql/private/mysqld_default_groups.h
-include/mysql/private/mysys_err.h
-include/mysql/private/password.h
-include/mysql/private/probes_mysql.h
-${PLIST.dtrace}include/mysql/private/probes_mysql_dtrace.h
-include/mysql/private/probes_mysql_nodtrace.h
-include/mysql/private/queues.h
-include/mysql/private/rijndael.h
-include/mysql/private/service_versions.h
-include/mysql/private/sha1.h
-include/mysql/private/sha2.h
-include/mysql/private/t_ctype.h
Home |
Main Index |
Thread Index |
Old Index