[pkgsrc/pkgsrc-2006Q1]: pkgsrc/databases Pullup ticket 1399 - requested by xt...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/databases Pullup ticket 1399 - requested by xt...
From: salo <salo%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:14:39 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/879588f8d1eb
branches:  pkgsrc-2006Q1
changeset: 510216:879588f8d1eb
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon Apr 17 21:58:38 2006 +0000

description:
Pullup ticket 1399 - requested by xtraeme
security update for mysql5

Revisions pulled up:
- pkgsrc/databases/mysql5-client/Makefile               1.7
- pkgsrc/databases/mysql5-client/Makefile.common        1.10
- pkgsrc/databases/mysql5-client/PLIST                  1.4
- pkgsrc/databases/mysql5-client/distinfo               1.5
- pkgsrc/databases/mysql5-client/patches/patch-ae       1.4
- pkgsrc/databases/mysql5-server/PLIST                  1.5
- pkgsrc/databases/mysql5-server/distinfo               1.5, 1.6
- pkgsrc/databases/mysql5-server/patches/patch-ao       1.1

   Module Name:         pkgsrc
   Committed By:        xtraeme
   Date:                Thu Apr 13 11:19:25 UTC 2006

   Modified Files:
        pkgsrc/databases/mysql5-client: Makefile Makefile.common PLIST
                distinfo
        pkgsrc/databases/mysql5-client/patches: patch-ae
        pkgsrc/databases/mysql5-server: PLIST distinfo

   Log Message:
   Update mysql5-* to 5.0.20.

   To see new changes and bugs fixed, see:
   http://dev.mysql.com/doc/refman/5.0/en/news-5-0-x.html.
---
   Module Name:         pkgsrc
   Committed By:        tron
   Date:                Mon Apr 17 11:21:41 UTC 2006

   Modified Files:
        pkgsrc/databases/mysql5-server: distinfo
   Added Files:
        pkgsrc/databases/mysql5-server/patches: patch-ao

   Log Message:
   Add fix for CAN-2006-0903 taken from MySQL bug #17667. Bump package
   revision because of this security fix.

diffstat:

 databases/mysql5-client/Makefile         |   4 +-
 databases/mysql5-client/Makefile.common  |   4 +-
 databases/mysql5-client/PLIST            |   4 +-
 databases/mysql5-client/distinfo         |  10 ++--
 databases/mysql5-client/patches/patch-ae |  41 ++++++++++------------
 databases/mysql5-server/PLIST            |  56 +++++++++++++++++++++++++++++++-
 databases/mysql5-server/distinfo         |   9 ++--
 databases/mysql5-server/patches/patch-ao |  14 ++++++++
 8 files changed, 105 insertions(+), 37 deletions(-)

diffs (truncated from 471 to 300 lines):

diff -r 9554f17a5268 -r 879588f8d1eb databases/mysql5-client/Makefile
--- a/databases/mysql5-client/Makefile  Sat Apr 15 23:33:26 2006 +0000
+++ b/databases/mysql5-client/Makefile  Mon Apr 17 21:58:38 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
-PKGREVISION=           1
+#PKGREVISION=          1
 SVR4_PKGNAME=          mysqc
 COMMENT=               MySQL 5, a free SQL database (client)
 
diff -r 9554f17a5268 -r 879588f8d1eb databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Sat Apr 15 23:33:26 2006 +0000
+++ b/databases/mysql5-client/Makefile.common   Mon Apr 17 21:58:38 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.7 2006/03/03 04:00:09 grant Exp $
+# $NetBSD: Makefile.common,v 1.7.2.1 2006/04/17 21:58:38 salo Exp $
 
-DISTNAME=              mysql-5.0.18
+DISTNAME=              mysql-5.0.20
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
diff -r 9554f17a5268 -r 879588f8d1eb databases/mysql5-client/PLIST
--- a/databases/mysql5-client/PLIST     Sat Apr 15 23:33:26 2006 +0000
+++ b/databases/mysql5-client/PLIST     Mon Apr 17 21:58:38 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/08 17:45:23 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2006/04/17 21:58:38 salo Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -6,9 +6,11 @@
 bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
+bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
 bin/mysql_setpermission
 bin/mysql_tableinfo
+bin/mysql_upgrade
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
diff -r 9554f17a5268 -r 879588f8d1eb databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo  Sat Apr 15 23:33:26 2006 +0000
+++ b/databases/mysql5-client/distinfo  Mon Apr 17 21:58:38 2006 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: distinfo,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
 
-SHA1 (mysql-5.0.18.tar.gz) = e102a5086455c0f80a830e5dfc65acccc5e19a60
-RMD160 (mysql-5.0.18.tar.gz) = 1987df6d9446637c8e353f61e269e9a57d995803
-Size (mysql-5.0.18.tar.gz) = 19169082 bytes
+SHA1 (mysql-5.0.20.tar.gz) = b66fd7821d6cb5f3150f703e90d64697a770a165
+RMD160 (mysql-5.0.20.tar.gz) = f7daabd98124b88c021b314ac23c25d09597e573
+Size (mysql-5.0.20.tar.gz) = 19445124 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
 SHA1 (patch-ad) = 81c48274e3a43e46cf9d53f9ed4620c02761902a
-SHA1 (patch-ae) = fa70584c1846c81fe72a7796b1f7f237b398bc30
+SHA1 (patch-ae) = 3fe37b158abdd892f077c805ce3eb4ba19dc4594
 SHA1 (patch-af) = 61f9cfd169e630708809142694d2bbea0055d20d
 SHA1 (patch-ag) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
 SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
diff -r 9554f17a5268 -r 879588f8d1eb databases/mysql5-client/patches/patch-ae
--- a/databases/mysql5-client/patches/patch-ae  Sat Apr 15 23:33:26 2006 +0000
+++ b/databases/mysql5-client/patches/patch-ae  Mon Apr 17 21:58:38 2006 +0000
@@ -1,32 +1,29 @@
-$NetBSD: patch-ae,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: patch-ae,v 1.3.2.1 2006/04/17 21:58:38 salo Exp $
+
+Don't install scripts handled by mysql-server.
 
---- scripts/Makefile.in.orig   2006-01-09 15:54:43.000000000 +0100
-+++ scripts/Makefile.in        2006-01-09 15:55:14.000000000 +0100
-@@ -341,23 +341,10 @@
+--- scripts/Makefile.in.orig   2006-04-13 11:58:39.000000000 +0200
++++ scripts/Makefile.in        2006-04-13 12:00:06.000000000 +0200
+@@ -344,13 +344,12 @@
  yassl_libs_with_path = @yassl_libs_with_path@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
--                      msql2mysql \
--                      mysql_config \
--                      mysql_fix_privilege_tables \
--                      mysql_fix_extensions \
--                      mysql_setpermission \
++bin_SCRIPTS = \
+                       msql2mysql \
+                       mysql_config \
+                       mysql_fix_privilege_tables \
+                       mysql_fix_extensions \
+                       mysql_setpermission \
 -                      mysql_secure_installation \
--                      mysql_zap \
--                      mysqlaccess \
--                      mysqlbug \
--                      mysql_convert_table_format \
--                      mysql_find_rows \
--                      mysqlhotcopy \
--                      mysqldumpslow \
--                      mysql_explain_log \
--                      mysql_tableinfo \
+                       mysql_zap \
+                       mysqlaccess \
+                       mysqlbug \
+@@ -361,7 +360,6 @@
+                       mysql_explain_log \
+                       mysql_tableinfo \
+                       mysql_upgrade \
 -                      mysqld_multi \
-+bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
-+      mysql_setpermission mysql_zap mysqlaccess mysqlbug \
-+      mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-+      mysqldumpslow mysql_explain_log mysql_tableinfo \
                        mysql_create_system_tables
  
  noinst_SCRIPTS = make_binary_distribution \
diff -r 9554f17a5268 -r 879588f8d1eb databases/mysql5-server/PLIST
--- a/databases/mysql5-server/PLIST     Sat Apr 15 23:33:26 2006 +0000
+++ b/databases/mysql5-server/PLIST     Mon Apr 17 21:58:38 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -54,11 +54,14 @@
 share/mysql-test/include/have_csv.inc
 share/mysql-test/include/have_debug.inc
 share/mysql-test/include/have_eucjpms.inc
+share/mysql-test/include/have_euckr.inc
 share/mysql-test/include/have_exampledb.inc
 share/mysql-test/include/have_federated_db.inc
+share/mysql-test/include/have_gb2312.inc
 share/mysql-test/include/have_gbk.inc
 share/mysql-test/include/have_geometry.inc
 share/mysql-test/include/have_innodb.inc
+share/mysql-test/include/have_latin2_ch.inc
 share/mysql-test/include/have_lowercase0.inc
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
@@ -68,6 +71,7 @@
 share/mysql-test/include/have_sjis.inc
 share/mysql-test/include/have_tis620.inc
 share/mysql-test/include/have_ucs2.inc
+share/mysql-test/include/have_udf.inc
 share/mysql-test/include/have_ujis.inc
 share/mysql-test/include/im_check_os.inc
 share/mysql-test/include/is_debug_build.inc
@@ -87,11 +91,14 @@
 share/mysql-test/include/rpl_stmt_seq.inc
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
+share/mysql-test/include/sourced.inc
+share/mysql-test/include/sourced1.inc
 share/mysql-test/include/sp-vars.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_outfile.inc
 share/mysql-test/include/testdb_only.inc
 share/mysql-test/include/varchar.inc
+share/mysql-test/include/wait_slave_status.inc
 share/mysql-test/include/windows.inc
 share/mysql-test/install_test_db
 share/mysql-test/lib/init_db.sql
@@ -154,12 +161,16 @@
 share/mysql-test/r/ctype_cp1251.result
 share/mysql-test/r/ctype_cp932.result
 share/mysql-test/r/ctype_cp932_binlog.result
+share/mysql-test/r/ctype_cp932_notembedded.result
 share/mysql-test/r/ctype_create.result
 share/mysql-test/r/ctype_eucjpms.result
+share/mysql-test/r/ctype_euckr.result
+share/mysql-test/r/ctype_gb2312.result
 share/mysql-test/r/ctype_gbk.result
 share/mysql-test/r/ctype_latin1.result
 share/mysql-test/r/ctype_latin1_de.result
 share/mysql-test/r/ctype_latin2.result
+share/mysql-test/r/ctype_latin2_ch.result
 share/mysql-test/r/ctype_many.result
 share/mysql-test/r/ctype_mb.result
 share/mysql-test/r/ctype_recoding.result
@@ -167,6 +178,7 @@
 share/mysql-test/r/ctype_tis620.result
 share/mysql-test/r/ctype_uca.result
 share/mysql-test/r/ctype_ucs.result
+share/mysql-test/r/ctype_ucs2_def.result
 share/mysql-test/r/ctype_ucs_binlog.result
 share/mysql-test/r/ctype_ujis.result
 share/mysql-test/r/ctype_utf8.result
@@ -249,11 +261,14 @@
 share/mysql-test/r/have_csv.require
 share/mysql-test/r/have_debug.require
 share/mysql-test/r/have_eucjpms.require
+share/mysql-test/r/have_euckr.require
 share/mysql-test/r/have_exampledb.require
 share/mysql-test/r/have_federated_db.require
+share/mysql-test/r/have_gb2312.require
 share/mysql-test/r/have_gbk.require
 share/mysql-test/r/have_geometry.require
 share/mysql-test/r/have_innodb.require
+share/mysql-test/r/have_latin2_ch.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_ndb.require
@@ -265,6 +280,7 @@
 share/mysql-test/r/have_symlink.require
 share/mysql-test/r/have_tis620.require
 share/mysql-test/r/have_ucs2.require
+share/mysql-test/r/have_udf.require
 share/mysql-test/r/have_ujis.require
 share/mysql-test/r/having.result
 share/mysql-test/r/heap.result
@@ -287,6 +303,7 @@
 share/mysql-test/r/information_schema_db.result
 share/mysql-test/r/information_schema_inno.result
 share/mysql-test/r/init_connect.result
+share/mysql-test/r/init_file.result
 share/mysql-test/r/innodb-big.result
 share/mysql-test/r/innodb-deadlock.result
 share/mysql-test/r/innodb-lock.result
@@ -295,6 +312,8 @@
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_handler.result
+share/mysql-test/r/innodb_notembedded.result
+share/mysql-test/r/innodb_unsafe_binlog.result
 share/mysql-test/r/insert.result
 share/mysql-test/r/insert_select-binlog.result
 share/mysql-test/r/insert_select.result
@@ -332,6 +351,7 @@
 share/mysql-test/r/myisam-blob.result
 share/mysql-test/r/myisam.result
 share/mysql-test/r/mysql.result
+share/mysql-test/r/mysql_client_test.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
@@ -362,6 +382,7 @@
 share/mysql-test/r/ndb_index_unique.result
 share/mysql-test/r/ndb_insert.result
 share/mysql-test/r/ndb_limit.result
+share/mysql-test/r/ndb_load.result
 share/mysql-test/r/ndb_lock.result
 share/mysql-test/r/ndb_minmax.result
 share/mysql-test/r/ndb_multi.result
@@ -453,6 +474,8 @@
 share/mysql-test/r/rpl_get_lock.result
 share/mysql-test/r/rpl_heap.result
 share/mysql-test/r/rpl_ignore_grant.result
+share/mysql-test/r/rpl_ignore_revoke.result
+share/mysql-test/r/rpl_ignore_table.result
 share/mysql-test/r/rpl_init_slave.result
 share/mysql-test/r/rpl_innodb.result
 share/mysql-test/r/rpl_insert_id.result
@@ -474,6 +497,7 @@
 share/mysql-test/r/rpl_multi_update.result
 share/mysql-test/r/rpl_multi_update2.result
 share/mysql-test/r/rpl_multi_update3.result
+share/mysql-test/r/rpl_multi_update4.result
 share/mysql-test/r/rpl_mystery22.result
 share/mysql-test/r/rpl_openssl.result
 share/mysql-test/r/rpl_optimize.result
@@ -498,6 +522,7 @@
 share/mysql-test/r/rpl_temporary.result
 share/mysql-test/r/rpl_timezone.result
 share/mysql-test/r/rpl_trigger.result
+share/mysql-test/r/rpl_trunc_temp.result
 share/mysql-test/r/rpl_until.result
 share/mysql-test/r/rpl_user_variables.result
 share/mysql-test/r/rpl_variables.result
@@ -524,6 +549,7 @@
 share/mysql-test/r/sp-threads.result
 share/mysql-test/r/sp-vars.result
 share/mysql-test/r/sp.result
+share/mysql-test/r/sp_notembedded.result
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sql_mode.result
 share/mysql-test/r/ssl.result
@@ -534,10 +560,12 @@
 share/mysql-test/r/subselect2.result
 share/mysql-test/r/subselect_gis.result
 share/mysql-test/r/subselect_innodb.result
+share/mysql-test/r/subselect_notembedded.result
 share/mysql-test/r/sum_distinct-big.result
 share/mysql-test/r/sum_distinct.result
 share/mysql-test/r/symlink.result
 share/mysql-test/r/synchronization.result
+share/mysql-test/r/sysdate_is_now.result
 share/mysql-test/r/system_mysql_db.result
 share/mysql-test/r/system_mysql_db_refs.result
 share/mysql-test/r/tablelock.result
@@ -549,6 +577,7 @@
 share/mysql-test/r/timezone_grant.result
 share/mysql-test/r/trigger-compat.result
Prev by Date: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/doc #1375
Next by Date: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/doc #1378
Previous by Thread: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/doc #1375
Next by Thread: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/doc #1378
Indexes:
Home | Main Index | Thread Index | Old Index