diff options
Diffstat (limited to 'databases/mysql60-server/files')
16 files changed, 0 insertions, 486 deletions
diff --git a/databases/mysql60-server/files/mysql-server.sh.in b/databases/mysql60-server/files/mysql-server.sh.in deleted file mode 100644 index 2caa4dc176e1..000000000000 --- a/databases/mysql60-server/files/mysql-server.sh.in +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. -# mysql_dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# - -. %%RC_SUBR%% - -name="mysql" -rcvar=`set_rcvar` - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_limits="NO"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_args=""} - -mysql_user="mysql" -mysql_limits_args="-e -U ${mysql_user}" -pidfile="${mysql_dbdir}/`/bin/hostname`.pid" -command="%%PREFIX%%/bin/mysqld_safe" -command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--ldata=${mysql_dbdir}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} -} - -mysql_prestart() -{ - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null - else - return 0 - fi -} - -run_rc_command "$1" diff --git a/databases/mysql60-server/files/patch-Docs::Makefile.in b/databases/mysql60-server/files/patch-Docs::Makefile.in deleted file mode 100644 index 677da903d045..000000000000 --- a/databases/mysql60-server/files/patch-Docs::Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Docs/Makefile.in.orig Fri Jun 2 20:02:56 2006 -+++ Docs/Makefile.in Thu Jun 15 07:18:41 2006 -@@ -370,7 +370,7 @@ - # generated files explicitly in DISTCLEANFILES. - DISTCLEANFILES = $(TXT_FILES) - GT = $(srcdir)/generate-text-files.pl --all: all-am -+all: - - .SUFFIXES: - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -@@ -458,7 +458,7 @@ - install-data: install-data-am - uninstall: uninstall-am - --install-am: all-am -+install-am: - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - - installcheck: installcheck-am diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in deleted file mode 100644 index dc92a178a9e8..000000000000 --- a/databases/mysql60-server/files/patch-Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.in.orig Tue May 8 11:43:16 2007 -+++ Makefile.in Thu May 17 09:28:15 2007 -@@ -396,14 +396,7 @@ - EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ - README COPYING EXCEPTIONS-CLIENT CMakeLists.txt - --SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ -- @readline_topdir@ sql-common scripts \ -- @thread_dirs@ pstack \ -- @sql_union_dirs@ unittest storage plugin \ -- @sql_server@ @man_dirs@ tests \ -- netware @libmysqld_dirs@ \ -- mysql-test support-files sql-bench @tools_dirs@ \ -- win -+SUBDIRS = - - DIST_SUBDIRS = $(SUBDIRS) BUILD debian - DISTCLEANFILES = ac_available_languages_fragment diff --git a/databases/mysql60-server/files/patch-client_mysql_upgrade.c b/databases/mysql60-server/files/patch-client_mysql_upgrade.c deleted file mode 100644 index cc29b97ddc60..000000000000 --- a/databases/mysql60-server/files/patch-client_mysql_upgrade.c +++ /dev/null @@ -1,36 +0,0 @@ ---- client/mysql_upgrade.c.orig Tue Aug 28 11:16:33 2007 -+++ client/mysql_upgrade.c Tue Aug 28 11:22:24 2007 -@@ -395,7 +395,6 @@ - path[0]= 0; - } - } -- do - { - size_t path_len; - DBUG_PRINT("enter", ("path: %s", path)); -@@ -411,22 +410,14 @@ - path, "", MYF(MY_REPLACE_DIR)); - - verbose("Looking for '%s' in: %s", tool_name, tool_path); -- -- /* Make sure the tool exists */ -- if (my_access(tool_path, F_OK) != 0) -- die("Can't find '%s'", tool_path); -- -- /* -- Make sure it can be executed, otherwise try again -- in higher level directory -- */ - } -- while(run_tool(tool_path, -+ if(run_tool(tool_path, - &ds_tmp, /* Get output from command, discard*/ - "--help", - "2>&1", - IF_WIN("> NUL", "> /dev/null"), -- NULL)); -+ NULL)) -+ die("Can't run '%s'", tool_path); - - dynstr_free(&ds_tmp); - diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure deleted file mode 100644 index abfacbb91222..000000000000 --- a/databases/mysql60-server/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig Sat May 26 12:22:14 2007 -+++ configure Fri Jun 1 07:53:46 2007 -@@ -20394,8 +20394,6 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - # Prevent multiple expansion - -@@ -26935,8 +26933,8 @@ - # Some system specific hacks - # - --MAX_C_OPTIMIZE="-O3" --MAX_CXX_OPTIMIZE="-O3" -+MAX_C_OPTIMIZE="" -+MAX_CXX_OPTIMIZE="" - - case $SYSTEM_TYPE in - *solaris2.7*) diff --git a/databases/mysql60-server/files/patch-extra_yassl_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_Makefile.in deleted file mode 100644 index 232d2c3852c2..000000000000 --- a/databases/mysql60-server/files/patch-extra_yassl_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/yassl/Makefile.in.orig Thu Oct 26 14:02:58 2006 -+++ extra/yassl/Makefile.in Tue Nov 7 08:17:34 2006 -@@ -351,7 +351,7 @@ - yassl_libs = @yassl_libs@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ --SUBDIRS = taocrypt src testsuite -+SUBDIRS = taocrypt src - EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \ - CMakeLists.txt - diff --git a/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in deleted file mode 100644 index bca462d08cba..000000000000 --- a/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/yassl/taocrypt/Makefile.in.orig Thu Oct 26 14:02:59 2006 -+++ extra/yassl/taocrypt/Makefile.in Tue Nov 7 08:18:38 2006 -@@ -351,7 +351,7 @@ - yassl_libs = @yassl_libs@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ --SUBDIRS = src test benchmark -+SUBDIRS = src - EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp) - all: all-recursive - diff --git a/databases/mysql60-server/files/patch-include_my_global.h b/databases/mysql60-server/files/patch-include_my_global.h deleted file mode 100644 index be6bf96f1841..000000000000 --- a/databases/mysql60-server/files/patch-include_my_global.h +++ /dev/null @@ -1,27 +0,0 @@ ---- include/my_global.h.orig Mon Jul 2 08:06:55 2007 -+++ include/my_global.h Mon Jul 2 08:07:53 2007 -@@ -561,12 +561,6 @@ - #define PURIFY_OR_LINT_INIT(var) - #endif - --/* Define some useful general macros */ --#if !defined(max) --#define max(a, b) ((a) > (b) ? (a) : (b)) --#define min(a, b) ((a) < (b) ? (a) : (b)) --#endif -- - #if !defined(HAVE_UINT) - #undef HAVE_UINT - #define HAVE_UINT -@@ -1508,5 +1502,11 @@ - - /* Length of decimal number represented by INT64. */ - #define MY_INT64_NUM_DECIMAL_DIGITS 21 -+ -+/* Define some useful general macros */ -+#if !defined(max) -+#define max(a, b) ((a) > (b) ? (a) : (b)) -+#define min(a, b) ((a) < (b) ? (a) : (b)) -+#endif - - #endif /* my_global_h */ diff --git a/databases/mysql60-server/files/patch-include_my_libwrap.h b/databases/mysql60-server/files/patch-include_my_libwrap.h deleted file mode 100644 index a115f40fc8fc..000000000000 --- a/databases/mysql60-server/files/patch-include_my_libwrap.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_libwrap.h.orig Tue Nov 7 08:39:53 2006 -+++ include/my_libwrap.h Tue Nov 7 08:40:17 2006 -@@ -15,7 +15,7 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include <my_tcpd.h> - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> diff --git a/databases/mysql60-server/files/patch-include_my_tcpd.h b/databases/mysql60-server/files/patch-include_my_tcpd.h deleted file mode 100644 index 38aad1aa57d7..000000000000 --- a/databases/mysql60-server/files/patch-include_my_tcpd.h +++ /dev/null @@ -1,147 +0,0 @@ ---- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 -+++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 -@@ -6,6 +6,25 @@ - * $FreeBSD$ - */ - -+#ifndef _TCPWRAPPERS_TCPD_H -+#define _TCPWRAPPERS_TCPD_H -+ -+/* someone else may have defined this */ -+#undef __P -+ -+/* use prototypes if we have an ANSI C compiler or are using C++ */ -+#if defined(__STDC__) || defined(__cplusplus) -+#define __P(args) args -+#else -+#define __P(args) () -+#endif -+ -+/* Need definitions of struct sockaddr_in and FILE. */ -+#include <netinet/in.h> -+#include <stdio.h> -+ -+__BEGIN_DECLS -+ - /* Structure to describe one communications endpoint. */ - - #define STRING_LENGTH 128 /* hosts, users, processes */ -@@ -31,10 +50,10 @@ - char pid[10]; /* access via eval_pid(request) */ - struct host_info client[1]; /* client endpoint info */ - struct host_info server[1]; /* server endpoint info */ -- void (*sink) (); /* datagram sink function or 0 */ -- void (*hostname) (); /* address to printable hostname */ -- void (*hostaddr) (); /* address to printable address */ -- void (*cleanup) (); /* cleanup function or 0 */ -+ void (*sink) __P((int)); /* datagram sink function or 0 */ -+ void (*hostname) __P((struct host_info *)); /* address to printable hostname */ -+ void (*hostaddr) __P((struct host_info *)); /* address to printable address */ -+ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */ - struct netconfig *config; /* netdir handle */ - }; - -@@ -67,20 +86,23 @@ - /* Global functions. */ - - #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) --extern void fromhost(); /* get/validate client host info */ -+extern void fromhost __P((struct request_info *)); /* get/validate client host info */ - #else - #define fromhost sock_host /* no TLI support needed */ - #endif - --extern int hosts_access(); /* access control */ --extern void shell_cmd(); /* execute shell command */ --extern char *percent_x(); /* do %<char> expansion */ --extern void rfc931(); /* client name from RFC 931 daemon */ --extern void clean_exit(); /* clean up and exit */ --extern void refuse(); /* clean up and exit */ --extern char *xgets(); /* fgets() on steroids */ --extern char *split_at(); /* strchr() and split */ --extern unsigned long dot_quad_addr(); /* restricted inet_addr() */ -+extern void shell_cmd __P((char *)); /* execute shell command */ -+extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */ -+#ifdef INET6 -+extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */ -+#else -+extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */ -+#endif -+extern void clean_exit __P((struct request_info *)); /* clean up and exit */ -+extern void refuse __P((struct request_info *)); /* clean up and exit */ -+extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */ -+extern char *split_at __P((char *, int)); /* strchr() and split */ -+extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */ - - /* Global variables. */ - -@@ -98,9 +120,14 @@ - */ - - #ifdef __STDC__ -+extern int hosts_access(struct request_info *request); -+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, -+ char *client_user); - extern struct request_info *request_init(struct request_info *,...); - extern struct request_info *request_set(struct request_info *,...); - #else -+extern int hosts_access(); -+extern int hosts_ctl(); - extern struct request_info *request_init(); /* initialize request */ - extern struct request_info *request_set(); /* update request structure */ - #endif -@@ -123,27 +150,27 @@ - * host_info structures serve as caches for the lookup results. - */ - --extern char *eval_user(); /* client user */ --extern char *eval_hostname(); /* printable hostname */ --extern char *eval_hostaddr(); /* printable host address */ --extern char *eval_hostinfo(); /* host name or address */ --extern char *eval_client(); /* whatever is available */ --extern char *eval_server(); /* whatever is available */ -+extern char *eval_user __P((struct request_info *)); /* client user */ -+extern char *eval_hostname __P((struct host_info *)); /* printable hostname */ -+extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */ -+extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */ -+extern char *eval_client __P((struct request_info *)); /* whatever is available */ -+extern char *eval_server __P((struct request_info *)); /* whatever is available */ - #define eval_daemon(r) ((r)->daemon) /* daemon process name */ - #define eval_pid(r) ((r)->pid) /* process id */ - - /* Socket-specific methods, including DNS hostname lookups. */ - --extern void sock_host(); /* look up endpoint addresses */ --extern void sock_hostname(); /* translate address to hostname */ --extern void sock_hostaddr(); /* address to printable address */ -+extern void sock_host __P((struct request_info *)); -+extern void sock_hostname __P((struct host_info *)); -+extern void sock_hostaddr __P((struct host_info *)); - #define sock_methods(r) \ - { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } - - /* The System V Transport-Level Interface (TLI) interface. */ - - #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) --extern void tli_host(); /* look up endpoint addresses etc. */ -+extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */ - #endif - - /* -@@ -184,7 +211,7 @@ - * behavior. - */ - --extern void process_options(); /* execute options */ -+extern void process_options __P((char *, struct request_info *)); /* execute options */ - extern int dry_run; /* verification flag */ - - /* Bug workarounds. */ -@@ -223,3 +250,7 @@ - #define strtok my_strtok - extern char *my_strtok(); - #endif -+ -+__END_DECLS -+ -+#endif /* tcpd.h */ diff --git a/databases/mysql60-server/files/patch-man::Makefile.in b/databases/mysql60-server/files/patch-man::Makefile.in deleted file mode 100644 index 0b15e2d4ca03..000000000000 --- a/databases/mysql60-server/files/patch-man::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 -+++ man/Makefile.in Tue Nov 7 08:19:50 2006 -@@ -363,8 +363,8 @@ - yassl_libs = @yassl_libs@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ --man1_MANS = @man1_files@ --man8_MANS = @man8_files@ -+man1_MANS = -+man8_MANS = - EXTRA_DIST = $(man1_MANS) $(man8_MANS) - all: all-am - diff --git a/databases/mysql60-server/files/patch-mysys_default.c b/databases/mysql60-server/files/patch-mysys_default.c deleted file mode 100644 index 02f3fa45eb91..000000000000 --- a/databases/mysql60-server/files/patch-mysys_default.c +++ /dev/null @@ -1,23 +0,0 @@ ---- mysys/default.c.orig Tue Jan 30 09:34:13 2007 -+++ mysys/default.c Sat Feb 3 17:12:31 2007 -@@ -608,7 +608,7 @@ - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -1013,9 +1013,9 @@ - #else - *ptr++= "/etc/"; - *ptr++= "/etc/mysql/"; -+ *ptr++= "%%PREFIX%%/etc/"; -+ *ptr++= "%%PREFIX%%/etc/mysql/"; - #endif -- if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV)))) -- *ptr++= env; - *ptr++= ""; /* Place for defaults_extra_file */ - #if !defined(__WIN__) && !defined(__NETWARE__) - *ptr++= "~/";; diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in deleted file mode 100644 index 7881ee6f48dc..000000000000 --- a/databases/mysql60-server/files/patch-scripts::Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ ---- scripts/Makefile.in.orig Tue May 8 11:42:25 2007 -+++ scripts/Makefile.in Thu May 17 09:30:48 2007 -@@ -399,21 +399,7 @@ - BUILT_SOURCES = mysql_fix_privilege_tables.sql \ - mysql_fix_privilege_tables_sql.c - --bin_SCRIPTS = @server_scripts@ \ -- msql2mysql \ -- mysql_config \ -- mysql_fix_privilege_tables \ -- mysql_fix_extensions \ -- mysql_setpermission \ -- mysql_secure_installation \ -- mysql_zap \ -- mysqlaccess \ -- mysqlbug \ -- mysql_convert_table_format \ -- mysql_find_rows \ -- mysqlhotcopy \ -- mysqldumpslow \ -- mysqld_multi -+bin_SCRIPTS = - - noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution -@@ -445,11 +431,7 @@ - mysql_system_tables_fix.sql \ - CMakeLists.txt - --dist_pkgdata_DATA = fill_help_tables.sql \ -- mysql_fix_privilege_tables.sql \ -- mysql_system_tables.sql \ -- mysql_system_tables_data.sql \ -- mysql_test_data_timezone.sql -+dist_pkgdata_DATA = - - CLEANFILES = @server_scripts@ \ - make_binary_distribution \ diff --git a/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh deleted file mode 100644 index 2a30469922f0..000000000000 --- a/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh +++ /dev/null @@ -1,24 +0,0 @@ ---- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 -+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 -@@ -242,10 +242,10 @@ - - if test -z "$MYSQL_HOME" - then -- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" -+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" - then - log_error "WARNING: Found two instances of my.cnf - --$MY_BASEDIR_VERSION/my.cnf and -+$MY_BASEDIR_VERSION/etc/my.cnf and - $DATADIR/my.cnf - IGNORING $DATADIR/my.cnf" - -@@ -254,7 +254,7 @@ - then - log_error "WARNING: Found $DATADIR/my.cnf - The data directory is a deprecated location for my.cnf, please move it to --$MY_BASEDIR_VERSION/my.cnf" -+$MY_BASEDIR_VERSION/etc/my.cnf" - MYSQL_HOME=$DATADIR - else - MYSQL_HOME=$MY_BASEDIR_VERSION diff --git a/databases/mysql60-server/files/patch-sql::mysqld.cc b/databases/mysql60-server/files/patch-sql::mysqld.cc deleted file mode 100644 index 4feed825cb11..000000000000 --- a/databases/mysql60-server/files/patch-sql::mysqld.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 -+++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -3177,7 +3177,7 @@ - init_ssl(); - - #ifdef HAVE_LIBWRAP -- libwrapName= my_progname+dirname_length(my_progname); -+ libwrapName= (char *) my_progname+dirname_length(my_progname); - openlog(libwrapName, LOG_PID, LOG_AUTH); - #endif - diff --git a/databases/mysql60-server/files/patch-support-files_Makefile.in b/databases/mysql60-server/files/patch-support-files_Makefile.in deleted file mode 100644 index 2d6ef213f891..000000000000 --- a/databases/mysql60-server/files/patch-support-files_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- support-files/Makefile.in.orig Thu Apr 19 09:31:48 2007 -+++ support-files/Makefile.in Thu Apr 19 09:33:03 2007 -@@ -419,7 +419,7 @@ - - pkgdata_SCRIPTS = mysql.server - aclocaldir = $(datadir)/aclocal --aclocal_DATA = mysql.m4 -+aclocal_DATA = - noinst_DATA = mysql-@VERSION@.spec \ - MySQL-shared-compat.spec - |