Update to 5.0.2 release:

- Use MASTER_SITES_MYSQL
- Add WITHOUT_INNODB knob [1]
- Fix tcp wrappers (hopefully definitely!)
- Add WITH_NDB knob

Submitted by:	sobomax [1]

5 files changed, 223 insertions, 44 deletions

diff --git a/databases/percona55-server/files/patch-Docs::Makefile.in b/databases/percona55-server/files/patch-Docs::Makefile.in
index e9700bd64e46..e76340001630 100644
--- a/databases/percona55-server/files/patch-Docs::Makefile.in
+++ b/databases/percona55-server/files/patch-Docs::Makefile.in
@@ -1,21 +1,29 @@
---- Docs/Makefile.in.orig	Fri Mar  5 15:59:43 2004
-+++ Docs/Makefile.in	Fri Mar  5 16:00:00 2004
-@@ -446,7 +446,7 @@
+--- Docs/Makefile.in.orig	Wed Dec  1 01:08:19 2004
++++ Docs/Makefile.in	Mon Jan 10 11:44:27 2005
+@@ -331,7 +331,7 @@
+ 	check-recursive installcheck-recursive
+ DIST_COMMON = Makefile.am Makefile.in
+ DIST_SUBDIRS = $(SUBDIRS)
+-all: $(BUILT_SOURCES)
++all:
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
- all:			$(targets) txt_files
+ .SUFFIXES:
+@@ -599,7 +599,7 @@
+ installdirs-am:
+ 	$(mkinstalldirs) $(DESTDIR)$(infodir)
  
--txt_files:		../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \
-+txt_files:		../INSTALL-SOURCE ../COPYING \
- 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
+-install: $(BUILT_SOURCES)
++install:
+ 	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -718,7 +718,7 @@
+ 	uninstall-info-am uninstall-info-recursive uninstall-recursive
  
- CLEAN_FILES:		$(BUILD_SOURCES)
-@@ -609,9 +609,6 @@
  
- ../INSTALL-SOURCE:	mysql.info $(GT)
- 	perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
--
--../INSTALL-WIN-SOURCE:	mysql.info $(GT)
--	perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@
+-all:			$(targets) txt_files
++all:
  
- # We put the description for the binary installation here so that
- # people who download source wont have to see it. It is moved up to
+ txt_files:		../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
+ 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in
index 356baf88b938..df6774784d9b 100644
--- a/databases/percona55-server/files/patch-Makefile.in
+++ b/databases/percona55-server/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig	Tue Jul 27 08:14:34 2004
-+++ Makefile.in	Sat Oct 23 10:39:45 2004
-@@ -293,12 +293,7 @@
+--- Makefile.in.orig	Wed Dec  1 01:08:19 2004
++++ Makefile.in	Mon Jan 10 11:46:31 2005
+@@ -302,12 +302,7 @@
  
  # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
--SUBDIRS = . include @docs_dirs@ \
+ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
--			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests SSL\
--			BUILD netware os2 @libmysqld_dirs@ \
+-			@thread_dirs@ pstack \
+-			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
+-			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
  
  
- # Relink after clean
+ DIST_SUBDIRS = . include @docs_dirs@ zlib \
diff --git a/databases/percona55-server/files/patch-client::mysql.cc b/databases/percona55-server/files/patch-client::mysql.cc
deleted file mode 100644
index 7e4fdfa6f22d..000000000000
--- a/databases/percona55-server/files/patch-client::mysql.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/mysql.cc.orig	Sun Oct 24 15:54:36 2004
-+++ client/mysql.cc	Sun Oct 24 15:55:52 2004
-@@ -294,7 +294,7 @@
-  HIST_ENTRY is defined for libedit, but not for the real readline
-  Need to redefine it for real readline to find it
- */
--#if !defined(USE_LIBEDIT_INTERFACE)
-+#if !defined(HAVE_HIST_ENTRY)
- typedef struct _hist_entry {
-   const char      *line;
-   const char      *data;
diff --git a/databases/percona55-server/files/patch-sql::mysqld.cc b/databases/percona55-server/files/patch-sql::mysqld.cc
index 1d0288494fb5..c98d38bcbd10 100644
--- a/databases/percona55-server/files/patch-sql::mysqld.cc
+++ b/databases/percona55-server/files/patch-sql::mysqld.cc
@@ -1,12 +1,47 @@
---- sql/mysqld.cc.orig	Wed Feb  5 01:55:03 2003
-+++ sql/mysqld.cc	Wed Feb  5 01:57:06 2003
-@@ -104,7 +104,8 @@
+--- 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>
+@@ -136,15 +136,6 @@
  int allow_severity = LOG_INFO;
  int deny_severity = LOG_WARNING;
  
 -#ifdef __STDC__
-+#include <osreldate.h>
-+#if defined(__STDC__) && __FreeBSD_version < 500000
- #define my_fromhost(A)	   fromhost(A)
- #define my_hosts_access(A) hosts_access(A)
- #define my_eval_client(A)  eval_client(A)
+-#define my_fromhost(A)	   fromhost(A)
+-#define my_hosts_access(A) hosts_access(A)
+-#define my_eval_client(A)  eval_client(A)
+-#else
+-#define my_fromhost(A)	   fromhost()
+-#define my_hosts_access(A) hosts_access()
+-#define my_eval_client(A)  eval_client()
+-#endif /* __STDC__ */
+ #endif /* HAVE_LIBWRAP */
+ 
+ #ifdef HAVE_SYS_MMAN_H
+@@ -3565,8 +3556,8 @@
+ 	struct request_info req;
+ 	signal(SIGCHLD, SIG_DFL);
+ 	request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL);
+-	my_fromhost(&req);
+-	if (!my_hosts_access(&req))
++	fromhost(&req);
++	if (!hosts_access(&req))
+ 	{
+ 	  /*
+ 	    This may be stupid but refuse() includes an exit(0)
+@@ -3574,7 +3565,7 @@
+ 	    clean_exit() - same stupid thing ...
+ 	  */
+ 	  syslog(deny_severity, "refused connect from %s",
+-		 my_eval_client(&req));
++		 eval_client(&req));
+ 
+ 	  /*
+ 	    C++ sucks (the gibberish in front just translates the supplied
diff --git a/databases/percona55-server/files/patch-sql::mytcpd.h b/databases/percona55-server/files/patch-sql::mytcpd.h
new file mode 100644
index 000000000000..981a21991dff
--- /dev/null
+++ b/databases/percona55-server/files/patch-sql::mytcpd.h
@@ -0,0 +1,147 @@
+--- 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/percona55-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 */