pkgsrc-Changes-HG archive

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

[pkgsrc/pkgsrc-2008Q2]: pkgsrc/databases Pullup ticket #2532 - requested by taca



details:   https://anonhg.NetBSD.org/pkgsrc/rev/05fcd972df41
branches:  pkgsrc-2008Q2
changeset: 544327:05fcd972df41
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Sep 23 11:15:53 2008 +0000

description:
Pullup ticket #2532 - requested by taca
mysql5-client: security update
mysql5-server: security update

Revisions pulled up:
- databases/mysql5-client/Makefile              1.19
- databases/mysql5-client/Makefile.common       1.33
- databases/mysql5-client/buildlink3.mk         1.12
- databases/mysql5-client/distinfo              1.24
- databases/mysql5-client/patches/patch-ab      1.3
- databases/mysql5-client/patches/patch-ac      1.7
- databases/mysql5-client/patches/patch-af      1.7
- databases/mysql5-client/patches/patch-ag      1.4
- databases/mysql5-client/patches/patch-aj      1.3
- databases/mysql5-client/patches/patch-ak      delete
- databases/mysql5-client/patches/patch-al      1.3
- databases/mysql5-server/Makefile              1.25
- databases/mysql5-server/PLIST                 1.13
- databases/mysql5-server/distinfo              1.21
- databases/mysql5-server/patches/patch-ad      1.4
- databases/mysql5-server/patches/patch-ag      1.7
- databases/mysql5-server/patches/patch-ai      1.3
- databases/mysql5-server/patches/patch-an      1.5
- databases/mysql5-server/patches/patch-ca      1.2
- databases/mysql5-server/patches/patch-cb      1.2
- databases/mysql5-server/patches/patch-cc      1.2
- databases/mysql5-server/patches/patch-da      delete
- databases/mysql5-server/patches/patch-db      delete
---
Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Sep 18 11:50:44 UTC 2008

Modified Files:
        pkgsrc/databases/mysql5-client: Makefile.common buildlink3.mk distinfo
        pkgsrc/databases/mysql5-client/patches: patch-ab patch-af patch-ag
            patch-aj patch-al
Added Files:
        pkgsrc/databases/mysql5-client/patches: patch-ac
Removed Files:
        pkgsrc/databases/mysql5-client/patches: patch-ak

Log Message:
Update mysql5-client pacakge to 5.0.67.

For complete changes, please refer
http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-67.html.
Here is a part of it.

Functionality added or changed:

Security Enhancement:

  To enable stricter control over the location from which user-defined
  functions can be loaded, the plugin_dir system variable has been
  backported from MySQL 5.1. If the value is non-empty, user-defined
  function object files can be loaded only from the directory named by this
  variable. If the value is empty, the behavior that is used before 5.0.67
  applies: The UDF object files must be located in a directory that is
  searched by your system's dynamic linker. (Bug#37428)

Important Change: Incompatible Change:

  The FEDERATED storage engine is now disabled by default in the .cnf files
  shipped with MySQL distributions (my-huge.cnf, my-medium.cnf, and so
  forth). This affects server behavior only if you install one of these
  files. (Bug#37069)

Cluster API: Important Change:

  Because NDB_LE_MemoryUsage.page_size_kb shows memory page sizes in bytes
  rather than kilobytes, it has been renamed to page_size_bytes. The name
  page_size_kb is now deprecated and thus subject to removal in a future
  release, although it currently remains supported for reasons of backward
  compatibility. See The Ndb_logevent_type Type, for more information about
  NDB_LE_MemoryUsage. (Bug#30271)

Important Change:

  Some changes were made to CHECK TABLE ... FOR UPGRADE and REPAIR TABLE
  with respect to detection and handling of tables with incompatible .frm
  files (files created with a different version of the MySQL server). These
  changes also affect mysqlcheck because that program uses CHECK TABLE and
  REPAIR table, and thus also mysql_upgrade because that program invokes
  mysqlcheck.
---
Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Sep 18 11:51:37 UTC 2008

Modified Files:
        pkgsrc/databases/mysql5-server: Makefile PLIST distinfo
        pkgsrc/databases/mysql5-server/patches: patch-ad patch-ag patch-ai
            patch-an patch-ca patch-cb patch-cc
Removed Files:
        pkgsrc/databases/mysql5-server/patches: patch-da patch-db

Log Message:
Update mysql5-server pacakge to 5.0.67.

This is security fix.

For complete changes, please refer
http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-67.html.
Here is a part of it.

Functionality added or changed:

Security Enhancement:

  To enable stricter control over the location from which user-defined
  functions can be loaded, the plugin_dir system variable has been
  backported from MySQL 5.1. If the value is non-empty, user-defined
  function object files can be loaded only from the directory named by this
  variable. If the value is empty, the behavior that is used before 5.0.67
  applies: The UDF object files must be located in a directory that is
  searched by your system's dynamic linker. (Bug#37428)

Important Change: Incompatible Change:

  The FEDERATED storage engine is now disabled by default in the .cnf files
  shipped with MySQL distributions (my-huge.cnf, my-medium.cnf, and so
  forth). This affects server behavior only if you install one of these
  files. (Bug#37069)

Cluster API: Important Change:

  Because NDB_LE_MemoryUsage.page_size_kb shows memory page sizes in bytes
  rather than kilobytes, it has been renamed to page_size_bytes. The name
  page_size_kb is now deprecated and thus subject to removal in a future
  release, although it currently remains supported for reasons of backward
  compatibility. See The Ndb_logevent_type Type, for more information about
  NDB_LE_MemoryUsage. (Bug#30271)

Important Change:

  Some changes were made to CHECK TABLE ... FOR UPGRADE and REPAIR TABLE
  with respect to detection and handling of tables with incompatible .frm
  files (files created with a different version of the MySQL server). These
  changes also affect mysqlcheck because that program uses CHECK TABLE and
  REPAIR table, and thus also mysql_upgrade because that program invokes
  mysqlcheck.
---
Module Name:    pkgsrc
Committed By:   tron
Date:           Thu Sep 18 12:49:40 UTC 2008

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

Log Message:
Fix path to Perl interpreter in the installed scripts. Bump package
revision because of this fix.

diffstat:

 databases/mysql5-client/Makefile         |    9 +-
 databases/mysql5-client/Makefile.common  |   10 +-
 databases/mysql5-client/buildlink3.mk    |    4 +-
 databases/mysql5-client/distinfo         |   20 +-
 databases/mysql5-client/patches/patch-ab |    8 +-
 databases/mysql5-client/patches/patch-ac |   16 +
 databases/mysql5-client/patches/patch-af |    8 +-
 databases/mysql5-client/patches/patch-ag |   12 +-
 databases/mysql5-client/patches/patch-aj |    8 +-
 databases/mysql5-client/patches/patch-ak |   13 -
 databases/mysql5-client/patches/patch-al |    8 +-
 databases/mysql5-server/Makefile         |   14 +-
 databases/mysql5-server/PLIST            |  544 +++++++++++++++++++++++++++---
 databases/mysql5-server/distinfo         |   24 +-
 databases/mysql5-server/patches/patch-ad |   28 +-
 databases/mysql5-server/patches/patch-ag |    8 +-
 databases/mysql5-server/patches/patch-ai |    8 +-
 databases/mysql5-server/patches/patch-an |   26 +-
 databases/mysql5-server/patches/patch-ca |    8 +-
 databases/mysql5-server/patches/patch-cb |    8 +-
 databases/mysql5-server/patches/patch-cc |    8 +-
 databases/mysql5-server/patches/patch-da |   12 -
 databases/mysql5-server/patches/patch-db |   85 ----
 23 files changed, 612 insertions(+), 277 deletions(-)

diffs (truncated from 1594 to 300 lines):

diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/Makefile
--- a/databases/mysql5-client/Makefile  Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/Makefile  Tue Sep 23 11:15:53 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2008/06/30 12:01:47 martti Exp $
+# $NetBSD: Makefile,v 1.18.4.1 2008/09/23 11:15:53 tron Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
+PKGREVISION=           1
 SVR4_PKGNAME=          mysqc
 COMMENT=               MySQL 5, a free SQL database (client)
 
@@ -18,6 +19,12 @@
 
 AUTO_MKDIRS=   yes
 
+REPLACE_PERL=  scripts/mysql_convert_table_format.sh \
+               scripts/mysql_explain_log.sh \
+               scripts/mysql_tableinfo.sh \
+               scripts/mysqldumpslow.sh \
+               scripts/mysqlhotcopy.sh
+
 post-install:
        cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do         \
                ${TEST} ! -f "$$f" ||                                   \
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/Makefile.common   Tue Sep 23 11:15:53 2008 +0000
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile.common,v 1.32 2008/06/30 12:01:47 martti Exp $
+# $NetBSD: Makefile.common,v 1.32.4.1 2008/09/23 11:15:53 tron Exp $
+#
+# used by databases/mysql5-client/Makefile
+# used by databases/mysql5-server/Makefile
+#
 
-DISTNAME=              mysql-5.0.51b
+DISTNAME=              mysql-5.0.67
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
@@ -42,6 +46,8 @@
 CONFIGURE_ENV+=                ac_cv_lib_gen_p2open="no"
 .endif
 
+BUILD_DEFS+=           VARBASE
+
 # We always use our own readline.  Note that these --without-* settings
 # are confusing, but they just mean "don't use the included readline
 # or libedit".
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/buildlink3.mk
--- a/databases/mysql5-client/buildlink3.mk     Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/buildlink3.mk     Tue Sep 23 11:15:53 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/06/30 12:01:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11.4.1 2008/09/23 11:15:53 tron Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=   ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@
 
 .if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mysql-client+=   mysql-client>=5.0.15
-BUILDLINK_ABI_DEPENDS.mysql-client+=   mysql-client>=5.0.51b
+BUILDLINK_ABI_DEPENDS.mysql-client+=   mysql-client>=5.0.67
 BUILDLINK_PKGSRCDIR.mysql-client?=     ../../databases/mysql5-client
 BUILDLINK_LIBDIRS.mysql-client?=       lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=       include/mysql
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo  Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/distinfo  Tue Sep 23 11:15:53 2008 +0000
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.23 2008/07/02 14:10:04 obache Exp $
+$NetBSD: distinfo,v 1.23.4.1 2008/09/23 11:15:53 tron Exp $
 
-SHA1 (mysql-5.0.51b.tar.gz) = 3884aed8e974fc397d1e86b0609a740a615dfd98
-RMD160 (mysql-5.0.51b.tar.gz) = 759682caa7708f400abd4ea980fe7ebb29cfe99a
-Size (mysql-5.0.51b.tar.gz) = 27809240 bytes
+SHA1 (mysql-5.0.67.tar.gz) = 168090a4698a3a5efa2f2c9380a4352d4433d377
+RMD160 (mysql-5.0.67.tar.gz) = 05d38a5f8d91cb4dac1ee446af96b28163bd3722
+Size (mysql-5.0.67.tar.gz) = 28370810 bytes
 SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
-SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381
+SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
+SHA1 (patch-ac) = 7e7034f64f8337e459fe16611db8d7854c02931e
 SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217
 SHA1 (patch-ae) = 74c830dddf3517ebc2226dc166b61a33f83b04da
-SHA1 (patch-af) = 06cb76ad50ed0de3e82f682bf57a75441f68da26
-SHA1 (patch-ag) = 212f9c0a2e2eb6feb013e4a72eaf658951b995b5
+SHA1 (patch-af) = b36307e554df858412c52ae53753c62d9761aaad
+SHA1 (patch-ag) = 076ab47225b66bc6d8472ec48f808641afdb780d
 SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7
 SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76
-SHA1 (patch-aj) = 9961c99cc90bf5a0e5ef7a6313030128403a1f55
-SHA1 (patch-ak) = 76e361240f4e62e98cebcb25ef913de1aecddc1f
-SHA1 (patch-al) = 5189fee50cd16a620fb1ccb3fe529c26b5e72356
+SHA1 (patch-aj) = 1b831b1c7a616eba7d27f362a7c885ce6b853bbb
+SHA1 (patch-al) = b77d3ebb9602a33e11d22190f26ea93fd6fb533d
 SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e
 SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc
 SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/patches/patch-ab
--- a/databases/mysql5-client/patches/patch-ab  Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/patches/patch-ab  Tue Sep 23 11:15:53 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ab,v 1.2.14.1 2008/09/23 11:15:53 tron Exp $
 
---- sql/mysqld.cc.orig 2007-03-05 20:21:11.000000000 +0100
-+++ sql/mysqld.cc
-@@ -171,7 +171,7 @@ static void getvolumeID(BYTE *volumeName
+--- sql/mysqld.cc.orig 2008-08-04 15:20:07.000000000 +0300
++++ sql/mysqld.cc      2008-09-16 12:16:20.000000000 +0300
+@@ -181,7 +181,7 @@
  int initgroups(const char *,unsigned int);
  #endif
  
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql5-client/patches/patch-ac  Tue Sep 23 11:15:53 2008 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.6.8.1 2008/09/23 11:15:53 tron Exp $
+
+--- configure.in.orig  2008-08-04 21:19:07.000000000 +0900
++++ configure.in
+@@ -2697,9 +2697,9 @@ linked_client_targets="linked_libmysql_s
+ 
+ if test "$THREAD_SAFE_CLIENT" = "no"
+ then
+-  sql_client_dirs="strings regex mysys dbug extra libmysql client"
++  sql_client_dirs="strings regex libmysql client"
+ else
+-  sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"
++  sql_client_dirs="strings regex libmysql libmysql_r client"
+   linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
+   AC_CONFIG_FILES(libmysql_r/Makefile)
+   AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/patches/patch-af
--- a/databases/mysql5-client/patches/patch-af  Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/patches/patch-af  Tue Sep 23 11:15:53 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-af,v 1.6.14.1 2008/09/23 11:15:53 tron Exp $
 
---- man/Makefile.in.orig       2007-03-05 20:22:54.000000000 +0100
-+++ man/Makefile.in
-@@ -348,8 +348,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
+--- man/Makefile.in.orig       2008-08-04 15:22:07.000000000 +0300
++++ man/Makefile.in    2008-09-16 12:17:49.000000000 +0300
+@@ -354,8 +354,9 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/patches/patch-ag
--- a/databases/mysql5-client/patches/patch-ag  Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/patches/patch-ag  Tue Sep 23 11:15:53 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ag,v 1.3.14.1 2008/09/23 11:15:53 tron Exp $
 
---- strings/Makefile.in.orig   2007-03-05 20:23:22.000000000 +0100
-+++ strings/Makefile.in
-@@ -616,7 +616,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+--- strings/Makefile.in.orig   2008-08-04 15:22:30.000000000 +0300
++++ strings/Makefile.in        2008-09-16 12:18:09.000000000 +0300
+@@ -622,7 +622,6 @@
          if test -f $$p; then \
            f=$(am__strip_dir) \
            echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
@@ -10,7 +10,7 @@
          else :; fi; \
        done
        @$(POST_INSTALL)
-@@ -624,7 +623,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+@@ -630,7 +629,6 @@
          if test -f $$p; then \
            p=$(am__strip_dir) \
            echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
@@ -18,7 +18,7 @@
          else :; fi; \
        done
  
-@@ -633,7 +631,6 @@ uninstall-pkglibLIBRARIES:
+@@ -639,7 +637,6 @@
        @list='$(pkglib_LIBRARIES)'; for p in $$list; do \
          p=$(am__strip_dir) \
          echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/patches/patch-aj
--- a/databases/mysql5-client/patches/patch-aj  Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/patches/patch-aj  Tue Sep 23 11:15:53 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-aj,v 1.2.14.1 2008/09/23 11:15:53 tron Exp $
 
---- client/mysqladmin.cc.orig  2007-03-05 20:21:42.000000000 +0100
-+++ client/mysqladmin.cc
-@@ -325,8 +325,14 @@ int main(int argc,char *argv[])
+--- client/mysqladmin.cc.orig  2008-08-04 15:19:04.000000000 +0300
++++ client/mysqladmin.cc       2008-09-16 12:18:37.000000000 +0300
+@@ -331,8 +331,14 @@
    if (tty_password)
      opt_password = get_tty_password(NullS);
  
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/patches/patch-ak
--- a/databases/mysql5-client/patches/patch-ak  Sun Sep 21 13:19:42 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2007/03/11 18:42:28 adam Exp $
-
---- mysys/Makefile.in.orig     2007-03-05 20:22:57.000000000 +0100
-+++ mysys/Makefile.in
-@@ -428,7 +428,7 @@ MYSQLBASEdir = $(prefix)
- INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-                       -I$(top_srcdir)/include -I$(srcdir)
- 
--pkglib_LIBRARIES = libmysys.a
-+pkglib_LIBRARIES =
- LDADD = libmysys.a ../dbug/libdbug.a \
-                       ../strings/libmystrings.a
- 
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-client/patches/patch-al
--- a/databases/mysql5-client/patches/patch-al  Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-client/patches/patch-al  Tue Sep 23 11:15:53 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-al,v 1.2.14.1 2008/09/23 11:15:53 tron Exp $
 
---- include/Makefile.in.orig   2007-03-11 09:24:33.000000000 +0100
-+++ include/Makefile.in
-@@ -360,6 +360,7 @@ zlib_dir = @zlib_dir@
+--- include/Makefile.in.orig   2008-08-04 15:22:05.000000000 +0300
++++ include/Makefile.in        2008-09-16 12:19:22.000000000 +0300
+@@ -366,6 +366,7 @@
  BUILT_SOURCES = $(HEADERS_GEN) abi_check
  HEADERS_GEN = mysql_version.h my_config.h
  HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile  Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-server/Makefile  Tue Sep 23 11:15:53 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2008/07/01 09:22:59 tron Exp $
+# $NetBSD: Makefile,v 1.24.4.1 2008/09/23 11:15:53 tron Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
-PKGREVISION=           1
+#PKGREVISION=          1
 SVR4_PKGNAME=          mysqs
 COMMENT=               MySQL 5, a free SQL database (server)
 
@@ -17,7 +17,7 @@
 CONFIGURE_ARGS+=       --with-raid
 CONFIGURE_ARGS+=       --without-berkeley-db
 CONFIGURE_ARGS+=       --without-mysqlfs
-CONFIGURE_ARGS+=       --with-mysqld-user=${MYSQL_USER:Q}
+CONFIGURE_ARGS+=       --with-mysqld-user=${MYSQL_USER}
 
 PTHREAD_OPTS+=         require
 CONFIGURE_ARGS+=       --with-pthreads
@@ -32,8 +32,8 @@
 RCD_SCRIPTS=           mysqld
 
 FILES_SUBST+=          HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
-                       MYSQL_DATADIR=${MYSQL_DATADIR:Q} \
-                       MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q}
+                       MYSQL_DATADIR=${MYSQL_DATADIR} \
+                       MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 MESSAGE_SUBST+=                MYSQL_DATADIR=${MYSQL_DATADIR} \
                        MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=           MYSQL_DATADIR
@@ -80,8 +80,8 @@
                ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-       #${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+#      ${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 \
+#              ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \
                ${DESTDIR}${PREFIX}/bin/mysql_secure_installation
 
diff -r ac58aa5a0b01 -r 05fcd972df41 databases/mysql5-server/PLIST
--- a/databases/mysql5-server/PLIST     Sun Sep 21 13:19:42 2008 +0000
+++ b/databases/mysql5-server/PLIST     Tue Sep 23 11:15:53 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2007/12/14 13:36:53 tron Exp $
+@comment $NetBSD: PLIST,v 1.12.8.1 2008/09/23 11:15:53 tron Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -40,12 +40,15 @@
 share/mysql-test/include/ctype_filesort.inc
 share/mysql-test/include/ctype_innodb_like.inc
 share/mysql-test/include/ctype_like_escape.inc
+share/mysql-test/include/ctype_like_range_f1f2.inc
+share/mysql-test/include/ctype_regex.inc
 share/mysql-test/include/delete_anonymous_users.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/federated.inc
 share/mysql-test/include/federated_cleanup.inc
 share/mysql-test/include/get_binlog_dump_thread_id.inc



Home | Main Index | Thread Index | Old Index