pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases Update to 5.0.41. Amongst many fixes these v...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0983089fa0ad
branches: trunk
changeset: 528960:0983089fa0ad
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Mon May 21 04:39:59 2007 +0000
description:
Update to 5.0.41. Amongst many fixes these vulnerabilities were
fixed:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2583
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2692
And another patch adapted from a mailing list to fix:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2691
See http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-41.html
To see all changes.
diffstat:
databases/mysql5-client/Makefile | 4 +-
databases/mysql5-client/Makefile.common | 32 +-
databases/mysql5-client/PLIST | 8 +-
databases/mysql5-client/distinfo | 15 +-
databases/mysql5-client/patches/patch-ac | 19 +-
databases/mysql5-client/patches/patch-ae | 16 +-
databases/mysql5-client/patches/patch-au | 55 ----
databases/mysql5-client/patches/patch-bg | 14 +
databases/mysql5-client/patches/patch-bh | 16 +
databases/mysql5-server/PLIST | 362 ++++++++++++++++++++++++++++++-
databases/mysql5-server/distinfo | 18 +-
databases/mysql5-server/patches/patch-ac | 51 +--
databases/mysql5-server/patches/patch-ah | 14 +-
databases/mysql5-server/patches/patch-ak | 10 +-
databases/mysql5-server/patches/patch-am | 15 +-
databases/mysql5-server/patches/patch-an | 58 ++--
16 files changed, 506 insertions(+), 201 deletions(-)
diffs (truncated from 1115 to 300 lines):
diff -r 4c89afd16645 -r 0983089fa0ad databases/mysql5-client/Makefile
--- a/databases/mysql5-client/Makefile Mon May 21 02:45:52 2007 +0000
+++ b/databases/mysql5-client/Makefile Mon May 21 04:39:59 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/03/11 18:42:27 adam Exp $
+# $NetBSD: Makefile,v 1.10 2007/05/21 04:39:59 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
SVR4_PKGNAME= mysqc
@@ -12,7 +12,7 @@
CONFIGURE_ARGS+= --without-server
CONFIGURE_ARGS+= --enable-thread-safe-client
UNWRAP_FILES+= scripts/mysql_config
-INFO_FILES= # PLIST
+INFO_FILES= yes
INSTALLATION_DIRS+= share/examples/mysql
diff -r 4c89afd16645 -r 0983089fa0ad databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common Mon May 21 02:45:52 2007 +0000
+++ b/databases/mysql5-client/Makefile.common Mon May 21 04:39:59 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.20 2007/03/11 18:42:27 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2007/05/21 04:39:59 xtraeme Exp $
-DISTNAME= mysql-5.0.37
+DISTNAME= mysql-5.0.41
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/}
@@ -43,12 +43,6 @@
CONFIGURE_ARGS+= --without-readline
CONFIGURE_ARGS+= --without-libedit
-# We need the full readline on NetBSD 1.6.x
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.*)
-USE_BUILTIN.readline= no
-.include "../../devel/readline/buildlink3.mk"
-.endif
-
# This forces mysql.info _not_ to be rebuilt.
CONFIGURE_ARGS+= --without-docs
@@ -88,29 +82,31 @@
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${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
+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
USE_LANGUAGES= c c++
USE_TOOLS+= autoconf gmake perl:run
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
-SUBST_CLASSES+= mk scripts
+SUBST_CLASSES= mk
SUBST_STAGE.mk= post-patch
SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \
mysys/Makefile.in strings/Makefile.in
SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//"
SUBST_MESSAGE.mk= Fixing Makefiles.
-SUBST_STAGE.scripts= post-patch
-SUBST_FILES.scripts= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
+
+SUBST_CLASSES+= scr
+SUBST_STAGE.scr= post-patch
+SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
scripts/mysql_secure_installation.sh \
support-files/mysql.server.sh
-SUBST_SED.scripts= -e "s,chown,${CHOWN},g"
-SUBST_SED.scripts+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
-SUBST_MESSAGE.scripts= Fixing scripts.
+SUBST_SED.scr= -e "s,chown,${CHOWN},g"
+SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
+SUBST_MESSAGE.scr= Fixing scripts.
# Fix broken shared library detection under Mac OS X
.if ${OPSYS} == Darwin
diff -r 4c89afd16645 -r 0983089fa0ad databases/mysql5-client/PLIST
--- a/databases/mysql5-client/PLIST Mon May 21 02:45:52 2007 +0000
+++ b/databases/mysql5-client/PLIST Mon May 21 04:39:59 2007 +0000
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2006/08/06 16:30:40 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/05/21 04:39:59 xtraeme Exp $
bin/msql2mysql
bin/mysql
bin/mysql_config
bin/mysql_convert_table_format
-bin/mysql_create_system_tables
bin/mysql_explain_log
bin/mysql_find_rows
bin/mysql_fix_extensions
@@ -26,6 +25,7 @@
bin/mysqltest
bin/mysqltestmanager-pwgen
bin/mysqltestmanagerc
+include/mysql/decimal.h
include/mysql/errmsg.h
include/mysql/keycache.h
include/mysql/m_ctype.h
@@ -40,7 +40,6 @@
include/mysql/my_net.h
include/mysql/my_no_pthread.h
include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
include/mysql/my_sys.h
include/mysql/my_xml.h
include/mysql/mysql.h
@@ -73,6 +72,9 @@
share/examples/mysql/my-small.cnf
share/mysql/fill_help_tables.sql
share/mysql/mysql_fix_privilege_tables.sql
+share/mysql/mysql_system_tables.sql
+share/mysql/mysql_system_tables_data.sql
+share/mysql/mysql_test_data_timezone.sql
@dirrm share/mysql
@dirrm share/examples/mysql
@dirrm lib/mysql
diff -r 4c89afd16645 -r 0983089fa0ad databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo Mon May 21 02:45:52 2007 +0000
+++ b/databases/mysql5-client/distinfo Mon May 21 04:39:59 2007 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.17 2007/03/12 12:33:12 tron Exp $
+$NetBSD: distinfo,v 1.18 2007/05/21 04:39:59 xtraeme Exp $
-SHA1 (mysql-5.0.37.tar.gz) = 7c957d4337156c7f98b0617fd5a63f3a838a9bc4
-RMD160 (mysql-5.0.37.tar.gz) = 132d3886a81fcec9be50cdc8d97c868928f5424f
-Size (mysql-5.0.37.tar.gz) = 23239518 bytes
+SHA1 (mysql-5.0.41.tar.gz) = cc2a119c9e07173fce6d78fc87d96c6102eeab36
+RMD160 (mysql-5.0.41.tar.gz) = 57f2b5ac628814abd2b19a263cd2c90e3e20593d
+Size (mysql-5.0.41.tar.gz) = 24083795 bytes
SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381
-SHA1 (patch-ac) = ec63621ba908b9da9e1d6dacba9a7894c21e9f5b
+SHA1 (patch-ac) = 87c795d0728f221e8d37b0711131f072bbadf1f1
SHA1 (patch-ad) = e8e04a6beca500a0fd96b95b19fac13d7a662500
-SHA1 (patch-ae) = aba6fc15aae07d501d3366553acb735d0137f1a8
+SHA1 (patch-ae) = 4403c09d89cdb1f72275551aa17e1b4e04bb1ad9
SHA1 (patch-af) = 06cb76ad50ed0de3e82f682bf57a75441f68da26
SHA1 (patch-ag) = 212f9c0a2e2eb6feb013e4a72eaf658951b995b5
SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7
@@ -23,5 +23,6 @@
SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923
SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156
-SHA1 (patch-au) = e5494174b9ed7d5bbca0fe4bd706f7301d331a46
SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
+SHA1 (patch-bg) = 32e63926587f59203eb4094139c3e0938a0bc877
+SHA1 (patch-bh) = 61ae8ad98f683418615a96f0dabb286a71642760
diff -r 4c89afd16645 -r 0983089fa0ad databases/mysql5-client/patches/patch-ac
--- a/databases/mysql5-client/patches/patch-ac Mon May 21 02:45:52 2007 +0000
+++ b/databases/mysql5-client/patches/patch-ac Mon May 21 04:39:59 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ac,v 1.5 2007/05/21 04:39:59 xtraeme Exp $
---- configure.in.orig 2007-03-05 20:21:13.000000000 +0100
-+++ configure.in
-@@ -487,7 +487,7 @@ then
+--- configure.in.orig 2007-05-21 05:53:04.000000000 +0200
++++ configure.in 2007-05-21 05:53:27.000000000 +0200
+@@ -487,7 +487,7 @@
FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
else
case $SYSTEM_TYPE in
@@ -11,16 +11,7 @@
FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
;;
*darwin*)
-@@ -794,6 +794,8 @@ AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(H
-
- # For sem_xxx functions on Solaris 2.6
- AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
-+# For sem_xxx functions on NetBSD
-+AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(rt, sem_init))
- MYSQL_CHECK_ZLIB_WITH_COMPRESS
-
- # For large pages support
-@@ -1119,7 +1121,7 @@ case $SYSTEM_TYPE in
+@@ -1121,7 +1121,7 @@
MAX_C_OPTIMIZE="-O"
fi
;;
diff -r 4c89afd16645 -r 0983089fa0ad databases/mysql5-client/patches/patch-ae
--- a/databases/mysql5-client/patches/patch-ae Mon May 21 02:45:52 2007 +0000
+++ b/databases/mysql5-client/patches/patch-ae Mon May 21 04:39:59 2007 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.7 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ae,v 1.8 2007/05/21 04:40:00 xtraeme Exp $
---- scripts/Makefile.in.orig 2007-03-05 20:23:19.000000000 +0100
-+++ scripts/Makefile.in
-@@ -355,13 +355,12 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
+--- scripts/Makefile.in.orig 2007-05-21 04:54:42.000000000 +0200
++++ scripts/Makefile.in 2007-05-21 04:55:14.000000000 +0200
+@@ -355,13 +355,12 @@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-bin_SCRIPTS = @server_scripts@ \
-+bin_SCRIPTS = \
++bin_SCRIPTS = \
msql2mysql \
mysql_config \
mysql_fix_privilege_tables \
@@ -17,11 +17,11 @@
mysql_zap \
mysqlaccess \
mysqlbug \
-@@ -372,7 +371,6 @@ bin_SCRIPTS = @server_scripts@ \
+@@ -372,7 +371,6 @@
mysql_explain_log \
mysql_tableinfo \
mysql_upgrade_shell \
-- mysqld_multi \
- mysql_create_system_tables
+- mysqld_multi
noinst_SCRIPTS = make_binary_distribution \
+ make_sharedlib_distribution \
diff -r 4c89afd16645 -r 0983089fa0ad databases/mysql5-client/patches/patch-au
--- a/databases/mysql5-client/patches/patch-au Mon May 21 02:45:52 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-$NetBSD: patch-au,v 1.3 2007/03/12 12:33:12 tron Exp $
-
---- client/mysql.cc.orig 2007-03-05 19:21:21.000000000 +0000
-+++ client/mysql.cc 2007-03-12 11:42:08.000000000 +0000
-@@ -37,7 +37,15 @@
- #endif
- #include "my_readline.h"
- #include <signal.h>
-+#ifdef IRIX5
-+#define _MYSQL_END_TYPE (void (*)(...))
-+#else
-+#define _MYSQL_END_TYPE
-+#endif
- #include <violite.h>
-+#ifdef NEEDS_BSTRING_H // defines bzero()
-+#include <bstring.h>
-+#endif
-
- #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
- #include <locale.h>
-@@ -438,10 +446,10 @@
- ignore_errors=1; // Don't abort monitor
-
- if (opt_sigint_ignore)
-- signal(SIGINT, SIG_IGN);
-+ signal(SIGINT, _MYSQL_END_TYPE SIG_IGN);
- else
-- signal(SIGINT, mysql_sigint); // Catch SIGINT to clean up
-- signal(SIGQUIT, mysql_end); // Catch SIGQUIT to clean up
-+ signal(SIGINT, _MYSQL_END_TYPE mysql_sigint); // Catch SIGINT to clean up
-+ signal(SIGQUIT, _MYSQL_END_TYPE mysql_end); // Catch SIGQUIT to clean up
-
- /*
- Run in interactive mode like the ingres/postgres monitor
-@@ -513,7 +521,7 @@
- char kill_buffer[40];
- MYSQL *kill_mysql= NULL;
-
-- signal(SIGINT, mysql_sigint);
-+ signal(SIGINT, _MYSQL_END_TYPE mysql_sigint);
-
- /* terminate if no query being executed, or we already tried interrupting */
- if (!executing_query || interrupted_query++)
-@@ -1418,7 +1426,11 @@
- */
-
- #if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-+#ifdef __NetBSD__
-+int no_completion(const char*,int)
-+#else
- char *no_completion(const char*,int)
-+#endif
- #else
- char *no_completion()
- #endif
diff -r 4c89afd16645 -r 0983089fa0ad databases/mysql5-client/patches/patch-bg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql5-client/patches/patch-bg Mon May 21 04:39:59 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-bg,v 1.1 2007/05/21 04:40:00 xtraeme Exp $
+
+
+--- sql/sql_parse.cc.orig 2007-05-21 04:56:56.000000000 +0200
++++ sql/sql_parse.cc 2007-05-21 04:59:31.000000000 +0200
+@@ -3304,7 +3304,7 @@
+ */
+ old_list= table[0];
+ new_list= table->next_local[0];
+- if (check_grant(thd, ALTER_ACL, &old_list, 0, 1, 0) ||
Home |
Main Index |
Thread Index |
Old Index