diff options
Diffstat (limited to 'databases/mysql51-server/files')
| -rw-r--r-- | databases/mysql51-server/files/mysql-client.sh | 15 | ||||
| -rw-r--r-- | databases/mysql51-server/files/mysql-server.sh.in | 64 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-Docs::Makefile.in | 11 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-Makefile.in | 16 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-configure | 22 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-man::Makefile.in | 13 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-mysys_default.c | 22 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-ndb::src::mgmclient::main.cpp | 11 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-scripts::Makefile.in | 37 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-sql::mysqld.cc | 11 | ||||
| -rw-r--r-- | databases/mysql51-server/files/patch-sql::mytcpd.h | 147 |
11 files changed, 0 insertions, 369 deletions
diff --git a/databases/mysql51-server/files/mysql-client.sh b/databases/mysql51-server/files/mysql-client.sh deleted file mode 100644 index bef414c12ed2..000000000000 --- a/databases/mysql51-server/files/mysql-client.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - /sbin/ldconfig -m %%PREFIX%%/lib/mysql - ;; - stop) - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac diff --git a/databases/mysql51-server/files/mysql-server.sh.in b/databases/mysql51-server/files/mysql-server.sh.in deleted file mode 100644 index 93bd177f98b3..000000000000 --- a/databases/mysql51-server/files/mysql-server.sh.in +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: mysql -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# 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 - [ $? -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/mysql51-server/files/patch-Docs::Makefile.in b/databases/mysql51-server/files/patch-Docs::Makefile.in deleted file mode 100644 index 3a4f448240cf..000000000000 --- a/databases/mysql51-server/files/patch-Docs::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Docs/Makefile.in.orig Fri Jun 3 14:54:01 2005 -+++ Docs/Makefile.in Fri Jun 3 14:55:32 2005 -@@ -494,7 +494,7 @@ - uninstall-info-am - - --all: txt_files -+all: - - txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in deleted file mode 100644 index 3d79a8146f37..000000000000 --- a/databases/mysql51-server/files/patch-Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.in.orig Thu May 26 15:27:53 2005 -+++ Makefile.in Fri Jun 3 15:05:48 2005 -@@ -355,12 +355,7 @@ - - # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT --SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ -- @readline_topdir@ sql-common \ -- @thread_dirs@ pstack \ -- @sql_union_dirs@ scripts @man_dirs@ tests \ -- netware @libmysqld_dirs@ \ -- @bench_dirs@ support-files @tools_dirs@ -+SUBDIRS = - - DIST_SUBDIRS = . include @docs_dirs@ zlib \ - @readline_topdir@ sql-common \ diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure deleted file mode 100644 index fbbdc8efd9d1..000000000000 --- a/databases/mysql51-server/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig Sun Dec 21 19:03:09 2003 -+++ configure Wed Dec 24 10:40:53 2003 -@@ -8128,8 +8128,6 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS; - --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - # Prevent multiple expansion - -@@ -12678,8 +12644,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/mysql51-server/files/patch-man::Makefile.in b/databases/mysql51-server/files/patch-man::Makefile.in deleted file mode 100644 index 0f83c2ae8cad..000000000000 --- a/databases/mysql51-server/files/patch-man::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- man/Makefile.in.orig Tue Mar 22 20:27:16 2005 -+++ man/Makefile.in Wed Apr 6 13:10:42 2005 -@@ -333,9 +333,7 @@ - tools_dirs = @tools_dirs@ - uname_prog = @uname_prog@ - zlib_dir = @zlib_dir@ --man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \ -- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -+man_MANS = - - EXTRA_DIST = mysql.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ diff --git a/databases/mysql51-server/files/patch-mysys_default.c b/databases/mysql51-server/files/patch-mysys_default.c deleted file mode 100644 index 7c1dbe23aa9a..000000000000 --- a/databases/mysql51-server/files/patch-mysys_default.c +++ /dev/null @@ -1,22 +0,0 @@ ---- mysys/default.c.orig Thu May 26 15:26:56 2005 -+++ mysys/default.c Fri Jun 3 17:16:59 2005 -@@ -517,7 +517,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 -@@ -867,9 +867,8 @@ - *ptr++= env; - #endif - *ptr++= "/etc/"; -+ *ptr++= "%%PREFIX%%/etc/"; - #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/mysql51-server/files/patch-ndb::src::mgmclient::main.cpp b/databases/mysql51-server/files/patch-ndb::src::mgmclient::main.cpp deleted file mode 100644 index ef1f6711f469..000000000000 --- a/databases/mysql51-server/files/patch-ndb::src::mgmclient::main.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ndb/src/mgmclient/main.cpp.orig Mon Jan 10 15:36:57 2005 -+++ ndb/src/mgmclient/main.cpp Mon Jan 10 15:37:26 2005 -@@ -122,7 +122,7 @@ - } - #ifdef HAVE_READLINE - /* Get a line from the user. */ -- line_read = readline (prompt); -+ line_read = readline ((char *)prompt); - /* If the line has any text in it, save it on the history. */ - if (line_read && *line_read) - add_history (line_read); diff --git a/databases/mysql51-server/files/patch-scripts::Makefile.in b/databases/mysql51-server/files/patch-scripts::Makefile.in deleted file mode 100644 index 5e2d4e697ea6..000000000000 --- a/databases/mysql51-server/files/patch-scripts::Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ ---- scripts/Makefile.in.orig Sat Jun 11 03:32:05 2005 -+++ scripts/Makefile.in Thu Jun 16 23:09:08 2005 -@@ -333,24 +333,7 @@ - uname_prog = @uname_prog@ - yassl_dir = @yassl_dir@ - zlib_dir = @zlib_dir@ --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 \ -- mysql_create_system_tables -+bin_SCRIPTS = - - EXTRA_SCRIPTS = make_binary_distribution.sh \ - make_sharedlib_distribution.sh \ -@@ -380,7 +363,7 @@ - mysqlaccess.conf \ - mysqlbug - --dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql -+dist_pkgdata_DATA = - - # mysqlbug should be distributed built so that people can report build - # failures with it. diff --git a/databases/mysql51-server/files/patch-sql::mysqld.cc b/databases/mysql51-server/files/patch-sql::mysqld.cc deleted file mode 100644 index e79f985fcb69..000000000000 --- a/databases/mysql51-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/mysql51-server/files/patch-sql::mytcpd.h b/databases/mysql51-server/files/patch-sql::mytcpd.h deleted file mode 100644 index c8f3ea3db236..000000000000 --- a/databases/mysql51-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/mysql51-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-10 13:17:30 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 */ |