head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.54 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.52 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.50 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.48 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.46 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.44 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.42 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.40 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.38 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.36 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.34 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.32 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.30 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.28 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.26 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.24 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.22 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.20 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.18 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.16 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 buildlink2-base:1.6 comdex-fall-1999:1.1; locks; strict; comment @# @; expand @o@; 1.6 date 2000.02.15.04.46.28; author bad; state dead; branches; next 1.5; 1.5 date 99.12.22.15.37.52; author bad; state Exp; branches; next 1.4; 1.4 date 99.12.13.20.36.28; author bad; state Exp; branches; next 1.3; 1.3 date 99.11.15.17.45.47; author rh; state Exp; branches; next 1.2; 1.2 date 99.11.15.17.32.07; author rh; state Exp; branches; next 1.1; 1.1 date 99.08.03.20.30.41; author bad; state Exp; branches; next ; desc @@ 1.6 log @Update mysql to 3.22.32. This includes a security fix for the remote password checking protocol. Other wise it's just the regular bunch of bugfixes. See appendix D of the manual. @ text @$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 Wed Dec 22 16:32:38 1999 @@@@ -5,2 +5,5 @@@@ * + * m68k work by Andy Finnell based off work by + * David Leonard and Chris Provenzano. + * */ @@@@ -18,10 +21,10 @@@@ -#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),"m" (*lock)); \ + temp; \ }) @@@@ -50,2 +53,3 @@@@ jmp_buf machdep_state; + char machdep_fstate[92]; }; @@@@ -58,2 +62,8 @@@@ /* + * Some fd flag defines that are necessary to distinguish between posix + * behavior and bsd4.3 behavior. + */ +#define __FD_NONBLOCK O_NONBLOCK + +/* * Static machdep_pthread initialization values. @@@@ -72,2 +82,22 @@@@ + +#ifndef __machdep_stack_get +#define __machdep_stack_get(x) (x)->machdep_stack +#endif +#ifndef __machdep_stack_set +#define __machdep_stack_set(x, y) (x)->machdep_stack = y +#endif +#ifndef __machdep_stack_repl +#define __machdep_stack_repl(x, y) \ +{ \ + if (stack = __machdep_stack_get(x)) { \ + __machdep_stack_free(stack); \ + } \ + __machdep_stack_set(x, y); \ +} +#endif + +void * __machdep_stack_alloc __P_((size_t)); +void __machdep_stack_free __P_((void *)); + int machdep_save_state __P_((void)); @ 1.5 log @Use less context to avoid a RCS keyword in the patch. @ text @@ 1.4 log @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. @ text @d3 3 a5 5 --- 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: patch-be,v 1.1 1999/08/03 20:30:41 bad Exp $ d11 1 a11 5 #include @@@@ -16,14 +19,14 @@@@ #define SEMAPHORE_CLEAR 0 #define SEMAPHORE_SET 0x80; d30 1 a30 5 #define SEMAPHORE_RESET(lock) *lock = SEMAPHORE_CLEAR @@@@ -48,6 +51,7 @@@@ void *machdep_stack; struct itimerval machdep_timer; d34 1 a34 5 /* @@@@ -56,6 +60,12 @@@@ #define PTHREAD_STACK_MIN 1024 d43 1 a43 5 * For initial thread only. */ @@@@ -70,7 +80,27 @@@@ #if defined(PTHREAD_KERNEL) a44 1 -int machdep_save_state __P_((void)); d65 1 a65 4 +int machdep_save_state __P_((void)); #endif @ 1.3 log @cvs admin -ko patch-be (because it contains RCS keywords at the wrong places) and redo defuzz. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- 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 d7 1 a7 1 * $Id: engine-m68000-netbsd.h,v 1.51 1994/11/08 15:39:15 proven Exp $ d15 3 a17 1 @@@@ -18,12 +21,12 @@@@ d19 2 a20 2 #define SEMAPHORE_TEST_AND_SET(lock) \ ({ \ d24 5 d32 1 a32 3 :"=r" (temp) \ - :"0" (temp),"r" (lock)); \ -temp; \ d59 1 a59 1 @@@@ -70,6 +80,26 @@@@ d63 1 d84 1 a84 1 int machdep_save_state __P_((void)); d87 1 @ 1.2 log @defuzz @ text @d4 1 a4 1 +++ mit-pthreads/machdep/engine-m68000-netbsd.h Mon Nov 15 18:25:36 1999 @ 1.1 log @Add support for m68k machines. Patches by Andy Finnell. Thanks to Greg Oster for testing. @ text @d3 2 a4 2 --- 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 d15 1 a15 3 @@@@ -16,14 +19,14 @@@@ #define SEMAPHORE_CLEAR 0 #define SEMAPHORE_SET 0x80; d17 2 a18 2 -#define SEMAPHORE_TEST_AND_SET(lock) \ -({ \ a21 5 - :"=r" (temp) \ - :"0" (temp),"r" (lock)); \ -temp; \ +#define SEMAPHORE_TEST_AND_SET(lock) \ +({ \ d25 3 a27 1 + :"=r" (temp) \ d54 1 a54 1 @@@@ -70,7 +80,27 @@@@ a57 1 -int machdep_save_state __P_((void)); d78 1 a78 1 +int machdep_save_state __P_((void)); a80 1 @