9 files changed, 222 insertions, 113 deletions

diff --git a/databases/mysql41-server/files/patch-Docs::Makefile.in b/databases/mysql41-server/files/patch-Docs::Makefile.in
index cb417e0742e2..a9744c12e53a 100644
--- a/databases/mysql41-server/files/patch-Docs::Makefile.in
+++ b/databases/mysql41-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	Sun Jan  9 12:51:43 2005
++++ Docs/Makefile.in	Sun Jan  9 12:58:11 2005
+@@ -316,7 +316,7 @@
  
- all:			$(targets) txt_files
+ SUBDIRS = Images
+ GT = $(srcdir)/Support/generate-text-files.pl
+-all: $(BUILT_SOURCES)
++all:
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
--txt_files:		../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
-+txt_files:		../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
- 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
+ .SUFFIXES:
+@@ -626,7 +626,7 @@
+ 	for dir in "$(DESTDIR)$(infodir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+-install: $(BUILT_SOURCES)
++install:
+ 	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -750,7 +750,7 @@
+ 	tags tags-recursive uninstall uninstall-am uninstall-info-am
  
- 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 ../EXCEPTIONS-CLIENT \
+ 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in
index 54fcf35c5e2c..4ae2c3ea9443 100644
--- a/databases/mysql41-server/files/patch-Makefile.in
+++ b/databases/mysql41-server/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig	Thu Aug 26 23:47:06 2004
-+++ Makefile.in	Thu Sep  2 12:49:11 2004
-@@ -297,12 +297,7 @@
+--- Makefile.in.orig	Tue Dec 14 13:41:10 2004
++++ Makefile.in	Sun Dec 19 11:48:00 2004
+@@ -338,12 +338,7 @@
  
  # These are built from source in the Docs directory
  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 \
+-			@thread_dirs@ pstack \
+-			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
  
- 
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
+ 			@readline_topdir@ sql-common \
diff --git a/databases/mysql41-server/files/patch-man::Makefile.in b/databases/mysql41-server/files/patch-man::Makefile.in
index 86d18cec61b2..36ea5bcf2af2 100644
--- a/databases/mysql41-server/files/patch-man::Makefile.in
+++ b/databases/mysql41-server/files/patch-man::Makefile.in
@@ -1,13 +1,13 @@
---- man/Makefile.in.orig	Mon Feb 23 14:54:10 2004
-+++ man/Makefile.in	Mon Feb 23 14:54:34 2004
-@@ -272,9 +272,7 @@
+--- man/Makefile.in.orig	Tue Dec 14 13:41:14 2004
++++ man/Makefile.in	Sun Dec 19 11:53:40 2004
+@@ -313,9 +313,7 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
- 
+ zlib_dir = @zlib_dir@
 -man_MANS = mysql.1 isamchk.1 isamlog.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 isamchk.1.in isamlog.1.in mysql_zap.1.in \
+ 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql41-server/files/patch-scripts::Makefile.in b/databases/mysql41-server/files/patch-scripts::Makefile.in
index 961fbb5898e2..3ee7b0e5ad7b 100644
--- a/databases/mysql41-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql41-server/files/patch-scripts::Makefile.in
@@ -1,9 +1,9 @@
---- scripts/Makefile.in.orig	Fri May 28 21:38:37 2004
-+++ scripts/Makefile.in	Mon May 31 15:14:31 2004
-@@ -276,26 +276,7 @@
+--- scripts/Makefile.in.orig	Tue Dec 14 13:41:31 2004
++++ scripts/Makefile.in	Sun Dec 19 11:52:42 2004
+@@ -316,26 +316,7 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
- 
+ zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
@@ -26,18 +26,18 @@
 -			mysql_create_system_tables
 +bin_SCRIPTS =
  
- 
  EXTRA_SCRIPTS = make_binary_distribution.sh \
-@@ -329,7 +310,7 @@
+ 			make_sharedlib_distribution.sh \
+@@ -366,7 +347,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.
-@@ -605,8 +586,6 @@
+@@ -652,8 +633,6 @@
  
  all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
  
diff --git a/databases/mysql41-server/files/patch-sql::Makefile.in b/databases/mysql41-server/files/patch-sql::Makefile.in
deleted file mode 100644
index f985188d1655..000000000000
--- a/databases/mysql41-server/files/patch-sql::Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- sql/Makefile.in.orig	Thu Aug 26 22:47:18 2004
-+++ sql/Makefile.in		Sun Sep 19 15:03:56 2004
-@@ -378,7 +378,7 @@
- 			gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \
- 			tztime.cc my_time.c \
- 			examples/ha_example.cc examples/ha_archive.cc \
--			examples/ha_tina.cc
-+			examples/ha_tina.cc mylibwrap.c
- 
- 
- gen_lex_hash_SOURCES = gen_lex_hash.cc
-@@ -450,7 +450,8 @@
- 	pack.$(OBJEXT) stacktrace.$(OBJEXT) repl_failsafe.$(OBJEXT) \
- 	gstream.$(OBJEXT) spatial.$(OBJEXT) sql_help.$(OBJEXT) \
- 	protocol_cursor.$(OBJEXT) tztime.$(OBJEXT) my_time.$(OBJEXT) \
--	ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT)
-+	ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT) \
-+	mylibwrap.$(OBJEXT)
- mysqld_OBJECTS = $(am_mysqld_OBJECTS)
- mysqld_DEPENDENCIES = $(top_builddir)/myisam/libmyisam.a \
- 	$(top_builddir)/myisammrg/libmyisammrg.a \
-@@ -518,7 +519,8 @@
- @AMDEP_TRUE@	./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/strfunc.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/table.Po ./$(DEPDIR)/thr_malloc.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/time.Po ./$(DEPDIR)/tztime.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/uniques.Po ./$(DEPDIR)/unireg.Po
-+@AMDEP_TRUE@	./$(DEPDIR)/uniques.Po ./$(DEPDIR)/unireg.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/mylibwrap.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -748,6 +750,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tztime.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniques.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unireg.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylibwrap.Po@am__quote@
- 
- distclean-depend:
- 	-rm -rf ./$(DEPDIR)
diff --git a/databases/mysql41-server/files/patch-sql::mylibwrap.c b/databases/mysql41-server/files/patch-sql::mylibwrap.c
deleted file mode 100644
index 39a31185a52d..000000000000
--- a/databases/mysql41-server/files/patch-sql::mylibwrap.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- sql/mylibwrap.c.orig	Thu Jan  1 01:00:00 1970
-+++ sql/mylibwrap.c		Sun Sep 19 15:37:22 2004
-@@ -0,0 +1,20 @@
-+#include <tcpd.h>
-+#include "mylibwrap.h"
-+
-+void
-+my_fromhost(struct request_info *req)
-+{
-+	fromhost(req);
-+}
-+
-+int
-+my_hosts_access(struct request_info *req)
-+{
-+	return hosts_access(req);
-+}
-+
-+char *
-+my_eval_client(struct request_info *req)
-+{
-+	return eval_client(req);
-+}
diff --git a/databases/mysql41-server/files/patch-sql::mylibwrap.h b/databases/mysql41-server/files/patch-sql::mylibwrap.h
deleted file mode 100644
index 1fa9e8cecf50..000000000000
--- a/databases/mysql41-server/files/patch-sql::mylibwrap.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql/mylibwrap.h.orig	Thu Jan  1 01:00:00 1970
-+++ sql/mylibwrap.h		Sun Sep 19 15:04:21 2004
-@@ -0,0 +1,9 @@
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+extern void my_fromhost(struct request_info *);
-+extern int my_hosts_access(struct request_info *);
-+extern char *my_eval_client(struct request_info *);
-+#ifdef __cplusplus
-+}
-+#endif
diff --git a/databases/mysql41-server/files/patch-sql::mysqld.cc b/databases/mysql41-server/files/patch-sql::mysqld.cc
index e9c1222d3773..c98d38bcbd10 100644
--- a/databases/mysql41-server/files/patch-sql::mysqld.cc
+++ b/databases/mysql41-server/files/patch-sql::mysqld.cc
@@ -1,6 +1,15 @@
---- sql/mysqld.cc.orig	Thu Sep 16 23:47:47 2004
-+++ sql/mysqld.cc	Tue Sep 21 23:56:49 2004
-@@ -115,15 +115,7 @@
+--- 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;
  
@@ -13,7 +22,26 @@
 -#define my_hosts_access(A) hosts_access()
 -#define my_eval_client(A)  eval_client()
 -#endif /* __STDC__ */
-+#include "mylibwrap.h"
  #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/mysql41-server/files/patch-sql::mytcpd.h b/databases/mysql41-server/files/patch-sql::mytcpd.h
new file mode 100644
index 000000000000..466e189f2dd0
--- /dev/null
+++ b/databases/mysql41-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/mysql41-server/files/patch-sql::mytcpd.h,v 1.1 2005-01-10 08:53:10 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 */