pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/mysql-server Updated mysql-server to 3.23.58
details: https://anonhg.NetBSD.org/pkgsrc/rev/282600a86042
branches: trunk
changeset: 462590:282600a86042
user: martti <martti%pkgsrc.org@localhost>
date: Sun Oct 05 17:55:34 2003 +0000
description:
Updated mysql-server to 3.23.58
A lot of bug and security fixes since 3.23.51...
diffstat:
databases/mysql-server/MESSAGE | 6 +-
databases/mysql-server/Makefile | 32 ++-----
databases/mysql-server/distinfo | 27 ++----
databases/mysql-server/files/mysqld.sh | 4 +-
databases/mysql-server/patches/patch-aa | 17 ++-
databases/mysql-server/patches/patch-ab | 37 ++-------
databases/mysql-server/patches/patch-ac | 93 -----------------------
databases/mysql-server/patches/patch-ad | 29 -------
databases/mysql-server/patches/patch-ae | 8 +-
databases/mysql-server/patches/patch-af | 10 +-
databases/mysql-server/patches/patch-ag | 12 ---
databases/mysql-server/patches/patch-ah | 17 ----
databases/mysql-server/patches/patch-ai | 40 ----------
databases/mysql-server/patches/patch-aj | 126 --------------------------------
databases/mysql-server/patches/patch-ak | 24 ------
databases/mysql-server/patches/patch-al | 26 +++++-
databases/mysql-server/patches/patch-am | 29 ++-----
databases/mysql-server/patches/patch-an | 13 ---
databases/mysql-server/patches/patch-ao | 13 ---
19 files changed, 85 insertions(+), 478 deletions(-)
diffs (truncated from 741 to 300 lines):
diff -r 0cb1e5e9d3eb -r 282600a86042 databases/mysql-server/MESSAGE
--- a/databases/mysql-server/MESSAGE Sun Oct 05 17:55:13 2003 +0000
+++ b/databases/mysql-server/MESSAGE Sun Oct 05 17:55:34 2003 +0000
@@ -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 -r 0cb1e5e9d3eb -r 282600a86042 databases/mysql-server/Makefile
--- a/databases/mysql-server/Makefile Sun Oct 05 17:55:13 2003 +0000
+++ b/databases/mysql-server/Makefile Sun Oct 05 17:55:34 2003 +0000
@@ -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_PKGINSTALL= YES
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-ONLY_FOR_PLATFORM= SunOS-*-sparc Linux-*-*
-
-# 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)
+PTHREAD_OPTS= require
-# 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 @@
${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 -r 0cb1e5e9d3eb -r 282600a86042 databases/mysql-server/distinfo
--- a/databases/mysql-server/distinfo Sun Oct 05 17:55:13 2003 +0000
+++ b/databases/mysql-server/distinfo Sun Oct 05 17:55:34 2003 +0000
@@ -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 -r 0cb1e5e9d3eb -r 282600a86042 databases/mysql-server/files/mysqld.sh
--- a/databases/mysql-server/files/mysqld.sh Sun Oct 05 17:55:13 2003 +0000
+++ b/databases/mysql-server/files/mysqld.sh Sun Oct 05 17:55:34 2003 +0000
@@ -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 -r 0cb1e5e9d3eb -r 282600a86042 databases/mysql-server/patches/patch-aa
--- a/databases/mysql-server/patches/patch-aa Sun Oct 05 17:55:13 2003 +0000
+++ b/databases/mysql-server/patches/patch-aa Sun Oct 05 17:55:34 2003 +0000
@@ -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 -r 0cb1e5e9d3eb -r 282600a86042 databases/mysql-server/patches/patch-ab
--- a/databases/mysql-server/patches/patch-ab Sun Oct 05 17:55:13 2003 +0000
+++ b/databases/mysql-server/patches/patch-ab Sun Oct 05 17:55:34 2003 +0000
@@ -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 @@
- }
-
- /* ==========================================================================
-- * machdep_save_state()
-+ * machdep_save_float_state()
- */
- void machdep_save_float_state(struct pthread * pthread)
- {
- char * fdata = pthread->machdep_data.machdep_fstate;
+--- 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 @@
-- __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]) );
- }
+ info-am:
- /* ==========================================================================
-@@ -83,9 +83,8 @@
- {
- char * fdata = pthread_run->machdep_data.machdep_fstate;
+-install-data-am: install-pkgdataDATA install-pkgdataSCRIPTS
++install-data-am: install-pkgdataSCRIPTS
-- __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]) );
- }
+ install-exec-am:
- /* ==========================================================================
diff -r 0cb1e5e9d3eb -r 282600a86042 databases/mysql-server/patches/patch-ac
--- a/databases/mysql-server/patches/patch-ac Sun Oct 05 17:55:13 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 0cb1e5e9d3eb -r 282600a86042 databases/mysql-server/patches/patch-ad
--- a/databases/mysql-server/patches/patch-ad Sun Oct 05 17:55:13 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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; \
Home |
Main Index |
Thread Index |
Old Index