diff options
Diffstat (limited to 'databases/mysql40-server/files')
| -rw-r--r-- | databases/mysql40-server/files/mysql-server.sh.in | 62 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-Docs::Makefile.in | 11 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-Makefile.in | 15 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-configure | 31 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-man::Makefile.in | 11 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-mysys_default.c | 13 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-scripts::Makefile.in | 36 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-sql::mysqld.cc | 11 | ||||
| -rw-r--r-- | databases/mysql40-server/files/patch-sql::mytcpd.h | 147 |
9 files changed, 0 insertions, 337 deletions
diff --git a/databases/mysql40-server/files/mysql-server.sh.in b/databases/mysql40-server/files/mysql-server.sh.in deleted file mode 100644 index e9c52657df91..000000000000 --- a/databases/mysql40-server/files/mysql-server.sh.in +++ /dev/null @@ -1,62 +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). -# - -. /etc/rc.subr - -name="mysql" -rcvar=`set_rcvar` - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_limits="NO"} -: ${mysql_dbdir="/var/db/mysql"} - -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 2>&1 &" -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>&1 - [ $? -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/mysql40-server/files/patch-Docs::Makefile.in b/databases/mysql40-server/files/patch-Docs::Makefile.in deleted file mode 100644 index 941446168e24..000000000000 --- a/databases/mysql40-server/files/patch-Docs::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Docs/Makefile.in.orig Wed Jun 29 19:07:04 2005 -+++ Docs/Makefile.in Wed Jul 20 09:27:21 2005 -@@ -454,7 +454,7 @@ - uninstall-info-am - - --all: txt_files -+all: - - txt_files: ../INSTALL-SOURCE ../EXCEPTIONS-CLIENT \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/mysql40-server/files/patch-Makefile.in b/databases/mysql40-server/files/patch-Makefile.in deleted file mode 100644 index 3a30878bf33f..000000000000 --- a/databases/mysql40-server/files/patch-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig Thu Oct 28 02:48:54 2004 -+++ Makefile.in Sun Oct 31 09:37:50 2004 -@@ -280,11 +280,7 @@ - - # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ -- @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ scripts @man_dirs@ tests \ -- BUILD netware os2 @libmysqld_dirs@ \ -- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -+SUBDIRS = - - - # Relink after clean diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure deleted file mode 100644 index 1604d36a6848..000000000000 --- a/databases/mysql40-server/files/patch-configure +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.orig Sat Sep 3 00:38:41 2005 -+++ configure Tue Sep 13 07:48:06 2005 -@@ -19611,8 +19611,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 - -@@ -24767,8 +24765,8 @@ - # Some system specific hacks - # - --MAX_C_OPTIMIZE="-O3" --MAX_CXX_OPTIMIZE="-O3" -+MAX_C_OPTIMIZE="" -+MAX_CXX_OPTIMIZE="" - - # workaround for Sun Forte/x86 see BUG#4681 - case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in -@@ -35775,7 +35773,7 @@ - /* ) rel_srcdir="$srcdir" ;; - * ) rel_srcdir="../$srcdir" ;; - esac -- if test "x$enable_dependency_tracking" == xno -+ if test "x$enable_dependency_tracking" = xno - then - innodb_conf_flags=--disable-dependency-tracking - fi diff --git a/databases/mysql40-server/files/patch-man::Makefile.in b/databases/mysql40-server/files/patch-man::Makefile.in deleted file mode 100644 index 18a44c36cf57..000000000000 --- a/databases/mysql40-server/files/patch-man::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- man/Makefile.in.orig Sat May 6 15:56:15 2006 -+++ man/Makefile.in Fri May 19 15:59:41 2006 -@@ -293,7 +293,7 @@ - uname_prog = @uname_prog@ - vio_dir = @vio_dir@ - vio_libs = @vio_libs@ --man1_MANS = @man1_files@ -+man1_MANS = - EXTRA_DIST = $(man1_MANS) - all: all-am - diff --git a/databases/mysql40-server/files/patch-mysys_default.c b/databases/mysql40-server/files/patch-mysys_default.c deleted file mode 100644 index cb2bf3776069..000000000000 --- a/databases/mysql40-server/files/patch-mysys_default.c +++ /dev/null @@ -1,13 +0,0 @@ ---- mysys/default.c.orig Mon Apr 11 11:15:09 2005 -+++ mysys/default.c Mon Apr 11 11:15:23 2005 -@@ -49,9 +49,7 @@ - "sys:/etc/", - #else - "/etc/", --#endif --#ifdef DATADIR --DATADIR, -+"%%PREFIX%%/etc/", - #endif - "", /* Place for defaults_extra_dir */ - #if !defined(__WIN__) && !defined(__NETWARE__) diff --git a/databases/mysql40-server/files/patch-scripts::Makefile.in b/databases/mysql40-server/files/patch-scripts::Makefile.in deleted file mode 100644 index dcb6132e85fd..000000000000 --- a/databases/mysql40-server/files/patch-scripts::Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ ---- scripts/Makefile.in.orig Sat Sep 3 00:38:37 2005 -+++ scripts/Makefile.in Tue Sep 13 07:58:03 2005 -@@ -289,23 +289,7 @@ - uname_prog = @uname_prog@ - vio_dir = @vio_dir@ - vio_libs = @vio_libs@ --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 \ -- mysql_explain_log \ -- mysql_tableinfo \ -- mysqld_multi -+bin_SCRIPTS = - - noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution \ -@@ -469,7 +453,7 @@ - uninstall: uninstall-am - - install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am - - installcheck: installcheck-am - install-strip: diff --git a/databases/mysql40-server/files/patch-sql::mysqld.cc b/databases/mysql40-server/files/patch-sql::mysqld.cc deleted file mode 100644 index e79f985fcb69..000000000000 --- a/databases/mysql40-server/files/patch-sql::mysqld.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 -+++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 -@@ -128,7 +128,7 @@ - #endif /* __WIN__ */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include "mytcpd.h" - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> diff --git a/databases/mysql40-server/files/patch-sql::mytcpd.h b/databases/mysql40-server/files/patch-sql::mytcpd.h deleted file mode 100644 index 4583de9fe8fb..000000000000 --- a/databases/mysql40-server/files/patch-sql::mytcpd.h +++ /dev/null @@ -1,147 +0,0 @@ ---- sql/mytcpd.h.orig Sun Jan 9 13:33:51 2005 -+++ sql/mytcpd.h Sun Jan 9 13:41:42 2005 -@@ -6,6 +6,25 @@ - * $FreeBSD: /tmp/pcvs/ports/databases/mysql40-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-09 13:20:47 ale Exp $ - */ - -+#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 */ |