diff options
| author | bad <bad> | 1999-12-13 20:36:21 +0000 |
|---|---|---|
| committer | bad <bad> | 1999-12-13 20:36:21 +0000 |
| commit | 4a7e7bd657c5ae6041674e022e2b211674b9e323 (patch) | |
| tree | 5088c939535ad1db8661cb18ce3bfd995eef0de7 /databases | |
| parent | c9042ca3cad87d14396520b03e24e7ad64306421 (diff) | |
| download | pkgsrc-4a7e7bd657c5ae6041674e022e2b211674b9e323.tar.gz | |
Update MySQL to 3.22.27.
There are a bunch of bug fixes to the server. For a complete list see
the documentation.
Also, get rid of USE_GMAKE. The normal make works just fine.
Delete a whole bunch of patches that have been integrated into the
distribution.
Update the mit-pthreads patches to use _C_LABEL where appropriate so that
mit-pthreads works on ELF and a.out for the affected platforms.
Diffstat (limited to 'databases')
31 files changed, 541 insertions, 1699 deletions
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index d2e9956909d..708c5993f55 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 1999/08/24 18:55:28 bad Exp $ +# $NetBSD: Makefile,v 1.8 1999/12/13 20:36:21 bad Exp $ # -DISTNAME= mysql-3.22.22 +DISTNAME= mysql-3.22.27 PKGNAME= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= ftp://ftp.mysql.com/pub/mysql/Downloads/MySQL-3.22/ \ @@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.mysql.com/pub/mysql/Downloads/MySQL-3.22/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mysql.com/ -DEPENDS= ${DISTNAME:S/-/-client-/}:../../databases/mysql-client +DEPENDS= ${DISTNAME:S/-/-client-/}:../../databases/mysql-client-current NO_CDROM= "Restrictive license." @@ -33,7 +33,6 @@ CFLAGS+= -Dunix ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ NetBSD-*-sparc NetBSD-*-m68k SunOS-*-sparc -USE_GMAKE= USE_PERL5= post-extract: diff --git a/databases/mysql-server/files/md5 b/databases/mysql-server/files/md5 index 0fc3d51ea3e..e6adc6468dc 100644 --- a/databases/mysql-server/files/md5 +++ b/databases/mysql-server/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ +$NetBSD: md5,v 1.2 1999/12/13 20:36:22 bad Exp $ -MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c +MD5 (mysql-3.22.27.tar.gz) = 385bee829a157b0a50e61402fc859035 diff --git a/databases/mysql-server/files/patch-sum b/databases/mysql-server/files/patch-sum index a48a24e9c0b..68dfa8f0195 100644 --- a/databases/mysql-server/files/patch-sum +++ b/databases/mysql-server/files/patch-sum @@ -1,32 +1,18 @@ -$NetBSD: patch-sum,v 1.4 1999/11/15 17:45:47 rh Exp $ +$NetBSD: patch-sum,v 1.5 1999/12/13 20:36:22 bad Exp $ -MD5 (patch-aa) = ad4fe0302fbab85a9e9904f06945412a -MD5 (patch-ab) = 8446222f95bd6f72618f28313803a6eb +MD5 (patch-aa) = f365bcd221de53ff6c21e25142e5c5e5 MD5 (patch-ac) = dcfe337e29c56131e736247172d8239c -MD5 (patch-ah) = 6c5da9199c8b212971a7d885440be271 -MD5 (patch-ai) = 226e4c2638a52272c2f69304d60dd3b9 -MD5 (patch-aj) = fa4fbd62e6dae95826ce4799c5ac5db9 -MD5 (patch-ak) = cb7fb6e317fa5df5bf5f1b2efb245792 -MD5 (patch-al) = 4a305ca7a9e49805f7207633945857d5 -MD5 (patch-am) = 91fa4a7d40b47b58daf61f8498bc3ace -MD5 (patch-an) = 8ec9c3996e3dc04b7493d820403043d4 -MD5 (patch-ao) = eee08cb7d570edfa6144e6378f55e45e -MD5 (patch-ap) = a1ce24e80dd5dad84be695a3cbdc030e -MD5 (patch-aq) = ec6a3e6affe1f72b8d14800990c10143 -MD5 (patch-ar) = 774b86580fd6ee7e71361f2e154ea6c9 -MD5 (patch-as) = d83fecd0e02dfe9acef04e67956e85d0 -MD5 (patch-at) = 46a4bf242771d5056511f3bd2c6ad265 -MD5 (patch-au) = ea9b9569497a53840db849d3b708f9ea -MD5 (patch-av) = 62152b9fd4266db96860347cdcd214a7 -MD5 (patch-aw) = 4ecffe594afaaa6b9a9f11afbf41b557 -MD5 (patch-ax) = 7d12a42c1ae801d275e098acbb4df8b0 -MD5 (patch-ay) = 1ea1c1b9603f96268ff2424ab289c9fe -MD5 (patch-az) = 646116cda551435bf4ad97e5b9739842 -MD5 (patch-ba) = 9c0f614b8a966c089b8e4d2d6e975e5e -MD5 (patch-bc) = 6e4107221cb116e84055511098ba3fde -MD5 (patch-bd) = 8341119fc27fe12e74ca6536672e6427 -MD5 (patch-be) = aa185cb2a9987fb46d6fb0b49e37fad0 +MD5 (patch-ah) = b8aed564301f4cbea7c9677590917925 +MD5 (patch-ar) = 81984794570fd5f45be71b3d1d9b9783 +MD5 (patch-as) = 13776a945f3ed5a04fc1a3a4aa042dee +MD5 (patch-au) = 6c45abe0f6c1600e0f2589f813047b1b +MD5 (patch-av) = 0344b8c994c3ad198a20dadba3c2fe56 +MD5 (patch-ay) = 37bf83f67cb3ba9257fb00bd7a3ecdd3 +MD5 (patch-az) = 3f30c742937b05f12042b5ff0fa7fca8 +MD5 (patch-bd) = 080456979112f42d1f88c9b69c4f9946 +MD5 (patch-be) = a3272f18e63d0dbdb73a8396847c9a5d MD5 (patch-bf) = 8818adb013190eea8648222cc86476c5 MD5 (patch-bg) = d625bb949765958d9ad60c413a599a38 MD5 (patch-bh) = 3cac847c3008c633cf8970d9dd46a1be -MD5 (patch-bi) = 1999fb9be3013d6f240604da260f0c2b +MD5 (patch-bi) = 41ca03261490be3b954dfd03bd79f47c +MD5 (patch-bj) = b7423ddca37dd5d914681690fd0b0563 diff --git a/databases/mysql-server/patches/patch-aa b/databases/mysql-server/patches/patch-aa index 6f3e0fafc52..86adf9dfd34 100644 --- a/databases/mysql-server/patches/patch-aa +++ b/databases/mysql-server/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ +$NetBSD: patch-aa,v 1.2 1999/12/13 20:36:22 bad Exp $ ---- Makefile.in.orig Thu May 6 10:58:47 1999 -+++ Makefile.in Thu May 6 12:35:20 1999 -@@ -136,8 +136,8 @@ +--- Makefile.in.orig Thu Jul 8 06:33:18 1999 ++++ Makefile.in Tue Aug 17 00:06:35 1999 +@@ -141,7 +141,7 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE-GENERIC README \ - PUBLIC INSTALL-SOURCE MIRRORS --SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ \ -- scripts include tests man @bench_dirs@ support-files -+SUBDIRS = @sql_server_dirs@ \ -+ tests @bench_dirs@ + EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS + +-SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files ++SUBDIRS = @sql_server_dirs@ tests @bench_dirs@ + # Relink after clean - CLEANFILES = linked_client_sources diff --git a/databases/mysql-server/patches/patch-ab b/databases/mysql-server/patches/patch-ab deleted file mode 100644 index d3066513189..00000000000 --- a/databases/mysql-server/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ - ---- dbug/dbug.c.orig Thu May 6 13:03:41 1999 -+++ dbug/dbug.c Thu May 6 13:03:52 1999 -@@ -317,7 +317,6 @@ - - #if defined(unix) || defined(xenix) || defined(VMS) - # define Delay(A) sleep((uint) A) --IMPORT unsigned sleep (); /* Pause for given number of seconds */ - #else - #if defined(AMIGA) - IMPORT int Delay (); /* Pause for given number of ticks */ diff --git a/databases/mysql-server/patches/patch-ah b/databases/mysql-server/patches/patch-ah index ab396343ab3..088eaf1d353 100644 --- a/databases/mysql-server/patches/patch-ah +++ b/databases/mysql-server/patches/patch-ah @@ -1,70 +1,8 @@ -$NetBSD: patch-ah,v 1.2 1999/08/03 20:30:41 bad Exp $ +$NetBSD: patch-ah,v 1.3 1999/12/13 20:36:23 bad Exp $ ---- mit-pthreads/config/configure.orig Tue Mar 10 10:11:25 1998 -+++ mit-pthreads/config/configure Thu Jul 29 19:17:31 1999 -@@ -1165,6 +1165,12 @@ - name=$host_cpu-$host_os - - case $host in -+ alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.4*) -+ name=alpha-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek pipe fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; - alpha-*-netbsd1.3*) - name=alpha-netbsd-1.3 - sysincludes=netbsd-1.1 -@@ -1183,6 +1189,17 @@ - CFLAGS="$CFLAGS -std" - fi - ;; -+ arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.4*) -+ name=arm32-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork pipe lseek ftruncate fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; -+ arm32-*-netbsd1.3*) -+ name=arm32-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork pipe lseek ftruncate sigsuspend sigprocmask fstat" -+ ;; - hppa1.0-*-hpux10.20 | hppa1.1-*-hpux10.20) - name=hppa-hpux-10.20 - sysincludes=hpux-10.20 -@@ -1232,6 +1249,17 @@ - EOF - - ;; -+ sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.4*) -+ name=sparc-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="pipe fork lseek ftruncate fstat" -+ available_syscalls="sigprocmask sigsuspend" -+ ;; -+ sparc-*-netbsd1.3*) -+ name=sparc-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="pipe fork lseek ftruncate sigprocmask sigsuspend fstat" -+ ;; - sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*) - name=sparc-sunos-4.1.3 - sysincludes=netbsd-1.0 -@@ -1257,6 +1285,12 @@ - syscall=i386-bsdi-2.0 - except="fork lseek ftruncate sigsuspend" - ;; -+ i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.4*) -+ name=i386-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; - i386-*-netbsd1.3*) - name=i386-netbsd-1.3 - sysincludes=netbsd-1.1 -@@ -1279,6 +1313,9 @@ +--- mit-pthreads/config/configure.orig Mon Jun 7 12:34:01 1999 ++++ mit-pthreads/config/configure Tue Aug 17 00:18:32 1999 +@@ -1313,6 +1313,9 @@ ;; m68*-*-netbsd*) name=m68000-netbsd @@ -74,42 +12,3 @@ $NetBSD: patch-ah,v 1.2 1999/08/03 20:30:41 bad Exp $ ;; i386-*-freebsd2.*) name=i386-freebsd-2.0 -@@ -1898,6 +1935,38 @@ - if test $pthreads_cv_timespec_in_time = yes ; then - cat >> confdefs.h <<\EOF - #define _OS_HAS_TIMESPEC 1 -+EOF -+fi -+ -+echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -+if eval "test \"`echo '$''{'pthreads_cv_socklen_t'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 1678 "configure" -+#include "confdefs.h" -+#include <sys/types.h> -+#include <sys/socket.h> -+int main() { return 0; } -+int t() { -+socklen_t foo; -+; return 0; } -+EOF -+if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ pthreads_cv_socklen_t=yes -+else -+ rm -rf conftest* -+ pthreads_cv_socklen_t=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$pthreads_cv_socklen_t" 1>&6 -+if test $pthreads_cv_socklen_t = yes ; then -+ cat >> confdefs.h <<\EOF -+#define _OS_HAS_SOCKLEN_T 1 - EOF - - fi diff --git a/databases/mysql-server/patches/patch-ai b/databases/mysql-server/patches/patch-ai deleted file mode 100644 index b72409c9057..00000000000 --- a/databases/mysql-server/patches/patch-ai +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ - ---- mit-pthreads/config/config.sub.orig Fri Jan 23 23:07:31 1998 -+++ mit-pthreads/config/config.sub Sun Oct 25 18:54:55 1998 -@@ -119,7 +119,7 @@ - case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. -- tahoe | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \ -+ tahoe | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm | arm32 | pyramid \ - | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \ - | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \ - | powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \ -@@ -133,7 +133,7 @@ - ;; - # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \ -- | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \ -+ | sparc-* | ns32k-* | fx80-* | arm-* | arm32-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ - | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ diff --git a/databases/mysql-server/patches/patch-aj b/databases/mysql-server/patches/patch-aj deleted file mode 100644 index f42e01e2acb..00000000000 --- a/databases/mysql-server/patches/patch-aj +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ ---- mit-pthreads/pthreads/fd.c.orig Tue Jan 13 06:28:04 1998 -+++ mit-pthreads/pthreads/fd.c Mon Dec 28 23:50:16 1998 -@@ -44,6 +44,7 @@ - - #include <pthread.h> - #include <stdlib.h> -+#include <string.h> - #include <unistd.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -702,7 +703,7 @@ - */ - off_t lseek(int fd, off_t offset, int whence) - { -- int ret; -+ off_t ret; - - if ((ret = fd_lock(fd, FD_RDWR, NULL)) == OK) { - ret = fd_table[fd]->ops->seek(fd_table[fd]->fd, diff --git a/databases/mysql-server/patches/patch-ak b/databases/mysql-server/patches/patch-ak deleted file mode 100644 index 5c553916f86..00000000000 --- a/databases/mysql-server/patches/patch-ak +++ /dev/null @@ -1,124 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ - ---- mit-pthreads/pthreads/fd_kern.c.orig Wed Nov 26 09:43:02 1997 -+++ mit-pthreads/pthreads/fd_kern.c Sat Mar 20 23:41:26 1999 -@@ -575,6 +575,7 @@ - off_t __fd_kern_lseek(union fd_data fd_data, int f, off_t offset, int whence) - { - int fd = fd_data.i; -+ extern off_t machdep_sys_lseek(int, off_t, int); - off_t ret=machdep_sys_lseek(fd, offset, whence); - if ((long) ret < 0L && (long) ret >= -255L) - { -@@ -1096,7 +1097,11 @@ - /* ========================================================================== - * bind() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int bind(int fd, const struct sockaddr *name, socklen_t namelen) -+#else - int bind(int fd, const struct sockaddr *name, int namelen) -+#endif - { - /* Not much to do in bind */ - int ret; -@@ -1118,7 +1123,11 @@ - /* ========================================================================== - * connect() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int connect(int fd, const struct sockaddr *name, socklen_t namelen) -+#else - int connect(int fd, const struct sockaddr *name, int namelen) -+#endif - { - struct sockaddr tmpname; - int ret, tmpnamelen; -@@ -1170,7 +1179,11 @@ - /* ========================================================================== - * accept() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int accept(int fd, struct sockaddr *name, socklen_t *namelen) -+#else - int accept(int fd, struct sockaddr *name, int *namelen) -+#endif - { - int ret, fd_kern; - -@@ -1377,8 +1390,13 @@ - /* ========================================================================== - * sendto() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+ssize_t sendto(int fd, const void * msg, size_t len, int flags, -+ const struct sockaddr *to, socklen_t to_len) -+#else - ssize_t sendto(int fd, const void * msg, size_t len, int flags, - const struct sockaddr *to, int to_len) -+#endif - { - return(sendto_timedwait(fd, msg, len, flags, to, to_len, NULL)); - } -@@ -1629,8 +1647,13 @@ - /* ========================================================================== - * recvfrom() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+ssize_t recvfrom(int fd, void * buf, size_t len, int flags, -+ struct sockaddr * from, socklen_t * from_len) -+#else - ssize_t recvfrom(int fd, void * buf, size_t len, int flags, - struct sockaddr * from, int * from_len) -+#endif - { - return(recvfrom_timedwait(fd, buf, len, flags, from, from_len, NULL)); - } -@@ -1788,7 +1811,11 @@ - /* ========================================================================== - * setsockopt() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int setsockopt(int fd, int level, int optname, const void * optval, socklen_t optlen) -+#else - int setsockopt(int fd, int level, int optname, const void * optval, int optlen) -+#endif - { - int ret; - -@@ -1810,7 +1837,11 @@ - /* ========================================================================== - * getsockopt() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int getsockopt(int fd, int level, int optname, void * optval, socklen_t * optlen) -+#else - int getsockopt(int fd, int level, int optname, void * optval, int * optlen) -+#endif - { - int ret; - -@@ -1832,7 +1863,11 @@ - /* ========================================================================== - * getsockname() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int getsockname(int fd, struct sockaddr * name, socklen_t * naddrlen) -+#else - int getsockname(int fd, struct sockaddr * name, int * naddrlen) -+#endif - { - int ret; - -@@ -1854,7 +1889,11 @@ - /* ========================================================================== - * getpeername() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int getpeername(int fd, struct sockaddr * peer, socklen_t * paddrlen) -+#else - int getpeername(int fd, struct sockaddr * peer, int * paddrlen) -+#endif - { - int ret; - diff --git a/databases/mysql-server/patches/patch-al b/databases/mysql-server/patches/patch-al deleted file mode 100644 index ab4d56a06df..00000000000 --- a/databases/mysql-server/patches/patch-al +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ - ---- mit-pthreads/machdep/netbsd-1.1/__signal.h.orig Tue Apr 23 08:11:39 1996 -+++ mit-pthreads/machdep/netbsd-1.1/__signal.h Sat Oct 17 21:41:52 1998 -@@ -1,8 +1,20 @@ - #include <sys/signal.h> - -+#if NSIG <= 32 - #define __SIGEMPTYSET 0 - #define __SIGFILLSET 0xffffffff - #define __SIGADDSET(s, n) (*(s) |= 1 << ((n) - 1), 0) - #define __SIGDELSET(s, n) (*(s) &= ~(1 << ((n) - 1)), 0) - #define __SIGISMEMBER(s, n) ((*(s) & (1 << ((n) - 1))) != 0) - -+#else /* XXX Netbsd >= 1.3H */ -+#define __SIGEMPTYSET { 0, 0, 0, 0} -+#define __SIGFILLSET { 0xffffffff, 0xffffffff, \ -+ 0xffffffff, 0xffffffff } -+#define __SIGMASK(n) (1 << (((n) - 1) & 31)) -+#define __SIGWORD(n) (((n) - 1) >> 5) -+#define __SIGADDSET(s, n) ((s)->__bits[__SIGWORD(n)] |= __SIGMASK(n)) -+#define __SIGDELSET(s, n) ((s)->__bits[__SIGWORD(n)] &= ~__SIGMASK(n)) -+#define __SIGISMEMBER(s, n) (((s)->__bits[__SIGWORD(n)] & __SIGMASK(n)) != 0) -+ -+#endif diff --git a/databases/mysql-server/patches/patch-am b/databases/mysql-server/patches/patch-am deleted file mode 100644 index 562dec8ff94..00000000000 --- a/databases/mysql-server/patches/patch-am +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ - ---- mit-pthreads/machdep/engine-alpha-netbsd-1.3.h.orig Mon Mar 9 11:30:59 1998 -+++ mit-pthreads/machdep/engine-alpha-netbsd-1.3.h Thu Oct 22 18:24:17 1998 -@@ -10,6 +10,7 @@ - #include <setjmp.h> - #include <sys/time.h> - #include <sys/cdefs.h> -+#include <sys/signal.h> /* for _NSIG */ - - /* The first machine dependent functions are the SEMAPHORES needing - the test and set instruction. -@@ -46,7 +47,7 @@ - * sigset_t macros - */ - #define SIG_ANY(sig) (sig) --#define SIGMAX 31 -+#define SIGMAX (_NSIG-1) - - /* - * New Strutures diff --git a/databases/mysql-server/patches/patch-an b/databases/mysql-server/patches/patch-an deleted file mode 100644 index 42dfa37fc50..00000000000 --- a/databases/mysql-server/patches/patch-an +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ - ---- mit-pthreads/machdep/syscall-alpha-netbsd-1.3.S.orig Mon Mar 9 11:30:59 1998 -+++ mit-pthreads/machdep/syscall-alpha-netbsd-1.3.S Mon Oct 19 21:25:47 1998 -@@ -72,6 +72,7 @@ - RET - .end machdep_sys_pipe - -+#ifndef SYS___sigsuspend14 - /* The sigsuspend system call is special... */ - .align 4 - .globl machdep_sys_sigsuspend -@@ -83,7 +84,9 @@ - mov zero, v0 /* shouldn't need; just in case... */ - RET - .end machdep_sys_sigsuspend -+#endif /* SYS_sigsuspend14 */ - -+#ifndef SYS___sigprocmask14 - /* The sigprocmask system call is special... */ - .align 4 - .globl machdep_sys_sigprocmask -@@ -100,6 +103,7 @@ - Lret: mov zero, v0 - RET - .end machdep_sys_sigprocmask -+#endif /* SYS_sigprocmask14 */ - - /* More stuff ... */ - .align 4 diff --git a/databases/mysql-server/patches/patch-ao b/databases/mysql-server/patches/patch-ao deleted file mode 100644 index 97d85d127d3..00000000000 --- a/databases/mysql-server/patches/patch-ao +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ - ---- mit-pthreads/machdep/syscall-template-alpha-netbsd-1.3.S.orig Mon Mar 9 11:30:59 1998 -+++ mit-pthreads/machdep/syscall-template-alpha-netbsd-1.3.S Mon Oct 19 21:24:36 1998 -@@ -3,6 +3,13 @@ - #include <sys/syscall.h> - #define CHMK() call_pal 0x83 - -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ - #undef SYSCALL - - /* Kernel syscall interface: diff --git a/databases/mysql-server/patches/patch-ap b/databases/mysql-server/patches/patch-ap deleted file mode 100644 index d0f78080d59..00000000000 --- a/databases/mysql-server/patches/patch-ap +++ /dev/null @@ -1,111 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ - ---- /dev/null Thu Oct 22 03:18:30 1998 -+++ mit-pthreads/machdep/engine-sparc-netbsd-1.3.h Thu Oct 22 18:29:44 1998 -@@ -0,0 +1,106 @@ -+/* ==== machdep.h ============================================================ -+ * Copyright (c) 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * engine-sparc-sunos-4.1.3.h,v 1.52.4.1 1995/12/13 05:42:33 proven Exp -+ * -+ */ -+ -+#include <unistd.h> -+#include <setjmp.h> -+#include <sys/time.h> -+#include <sys/cdefs.h> -+#include <sys/signal.h> /* for _NSIG */ -+ -+/* -+ * The first machine dependent functions are the SEMAPHORES -+ * needing the test and set instruction. -+ */ -+#define SEMAPHORE_CLEAR 0 -+#define SEMAPHORE_SET 0xff -+ -+#define SEMAPHORE_TEST_AND_SET(lock) \ -+({ \ -+char *p = lock; \ -+long temp; \ -+ \ -+__asm__ volatile("ldstub %1,%0" \ -+ :"=r" (temp) \ -+ :"m" (*p) \ -+ :"memory"); \ -+temp; \ -+}) -+ -+#define SEMAPHORE_RESET(lock) \ -+{ \ -+__asm__ volatile("stb %1, %0" \ -+ :"=m" (*lock) \ -+ :"r" (SEMAPHORE_CLEAR) \ -+ :"memory"); \ -+} -+ -+/* -+ * New types -+ */ -+typedef char semaphore; -+ -+/* -+ * sigset_t macros -+ */ -+#define SIG_ANY(sig) (sig) -+#define SIGMAX (_NSIG-1) -+ -+/* -+ * New Strutures -+ */ -+struct machdep_pthread { -+ void *(*start_routine)(void *); -+ void *start_argument; -+ void *machdep_stack; -+ struct itimerval machdep_timer; -+ jmp_buf machdep_state; -+}; -+ -+/* -+ * Static machdep_pthread initialization values. -+ * For initial thread only. -+ */ -+#define MACHDEP_PTHREAD_INIT \ -+{ NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, 0 } -+ -+/* -+ * Minimum stack size -+ */ -+#define PTHREAD_STACK_MIN 1024 -+ -+/* -+ * Some fd flag defines that are necessary to distinguish between posix -+ * behavior and bsd4.3 behavior. -+ */ -+#define __FD_NONBLOCK (O_NONBLOCK | O_NDELAY) -+ -+/* -+ * New functions -+ */ -+ -+__BEGIN_DECLS -+ -+#if defined(PTHREAD_KERNEL) -+ -+#define __machdep_stack_get(x) (x)->machdep_stack -+#define __machdep_stack_set(x, y) (x)->machdep_stack = y -+#define __machdep_stack_repl(x, y) \ -+{ \ -+ if (stack = __machdep_stack_get(x)) { \ -+ __machdep_stack_free(stack); \ -+ } \ -+ __machdep_stack_set(x, y); \ -+} -+ -+void * __machdep_stack_alloc __P_((size_t)); -+void __machdep_stack_free __P_((void *)); -+ -+int machdep_save_state __P_((void)); -+ -+#endif -+ -+__END_DECLS diff --git a/databases/mysql-server/patches/patch-aq b/databases/mysql-server/patches/patch-aq deleted file mode 100644 index aabe9fb545e..00000000000 --- a/databases/mysql-server/patches/patch-aq +++ /dev/null @@ -1,237 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ - ---- /dev/null Sun Oct 25 03:18:33 1998 -+++ mit-pthreads/machdep/engine-sparc-netbsd-1.3.c Sun Oct 25 18:26:20 1998 -@@ -0,0 +1,232 @@ -+/* ==== machdep.c ============================================================ -+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Description : Machine dependent functions for SunOS-4.1.3 on sparc -+ * -+ * 1.00 93/08/04 proven -+ * -Started coding this file. -+ * -+ * 98/10/22 bad -+ * -update for fat sigset_t in NetBSD 1.3H -+ */ -+ -+#ifndef lint -+static const char rcsid[] = "$Id: patch-aq,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $"; -+#endif -+ -+#include "config.h" -+#include <pthread.h> -+#include <stdlib.h> -+#include <errno.h> -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_state(void) -+{ -+ /* Save register windows onto stackframe */ -+ __asm__ ("ta 3"); -+ -+ return(setjmp(pthread_run->machdep_data.machdep_state)); -+} -+ -+/* ========================================================================== -+ * machdep_restore_state() -+ */ -+void machdep_restore_state(void) -+{ -+ longjmp(pthread_run->machdep_data.machdep_state, 1); -+} -+/* ========================================================================== -+ * machdep_save_float_state() -+ */ -+void machdep_save_float_state(struct pthread * pthread) -+{ -+ return; -+} -+ -+/* ========================================================================== -+ * machdep_restore_float_state() -+ */ -+void machdep_restore_float_state(void) -+{ -+ return; -+} -+ -+/* ========================================================================== -+ * machdep_set_thread_timer() -+ */ -+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_unset_thread_timer() -+ */ -+void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ struct itimerval zeroval = { { 0, 0 }, { 0, 0} }; -+ -+ if (setitimer(ITIMER_VIRTUAL, &zeroval, NULL)) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_pthread_cleanup() -+ */ -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread) -+{ -+ return(machdep_pthread->machdep_stack); -+} -+ -+/* ========================================================================== -+ * machdep_pthread_start() -+ */ -+void machdep_pthread_start(void) -+{ -+ context_switch_done(); -+ pthread_sched_resume (); -+ -+ /* Run current threads start routine with argument */ -+ pthread_exit(pthread_run->machdep_data.start_routine -+ (pthread_run->machdep_data.start_argument)); -+ -+ /* should never reach here */ -+ PANIC(); -+} -+ -+/* ========================================================================== -+ * __machdep_stack_free() -+ */ -+void __machdep_stack_free(void * stack) -+{ -+ free(stack); -+} -+ -+/* ========================================================================== -+ * __machdep_stack_alloc() -+ */ -+void * __machdep_stack_alloc(size_t size) -+{ -+ void * stack; -+ -+ return(malloc(size)); -+} -+ -+/* ========================================================================== -+ * __machdep_pthread_create() -+ */ -+void __machdep_pthread_create(struct machdep_pthread *machdep_pthread, -+ void *(* start_routine)(), void *start_argument, -+ long stack_size, long nsec, long flags) -+{ -+ machdep_pthread->start_routine = start_routine; -+ machdep_pthread->start_argument = start_argument; -+ -+ machdep_pthread->machdep_timer.it_value.tv_sec = 0; -+ machdep_pthread->machdep_timer.it_interval.tv_sec = 0; -+ machdep_pthread->machdep_timer.it_interval.tv_usec = 0; -+ machdep_pthread->machdep_timer.it_value.tv_usec = nsec / 1000; -+ -+ /* Save register windows onto stackframe */ -+ __asm__ ("ta 3"); -+ -+ setjmp(machdep_pthread->machdep_state); -+ /* -+ * Set up new stact frame so that it looks like it -+ * returned from a longjmp() to the beginning of -+ * machdep_pthread_start(). -+ */ -+ machdep_pthread->machdep_state[3] = (int)machdep_pthread_start; -+ machdep_pthread->machdep_state[4] = (int)machdep_pthread_start; -+ -+ /* Sparc stack starts high and builds down. */ -+ machdep_pthread->machdep_state[2] = -+ (int)machdep_pthread->machdep_stack + stack_size - 1024; -+ machdep_pthread->machdep_state[2] &= ~7; -+ -+} -+ -+#if defined(HAVE_SYSCALL_GETDENTS) -+/* ========================================================================== -+ * machdep_sys_getdirentries() -+ * -+ * Always use getdents in place of getdirentries if possible --proven -+ */ -+int machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+{ -+ return(machdep_sys_getdents(fd, buf, len)); -+} -+#endif -+ -+/* ========================================================================== -+ * machdep_sys_wait3() -+ */ -+machdep_sys_wait3(int * b, int c, int * d) -+{ -+ return(machdep_sys_wait4(0, b, c, d)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_waitpid() -+ */ -+machdep_sys_waitpid(int pid, int * statusp, int options) -+{ -+ if (pid == -1) -+ pid = 0; -+ else if (pid == 0) -+ pid = - getpgrp (); -+ return machdep_sys_wait4 (pid, statusp, options, NULL); -+} -+ -+#if !defined(HAVE_SYSCALL_SIGPROCMASK) -+#if 0 -+/* ========================================================================== -+ * machdep_sys_sigprocmask() -+ * This isn't a real implementation; we can make the assumption that the -+ * pthreads library is not using oset, and that it is always blocking or -+ * unblocking all signals at once. -+ */ -+int machdep_sys_sigprocmask(int how, const sigset_t *set, sigset_t *oset) -+{ -+ switch(how) { -+ case SIG_BLOCK: -+ sigblock(*set); -+ break; -+ case SIG_UNBLOCK: -+ sigsetmask(~*set); -+ break; -+ case SIG_SETMASK: -+ sigsetmask(*set); -+ break; -+ default: -+ return -EINVAL; -+ } -+ return(OK); -+} -+ -+/* ========================================================================== -+ * sigaction() -+ * -+ * Temporary until I do machdep_sys_sigaction() -+ */ -+int sigaction(int sig, const struct sigaction *act, struct sigaction *oldact) -+{ -+ return(sigvec(sig, (struct sigvec *)act, (struct sigvec *)oldact)); -+} -+#endif -+#endif -+ -+#if !defined(HAVE_SYSCALL_GETDTABLESIZE) -+/* ========================================================================== -+ * machdep_sys_getdtablesize() -+ */ -+machdep_sys_getdtablesize() -+{ -+ return(sysconf(_SC_OPEN_MAX)); -+} -+#endif diff --git a/databases/mysql-server/patches/patch-ar b/databases/mysql-server/patches/patch-ar index bea1d8b580e..8051c7b8942 100644 --- a/databases/mysql-server/patches/patch-ar +++ b/databases/mysql-server/patches/patch-ar @@ -1,176 +1,152 @@ -$NetBSD: patch-ar,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ +$NetBSD: patch-ar,v 1.2 1999/12/13 20:36:26 bad Exp $ ---- /dev/null Sun Oct 25 03:17:31 1998 -+++ mit-pthreads/machdep/syscall-sparc-netbsd-1.3.S Sat Oct 24 21:39:15 1998 -@@ -0,0 +1,171 @@ -+/* ==== syscall.S ============================================================ -+ * Copyright (c) 1994 Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ */ -+ -+#ifndef lint -+ .text -+ .asciz "$Id: patch-ar,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $"; -+#endif -+ -+#include <sys/syscall.h> -+ -+#define SYSCALL(x) \ -+ .globl _machdep_sys_##x; \ -+ \ -+_machdep_sys_##x:; \ -+ \ -+ mov SYS_##x, %g1; \ -+ ta 0; \ -+ bcs,a 2b; \ -+ sub %r0,%o0,%o0; \ -+ retl -+ -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 4 -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+1: -+ sub %r0, %o0, %o0 -+2: -+ retl -+ nop -+ -+/* ========================================================================== -+ * machdep_sys_pipe() -+ */ -+ .globl _machdep_sys_pipe -+ -+_machdep_sys_pipe: -+ mov %o0, %o2 -+ mov SYS_pipe, %g1 -+ ta 0 -+ bcs 1b +--- mit-pthreads/machdep/syscall-sparc-netbsd-1.3.S.orig Mon Jun 7 12:34:23 1999 ++++ mit-pthreads/machdep/syscall-sparc-netbsd-1.3.S Sun Aug 22 03:22:12 1999 +@@ -9,16 +9,17 @@ + .asciz "$Id: patch-ar,v 1.2 1999/12/13 20:36:26 bad Exp $"; + #endif + ++#include <machine/asm.h> + #include <sys/syscall.h> + + #define SYSCALL(x) \ +- .globl _machdep_sys_##x; \ +- \ +-_machdep_sys_##x:; \ +- \ +- mov SYS_##x, %g1; \ +- ta 0; \ +- bcs,a 2b; \ ++ .globl _C_LABEL(machdep_sys_##x); \ ++ \ ++_C_LABEL(machdep_sys_##x):; \ ++ \ ++ mov SYS_##x, %g1; \ ++ ta 0; \ ++ bcs,a 2b; \ + sub %r0,%o0,%o0; \ + retl + +@@ -43,9 +44,9 @@ + /* ========================================================================== + * machdep_sys_pipe() + */ +- .globl _machdep_sys_pipe ++ .globl _C_LABEL(machdep_sys_pipe) + +-_machdep_sys_pipe: ++_C_LABEL(machdep_sys_pipe): + mov %o0, %o2 + mov SYS_pipe, %g1 + ta 0 +@@ -59,65 +60,65 @@ + /* ========================================================================== + * machdep_sys_fork() + */ +- .globl _machdep_sys_fork; ++ .globl _C_LABEL(machdep_sys_fork); + +-_machdep_sys_fork:; ++_C_LABEL(machdep_sys_fork):; + + mov SYS_fork, %g1; + ta 0; + bcs 1b; + nop; +- dec %o1; ++ dec %o1; + retl; +- and %o0, %o1, %o0; ! return 0 in child, pid in parent ++ and %o0, %o1, %o0; ! return 0 in child, pid in parent + + #ifndef SYS___sigprocmask14 + /* ========================================================================== + * machdep_sys_sigprocmask() + */ +- .globl _machdep_sys_sigprocmask; ++ .globl _C_LABEL(machdep_sys_sigprocmask); + +-_machdep_sys_sigprocmask:; ++_C_LABEL(machdep_sys_sigprocmask):; + +- ld [%o1], %o1; ++ ld [%o1], %o1; + mov SYS_sigprocmask, %g1; + ta 0; + bcs 1b; + nop; + retl +- nop + nop -+ st %o0, [ %o2 ] -+ st %o1, [ %o2 + 4 ] -+ retl -+ mov %g0, %o0 -+ -+/* ========================================================================== -+ * machdep_sys_fork() -+ */ -+ .globl _machdep_sys_fork; -+ -+_machdep_sys_fork:; -+ -+ mov SYS_fork, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ dec %o1; -+ retl; -+ and %o0, %o1, %o0; ! return 0 in child, pid in parent -+ -+#ifndef SYS___sigprocmask14 -+/* ========================================================================== -+ * machdep_sys_sigprocmask() -+ */ -+ .globl _machdep_sys_sigprocmask; -+ -+_machdep_sys_sigprocmask:; -+ -+ ld [%o1], %o1; -+ mov SYS_sigprocmask, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ retl -+ nop -+#endif -+ -+#ifndef SYS___sigsuspend14 -+/* ========================================================================== -+ * machdep_sys_sigsuspend() -+ */ -+ .globl _machdep_sys_sigsuspend; -+ -+_machdep_sys_sigsuspend:; -+ -+ ld [%o0], %o0; -+ mov SYS_sigsuspend, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ retl -+ nop -+#endif -+ -+/* ========================================================================== -+ * machdep_sys_fstat() -+ */ -+ .globl _machdep_sys_fstat; -+ -+_machdep_sys_fstat:; -+ -+ mov SYS___fstat13, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ retl -+ nop -+ -+/* ========================================================================== -+ * machdep_sys___syscall() -+ */ -+_machdep_sys___syscall:; -+ -+ mov SYS___syscall, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ retl -+ nop -+ -+/* ========================================================================== -+ * machdep_sys_lseek() -+ */ -+ .global _machdep_sys_lseek -+ -+_machdep_sys_lseek: -+ save %sp,-112,%sp -+ mov %i1,%o4 -+ mov %i2,%o5 -+ st %i3,[%sp+92] -+ mov 0,%o0 -+ mov SYS_lseek,%o1 -+ mov %i0,%o2 -+ call _machdep_sys___syscall,0 -+ mov 0,%o3 -+ mov %o0,%i0 -+ mov %o1,%i1 -+ ret -+ restore -+ -+/* ========================================================================== -+ * machdep_sys_ftruncate() -+ */ -+ .global _machdep_sys_ftruncate -+ -+_machdep_sys_ftruncate: -+ save %sp,-104,%sp -+ mov %i1,%o4 -+ mov %i2,%o5 -+ mov 0,%o0 -+ mov SYS_ftruncate,%o1 -+ mov %i0,%o2 -+ call _machdep_sys___syscall,0 -+ mov 0,%o3 -+ mov %o0,%o1 -+ sra %o0,31,%o0 -+ ret -+ restore %g0,%o1,%o0 + #endif + + #ifndef SYS___sigsuspend14 + /* ========================================================================== + * machdep_sys_sigsuspend() + */ +- .globl _machdep_sys_sigsuspend; ++ .globl _C_LABEL(machdep_sys_sigsuspend); + +-_machdep_sys_sigsuspend:; ++_C_LABEL(machdep_sys_sigsuspend):; + +- ld [%o0], %o0; ++ ld [%o0], %o0; + mov SYS_sigsuspend, %g1; + ta 0; + bcs 1b; + nop; + retl +- nop ++ nop + #endif + + /* ========================================================================== + * machdep_sys_fstat() + */ +- .globl _machdep_sys_fstat; ++ .globl _C_LABEL(machdep_sys_fstat); + +-_machdep_sys_fstat:; ++_C_LABEL(machdep_sys_fstat):; + + mov SYS___fstat13, %g1; + ta 0; + bcs 1b; + nop; + retl +- nop ++ nop + + /* ========================================================================== + * machdep_sys___syscall() +@@ -129,14 +130,14 @@ + bcs 1b; + nop; + retl +- nop ++ nop + + /* ========================================================================== + * machdep_sys_lseek() + */ +- .global _machdep_sys_lseek ++ .global _C_LABEL(machdep_sys_lseek) + +-_machdep_sys_lseek: ++_C_LABEL(machdep_sys_lseek): + save %sp,-112,%sp + mov %i1,%o4 + mov %i2,%o5 +@@ -154,9 +155,9 @@ + /* ========================================================================== + * machdep_sys_ftruncate() + */ +- .global _machdep_sys_ftruncate ++ .global _C_LABEL(machdep_sys_ftruncate) + +-_machdep_sys_ftruncate: ++_C_LABEL(machdep_sys_ftruncate): + save %sp,-104,%sp + mov %i1,%o4 + mov %i2,%o5 diff --git a/databases/mysql-server/patches/patch-as b/databases/mysql-server/patches/patch-as index 45238d5f01d..7975b7e698a 100644 --- a/databases/mysql-server/patches/patch-as +++ b/databases/mysql-server/patches/patch-as @@ -1,52 +1,36 @@ -$NetBSD: patch-as,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ +$NetBSD: patch-as,v 1.2 1999/12/13 20:36:26 bad Exp $ ---- /dev/null Mon Oct 19 22:21:39 1998 -+++ mit-pthreads/machdep/syscall-template-sparc-netbsd-1.3.S Mon Oct 19 22:36:44 1998 -@@ -0,0 +1,47 @@ -+/* ==== syscall.S ============================================================ -+ * Copyright (c) 1994 Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ */ -+ -+#include <sys/syscall.h> -+ -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ -+#define SYSCALL(x) \ -+ .globl _machdep_sys_##x; \ -+ \ -+_machdep_sys_##x:; \ -+ \ -+ mov SYS_##x, %g1; \ -+ ta 0; \ -+ bcs,a 2b; \ -+ sub %r0,%o0,%o0; \ -+ retl; \ -+ nop -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 4 -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+1: -+ sub %r0, %o0, %o0 -+2: -+ retl -+ nop -+ -+#define XSYSCALL(NAME) SYSCALL(NAME) -+ -+XSYSCALL(SYSCALL_NAME) +--- mit-pthreads/machdep/syscall-template-sparc-netbsd-1.3.S.orig Mon Jun 7 12:34:23 1999 ++++ mit-pthreads/machdep/syscall-template-sparc-netbsd-1.3.S Sun Aug 22 03:21:52 1999 +@@ -4,6 +4,7 @@ + * + */ + ++#include <machine/asm.h> + #include <sys/syscall.h> + + #ifdef SYS___sigsuspend14 +@@ -14,15 +15,15 @@ + #endif + + #define SYSCALL(x) \ +- .globl _machdep_sys_##x; \ +- \ +-_machdep_sys_##x:; \ +- \ +- mov SYS_##x, %g1; \ +- ta 0; \ +- bcs,a 2b; \ ++ .globl _C_LABEL(machdep_sys_##x); \ ++ \ ++_C_LABEL(machdep_sys_##x):; \ ++ \ ++ mov SYS_##x, %g1; \ ++ ta 0; \ ++ bcs,a 2b; \ + sub %r0,%o0,%o0; \ +- retl; \ ++ retl; \ + nop + + /* diff --git a/databases/mysql-server/patches/patch-at b/databases/mysql-server/patches/patch-at deleted file mode 100644 index 4a3813ae1b8..00000000000 --- a/databases/mysql-server/patches/patch-at +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ - ---- mit-pthreads/machdep/engine-i386-netbsd-1.3.h.orig Mon Mar 2 19:44:34 1998 -+++ mit-pthreads/machdep/engine-i386-netbsd-1.3.h Thu Oct 22 18:24:46 1998 -@@ -8,6 +8,7 @@ - #include <unistd.h> - #include <setjmp.h> - #include <sys/time.h> -+#include <sys/signal.h> /* for _NSIG */ - - /* - * The first machine dependent functions are the SEMAPHORES -@@ -37,7 +38,7 @@ - * sigset_t macros - */ - #define SIG_ANY(sig) (sig) --#define SIGMAX 31 -+#define SIGMAX (_NSIG-1) - - /* - * New Strutures diff --git a/databases/mysql-server/patches/patch-au b/databases/mysql-server/patches/patch-au index 2886da5aeb5..2f86ef2d825 100644 --- a/databases/mysql-server/patches/patch-au +++ b/databases/mysql-server/patches/patch-au @@ -1,36 +1,99 @@ -$NetBSD: patch-au,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ +$NetBSD: patch-au,v 1.2 1999/12/13 20:36:26 bad Exp $ ---- mit-pthreads/machdep/syscall-i386-netbsd-1.3.S.orig Mon Mar 2 19:44:34 1998 -+++ mit-pthreads/machdep/syscall-i386-netbsd-1.3.S Mon Oct 19 00:12:26 1998 -@@ -88,6 +88,7 @@ - jb 3f; - ret - -+#ifndef SYS___sigsuspend14 +--- mit-pthreads/machdep/syscall-i386-netbsd-1.3.S.orig Mon Jun 7 12:34:23 1999 ++++ mit-pthreads/machdep/syscall-i386-netbsd-1.3.S Sun Aug 22 02:17:44 1999 +@@ -65,9 +65,9 @@ + /* ========================================================================== + * machdep_sys_fork() + */ +- .globl _machdep_sys_fork; ++ .globl _C_LABEL(machdep_sys_fork); + +-_machdep_sys_fork:; ++_C_LABEL(machdep_sys_fork):; + + movl $(SYS_fork), %eax; + .byte 0x9a; .long 0; .word 7; +@@ -92,13 +92,13 @@ /* ========================================================================== * machdep_sys_sigsuspend() */ -@@ -102,6 +103,7 @@ +- .globl _machdep_sys_sigsuspend; ++ .globl _C_LABEL(machdep_sys_sigsuspend); + +-_machdep_sys_sigsuspend:; ++_C_LABEL(machdep_sys_sigsuspend):; + + movl 4(%esp),%eax # fetch mask arg +- movl (%eax),%eax # indirect to mask arg +- movl %eax,4(%esp) ++ movl (%eax),%eax # indirect to mask arg ++ movl %eax,4(%esp) + movl $(SYS_sigsuspend), %eax; int $0x80; jb 3f; - ret -+#endif - - 3: - -@@ -148,6 +150,7 @@ - leave - ret +@@ -114,9 +114,9 @@ + /* ========================================================================== + * machdep_sys_lseek() + */ +- .globl _machdep_sys_lseek; ++ .globl _C_LABEL(machdep_sys_lseek); -+#ifndef SYS___sigprocmask14 +-_machdep_sys_lseek:; ++_C_LABEL(machdep_sys_lseek):; + + pushl %ebp; + movl %esp,%ebp; +@@ -134,9 +134,9 @@ + /* ========================================================================== + * machdep_sys_ftruncate() ; Added by Monty + */ +- .globl _machdep_sys_ftruncate; ++ .globl _C_LABEL(machdep_sys_ftruncate); + +-_machdep_sys_ftruncate:; ++_C_LABEL(machdep_sys_ftruncate):; + + pushl %ebp; + movl %esp,%ebp; +@@ -154,13 +154,13 @@ /* ========================================================================== * machdep_sys_sigprocmask() */ -@@ -162,6 +165,7 @@ +- .globl _machdep_sys_sigprocmask; ++ .globl _C_LABEL(machdep_sys_sigprocmask); + +-_machdep_sys_sigprocmask:; ++_C_LABEL(machdep_sys_sigprocmask):; + + movl 8(%esp),%ecx + movl (%ecx),%ecx +- movl %ecx,8(%esp) ++ movl %ecx,8(%esp) + movl $(SYS_sigprocmask), %eax; int $0x80; jb 3b; - ret -+#endif - +@@ -170,9 +170,9 @@ /* ========================================================================== * machdep_sys_pipe() + */ +- .globl _machdep_sys_pipe; ++ .globl _C_LABEL(machdep_sys_pipe); + +-_machdep_sys_pipe:; ++_C_LABEL(machdep_sys_pipe):; + + movl $(SYS_pipe), %eax; + int $0x80; +@@ -186,9 +186,9 @@ + /* ========================================================================== + * machdep_sys_fstat() + */ +- .globl _machdep_sys_fstat; ++ .globl _C_LABEL(machdep_sys_fstat); + +-_machdep_sys_fstat:; ++_C_LABEL(machdep_sys_fstat):; + movl $(SYS___fstat13), %eax; + int $0x80; + jb 4f; diff --git a/databases/mysql-server/patches/patch-av b/databases/mysql-server/patches/patch-av index 1a74f07883a..f7d3b4a92d0 100644 --- a/databases/mysql-server/patches/patch-av +++ b/databases/mysql-server/patches/patch-av @@ -1,18 +1,45 @@ -$NetBSD: patch-av,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ +$NetBSD: patch-av,v 1.2 1999/12/13 20:36:26 bad Exp $ ---- mit-pthreads/machdep/syscall-template-i386-netbsd-1.3.S.orig Mon Mar 2 19:44:34 1998 -+++ mit-pthreads/machdep/syscall-template-i386-netbsd-1.3.S Mon Oct 19 00:10:09 1998 -@@ -1,6 +1,13 @@ - #include <machine/asm.h> - #include <sys/syscall.h> - -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ +--- mit-pthreads/machdep/syscall-template-i386-netbsd-1.3.S.orig Mon Jun 7 12:34:23 1999 ++++ mit-pthreads/machdep/syscall-template-i386-netbsd-1.3.S Sun Aug 22 00:59:11 1999 +@@ -11,25 +11,25 @@ #ifdef __STDC__ #define SYSCALL(x) \ +- .globl _machdep_sys_##x; \ +- \ +-_machdep_sys_##x:; \ +- \ +- movl $(SYS_##x), %eax; \ +- int $0x80; \ +- jb 1b; \ ++ .globl _C_LABEL(machdep_sys_##x); \ ++ \ ++_C_LABEL(machdep_sys_##x):; \ ++ \ ++ movl $(SYS_##x), %eax; \ ++ int $0x80; \ ++ jb 1b; \ + ret; + + #else + +-#define SYSCALL(x) \ +- .globl _machdep_sys_/**/x; \ +- \ +-_machdep_sys_/**/x:; \ +- \ +- movl $(SYS_/**/x), %eax; \ +- int $0x80; \ +- jb 1b; \ ++#define _SYSCALL(x) \ ++ .globl _C_LABEL(machdep_sys_/**/x); \ ++ \ ++_C_LABEL(machdep_sys_/**/x):; \ ++ \ ++ movl $(SYS_/**/x), %eax; \ ++ int $0x80; \ ++ jb 1b; \ + ret; + + #endif diff --git a/databases/mysql-server/patches/patch-aw b/databases/mysql-server/patches/patch-aw deleted file mode 100644 index aadca25e622..00000000000 --- a/databases/mysql-server/patches/patch-aw +++ /dev/null @@ -1,107 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ - ---- /dev/null Thu Oct 22 03:18:30 1998 -+++ mit-pthreads/machdep/engine-arm32-netbsd-1.3.h Thu Oct 22 19:39:30 1998 -@@ -0,0 +1,102 @@ -+/* ==== machdep.h ============================================================ -+ * Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Id: engine-i386-netbsd-1.3.h,v 1.1 1998/02/28 04:53:15 cjs Exp -+ * -+ */ -+ -+#include <unistd.h> -+#include <setjmp.h> -+#include <sys/time.h> -+#include <sys/signal.h> /* for _NSIG */ -+ -+/* -+ * The first machine dependent functions are the SEMAPHORES -+ * needing the test and set instruction. -+ */ -+#define SEMAPHORE_CLEAR 0 -+#define SEMAPHORE_SET 1 -+ -+#if 0 -+#define SEMAPHORE_TEST_AND_SET(lock) \ -+({ \ -+long temp = SEMAPHORE_SET; \ -+ \ -+__asm__ volatile ("xchgl %0,(%2)" \ -+ :"=r" (temp) \ -+ :"0" (temp),"r" (lock)); \ -+temp; \ -+}) -+ -+#define SEMAPHORE_RESET(lock) *lock = SEMAPHORE_CLEAR -+#endif -+ -+/* -+ * New types -+ */ -+typedef long semaphore; -+ -+/* -+ * sigset_t macros -+ */ -+#define SIG_ANY(sig) (sig) -+#define SIGMAX (_NSIG-1) -+ -+/* -+ * New Strutures -+ */ -+struct machdep_pthread { -+ void *(*start_routine)(void *); -+ void *start_argument; -+ void *machdep_stack; -+ struct itimerval machdep_timer; -+ jmp_buf machdep_state; -+#if 0 -+ char machdep_float_state[108]; -+#endif -+}; -+ -+/* -+ * Static machdep_pthread initialization values. -+ * For initial thread only. -+ */ -+#define MACHDEP_PTHREAD_INIT \ -+{ NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, 0 } -+ -+/* -+ * Minimum stack size -+ */ -+#define PTHREAD_STACK_MIN 1024 -+ -+/* -+ * Some fd flag defines that are necessary to distinguish between posix -+ * behavior and bsd4.3 behavior. -+ */ -+#define __FD_NONBLOCK O_NONBLOCK -+ -+/* -+ * New functions -+ */ -+ -+__BEGIN_DECLS -+ -+#if defined(PTHREAD_KERNEL) -+ -+#define __machdep_stack_get(x) (x)->machdep_stack -+#define __machdep_stack_set(x, y) (x)->machdep_stack = y -+#define __machdep_stack_repl(x, y) \ -+{ \ -+ if (stack = __machdep_stack_get(x)) { \ -+ __machdep_stack_free(stack); \ -+ } \ -+ __machdep_stack_set(x, y); \ -+} -+ -+void * __machdep_stack_alloc __P_((size_t)); -+void __machdep_stack_free __P_((void *)); -+ -+int machdep_save_state __P_((void)); -+ -+#endif -+ -+__END_DECLS diff --git a/databases/mysql-server/patches/patch-ax b/databases/mysql-server/patches/patch-ax deleted file mode 100644 index e219803cd85..00000000000 --- a/databases/mysql-server/patches/patch-ax +++ /dev/null @@ -1,208 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ - ---- /dev/null Thu Feb 4 01:37:20 1999 -+++ mit-pthreads/machdep/engine-arm32-netbsd-1.3.c Thu Feb 4 01:53:39 1999 -@@ -0,0 +1,203 @@ -+/* ==== machdep.c ============================================================ -+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Description : Machine dependent functions for NetBSD on arm32 -+ * -+ * 1.00 93/08/04 proven -+ * -Started coding this file. -+ * -+ * 98/10/22 bad -+ * -adapt from i386 version -+ */ -+ -+#ifndef lint -+static const char rcsid[] = "$Id: patch-ax,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $"; -+#endif -+ -+#include <pthread.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/syscall.h> -+#include <stdlib.h> -+#include <fcntl.h> -+#include <stdio.h> -+ -+#if defined(_JB_REG_R13) -+#define REG_LR _JB_REG_R14 -+#define REG_SP _JB_REG_R13 -+#else -+#define REG_LR JMPBUF_REG_R14 -+#define REG_SP JMPBUF_REG_R13 -+#endif -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_state(void) -+{ -+ return(_setjmp(pthread_run->machdep_data.machdep_state)); -+} -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_float_state(struct pthread * pthread) -+{ -+ return; -+} -+ -+/* ========================================================================== -+ * machdep_restore_state() -+ */ -+void machdep_restore_state(void) -+{ -+ _longjmp(pthread_run->machdep_data.machdep_state, 1); -+} -+ -+/* ========================================================================== -+ * machdep_restore_float_state() -+ */ -+int machdep_restore_float_state(void) -+{ -+ return; -+} -+ -+/* ========================================================================== -+ * machdep_set_thread_timer() -+ */ -+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_unset_thread_timer() -+ */ -+void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ struct itimerval zeroval = { { 0, 0 }, { 0, 0 } }; -+ int ret; -+ -+ if (machdep_pthread) { -+ ret = setitimer(ITIMER_VIRTUAL, &zeroval, -+ &(machdep_pthread->machdep_timer)); -+ } else { -+ ret = setitimer(ITIMER_VIRTUAL, &zeroval, NULL); -+ } -+ -+ if (ret) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_pthread_cleanup() -+ */ -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread) -+{ -+ return(machdep_pthread->machdep_stack); -+} -+ -+/* ========================================================================== -+ * machdep_pthread_start() -+ */ -+void machdep_pthread_start(void) -+{ -+ context_switch_done(); -+ pthread_sched_resume(); -+ -+ /* Run current threads start routine with argument */ -+ pthread_exit(pthread_run->machdep_data.start_routine -+ (pthread_run->machdep_data.start_argument)); -+ -+ /* should never reach here */ -+ PANIC(); -+} -+ -+/* ========================================================================== -+ * __machdep_stack_free() -+ */ -+void __machdep_stack_free(void * stack) -+{ -+ free(stack); -+} -+ -+/* ========================================================================== -+ * __machdep_stack_alloc() -+ */ -+void * __machdep_stack_alloc(size_t size) -+{ -+ void * stack; -+ -+ return(malloc(size)); -+} -+ -+/* ========================================================================== -+ * __machdep_pthread_create() -+ */ -+void __machdep_pthread_create(struct machdep_pthread *machdep_pthread, -+ void *(* start_routine)(), void *start_argument, -+ long stack_size, long nsec, long flags) -+{ -+ machdep_pthread->start_routine = start_routine; -+ machdep_pthread->start_argument = start_argument; -+ -+ machdep_pthread->machdep_timer.it_value.tv_sec = 0; -+ machdep_pthread->machdep_timer.it_interval.tv_sec = 0; -+ machdep_pthread->machdep_timer.it_interval.tv_usec = 0; -+ machdep_pthread->machdep_timer.it_value.tv_usec = nsec / 1000; -+ -+ _setjmp(machdep_pthread->machdep_state); -+ /* -+ * Set up new stact frame so that it looks like it -+ * returned from a longjmp() to the beginning of -+ * machdep_pthread_start(). -+ */ -+ machdep_pthread->machdep_state[REG_LR] = (int)machdep_pthread_start; -+ -+ /* Stack starts high and builds down. */ -+ machdep_pthread->machdep_state[REG_SP] = -+ (int)machdep_pthread->machdep_stack + stack_size; -+} -+ -+/* ========================================================================== -+ * machdep_sys_creat() -+ */ -+machdep_sys_creat(char * path, int mode) -+{ -+ return(machdep_sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_wait3() -+ */ -+machdep_sys_wait3(int * b, int c, int * d) -+{ -+ return(machdep_sys_wait4(0, b, c, d)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_waitpid() -+ */ -+machdep_sys_waitpid(int a, int * b, int c) -+{ -+ return(machdep_sys_wait4(a, b, c, NULL)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_getdtablesize() -+ */ -+machdep_sys_getdtablesize() -+{ -+ return(sysconf(_SC_OPEN_MAX)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_getdirentries() -+ */ -+machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+{ -+ return(machdep_sys_getdents(fd, buf, len)); -+} diff --git a/databases/mysql-server/patches/patch-ay b/databases/mysql-server/patches/patch-ay index 20d3f7656e0..cb3ec4cd94c 100644 --- a/databases/mysql-server/patches/patch-ay +++ b/databases/mysql-server/patches/patch-ay @@ -1,198 +1,87 @@ -$NetBSD: patch-ay,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ +$NetBSD: patch-ay,v 1.2 1999/12/13 20:36:27 bad Exp $ ---- /dev/null Sun Oct 25 03:15:17 1998 -+++ mit-pthreads/machdep/syscall-arm32-netbsd-1.3.S Sun Oct 25 18:49:24 1998 -@@ -0,0 +1,193 @@ -+/* ==== syscall.S ============================================================ -+ * Copyright (c) 1990 The Regents of the University of California. -+ * Copyright (c) 1993 Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ * This code is derived from software contributed to Berkeley by -+ * William Jolitz. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. All advertising materials mentioning features or use of this software -+ * must display the following acknowledgement: -+ * This product includes software developed by the University of -+ * California, Berkeley and its contributors. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * Description : Machine dependent syscalls for i386/i486/i586 -+ * -+ * 1.00 93/08/26 proven -+ * -Started coding this file. -+ * -+ * 1.01 93/11/13 proven -+ * -The functions readv() and writev() added. -+ */ -+ -+#ifndef lint -+ .text -+ .asciz "$Id: patch-ay,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $"; -+#endif -+ -+#if defined(SYSLIBC_SCCS) && !defined(lint) -+ .asciz "@(#)syscall.s 5.1 (Berkeley) 4/23/90" -+#endif /* SYSLIBC_SCCS and not lint */ -+ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 0 -+ -+ -+/* ========================================================================== -+ * machdep_sys_fork() -+ */ -+ .globl _machdep_sys_fork; -+ -+_machdep_sys_fork:; -+ -+ swi SYS_fork -+ bcs 1f -+ sub r1, r1, #0x00000001 -+ and r0, r0, r1 -+ mov r15, r14 -+ -+ -+ -+/* ========================================================================== -+ * machdep_sys_fstat() -+ */ -+ .globl _machdep_sys_fstat; -+ -+_machdep_sys_fstat:; -+ -+ swi SYS___fstat13 -+ bcs 1f -+ mov r15, r14 -+ -+/* ========================================================================== -+ * machdep_sys___syscall() -+ */ -+ -+_machdep_sys___syscall:; -+ -+ swi SYS___syscall -+ bcs 1f -+ mov r15, r14 -+ -+ -+#ifndef SYS___sigsuspend14 -+/* ========================================================================== -+ * machdep_sys_sigsuspend() -+ */ -+ .globl _machdep_sys_sigsuspend; -+ -+_machdep_sys_sigsuspend:; -+ -+ ldr r0, [r0] -+ swi SYS_sigsuspend -+ bcs 1f -+ mov r0, #0x00000000 -+ mov r15, r14 -+ -+#endif -+ -+#ifndef SYS___sigprocmask14 -+/* ========================================================================== -+ * machdep_sys_sigprocmask() -+ */ -+ .globl _machdep_sys_sigprocmask; -+ -+_machdep_sys_sigprocmask:; -+ -+ teq r1, #0x00000000 -+ moveq r0, #0x00000001 -+ moveq r1, #0x00000000 -+ ldrne r1, [r1] -+ swi SYS_sigprocmask -+ bcs 1f -+ teq r2, #0x00000000 -+ strne r0, [r2] -+ mov r0, #0x00000000 -+ mov r15, r14 -+#endif -+ -+/* ========================================================================== -+ * machdep_sys_ftruncate() -+ */ -+ .global _machdep_sys_ftruncate -+_machdep_sys_ftruncate: -+ mov r12, r13 -+ stmfd r13!, {r11, r12, r14, r15} -+ sub r13, r13, #8 -+ stmia r13, {r1-r2} -+ mov r3, #0 -+ sub r11, r12, #4 -+ mov r2, r0 -+ mov r1, #0 -+ mov r0, #201 -+ bl _machdep_sys___syscall -+ ldmea r11, {r11, r13, r15} -+ -+/* ========================================================================== -+ * machdep_sys_lseek() -+ */ -+ .global _machdep_sys_lseek -+ -+_machdep_sys_lseek: -+ mov r12, r13 -+ stmfd r13!, {r11, r12, r14, r15} -+ str r3, [r13, #-4]! -+ sub r13, r13, #8 -+ stmia r13, {r1-r2} -+ sub r11, r12, #4 -+ mov r3, #0 -+ mov r2, r0 -+ mov r1, #0 -+ mov r0, #SYS_lseek -+ bl _machdep_sys___syscall -+ ldmea r11, {r11, r13, r15} -+ -+/* ========================================================================== -+ * machdep_sys_pipe() -+ */ -+ .globl _machdep_sys_pipe; -+ -+_machdep_sys_pipe:; -+ -+ mov r2, r0 -+ swi SYS_pipe -+ bcs 1f -+ str r0, [r2, #0x0000] -+ str r1, [r2, #0x0004] -+ mov r0, #0x00000000 -+ mov r15, r14 -+ -+ -+1: -+ rsb r0, r0, #0x00000000 -+ mvn r1, #0x00000000 -+ mov r15, r14 +--- mit-pthreads/machdep/syscall-arm32-netbsd-1.3.S.orig Mon Jun 7 12:34:23 1999 ++++ mit-pthreads/machdep/syscall-arm32-netbsd-1.3.S Sun Aug 22 02:16:09 1999 +@@ -65,9 +65,9 @@ + /* ========================================================================== + * machdep_sys_fork() + */ +- .globl _machdep_sys_fork; ++ .globl _C_LABEL(machdep_sys_fork); + +-_machdep_sys_fork:; ++_C_LABEL(machdep_sys_fork):; + + swi SYS_fork + bcs 1f +@@ -80,9 +80,9 @@ + /* ========================================================================== + * machdep_sys_fstat() + */ +- .globl _machdep_sys_fstat; ++ .globl _C_LABEL(machdep_sys_fstat); + +-_machdep_sys_fstat:; ++_C_LABEL(machdep_sys_fstat):; + + swi SYS___fstat13 + bcs 1f +@@ -103,9 +103,9 @@ + /* ========================================================================== + * machdep_sys_sigsuspend() + */ +- .globl _machdep_sys_sigsuspend; ++ .globl _C_LABEL(machdep_sys_sigsuspend); + +-_machdep_sys_sigsuspend:; ++_C_LABEL(machdep_sys_sigsuspend):; + + ldr r0, [r0] + swi SYS_sigsuspend +@@ -119,9 +119,9 @@ + /* ========================================================================== + * machdep_sys_sigprocmask() + */ +- .globl _machdep_sys_sigprocmask; ++ .globl _C_LABEL(machdep_sys_sigprocmask); + +-_machdep_sys_sigprocmask:; ++_C_LABEL(machdep_sys_sigprocmask):; + + teq r1, #0x00000000 + moveq r0, #0x00000001 +@@ -138,8 +138,8 @@ + /* ========================================================================== + * machdep_sys_ftruncate() + */ +- .global _machdep_sys_ftruncate +-_machdep_sys_ftruncate: ++ .global _C_LABEL(machdep_sys_ftruncate) ++_C_LABEL(machdep_sys_ftruncate): + mov r12, r13 + stmfd r13!, {r11, r12, r14, r15} + sub r13, r13, #8 +@@ -155,9 +155,9 @@ + /* ========================================================================== + * machdep_sys_lseek() + */ +- .global _machdep_sys_lseek ++ .global _C_LABEL(machdep_sys_lseek) + +-_machdep_sys_lseek: ++_C_LABEL(machdep_sys_lseek): + mov r12, r13 + stmfd r13!, {r11, r12, r14, r15} + str r3, [r13, #-4]! +@@ -174,9 +174,9 @@ + /* ========================================================================== + * machdep_sys_pipe() + */ +- .globl _machdep_sys_pipe; ++ .globl _C_LABEL(machdep_sys_pipe); + +-_machdep_sys_pipe:; ++_C_LABEL(machdep_sys_pipe):; + + mov r2, r0 + swi SYS_pipe diff --git a/databases/mysql-server/patches/patch-az b/databases/mysql-server/patches/patch-az index f65352f4ddf..b943e8e8a9b 100644 --- a/databases/mysql-server/patches/patch-az +++ b/databases/mysql-server/patches/patch-az @@ -1,60 +1,40 @@ -$NetBSD: patch-az,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ +$NetBSD: patch-az,v 1.2 1999/12/13 20:36:27 bad Exp $ ---- /dev/null Sun Oct 25 20:12:14 1998 -+++ mit-pthreads/machdep/syscall-template-arm32-netbsd-1.3.S Sun Oct 25 20:18:57 1998 -@@ -0,0 +1,55 @@ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ -+#ifdef __STDC__ -+ -+#define SYSCALL(x) \ -+ .globl _machdep_sys_##x; \ -+ \ -+_machdep_sys_##x:; \ -+ \ -+ swi SYS_##x; \ -+ bcs 1b; \ -+ mov r15, r14; -+ -+#else -+ -+#define SYSCALL(x) \ -+ .globl _machdep_sys_/**/x; \ -+ \ -+_machdep_sys_/**/x:; \ -+ \ -+ swi SYS_/**/x; \ -+ bcs 1b; \ -+ mov r15, r14; -+ -+#endif -+ -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 0 -+ -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+1: -+ rsb r0, r0, #0x00000000 -+ mvn r1, #0x00000000 -+ mov r15, r14 -+ -+#define XSYSCALL(NAME) SYSCALL(NAME) -+ -+XSYSCALL(SYSCALL_NAME) +--- mit-pthreads/machdep/syscall-template-arm32-netbsd-1.3.S.orig Mon Jun 7 12:34:24 1999 ++++ mit-pthreads/machdep/syscall-template-arm32-netbsd-1.3.S Sun Aug 22 02:13:21 1999 +@@ -11,23 +11,23 @@ + #ifdef __STDC__ + + #define SYSCALL(x) \ +- .globl _machdep_sys_##x; \ +- \ +-_machdep_sys_##x:; \ +- \ +- swi SYS_##x; \ +- bcs 1b; \ ++ .globl _C_LABEL(machdep_sys_##x); \ ++ \ ++_C_LABEL(machdep_sys_##x):; \ ++ \ ++ swi SYS_##x; \ ++ bcs 1b; \ + mov r15, r14; + + #else + + #define SYSCALL(x) \ +- .globl _machdep_sys_/**/x; \ +- \ +-_machdep_sys_/**/x:; \ +- \ +- swi SYS_/**/x; \ +- bcs 1b; \ ++ .globl _C_LABEL(_machdep_sys_/**/x); \ ++ \ ++_C_LABEL(machdep_sys_/**/x):; \ ++ \ ++ swi SYS_/**/x; \ ++ bcs 1b; \ + mov r15, r14; + + #endif diff --git a/databases/mysql-server/patches/patch-ba b/databases/mysql-server/patches/patch-ba deleted file mode 100644 index af05d97b75a..00000000000 --- a/databases/mysql-server/patches/patch-ba +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ ---- mit-pthreads/pthreads/specific.c.orig Mon Dec 28 23:52:16 1998 -+++ mit-pthreads/pthreads/specific.c Mon Dec 28 23:52:30 1998 -@@ -42,6 +42,7 @@ - #include <errno.h> - #include <pthread.h> - #include <stdlib.h> -+#include <string.h> - - static struct pthread_key key_table[PTHREAD_DATAKEYS_MAX]; - static pthread_mutex_t key_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/databases/mysql-server/patches/patch-bc b/databases/mysql-server/patches/patch-bc deleted file mode 100644 index 13e1fd97ca9..00000000000 --- a/databases/mysql-server/patches/patch-bc +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bc,v 1.1.1.1 1999/05/06 23:37:00 tv Exp $ - ---- mit-pthreads/config/config.h.in.orig Thu May 29 16:59:14 1997 -+++ mit-pthreads/config/config.h.in Sat Mar 20 23:30:53 1999 -@@ -18,6 +18,9 @@ - /* Does the OS already support struct timespec */ - #undef _OS_HAS_TIMESPEC - -+/* Does the OS need socklen_t for the socket syscalls? */ -+#undef _OS_HAS_SOCKLEN_T -+ - /* For networking code: an integral type the size of an IP address (4 - octets). Determined by examining return values from certain - functions. */ diff --git a/databases/mysql-server/patches/patch-bd b/databases/mysql-server/patches/patch-bd index 8ec517cdd0c..3b99ca6dd17 100644 --- a/databases/mysql-server/patches/patch-bd +++ b/databases/mysql-server/patches/patch-bd @@ -1,25 +1,25 @@ -$NetBSD: patch-bd,v 1.2 1999/08/03 20:30:41 bad Exp $ +$NetBSD: patch-bd,v 1.3 1999/12/13 20:36:28 bad Exp $ ---- mit-pthreads/config/configure.in.orig Mon Mar 9 02:30:59 1998 -+++ mit-pthreads/config/configure.in Tue Aug 3 12:23:03 1999 -@@ -124,6 +124,14 @@ +--- mit-pthreads/config/configure.in.orig Mon Jun 7 12:34:24 1999 ++++ mit-pthreads/config/configure.in Tue Aug 17 01:07:21 1999 +@@ -124,12 +124,14 @@ name=$host_cpu-$host_os case $host in +changequote(,)dnl -+ alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.4*) -+ name=alpha-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek pipe fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; + alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.4*) + name=alpha-netbsd-1.3 + sysincludes=netbsd-1.1 + except="fork lseek pipe fstat" + available_syscalls="sigsuspend sigprocmask" + ;; +changequote([,])dnl alpha-*-netbsd1.3*) name=alpha-netbsd-1.3 sysincludes=netbsd-1.1 -@@ -142,6 +150,19 @@ - CFLAGS="$CFLAGS -std" - fi +@@ -159,6 +161,19 @@ + sysincludes=netbsd-1.1 + except="fork pipe lseek ftruncate sigsuspend sigprocmask fstat" ;; +changequote(,)dnl + arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.4*) @@ -37,9 +37,9 @@ $NetBSD: patch-bd,v 1.2 1999/08/03 20:30:41 bad Exp $ hppa1.0-*-hpux10.20 | hppa1.1-*-hpux10.20) name=hppa-hpux-10.20 sysincludes=hpux-10.20 -@@ -176,6 +197,19 @@ - AC_DEFINE(LD_LINKS_STATIC_DATA) - AC_DEFINE(BROKEN_SIGNALS) +@@ -204,6 +219,19 @@ + sysincludes=netbsd-1.1 + except="pipe fork lseek ftruncate sigprocmask sigsuspend fstat" ;; +changequote(,)dnl + sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.4*) @@ -57,9 +57,9 @@ $NetBSD: patch-bd,v 1.2 1999/08/03 20:30:41 bad Exp $ sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*) name=sparc-sunos-4.1.3 sysincludes=netbsd-1.0 -@@ -201,6 +235,14 @@ - syscall=i386-bsdi-2.0 - except="fork lseek ftruncate sigsuspend" +@@ -235,6 +263,14 @@ + except="fork lseek ftruncate pipe fstat" + available_syscalls="sigsuspend sigprocmask" ;; +changequote(,)dnl + i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.4*) @@ -72,7 +72,7 @@ $NetBSD: patch-bd,v 1.2 1999/08/03 20:30:41 bad Exp $ i386-*-netbsd1.3*) name=i386-netbsd-1.3 sysincludes=netbsd-1.1 -@@ -223,6 +265,9 @@ +@@ -257,6 +293,9 @@ ;; m68*-*-netbsd*) name=m68000-netbsd @@ -82,20 +82,3 @@ $NetBSD: patch-bd,v 1.2 1999/08/03 20:30:41 bad Exp $ ;; i386-*-freebsd2.*) name=i386-freebsd-2.0 -@@ -339,6 +384,16 @@ - AC_MSG_RESULT($pthreads_cv_timespec_in_time) - if test $pthreads_cv_timespec_in_time = yes ; then - AC_DEFINE(_OS_HAS_TIMESPEC) -+fi -+ -+dnl socklen_t -+AC_CACHE_VAL(pthreads_cv_socklen_t, -+ AC_TRY_COMPILE([#include <sys/types.h> -+#include <sys/socket.h>], [socklen_t foo;], -+ pthreads_cv_socklen_t=yes, pthreads_cv_socklen_t=no)) -+AC_MSG_RESULT($pthreads_cv_socklen_t) -+if test $pthreads_cv_socklen_t = yes ; then -+ AC_DEFINE(_OS_HAS_SOCKLEN_T) - fi - - diff --git a/databases/mysql-server/patches/patch-be b/databases/mysql-server/patches/patch-be index 0d51c244050..13fa5fb1797 100644 --- a/databases/mysql-server/patches/patch-be +++ b/databases/mysql-server/patches/patch-be @@ -1,10 +1,10 @@ -$NetBSD$ +$NetBSD: patch-be,v 1.1 1999/08/03 20:30:41 bad Exp $ ---- mit-pthreads/machdep/engine-m68000-netbsd.h.orig Sun Oct 12 14:07:37 1997 -+++ mit-pthreads/machdep/engine-m68000-netbsd.h Mon Nov 15 18:37:19 1999 +--- mit-pthreads/machdep/engine-m68000-netbsd.h.orig Tue Nov 8 16:39:15 1994 ++++ mit-pthreads/machdep/engine-m68000-netbsd.h Wed Jul 7 04:29:09 1999 @@ -3,6 +3,9 @@ * - * $Id: engine-m68000-netbsd.h,v 1.51 1994/11/08 15:39:15 proven Exp $ + * $Id: patch-be,v 1.1 1999/08/03 20:30:41 bad Exp $ * + * m68k work by Andy Finnell <andyf@vei.net> based off work by + * David Leonard and Chris Provenzano. @@ -12,19 +12,24 @@ $NetBSD$ */ #include <unistd.h> -@@ -18,12 +21,12 @@ +@@ -16,14 +19,14 @@ + #define SEMAPHORE_CLEAR 0 + #define SEMAPHORE_SET 0x80; - #define SEMAPHORE_TEST_AND_SET(lock) \ - ({ \ +-#define SEMAPHORE_TEST_AND_SET(lock) \ +-({ \ -volatile long temp = SEMAPHORE_CLEAR; \ - \ -__asm__ volatile("tas (%2); bpl 0f; movl #1,%0; 0:" \ +- :"=r" (temp) \ +- :"0" (temp),"r" (lock)); \ +-temp; \ ++#define SEMAPHORE_TEST_AND_SET(lock) \ ++({ \ + volatile long temp = SEMAPHORE_CLEAR; \ + __asm__ volatile( \ + "tas %2; bpl 0f; movl #1,%0; 0:" \ - :"=r" (temp) \ -- :"0" (temp),"r" (lock)); \ --temp; \ ++ :"=r" (temp) \ + :"0" (temp),"m" (*lock)); \ + temp; \ }) @@ -51,10 +56,11 @@ $NetBSD$ * Static machdep_pthread initialization values. * For initial thread only. */ -@@ -70,6 +80,26 @@ +@@ -70,7 +80,27 @@ #if defined(PTHREAD_KERNEL) +-int machdep_save_state __P_((void)); + +#ifndef __machdep_stack_get +#define __machdep_stack_get(x) (x)->machdep_stack @@ -75,6 +81,7 @@ $NetBSD$ +void * __machdep_stack_alloc __P_((size_t)); +void __machdep_stack_free __P_((void *)); + - int machdep_save_state __P_((void)); ++int machdep_save_state __P_((void)); #endif + diff --git a/databases/mysql-server/patches/patch-bi b/databases/mysql-server/patches/patch-bi index 2bc6daaed76..22176f4528b 100644 --- a/databases/mysql-server/patches/patch-bi +++ b/databases/mysql-server/patches/patch-bi @@ -1,4 +1,4 @@ -$NetBSD: patch-bi,v 1.1 1999/08/03 20:30:41 bad Exp $ +$NetBSD: patch-bi,v 1.2 1999/12/13 20:36:28 bad Exp $ --- mit-pthreads/config/config.guess.orig Sun Jul 7 05:51:23 1996 +++ mit-pthreads/config/config.guess Tue Jul 27 16:55:36 1999 @@ -18,7 +18,7 @@ $NetBSD: patch-bi,v 1.1 1999/08/03 20:30:41 bad Exp $ + mac68k:NetBSD:*:*) + echo m68k-apple-netbsd${UNAME_RELEASE} + exit 0 ;; -+ mvme68:NetBSD:*:*) ++ mvme68k:NetBSD:*:*) + echo m68k-motorola-netbsd${UNAME_RELEASE} + exit 0 ;; + next68k:NetBSD:*:*) diff --git a/databases/mysql-server/patches/patch-bj b/databases/mysql-server/patches/patch-bj new file mode 100644 index 00000000000..a89e8f7faec --- /dev/null +++ b/databases/mysql-server/patches/patch-bj @@ -0,0 +1,17 @@ +--- mit-pthreads/config/Makefile.in.orig Mon Mar 2 19:44:34 1998 ++++ mit-pthreads/config/Makefile.in Sun Dec 5 03:24:04 1999 +@@ -2,8 +2,12 @@ + # + + LIB=pthread +-#NOPIC= +-#NOPROFILE=1 ++NOPIC=1 ++NOPROFILE=1 ++NOLINT=1 ++MKPIC=no ++MKPROFILE=no ++MKLINT=no + CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/include -I${srcdir}/include -DPTHREAD_KERNEL + CDEBUGFLAGS= @CFLAGS@ + CFLAGS+= ${CDEBUGFLAGS} diff --git a/databases/mysql-server/pkg/PLIST b/databases/mysql-server/pkg/PLIST index ea398c4e33c..458b38e16ab 100644 --- a/databases/mysql-server/pkg/PLIST +++ b/databases/mysql-server/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/05/06 23:37:01 tv Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/12/13 20:36:29 bad Exp $ bin/comp_err bin/isamchk bin/isamlog @@ -7,17 +7,29 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld +lib/mysql/libmystrings.a +lib/mysql/libdbug.a +lib/mysql/libmysys.a +lib/mysql/libnisam.a +lib/mysql/libheap.a +lib/mysql/libmerge.a libexec/mysqld share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -44,10 +56,13 @@ share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt @exec %D/bin/mysql_install_db --force @dirrm share/mysql/czech +@dirrm share/mysql/danish @dirrm share/mysql/dutch @dirrm share/mysql/english +@dirrm share/mysql/estonia @dirrm share/mysql/french @dirrm share/mysql/german +@dirrm share/mysql/greek @dirrm share/mysql/hungarian @dirrm share/mysql/italian @dirrm share/mysql/japanese |