pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2012Q1]: pkgsrc/databases Pullup ticket #3744 - requested by taca
details: https://anonhg.NetBSD.org/pkgsrc/rev/663f8c8aeb1d
branches: pkgsrc-2012Q1
changeset: 602042:663f8c8aeb1d
user: tron <tron%pkgsrc.org@localhost>
date: Wed Apr 18 13:50:48 2012 +0000
description:
Pullup ticket #3744 - requested by taca
databases/mysql5-client: security update
databases/mysql5-server: security update
Revisions pulled up:
- databases/mysql5-client/Makefile.common 1.42
- databases/mysql5-client/distinfo 1.31
- databases/mysql5-client/patches/patch-ap 1.3
- databases/mysql5-server/Makefile 1.33
- databases/mysql5-server/PLIST 1.18
- databases/mysql5-server/distinfo 1.29
- databases/mysql5-server/patches/patch-ca 1.5
- databases/mysql5-server/patches/patch-include_my__time.h deleted
- databases/mysql5-server/patches/patch-mysql-test_r_func__time.result deleted
- databases/mysql5-server/patches/patch-mysql-test_t_func__time.test deleted
- databases/mysql5-server/patches/patch-sql-common_my__time.c deleted
- databases/mysql5-server/patches/patch-sql_mysqld.cc deleted
- databases/mysql5-server/patches/patch-sql_set__var.cc deleted
- databases/mysql5-server/patches/patch-sql_sql__class.h deleted
---
Module Name: pkgsrc
Committed By: taca
Date: Sat Apr 14 04:04:48 UTC 2012
Modified Files:
pkgsrc/databases/mysql5-client: Makefile.common distinfo
pkgsrc/databases/mysql5-client/patches: patch-ap
pkgsrc/databases/mysql5-server: Makefile PLIST distinfo
pkgsrc/databases/mysql5-server/patches: patch-ca
Removed Files:
pkgsrc/databases/mysql5-server/patches: patch-include_my__time.h
patch-mysql-test_r_func__time.result
patch-mysql-test_t_func__time.test patch-sql-common_my__time.c
patch-sql_mysqld.cc patch-sql_set__var.cc patch-sql_sql__class.h
Log Message:
Update mysql5-client and mysql5-server to 5.0.96, last release of
MySQL 5.0 series.
5.0.96
* yaSSL was upgraded from version 1.7.2 to 2.2.0.
5.0.95
* No change log entries.
5.0.94
* Some files in the MySQL Server sources containing legacy code still used the
LGPL license. Such files that were no longer in use have been removed. Any
such code that remains following this removal now appears under the GPL
only. (Bug #11896296)
References: See also Bug #11840513.
* Under some circumstances, the result of SUBSTRING_INDEX() incorrectly
depended on the contents of the previous row. (Bug #42404, Bug #11751514)
5.0.93
* Security Fix: The PolyFromWKB() function could crash the server when
improper WKB data was passed to the function. (Bug #51875, Bug #11759554,
CVE-2010-3840)
* Security Fix: Bug #36544 was fixed.
* Security Fix: Bug #49124 and Bug #11757121 were fixed.
* Two unused test files in storage/ndb/test/sql contained incorrect versions
of the GNU Lesser General Public License. The files and the directory
containing them have been removed. (Bug #11810224)
References: See also Bug #11810156.
* On FreeBSD and OpenBSD, the server incorrectly checked the range of the
system date, causing legal values to be rejected. (Bug #55755, Bug
#11763089)
diffstat:
databases/mysql5-client/Makefile.common | 4 +-
databases/mysql5-client/distinfo | 10 +-
databases/mysql5-client/patches/patch-ap | 8 +-
databases/mysql5-server/Makefile | 3 +-
databases/mysql5-server/PLIST | 8 ++-
databases/mysql5-server/distinfo | 17 +---
databases/mysql5-server/patches/patch-ca | 19 +-----
databases/mysql5-server/patches/patch-include_my__time.h | 24 -------
databases/mysql5-server/patches/patch-mysql-test_r_func__time.result | 22 ------
databases/mysql5-server/patches/patch-mysql-test_t_func__time.test | 26 -------
databases/mysql5-server/patches/patch-sql-common_my__time.c | 25 -------
databases/mysql5-server/patches/patch-sql_mysqld.cc | 34 ----------
databases/mysql5-server/patches/patch-sql_set__var.cc | 19 -----
databases/mysql5-server/patches/patch-sql_sql__class.h | 15 ----
14 files changed, 25 insertions(+), 209 deletions(-)
diffs (truncated from 379 to 300 lines):
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common Tue Apr 17 23:51:50 2012 +0000
+++ b/databases/mysql5-client/Makefile.common Wed Apr 18 13:50:48 2012 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.41 2011/02/26 02:58:55 taca Exp $
+# $NetBSD: Makefile.common,v 1.41.10.1 2012/04/18 13:50:48 tron Exp $
#
# used by databases/mysql5-client/Makefile
# used by databases/mysql5-server/Makefile
#
-DISTNAME= mysql-5.0.92
+DISTNAME= mysql-5.0.96
CATEGORIES= databases
MASTER_SITES= http://downloads.mysql.com/archives/mysql-5.0/ \
${MASTER_SITE_MYSQL:=MySQL-5.0/}
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo Tue Apr 17 23:51:50 2012 +0000
+++ b/databases/mysql5-client/distinfo Wed Apr 18 13:50:48 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2011/02/26 02:58:55 taca Exp $
+$NetBSD: distinfo,v 1.30.10.1 2012/04/18 13:50:48 tron Exp $
-SHA1 (mysql-5.0.92.tar.gz) = 10fffc7672a469af4a7fd980922b04d7ba0143ba
-RMD160 (mysql-5.0.92.tar.gz) = 24a373a1b124acf39d0c0726e5cb6f47dc1bef08
-Size (mysql-5.0.92.tar.gz) = 22440590 bytes
+SHA1 (mysql-5.0.96.tar.gz) = b28a82dccaa8a9d708f49ec5d0d0c3762d4010c8
+RMD160 (mysql-5.0.96.tar.gz) = b7c500f5aa82ab7189acc3c184db25616645e3ec
+Size (mysql-5.0.96.tar.gz) = 22686667 bytes
SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
SHA1 (patch-ac) = 66b6d0ffd3011df1dcf8f3be7f7300e975635d95
@@ -17,7 +17,7 @@
SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e
SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc
SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88
-SHA1 (patch-ap) = fc4246e829a3b53b27ff2c6f5572eb4b13a277e5
+SHA1 (patch-ap) = ee63b8477cbefac076d4384d671531f0795652e5
SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3
SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923
SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-client/patches/patch-ap
--- a/databases/mysql5-client/patches/patch-ap Tue Apr 17 23:51:50 2012 +0000
+++ b/databases/mysql5-client/patches/patch-ap Wed Apr 18 13:50:48 2012 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ap,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ap,v 1.2.46.1 2012/04/18 13:50:48 tron Exp $
---- client/mysqlbinlog.cc.orig 2007-03-05 20:21:42.000000000 +0100
+--- client/mysqlbinlog.cc.orig 2012-03-02 14:04:08.000000000 +0000
+++ client/mysqlbinlog.cc
-@@ -36,6 +36,9 @@
+@@ -37,6 +37,9 @@
#include "mysql_priv.h"
#include "log_event.h"
#include "sql_common.h"
+#ifdef NEEDS_BSTRING_H
+#include <bstring.h> /* defines bzero() */
+#endif
+ #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
#define BIN_LOG_HEADER_SIZE 4
- #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4)
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile Tue Apr 17 23:51:50 2012 +0000
+++ b/databases/mysql5-server/Makefile Wed Apr 18 13:50:48 2012 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2011/08/02 16:15:08 taca Exp $
+# $NetBSD: Makefile,v 1.32.6.1 2012/04/18 13:50:48 tron Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 1
SVR4_PKGNAME= mysqs
COMMENT= MySQL 5, a free SQL database (server)
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/PLIST
--- a/databases/mysql5-server/PLIST Tue Apr 17 23:51:50 2012 +0000
+++ b/databases/mysql5-server/PLIST Wed Apr 18 13:50:48 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2011/02/26 02:58:55 taca Exp $
+@comment $NetBSD: PLIST,v 1.17.10.1 2012/04/18 13:50:48 tron Exp $
bin/comp_err
bin/innochecksum
bin/my_print_defaults
@@ -611,6 +611,7 @@
share/mysql-test/r/rpl_charset.result
share/mysql-test/r/rpl_charset_sjis.result
share/mysql-test/r/rpl_commit_after_flush.result
+share/mysql-test/r/rpl_conditional_comments.result
share/mysql-test/r/rpl_create_database.result
share/mysql-test/r/rpl_critical_errors.result
share/mysql-test/r/rpl_ddl.result
@@ -702,6 +703,7 @@
share/mysql-test/r/rpl_variables.result
share/mysql-test/r/rpl_view.result
share/mysql-test/r/schema.result
+share/mysql-test/r/secure_file_priv_win.result
share/mysql-test/r/select.result
share/mysql-test/r/select_found.result
share/mysql-test/r/select_safe.result
@@ -1894,6 +1896,7 @@
share/mysql-test/t/rpl_charset.test
share/mysql-test/t/rpl_charset_sjis.test
share/mysql-test/t/rpl_commit_after_flush.test
+share/mysql-test/t/rpl_conditional_comments.test
share/mysql-test/t/rpl_create_database-master.opt
share/mysql-test/t/rpl_create_database-slave.opt
share/mysql-test/t/rpl_create_database.test
@@ -2042,6 +2045,8 @@
share/mysql-test/t/rpl_variables.test
share/mysql-test/t/rpl_view.test
share/mysql-test/t/schema.test
+share/mysql-test/t/secure_file_priv_win-master.opt
+share/mysql-test/t/secure_file_priv_win.test
share/mysql-test/t/select.test
share/mysql-test/t/select_found.test
share/mysql-test/t/select_safe.test
@@ -2214,3 +2219,4 @@
share/mysql/spanish/errmsg.sys
share/mysql/swedish/errmsg.sys
share/mysql/ukrainian/errmsg.sys
+@pkgdir share/mysql-test/collections
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/distinfo
--- a/databases/mysql5-server/distinfo Tue Apr 17 23:51:50 2012 +0000
+++ b/databases/mysql5-server/distinfo Wed Apr 18 13:50:48 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2011/08/04 09:09:41 taca Exp $
+$NetBSD: distinfo,v 1.28.6.1 2012/04/18 13:50:48 tron Exp $
-SHA1 (mysql-5.0.92.tar.gz) = 10fffc7672a469af4a7fd980922b04d7ba0143ba
-RMD160 (mysql-5.0.92.tar.gz) = 24a373a1b124acf39d0c0726e5cb6f47dc1bef08
-Size (mysql-5.0.92.tar.gz) = 22440590 bytes
+SHA1 (mysql-5.0.96.tar.gz) = b28a82dccaa8a9d708f49ec5d0d0c3762d4010c8
+RMD160 (mysql-5.0.96.tar.gz) = b7c500f5aa82ab7189acc3c184db25616645e3ec
+Size (mysql-5.0.96.tar.gz) = 22686667 bytes
SHA1 (patch-aa) = 4517f9e7445ccb6e7cdd6eee44af4fe3d8dc9513
SHA1 (patch-ab) = 7c51a0214c3e6205605047c72b07eac6792600db
SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
@@ -18,13 +18,6 @@
SHA1 (patch-ap) = 70049d00e30d89201dd8d9fc0ace4e6edfcffae7
SHA1 (patch-aq) = e63b5be7cb1cb2e8ca8ee52e7e42632c05804959
SHA1 (patch-bf) = 180aefb012a0d17269654ba0aeb71ec74ea98e6c
-SHA1 (patch-ca) = a1620b5ebad72bcf9265ec0f9b44ecebb2ee22c7
+SHA1 (patch-ca) = 34cd54409f459a8938c7068218d736b6c7916a5c
SHA1 (patch-cb) = 3e6e3e5aeb0476b399ce80d7af58564cdad7da7a
SHA1 (patch-cc) = 5dc7423892271cf9be86be71de10d275532a8541
-SHA1 (patch-include_my__time.h) = 369fb468388bdec4e8449927e2109a8839fdde8a
-SHA1 (patch-mysql-test_r_func__time.result) = c85c6ff7981adf9dd10a4d1724e0b94616dcbe1c
-SHA1 (patch-mysql-test_t_func__time.test) = 5ff59d3fb9486a34ab23f33a942c2bd16be87776
-SHA1 (patch-sql-common_my__time.c) = 8fa7f2f54cccf778c316e311dec8a39a87b9fc57
-SHA1 (patch-sql_mysqld.cc) = ae26b56f5ede21ed975005f47994b685b2c8083e
-SHA1 (patch-sql_set__var.cc) = 149b35a73c5b82094fc5188b872904aaeb9f2329
-SHA1 (patch-sql_sql__class.h) = 27fc6cc1684288b7ca517915af69a4ef8447c691
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/patches/patch-ca
--- a/databases/mysql5-server/patches/patch-ca Tue Apr 17 23:51:50 2012 +0000
+++ b/databases/mysql5-server/patches/patch-ca Wed Apr 18 13:50:48 2012 +0000
@@ -1,28 +1,11 @@
-$NetBSD: patch-ca,v 1.4 2011/08/02 16:15:08 taca Exp $
+$NetBSD: patch-ca,v 1.4.6.1 2012/04/18 13:50:48 tron Exp $
-* Handling of time_t: http://lists.mysql.com/commits/128103
* Before calling sigsend(), make sure the function actuall exists.
Fixes the build on NetBSD >= 4.99.49, in which the macro P_MYID
is defined somewhere unrelated to signals.
--- configure.in.orig 2011-01-25 11:27:51.000000000 +0000
+++ configure.in
-@@ -1956,6 +1956,15 @@ dnl
-
- MYSQL_CHECK_TIME_T
-
-+dnl
-+dnl check size of time_t
-+dnl
-+
-+AC_CHECK_SIZEOF(time_t, 8)
-+if test "$ac_cv_sizeof_time_t" -eq 0
-+then
-+ AC_MSG_ERROR("MySQL needs a time_t type.")
-+fi
-
- # do we need #pragma interface/#pragma implementation ?
- # yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin
@@ -2051,7 +2060,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire
paths.h semaphore.h)
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/patches/patch-include_my__time.h
--- a/databases/mysql5-server/patches/patch-include_my__time.h Tue Apr 17 23:51:50 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-include_my__time.h,v 1.1 2011/08/02 16:15:08 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- include/my_time.h.orig 2011-01-25 11:28:00.000000000 +0000
-+++ include/my_time.h
-@@ -44,6 +44,17 @@ typedef long my_time_t;
- #define MY_TIME_T_MIN LONG_MIN
-
-
-+/*
-+ check for valid times only if the range of time_t is greater than
-+ the range of my_time_t
-+*/
-+#if SIZEOF_TIME_T > SIZEOF_LONG
-+# define IS_VALID_TIME_T(x) ((x) <= (time_t) MY_TIME_T_MAX && \
-+ (x) >= (time_t) MY_TIME_T_MIN)
-+#else
-+# define IS_VALID_TIME_T(x) (1 > 0)
-+#endif
-+
- /* Time handling defaults */
- #define TIMESTAMP_MAX_YEAR 2038
- #define YY_PART_YEAR 70
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/patches/patch-mysql-test_r_func__time.result
--- a/databases/mysql5-server/patches/patch-mysql-test_r_func__time.result Tue Apr 17 23:51:50 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-mysql-test_r_func__time.result,v 1.1 2011/08/02 16:15:08 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- mysql-test/r/func_time.result.orig 2011-01-25 11:52:36.000000000 +0000
-+++ mysql-test/r/func_time.result
-@@ -1323,4 +1323,15 @@ SELECT '2008-02-18' + INTERVAL 1 FRAC_SE
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
- SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
-+#
-+# Bug #52315 part 2 : utc_date() crashes when system time > year 2037
-+#
-+SET TIMESTAMP=-147490000;
-+SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483648;
-+SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483646;
-+SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483647;
-+SELECT UTC_TIMESTAMP();
- End of 5.0 tests
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/patches/patch-mysql-test_t_func__time.test
--- a/databases/mysql5-server/patches/patch-mysql-test_t_func__time.test Tue Apr 17 23:51:50 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-mysql-test_t_func__time.test,v 1.1 2011/08/02 16:15:08 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- mysql-test/t/func_time.test.orig 2011-01-25 11:52:35.000000000 +0000
-+++ mysql-test/t/func_time.test
-@@ -838,4 +838,19 @@ SELECT '2008-02-18' + INTERVAL 1 FRAC_SE
- --error ER_PARSE_ERROR
- SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
-
-+
-+--echo #
-+--echo # Bug #52315 part 2 : utc_date() crashes when system time > year 2037
-+--echo #
-+
-+--disable_result_log
-+--error ER_UNKNOWN_ERROR
-+SET TIMESTAMP=-147490000; SELECT UTC_TIMESTAMP();
-+--error ER_UNKNOWN_ERROR
-+SET TIMESTAMP=2147483648; SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483646; SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483647; SELECT UTC_TIMESTAMP();
-+--enable_result_log
-+
-+
- --echo End of 5.0 tests
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/patches/patch-sql-common_my__time.c
--- a/databases/mysql5-server/patches/patch-sql-common_my__time.c Tue Apr 17 23:51:50 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-sql-common_my__time.c,v 1.2 2011/08/04 09:09:41 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- sql-common/my_time.c.orig 2011-01-25 11:28:00.000000000 +0000
-+++ sql-common/my_time.c
-@@ -984,8 +984,17 @@ my_system_gmt_sec(const MYSQL_TIME *t_sr
- So, tmp < TIMESTAMP_MIN_VALUE will be triggered. On platfroms
- with unsigned time_t tmp+= shift*86400L might result in a number,
- larger then TIMESTAMP_MAX_VALUE, so another check will work.
-+
-+ tmp being larger than TIMESTAMP_MAX_VALUE can only happen on
-+ platforms where the size of time_t is larger than the size of
-+ TIMESTAMP_MAX_VALUE (currently INT32 : 4 bytes).
-+ #ifdef to avoid the compilation warnings on these platforms (OpenBSD).
- */
-- if ((tmp < TIMESTAMP_MIN_VALUE) || (tmp > TIMESTAMP_MAX_VALUE))
-+ if ((tmp < TIMESTAMP_MIN_VALUE)
-+#if SIZEOF_TIME_T > 4
-+ || (tmp > TIMESTAMP_MAX_VALUE)
-+#endif
-+ )
- tmp= 0;
-
- return (my_time_t) tmp;
diff -r 1febcc398fad -r 663f8c8aeb1d databases/mysql5-server/patches/patch-sql_mysqld.cc
Home |
Main Index |
Thread Index |
Old Index