pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2007Q3]: pkgsrc/databases Pullup ticket 2245 - requested by tron



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf81b77422e5
branches:  pkgsrc-2007Q3
changeset: 534061:cf81b77422e5
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Dec 17 15:26:47 2007 +0000

description:
Pullup ticket 2245 - requested by tron
security update for mysql5

- pkgsrc/databases/mysql5-client/Makefile               1.11, 1.12, 1.14
- pkgsrc/databases/mysql5-client/Makefile.common        1.26, 1.28
- pkgsrc/databases/mysql5-client/PLIST                  1.8, 1.9
- pkgsrc/databases/mysql5-client/distinfo               1.20, 1.21
- pkgsrc/databases/mysql5-client/patches/patch-ad       1.7
- pkgsrc/databases/mysql5-server/Makefile               1.20
- pkgsrc/databases/mysql5-server/PLIST                  1.12
- pkgsrc/databases/mysql5-server/distinfo               1.17
- pkgsrc/databases/mysql5-server/patches/patch-ab       1.5
- pkgsrc/databases/mysql5-server/patches/patch-ak       1.4
- pkgsrc/databases/mysql5-server/patches/patch-an       1.4

   Module Name:         pkgsrc
   Committed By:        rillig
   Date:                Fri Oct 12 14:32:46 UTC 2007

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

   Log Message:
   The mysql.info file is not rebuilt anymore, so it is safe to install the
   documentation.

   PKGREVISION++
---
   Module Name:         pkgsrc
   Committed By:        rillig
   Date:                Sun Oct 14 17:43:33 UTC 2007

   Modified Files:
           pkgsrc/databases/mysql5-client: Makefile PLIST

   Log Message:
   The file manual.chm is installed additionally, since it is much more
   comfortable to browse than the GNU info file.

   PKGREVISION++
---
   Module Name:         pkgsrc
   Committed By:        tron
   Date:                Fri Dec 14 13:36:54 UTC 2007

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

   Log Message:
   Update "mysql5-client" and "mysql5-server" packages to version 5.0.51.
   This version fixes a lot of bugs including the security vulnerability
   reported in CVE-2007-5969.

   A complete list of the changes can be found here:
   http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-51.html

diffstat:

 databases/mysql5-client/Makefile         |    5 +-
 databases/mysql5-client/Makefile.common  |    7 +-
 databases/mysql5-client/PLIST            |    4 +-
 databases/mysql5-client/distinfo         |   10 +-
 databases/mysql5-client/patches/patch-ad |    4 +-
 databases/mysql5-server/Makefile         |   10 +-
 databases/mysql5-server/PLIST            |  166 +++++++++++++-----------------
 databases/mysql5-server/distinfo         |   14 +-
 databases/mysql5-server/patches/patch-ab |   16 +-
 databases/mysql5-server/patches/patch-ak |   12 +-
 databases/mysql5-server/patches/patch-an |   22 ++-
 11 files changed, 127 insertions(+), 143 deletions(-)

diffs (truncated from 757 to 300 lines):

diff -r 76352e8a2bc2 -r cf81b77422e5 databases/mysql5-client/Makefile
--- a/databases/mysql5-client/Makefile  Mon Dec 10 17:08:39 2007 +0000
+++ b/databases/mysql5-client/Makefile  Mon Dec 17 15:26:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/05/21 04:39:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2007/12/17 15:26:47 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
 SVR4_PKGNAME=          mysqc
@@ -14,7 +14,7 @@
 UNWRAP_FILES+=         scripts/mysql_config
 INFO_FILES=            yes
 
-INSTALLATION_DIRS+=    share/examples/mysql
+INSTALLATION_DIRS_FROM_PLIST=  yes
 
 post-install:
        cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do         \
@@ -25,6 +25,7 @@
        ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
                ${PREFIX}/share/examples/mysql/my-${f}.cnf
 .endfor
+       ${INSTALL_DATA} ${WRKSRC}/Docs/manual.chm ${DESTDIR}${PREFIX}/share/doc/mysql/
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 76352e8a2bc2 -r cf81b77422e5 databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Mon Dec 10 17:08:39 2007 +0000
+++ b/databases/mysql5-client/Makefile.common   Mon Dec 17 15:26:47 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.25 2007/07/15 19:22:06 tron Exp $
+# $NetBSD: Makefile.common,v 1.25.2.1 2007/12/17 15:26:48 ghen Exp $
 
-DISTNAME=              mysql-5.0.45
+DISTNAME=              mysql-5.0.51
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
@@ -47,9 +47,6 @@
 CONFIGURE_ARGS+=       --without-readline
 CONFIGURE_ARGS+=       --without-libedit
 
-# This forces mysql.info _not_ to be rebuilt.
-CONFIGURE_ARGS+=       --without-docs
-
 # Speed up production one-time builds; see "./configure --help" for
 # more information on using or disabling this option.
 CONFIGURE_ARGS+=       --disable-dependency-tracking
diff -r 76352e8a2bc2 -r cf81b77422e5 databases/mysql5-client/PLIST
--- a/databases/mysql5-client/PLIST     Mon Dec 10 17:08:39 2007 +0000
+++ b/databases/mysql5-client/PLIST     Mon Dec 17 15:26:47 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/07/15 19:22:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.7.2.1 2007/12/17 15:26:48 ghen Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -57,6 +57,7 @@
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
+info/mysql.info
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
 man/man1/mysql.1
@@ -66,6 +67,7 @@
 man/man1/mysqladmin.1
 man/man1/mysqldump.1
 man/man1/mysqlshow.1
+share/doc/mysql/manual.chm
 share/examples/mysql/my-huge.cnf
 share/examples/mysql/my-innodb-heavy-4G.cnf
 share/examples/mysql/my-large.cnf
diff -r 76352e8a2bc2 -r cf81b77422e5 databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo  Mon Dec 10 17:08:39 2007 +0000
+++ b/databases/mysql5-client/distinfo  Mon Dec 17 15:26:47 2007 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2007/07/15 19:22:06 tron Exp $
+$NetBSD: distinfo,v 1.19.2.1 2007/12/17 15:26:49 ghen Exp $
 
-SHA1 (mysql-5.0.45.tar.gz) = a5fba8e004acc43ac1a576d728f10215f54ebe20
-RMD160 (mysql-5.0.45.tar.gz) = ee6717c65dc7bb6b5b596b90ef6c47c7fdebf5fb
-Size (mysql-5.0.45.tar.gz) = 24433261 bytes
+SHA1 (mysql-5.0.51.tar.gz) = a9a253ea842e973df6f475c04dac77522de0dea7
+RMD160 (mysql-5.0.51.tar.gz) = e14baa1c40cb385fa64fc72355db9ca58a6be2f9
+Size (mysql-5.0.51.tar.gz) = 27045586 bytes
 SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381
-SHA1 (patch-ad) = 716c02583e87c99e69ebe00c64d4a4371487a666
+SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217
 SHA1 (patch-ae) = 74c830dddf3517ebc2226dc166b61a33f83b04da
 SHA1 (patch-af) = 06cb76ad50ed0de3e82f682bf57a75441f68da26
 SHA1 (patch-ag) = 212f9c0a2e2eb6feb013e4a72eaf658951b995b5
diff -r 76352e8a2bc2 -r cf81b77422e5 databases/mysql5-client/patches/patch-ad
--- a/databases/mysql5-client/patches/patch-ad  Mon Dec 10 17:08:39 2007 +0000
+++ b/databases/mysql5-client/patches/patch-ad  Mon Dec 17 15:26:47 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2007/07/15 19:22:06 tron Exp $
+$NetBSD: patch-ad,v 1.6.2.1 2007/12/17 15:26:49 ghen Exp $
 
 --- Makefile.in.orig   2007-07-04 14:10:07.000000000 +0100
 +++ Makefile.in        2007-07-15 17:20:48.000000000 +0100
@@ -12,7 +12,7 @@
 -                      @sql_union_dirs@ @man_dirs@ tests \
 -                      netware @libmysqld_dirs@ \
 -                      @bench_dirs@ support-files @tools_dirs@
-+SUBDIRS = . include strings @sql_client_dirs@ scripts man
++SUBDIRS = . include @docs_dirs@ strings @sql_client_dirs@ scripts man
  
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
                        @readline_topdir@ sql-common \
diff -r 76352e8a2bc2 -r cf81b77422e5 databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile  Mon Dec 10 17:08:39 2007 +0000
+++ b/databases/mysql5-server/Makefile  Mon Dec 17 15:26:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/07/31 14:10:11 obache Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2007/12/17 15:26:50 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=          mysqs
@@ -36,7 +36,11 @@
 BUILD_DEFS+=           MYSQL_DATADIR
 BUILD_DIRS=            . man
 
-REPLACE_PERL+=         mysql-test/mysql-test-run.pl
+REPLACE_PERL+=         mysql-test/mysql-test-run.pl \
+                       mysql-test/suite/funcs_1/lib/DataGen_local.pl \
+                       mysql-test/suite/funcs_1/lib/DataGen_modify.pl \
+                       mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl \
+                       mysql-test/mysql-stress-test.pl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -51,7 +55,7 @@
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
 post-configure:
-       cd ${WRKSRC} && cp -f config.h include/my_config.h
+       cd ${WRKSRC}/include && cp -f config.h my_config.h
 
 post-build:
        cd ${WRKSRC}/scripts && env ${MAKE_ENV} ${MAKE_PROGRAM} \
diff -r 76352e8a2bc2 -r cf81b77422e5 databases/mysql5-server/PLIST
--- a/databases/mysql5-server/PLIST     Mon Dec 10 17:08:39 2007 +0000
+++ b/databases/mysql5-server/PLIST     Mon Dec 17 15:26:47 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/07/15 19:22:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.11.2.1 2007/12/17 15:26:50 ghen Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -30,9 +30,6 @@
 man/man8/mysqlmanager.8
 share/examples/rc.d/mysqld
 share/mysql-test/README
-share/mysql-test/cacert.pem
-share/mysql-test/client-cert.pem
-share/mysql-test/client-key.pem
 share/mysql-test/include/add_anonymous_users.inc
 share/mysql-test/include/analyze_failure_sync_with_master.test
 share/mysql-test/include/big_test.inc
@@ -53,6 +50,7 @@
 share/mysql-test/include/have_bdb.inc
 share/mysql-test/include/have_big5.inc
 share/mysql-test/include/have_blackhole.inc
+share/mysql-test/include/have_bug25714.inc
 share/mysql-test/include/have_case_sensitive_file_system.inc
 share/mysql-test/include/have_compress.inc
 share/mysql-test/include/have_cp1250_ch.inc
@@ -114,6 +112,7 @@
 share/mysql-test/include/varchar.inc
 share/mysql-test/include/wait_for_query_to_suceed.inc
 share/mysql-test/include/wait_for_slave_io_to_stop.inc
+share/mysql-test/include/wait_for_slave_param.inc
 share/mysql-test/include/wait_for_slave_sql_to_stop.inc
 share/mysql-test/include/wait_for_slave_to_start.inc
 share/mysql-test/include/wait_for_slave_to_stop.inc
@@ -135,6 +134,7 @@
 share/mysql-test/lib/mtr_timer.pl
 share/mysql-test/lib/mtr_unique.pl
 share/mysql-test/mtr
+share/mysql-test/mysql-stress-test.pl
 share/mysql-test/mysql-test-run
 share/mysql-test/mysql-test-run-shell
 share/mysql-test/mysql-test-run.pl
@@ -144,6 +144,7 @@
 share/mysql-test/r/analyse.result
 share/mysql-test/r/analyze.result
 share/mysql-test/r/ansi.result
+share/mysql-test/r/archive-big.result
 share/mysql-test/r/archive.result
 share/mysql-test/r/archive_gis.result
 share/mysql-test/r/auto_increment.result
@@ -161,6 +162,7 @@
 share/mysql-test/r/bigint.result
 share/mysql-test/r/binary.result
 share/mysql-test/r/binlog.result
+share/mysql-test/r/binlog_innodb.result
 share/mysql-test/r/binlog_killed.result
 share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
@@ -185,6 +187,7 @@
 share/mysql-test/r/create_not_windows.result
 share/mysql-test/r/create_select_tmp.result
 share/mysql-test/r/csv.result
+share/mysql-test/r/ctype_ascii.result
 share/mysql-test/r/ctype_big5.result
 share/mysql-test/r/ctype_collate.result
 share/mysql-test/r/ctype_cp1250_ch.result
@@ -201,6 +204,7 @@
 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_ldml.result
 share/mysql-test/r/ctype_many.result
 share/mysql-test/r/ctype_mb.result
 share/mysql-test/r/ctype_recoding.result
@@ -231,6 +235,8 @@
 share/mysql-test/r/federated.result
 share/mysql-test/r/federated_archive.result
 share/mysql-test/r/federated_bug_13118.result
+share/mysql-test/r/federated_bug_25714.result
+share/mysql-test/r/federated_innodb.result
 share/mysql-test/r/fix_priv_tables.result
 share/mysql-test/r/flush.result
 share/mysql-test/r/flush2.result
@@ -241,6 +247,7 @@
 share/mysql-test/r/foreign_key.result
 share/mysql-test/r/fulltext.result
 share/mysql-test/r/fulltext2.result
+share/mysql-test/r/fulltext3.result
 share/mysql-test/r/fulltext_cache.result
 share/mysql-test/r/fulltext_distinct.result
 share/mysql-test/r/fulltext_left_join.result
@@ -289,6 +296,7 @@
 share/mysql-test/r/have_bdb.require
 share/mysql-test/r/have_big5.require
 share/mysql-test/r/have_blackhole.require
+share/mysql-test/r/have_bug25714.require
 share/mysql-test/r/have_compress.require
 share/mysql-test/r/have_cp1250_ch.require
 share/mysql-test/r/have_cp932.require
@@ -410,6 +418,7 @@
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
 share/mysql-test/r/mysqlcheck.result
+share/mysql-test/r/mysqldump-compat.result
 share/mysql-test/r/mysqldump-max.result
 share/mysql-test/r/mysqldump.result
 share/mysql-test/r/mysqlshow.result
@@ -419,9 +428,11 @@
 share/mysql-test/r/ndb_autodiscover.result
 share/mysql-test/r/ndb_autodiscover2.result
 share/mysql-test/r/ndb_autodiscover3.result
+share/mysql-test/r/ndb_backup_print.result
 share/mysql-test/r/ndb_basic.result
 share/mysql-test/r/ndb_bitfield.result
 share/mysql-test/r/ndb_blob.result
+share/mysql-test/r/ndb_bug26793.result
 share/mysql-test/r/ndb_cache.result
 share/mysql-test/r/ndb_cache2.result
 share/mysql-test/r/ndb_cache_multi.result
@@ -447,6 +458,7 @@
 share/mysql-test/r/ndb_rename.result
 share/mysql-test/r/ndb_replace.result
 share/mysql-test/r/ndb_restore.result
+share/mysql-test/r/ndb_restore_different_endian_data.result
 share/mysql-test/r/ndb_restore_print.result
 share/mysql-test/r/ndb_single_user.result
 share/mysql-test/r/ndb_subquery.result
@@ -471,6 +483,7 @@
 share/mysql-test/r/outfile.result
 share/mysql-test/r/overflow.result
 share/mysql-test/r/packet.result
+share/mysql-test/r/parser_precedence.result
 share/mysql-test/r/perror.result
 share/mysql-test/r/preload.result
 share/mysql-test/r/profiling.result
@@ -488,6 +501,7 @@
 share/mysql-test/r/query_cache.result
 share/mysql-test/r/query_cache_merge.result
 share/mysql-test/r/query_cache_notembedded.result
+share/mysql-test/r/query_cache_with_views.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
 share/mysql-test/r/read_only.result
@@ -537,6 +551,7 @@
 share/mysql-test/r/rpl_flush_tables.result
 share/mysql-test/r/rpl_free_items.result
 share/mysql-test/r/rpl_get_lock.result
+share/mysql-test/r/rpl_grant.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
@@ -625,7 +640,9 @@
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sp_trans_log.result
 share/mysql-test/r/sql_mode.result
+share/mysql-test/r/ssl-big.result
 share/mysql-test/r/ssl.result



Home | Main Index | Thread Index | Old Index