Updated mysql-server to 3.23.58

A lot of bug and security fixes since 3.23.51...

19 files changed, 85 insertions, 478 deletions

diff --git a/databases/mysql-server/MESSAGE b/databases/mysql-server/MESSAGE
index 4acb0fe7b23..5a126e9462c 100644
--- a/databases/mysql-server/MESSAGE
+++ b/databases/mysql-server/MESSAGE
@@ -1,5 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2003/09/19 14:34:57 wiz Exp $
+$NetBSD: MESSAGE,v 1.8 2003/10/05 17:55:34 martti Exp $
+
+The MySQL directory `${MYSQL_DATADIR}' should be owned by the
+user `${MYSQL_USER}' and group `${MYSQL_GROUP}'.  This can be done with:
+	chown -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
 
 If this is a new installation, please remember to set a password for
 the MySQL root user!  This is done by running both:
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 74711a9a992..5c9d15ca5f2 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2003/09/28 09:03:53 jdolecek Exp $
+# $NetBSD: Makefile,v 1.51 2003/10/05 17:55:34 martti Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL, a free SQL database (server)
 
@@ -15,26 +14,9 @@ USE_GMAKE=		YES
 USE_PKGINSTALL=		YES
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-ONLY_FOR_PLATFORM=	SunOS-*-sparc Linux-*-*
+PTHREAD_OPTS=		require
 
-# on NetBSD, if native threads are not available, hardwire
-# included mit-pthreads, as this doesn't yet work properly with pth
-.if ${OPSYS} == "NetBSD"
-.  if exists(/usr/include/pthread.h)
-
-# native pthreads
-ONLY_FOR_PLATFORM+=	NetBSD-*-*
-.  else
-
-# force included mit-pthreads
-CONFIGURE_ARGS+=	--with-mit-threads
-
-# platforms on which included mit-pthreads is usable
-ONLY_FOR_PLATFORM+=	NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32	\
-			NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-m68k	\
-			NetBSD-*-powerpc
-.  endif
-.endif
+CONFIGURE_ARGS+=	--with-pthreads
 
 PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
@@ -62,7 +44,15 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/safe_mysqld.1 ${PREFIX}/man/man1
 
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../databases/mysql-client/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
 
+.if ${PTHREAD_TYPE} == "pth"
+CFLAGS+=	-DSIGNALS_DONT_BREAK_READ
+CXXFLAGS+=	-DSIGNALS_DONT_BREAK_READ
+CONFIGURE_ENV+=	ac_cv_func_pthread_setschedparam=no
+CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo
index 09284c1330b..7284091a52b 100644
--- a/databases/mysql-server/distinfo
+++ b/databases/mysql-server/distinfo
@@ -1,19 +1,10 @@
-$NetBSD: distinfo,v 1.23 2003/09/28 15:09:48 jdolecek Exp $
+$NetBSD: distinfo,v 1.24 2003/10/05 17:55:34 martti Exp $
 
-SHA1 (mysql-3.23.51.tar.gz) = 5833feb9ecacd9870586d20a94c4c4650f988770
-Size (mysql-3.23.51.tar.gz) = 11203102 bytes
-SHA1 (patch-aa) = 78b86f81294ae1a483dcb64554d0c5d199201296
-SHA1 (patch-ab) = 8e80dc2b0def56f3453395f8310e71f8113c7ccd
-SHA1 (patch-ac) = 29fbb5bac3a81c3f9197c2d9ff84b795cdfbcaed
-SHA1 (patch-ad) = 7127dd00a6067aa06a563c13dde1ea25e70fa7bf
-SHA1 (patch-ae) = 81fa0273261ea44c599cf44f5a3a56935c3a62bd
-SHA1 (patch-af) = 23afbae1f93c149612619f9b3c74dff1e871a019
-SHA1 (patch-ag) = 75634ff5c9ee61ff3ef61b1d9a4be4afc65e8754
-SHA1 (patch-ah) = 7cd4278c9bdc5220de04f7e6b62bb8d11c892ffb
-SHA1 (patch-ai) = 071e34cc9236b08cdc438afbb46801e66efc7e92
-SHA1 (patch-aj) = 2e619c6f16a1256174fd3e6e4bca3214679a9347
-SHA1 (patch-ak) = f484f0bd5b77e0475c7b693b51f5f5146795afa0
-SHA1 (patch-al) = 75b237ea28da2b44f05c0c0fb3493bba060004dc
-SHA1 (patch-am) = adc14bcc3bd21e5a522e1a732ded223b641a2ac7
-SHA1 (patch-an) = c42a40e8772eb4a59eacae71c416b62682ce78dd
-SHA1 (patch-ao) = 39feaabdfe23d3007722001e3bda0b8967c473eb
+SHA1 (mysql-3.23.58.tar.gz) = f3383e41e8926c040a295173881414a1e96e0266
+Size (mysql-3.23.58.tar.gz) = 12039843 bytes
+SHA1 (patch-aa) = 3954608e14c5c7996e699dc3dc083cf93d5944c7
+SHA1 (patch-ab) = 026fe468b4d7517084eea74ae14e115861d7d552
+SHA1 (patch-ae) = 127fb44f62f351236e4f36609f8d3af7469e67cd
+SHA1 (patch-af) = 53d0c68891918e9b0a21a9e30bf4b36aec44d2b8
+SHA1 (patch-al) = 12cbb309e290067f599c2bbe9379e7dd804b8dad
+SHA1 (patch-am) = 8e4398480701eb38193babdeac59572cdadbd4ea
diff --git a/databases/mysql-server/files/mysqld.sh b/databases/mysql-server/files/mysqld.sh
index 8c3767c4473..334eab15e81 100644
--- a/databases/mysql-server/files/mysqld.sh
+++ b/databases/mysql-server/files/mysqld.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.1 2003/01/21 06:02:42 lukem Exp $
+# $NetBSD: mysqld.sh,v 1.2 2003/10/05 17:55:34 martti Exp $
 #
 
 # PROVIDE: mysqld
diff --git a/databases/mysql-server/patches/patch-aa b/databases/mysql-server/patches/patch-aa
index 5aa0661c27f..d0a8532681b 100644
--- a/databases/mysql-server/patches/patch-aa
+++ b/databases/mysql-server/patches/patch-aa
@@ -1,12 +1,15 @@
-$NetBSD: patch-aa,v 1.8 2003/09/28 09:03:53 jdolecek Exp $
+$NetBSD: patch-aa,v 1.9 2003/10/05 17:55:34 martti Exp $
 
---- Makefile.in.orig	2002-06-03 12:45:17.000000000 +0200
-+++ Makefile.in	2003-09-28 09:59:18.000000000 +0200
-@@ -185,7 +185,7 @@
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README 			COPYING COPYING.LIB MIRRORS
+--- Makefile.in.orig	Thu Mar 13 20:32:20 2003
++++ Makefile.in	Fri Apr 11 13:57:27 2003
+@@ -195,10 +195,7 @@
+ EXTRA_DIST = INSTALL-SOURCE README \
+ 			COPYING COPYING.LIB
  
--SUBDIRS = include @docs_dirs@ @readline_dir@ 			@thread_dirs@ @sql_client_dirs@ 			@sql_server_dirs@ scripts tests man 			@bench_dirs@ support-files os2
+-SUBDIRS = . include @docs_dirs@ @readline_dir@ \
+-			@thread_dirs@ @sql_client_dirs@ \
+-			@sql_server_dirs@ scripts tests man \
+-			@bench_dirs@ support-files os2
 +SUBDIRS = @thread_dirs@ @sql_server_dirs@ tests @bench_dirs@ support-files
  
  
diff --git a/databases/mysql-server/patches/patch-ab b/databases/mysql-server/patches/patch-ab
index ba74bafea24..01801f96ff6 100644
--- a/databases/mysql-server/patches/patch-ab
+++ b/databases/mysql-server/patches/patch-ab
@@ -1,34 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2002/04/11 13:45:24 fredb Exp $
+$NetBSD: patch-ab,v 1.7 2003/10/05 17:55:34 martti Exp $
 
---- mit-pthreads/machdep/engine-m68000-netbsd.c.orig	Thu Feb 14 11:30:25 2002
-+++ mit-pthreads/machdep/engine-m68000-netbsd.c
-@@ -66,14 +66,14 @@
- }
+--- support-files/Makefile.in.orig	Sun Feb 16 09:26:07 2003
++++ support-files/Makefile.in	Sun Feb 16 09:28:32 2003
+@@ -363,7 +363,7 @@
  
- /* ==========================================================================
-- * machdep_save_state()
-+ * machdep_save_float_state()
-  */
- void machdep_save_float_state(struct pthread * pthread)
- {
-     char * fdata = pthread->machdep_data.machdep_fstate;
+ info-am:
  
--    __asm__ ( "fmovem fp0-fp7,%0"::"m" (*fdata) );
--    __asm__ ( "fmovem fpcr/fpsr/fpi,%0"::"m" (fdata[80]) );
-+    __asm__ ( "fmovem %%fp0-%%fp7,%0"::"m" (*fdata) );
-+    __asm__ ( "fmovem %%fpcr/%%fpsr/%%fpi,%0"::"m" (fdata[80]) );
- }
+-install-data-am: install-pkgdataDATA install-pkgdataSCRIPTS
++install-data-am: install-pkgdataSCRIPTS
  
- /* ==========================================================================
-@@ -83,9 +83,8 @@
- {
-     char * fdata = pthread_run->machdep_data.machdep_fstate;
+ install-exec-am:
  
--    __asm__ ( "fmovem %0,fp0-fp7"::"m" (*fdata) );
--    __asm__ ( "fmovem %0,fpcr/fpsr/fpi"::"m" (fdata[80]) );
--
-+    __asm__ ( "fmovem %0,%%fp0-%%fp7"::"m" (*fdata) );
-+    __asm__ ( "fmovem %0,%%fpcr/%%fpsr/%%fpi"::"m" (fdata[80]) );
- }
- 
- /* ==========================================================================
diff --git a/databases/mysql-server/patches/patch-ac b/databases/mysql-server/patches/patch-ac
deleted file mode 100644
index 48440604871..00000000000
--- a/databases/mysql-server/patches/patch-ac
+++ /dev/null
@@ -1,93 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2002/04/11 13:45:25 fredb Exp $
-
---- mit-pthreads/machdep/syscall-m68000-netbsd.S.orig	Thu Feb 14 11:30:15 2002
-+++ mit-pthreads/machdep/syscall-m68000-netbsd.S
-@@ -10,10 +10,10 @@
- #ifdef __STDC__
- #define IMM	#
- #define SYSCALL(x)      .even; ENTRY(machdep_sys_ ## x); \
--                        movl IMM SYS_ ## x,d0; trap IMM 0; jcs err; rts
-+                        movl IMM SYS_ ## x,%d0; trap IMM 0; jcs err; rts
- #else /* !__STDC__ */
- #define SYSCALL(x)      .even; ENTRY(machdep_sys_/**/x); \
--                        movl #SYS_/**/x,d0; trap #0; jcs err; rts
-+                        movl #SYS_/**/x,%d0; trap #0; jcs err; rts
- #endif /* !__STDC__ */
- 
- /*
-@@ -29,7 +29,7 @@
-  */
- 
- err:
--        negl            d0
-+        negl            %d0
-         rts
- 
- /* ==========================================================================
-@@ -37,47 +37,47 @@
-  */
- 	.even
- ENTRY(machdep_sys_pipe);
--	movl #SYS_pipe,d0
-+	movl #SYS_pipe,%d0
- 	trap #0
- 	jcs 	err
--	movl	sp@(4),a0
--	movl	d0,a0@+
--	movl	d1,a0@
--	clrl	d0
-+	movl	%sp@(4),%a0
-+	movl	%d0,%a0@+
-+	movl	%d1,%a0@
-+	clrl	%d0
- 	rts
- 
- #ifndef SYS___sigsuspend14
- 	.even
- ENTRY(machdep_sys_sigsuspend)
--	movl	sp@(4),a0
--	movl	a0@,sp@(4)
--	movl	#SYS_compat_13_sigsuspend13,d0
-+	movl	%sp@(4),%a0
-+	movl	%a0@,%sp@(4)
-+	movl	#SYS_compat_13_sigsuspend13,%d0
- 	trap	#0
- 	jcs	err
--	clrl	d0
-+	clrl	%d0
- 	rts
- #endif
- 
- #ifndef SYS___sigprocmask14
- 	.even
- ENTRY(machdep_sys_sigprocmask)
--	tstl	sp@(8)
-+	tstl	%sp@(8)
- 	jne	gotptr
--/*	movl	#0,sp@(8)	/* null mask pointer; block empty set */
--	movl	#1,sp@(4)	
-+/*	movl	#0,%sp@(8)	/* null mask pointer; block empty set */
-+	movl	#1,%sp@(4)	
- 	jra	doit
- gotptr:
--	movl	sp@(8),a0
--	movl	a0@,sp@(8)
-+	movl	%sp@(8),%a0
-+	movl	%a0@,%sp@(8)
- doit:
--	movl	#SYS_compat_13_sigprocmask13,d0
-+	movl	#SYS_compat_13_sigprocmask13,%d0
- 	trap	#0
- 	jcs	err
--	tstl	sp@(12)
-+	tstl	%sp@(12)
- 	jeq	out
--	movl	sp@(12),a0
--	movl	d0,a0@
-+	movl	%sp@(12),%a0
-+	movl	%d0,%a0@
- out:
--	clrl	d0
-+	clrl	%d0
- 	rts
- #endif
diff --git a/databases/mysql-server/patches/patch-ad b/databases/mysql-server/patches/patch-ad
deleted file mode 100644
index 056b3e9a074..00000000000
--- a/databases/mysql-server/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2002/04/11 13:45:25 fredb Exp $
-
---- mit-pthreads/machdep/syscall-template-m68000-netbsd.S.orig	Thu Feb 14 11:30:13 2002
-+++ mit-pthreads/machdep/syscall-template-m68000-netbsd.S
-@@ -13,13 +13,13 @@
- #define IMM	#
- #define SYSCALL(x)      .even; \
- 			ENTRY(machdep_sys_ ## x); \
--                        movl IMM SYS_ ## x,d0; \
-+                        movl IMM SYS_ ## x,%d0; \
- 			trap IMM 0; \
- 			jcs err; \
- 			 rts
- #else /* !__STDC__ */
- #define SYSCALL(x)      .even; ENTRY(machdep_sys_/**/x); \
--                        movl #SYS_/**/x,d0; trap #0; jcs err; rts
-+                        movl #SYS_/**/x,%d0; trap #0; jcs err; rts
- #endif /* !__STDC__ */
- 
- /*
-@@ -35,7 +35,7 @@
-  */
- 
- err:
--        negl            d0
-+        negl            %d0
-         rts
- 
- #define XSYSCALL(NAME)	SYSCALL(NAME)
diff --git a/databases/mysql-server/patches/patch-ae b/databases/mysql-server/patches/patch-ae
index 855dfce9945..8b5813a9286 100644
--- a/databases/mysql-server/patches/patch-ae
+++ b/databases/mysql-server/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.10 2002/03/18 14:17:44 martti Exp $
+$NetBSD: patch-ae,v 1.11 2003/10/05 17:55:34 martti Exp $
 
---- configure.in.orig	Thu Feb 14 18:30:15 2002
-+++ configure.in	Mon Mar 18 14:49:20 2002
-@@ -1743,7 +1743,6 @@
+--- configure.in.orig	Thu Aug 28 13:20:55 2003
++++ configure.in	Thu Aug 28 13:23:04 2003
+@@ -1846,7 +1846,6 @@
  else
    bench_dirs=""
  fi
diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af
index 5cf0392dc1e..823e2a1122c 100644
--- a/databases/mysql-server/patches/patch-af
+++ b/databases/mysql-server/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.11 2003/09/28 09:03:53 jdolecek Exp $
+$NetBSD: patch-af,v 1.12 2003/10/05 17:55:34 martti Exp $
 
---- configure.orig	2002-06-03 12:39:20.000000000 +0200
-+++ configure	2003-09-28 10:01:27.000000000 +0200
-@@ -13397,7 +13397,6 @@
+--- configure.orig	Thu Aug 28 13:24:42 2003
++++ configure	Thu Aug 28 13:25:36 2003
+@@ -19952,7 +19952,6 @@
  else
    bench_dirs=""
  fi
 -bench_dirs="$bench_dirs mysql-test"
  
- # Don't build readline, i have it already
  
+ # Don't build readline, i have it already
diff --git a/databases/mysql-server/patches/patch-ag b/databases/mysql-server/patches/patch-ag
deleted file mode 100644
index 4fcf18cfa88..00000000000
--- a/databases/mysql-server/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2002/04/14 13:32:37 veego Exp $
-
---- mit-pthreads/config/Makefile.in-orig	Thu Feb 14 18:30:14 2002
-+++ mit-pthreads/config/Makefile.in	Sun Apr 14 15:21:53 2002
-@@ -53,4 +53,7 @@
- #install : install-bin install-include
- install:
- 
-+# Ditto for NetBSD-1.6
-+libinstall:
-+
- .include <bsd.lib.mk>
diff --git a/databases/mysql-server/patches/patch-ah b/databases/mysql-server/patches/patch-ah
deleted file mode 100644
index c01401a902b..00000000000
--- a/databases/mysql-server/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2001/10/08 17:28:13 veego Exp $
-
---- mit-pthreads/include/unistd.h-orig	Wed Oct  3 18:08:36 2001
-+++ mit-pthreads/include/unistd.h	Mon Oct  8 08:15:37 2001
-@@ -177,6 +177,12 @@
- void	 usleep __P_((unsigned));
- int	 vfork __P_((void));
- 
-+/* FIXME: this should go to <sys/time.h>! */
-+#if __STDC__
-+struct timeval;				/* select(2) XXX */
-+#endif
-+int	 select __P((int, fd_set *, fd_set *, fd_set *, struct timeval *));
-+
- #endif /* !_POSIX_SOURCE */
- __END_DECLS
- 
diff --git a/databases/mysql-server/patches/patch-ai b/databases/mysql-server/patches/patch-ai
deleted file mode 100644
index e939fe12dba..00000000000
--- a/databases/mysql-server/patches/patch-ai
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2002/06/03 14:08:28 tron Exp $
-
---- mit-pthreads/config/configure.orig	Thu Feb 14 18:30:22 2002
-+++ mit-pthreads/config/configure	Mon Jun  3 15:59:48 2002
-@@ -1252,7 +1252,7 @@
- name=$host_cpu-$host_os
- 
- case $host in
--    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[45]*)
-+    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[456]*)
- 	name=alpha-netbsd-1.3
- 	sysincludes=netbsd-1.1
- 	except="fork lseek pipe fstat"
-@@ -1276,7 +1276,7 @@
- 	  CFLAGS="$CFLAGS -std"
- 	fi
- 	;;
--    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[45]*)
-+    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[456]*)
- 	name=arm32-netbsd-1.3
- 	sysincludes=netbsd-1.1
- 	except="fork pipe lseek ftruncate fstat"
-@@ -1342,7 +1342,7 @@
- EOF
- 
- 	;;
--    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[45]*)
-+    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[456]*)
- 	name=sparc-netbsd-1.3
- 	sysincludes=netbsd-1.1
- 	except="pipe fork lseek ftruncate fstat"
-@@ -1381,7 +1381,7 @@
-         syscall=i386-bsdi-2.0
-         except="fork lseek ftruncate sigsuspend"
- 		;;
--    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[45]*)
-+    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[456]*)
- 	name=i386-netbsd-1.3
- 	sysincludes=netbsd-1.1
- 	except="fork lseek ftruncate pipe fstat"
diff --git a/databases/mysql-server/patches/patch-aj b/databases/mysql-server/patches/patch-aj
deleted file mode 100644
index 1dd7b4a3d6a..00000000000
--- a/databases/mysql-server/patches/patch-aj
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2002/03/25 15:19:31 briggs Exp $
-
-*** mit-pthreads/machdep/syscall-powerpc-netbsd.S	Thu Feb 14 12:30:14 2002
---- mit-pthreads/machdep/syscall-powerpc-netbsd.S	Mon Mar 25 09:52:47 2002
-***************
-*** 1,10 ****
-  #include <machine/asm.h>
-  #define COMPAT_43
-  #include <sys/syscall.h>
-- #ifndef __CONCAT
-- #include <sys/cdefs.h>
-- #endif
-- #define        CONCAT          __CONCAT
-  
-  #undef SYSCALL
-  
---- 1,6 ----
-***************
-*** 26,45 ****
-     SYSCALL invocation.  */
-  
-  ENTRY(machdep_cerror)
-! 	mflr    0		# Save LR in 0
-! 	stwu	1,-16(1)	# allocate new stack frame
-! 	stw	0,20(1)		# Stash 0 in stack
-! 	stw	31,8(1)		# Stash 31 in stack (since it's callee-saved
-! 	mr	31,3		# and we stash return there)
-  	bl	PIC_PLT(_C_LABEL(__errno))
-! 	stw	31,0(3)		# *errno() = err
-! 	lwz	0,20(1)		# Restore LR from stack to 0
-! 	neg	3,31		# return -errno to 3
-! 	lwz	31,8(1)		# Restore 31 from stack
-  	mtlr	0
-! 	la	1,16(1)		# Restore stack frame
-! 	li	4,-1		# Put -1 in r4 for those syscalls that return
-! 	blr			# two values
-  
-  /* The fork system call is special...  */
-  ENTRY(machdep_sys_fork)
---- 22,41 ----
-     SYSCALL invocation.  */
-  
-  ENTRY(machdep_cerror)
-! 	mflr    0		/* Save LR in 0 */
-! 	stwu	1,-16(1)	/* allocate new stack frame */
-! 	stw	0,20(1)		/* Stash 0 in stack */
-! 	stw	31,8(1)		/* Stash 31 in stack (since it's callee-saved */
-! 	mr	31,3		/* and we stash return there) */
-  	bl	PIC_PLT(_C_LABEL(__errno))
-! 	stw	31,0(3)		/* *errno() = err */
-! 	lwz	0,20(1)		/* Restore LR from stack to 0 */
-! 	neg	3,31		/* return -errno to 3 */
-! 	lwz	31,8(1)		/* Restore 31 from stack */
-  	mtlr	0
-! 	la	1,16(1)		/* Restore stack frame */
-! 	li	4,-1		/* Put -1 in r4 for those syscalls that ret */
-! 	blr			/* two values */
-  
-  /* The fork system call is special...  */
-  ENTRY(machdep_sys_fork)
-***************
-*** 55,64 ****
-  	li	0,SYS_pipe
-  	sc
-  	bso	PIC_PLT(_C_LABEL(machdep_cerror))
-! 	stw	3,0(5)		# Success, store fds
-  	stw	4,4(5)
-  	li	3,0
-! 	blr			# And return 0
-  
-  #ifndef SYS___sigsuspend14
-  /* The sigsuspend system call is special... */
---- 51,60 ----
-  	li	0,SYS_pipe
-  	sc
-  	bso	PIC_PLT(_C_LABEL(machdep_cerror))
-! 	stw	3,0(5)		/* Success, store fds */
-  	stw	4,4(5)
-  	li	3,0
-! 	blr			/* And return 0 */
-  
-  #ifndef SYS___sigsuspend14
-  /* The sigsuspend system call is special... */
-***************
-*** 72,91 ****
-  #ifndef SYS___sigprocmask14
-  /* The sigprocmask system call is special... */
-  ENTRY(machdep_sys_sigprocmask)
-! 	or.	4,4,4		# Set == NULL ?
-! 	li	6,1		# how = SIG_BLOCK
-  	beq	Ldoit
-! 	lwz	4,0(4)		# if not, replace it in r4 with #set
-  	mr	6,3
-! Ldoit:	mr	3,6		# ... using sigprocmask(SIG_BLOCK)
-  	li	0,SYS_compat_13_sigprocmask13
-  	sc
-  	bso	PIC_PLT(_C_LABEL(machdep_cerror))
-! 	or.	5,5,5		# Check to see if oset requested
-! 	beq	Ldone		# if oset != NULL
-! 	stw	3,0(5)		#   *oset = oldmask
-  Ldone:
-! 	li	3,0		# return 0
-  	blr
-  #endif /* SYS_sigprocmask14 */
-  
---- 68,87 ----
-  #ifndef SYS___sigprocmask14
-  /* The sigprocmask system call is special... */
-  ENTRY(machdep_sys_sigprocmask)
-! 	or.	4,4,4		/* Set == NULL ? */
-! 	li	6,1		/* how = SIG_BLOCK */
-  	beq	Ldoit
-! 	lwz	4,0(4)		/* if not, replace it in r4 with #set */
-  	mr	6,3
-! Ldoit:	mr	3,6		/* ... using sigprocmask(SIG_BLOCK) */
-  	li	0,SYS_compat_13_sigprocmask13
-  	sc
-  	bso	PIC_PLT(_C_LABEL(machdep_cerror))
-! 	or.	5,5,5		/* Check to see if oset requested */
-! 	beq	Ldone		/* if oset != NULL */
-! 	stw	3,0(5)		/*   *oset = oldmask */
-  Ldone:
-! 	li	3,0		/* return 0 */
-  	blr
-  #endif /* SYS_sigprocmask14 */
-  
diff --git a/databases/mysql-server/patches/patch-ak b/databases/mysql-server/patches/patch-ak
deleted file mode 100644
index 05d0975af63..00000000000
--- a/databases/mysql-server/patches/patch-ak
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2002/12/13 14:19:55 tron Exp $
-
---- sql/sql_parse.cc.orig	Thu Feb 14 18:30:14 2002
-+++ sql/sql_parse.cc	Fri Dec 13 14:46:28 2002
-@@ -105,6 +105,8 @@
-   NET *net= &thd->net;
-   thd->db=0;
- 
-+  if (passwd[0] && strlen(passwd) != SCRAMBLE_LENGTH)
-+    return 1;
-   if (!(thd->user = my_strdup(user, MYF(0))))
-   {
-     send_error(net,ER_OUT_OF_RESOURCES);
-@@ -764,8 +766,8 @@
-       thread_safe_increment(com_other,&LOCK_thread_count);
-       slow_command = TRUE;
-       char* data = packet + 1;
--      uint db_len = *data;
--      uint tbl_len = *(data + db_len + 1);
-+      uint db_len = *(uchar *)*data;
-+      uint tbl_len = *(uchar *)(data + db_len + 1);
-       char* db = sql_alloc(db_len + tbl_len + 2);
-       memcpy(db, data + 1, db_len);
-       char* tbl_name = db + db_len;
diff --git a/databases/mysql-server/patches/patch-al b/databases/mysql-server/patches/patch-al
index 557ea1ca7a8..9a5a00d364f 100644
--- a/databases/mysql-server/patches/patch-al
+++ b/databases/mysql-server/patches/patch-al
@@ -1,12 +1,30 @@
-$NetBSD: patch-al,v 1.3 2003/01/20 17:48:48 jdolecek Exp $
+$NetBSD: patch-al,v 1.4 2003/10/05 17:55:34 martti Exp $
 
---- include/my_pthread.h.orig	Mon Jan 20 18:40:49 2003
-+++ include/my_pthread.h	Mon Jan 20 18:40:58 2003
-@@ -21,6 +21,7 @@
+--- include/my_pthread.h.orig	Thu Aug 28 13:26:47 2003
++++ include/my_pthread.h	Thu Aug 28 13:28:45 2003
+@@ -20,7 +20,13 @@
+ #ifndef _my_pthread_h
  #define _my_pthread_h
  
++/* defines __NetBSD_Version__ */
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
  #include <errno.h>
 +#include <signal.h>
  #ifndef ETIME
  #define ETIME ETIMEDOUT				/* For FreeBSD */
  #endif
+@@ -294,7 +300,11 @@
+ #endif
+ 
+ #ifndef HAVE_NONPOSIX_SIGWAIT
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 106130000)
+ #define my_sigwait(A,B) sigwait((A),(B))
++#elif defined (__NetBSD__) && (__NetBSD_Version__ < 106130000)
++#define my_sigwait(A,B) __pthread_sigwait((A),(B))
++#endif
+ #else
+ int my_sigwait(const sigset_t *set,int *sig);
+ #endif
diff --git a/databases/mysql-server/patches/patch-am b/databases/mysql-server/patches/patch-am
index 0a90bbd7d66..5e23752e9e2 100644
--- a/databases/mysql-server/patches/patch-am
+++ b/databases/mysql-server/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.3 2003/01/21 06:02:42 lukem Exp $
+$NetBSD: patch-am,v 1.4 2003/10/05 17:55:34 martti Exp $
 
---- scripts/safe_mysqld.sh.orig	Tue Jan 21 16:11:16 2003
-+++ scripts/safe_mysqld.sh
-@@ -184,6 +184,14 @@ then
+--- scripts/safe_mysqld.sh.orig	Fri Apr 11 13:57:14 2003
++++ scripts/safe_mysqld.sh	Fri Apr 11 13:58:02 2003
+@@ -195,6 +195,14 @@
    fi
  fi
  
@@ -17,7 +17,7 @@ $NetBSD: patch-am,v 1.3 2003/01/21 06:02:42 lukem Exp $
  #
  # If there exists an old pid file, check if the daemon is already running
  # Note: The switches to 'ps' may depend on your operating system
-@@ -194,18 +202,16 @@ then
+@@ -205,18 +213,16 @@
    then
      if @FIND_PROC@
      then    # The pid contains a mysqld process
@@ -40,7 +40,7 @@ $NetBSD: patch-am,v 1.3 2003/01/21 06:02:42 lukem Exp $
      exit 1
    fi
  fi
-@@ -214,11 +220,11 @@ fi
+@@ -225,11 +231,11 @@
  # Uncomment the following lines if you want all tables to be automaticly
  # checked and repaired at start
  #
@@ -54,7 +54,7 @@ $NetBSD: patch-am,v 1.3 2003/01/21 06:02:42 lukem Exp $
  
  # Does this work on all systems?
  #if type ulimit | grep "shell builtin" > /dev/null
-@@ -226,7 +232,7 @@ echo "Starting $MYSQLD daemon with datab
+@@ -237,7 +243,7 @@
  #  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
  #fi
  
@@ -63,7 +63,7 @@ $NetBSD: patch-am,v 1.3 2003/01/21 06:02:42 lukem Exp $
  while true
  do
    rm -f $MYSQL_UNIX_PORT $pid_file	# Some extra safety
-@@ -249,7 +255,7 @@ do
+@@ -260,7 +266,7 @@
      # The only thing is ps x => redhat 5 gives warnings when using ps -x.
      # kill -9 is used or the process won't react on the kill.
      numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
@@ -72,7 +72,7 @@ $NetBSD: patch-am,v 1.3 2003/01/21 06:02:42 lukem Exp $
      I=1
      while test "$I" -le "$numofproces"
      do 
-@@ -261,7 +267,7 @@ do
+@@ -272,7 +278,7 @@
  	#    echo "TEST $I - $T **"
  	if kill -9 $T
  	then
@@ -81,14 +81,3 @@ $NetBSD: patch-am,v 1.3 2003/01/21 06:02:42 lukem Exp $
  	else 
  	  break
  	fi
-@@ -269,8 +275,7 @@ do
-     done
-   fi
- 
--  echo "`date +'%y%m%d %H:%M:%S  mysqld restarted'`" | tee -a $err_log
-+  datemsg "mysqld restarted"
- done
- 
--echo "`date +'%y%m%d %H:%M:%S  mysqld ended'`" | tee -a $err_log
--echo "" | tee -a $err_log
-+datemsg "mysqld ended"
diff --git a/databases/mysql-server/patches/patch-an b/databases/mysql-server/patches/patch-an
deleted file mode 100644
index 891b1e9919d..00000000000
--- a/databases/mysql-server/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.3 2003/09/17 21:03:11 wiz Exp $
-
---- sql/sql_acl.cc.orig	Thu Feb 14 18:30:21 2002
-+++ sql/sql_acl.cc
-@@ -206,7 +206,7 @@ int  acl_init(bool dont_read_acl_tables)
- 		      "Found old style password for user '%s'. Ignoring user. (You may want to restart using --old-protocol)",
- 		      user.user ? user.user : ""); /* purecov: tested */
-     }
--    else if (length % 8)		// This holds true for passwords
-+    else if (length % 8 || length > 16)		// This holds true for passwords
-     {
-       sql_print_error(
- 		      "Found invalid password for user: '%s@%s'; Ignoring user",
diff --git a/databases/mysql-server/patches/patch-ao b/databases/mysql-server/patches/patch-ao
deleted file mode 100644
index d0d1f5b5898..00000000000
--- a/databases/mysql-server/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2003/09/28 15:09:48 jdolecek Exp $
-
---- mit-pthreads/include/netdb.h.orig	Sun Sep 28 16:36:39 2003
-+++ mit-pthreads/include/netdb.h	Sun Sep 28 16:37:20 2003
-@@ -49,6 +49,8 @@
- #define __NETDB_MAXALIASES	35
- #define __NETDB_MAXADDRS	35
- 
-+extern int h_errno;
-+
- /*
-  * Structures returned by network data base library.  All addresses are
-  * supplied in host order, and returned in network order (suitable for