CVS commit: pkgsrc/databases/mysql55-client

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Wed May  3 12:37:02 UTC 2017

Modified Files:
        pkgsrc/databases/mysql55-client: Makefile.common distinfo options.mk

Log Message:
Updated database/mysql55-{client,server} to 5.5.56
-------------------------------------------------------------------
(From https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-56.html)

Changes in MySQL 5.5.56 (2017-05-02, General availability)

Binary packages for MySQL 5.5.56 are identical to those for MySQL
5.5.55, except for the version number. The change in 5.5.56 for Bug
#25942414 is applicable only to those who build from source.

Security Notes

  For the WITH_SSL CMake option, no is no longer a permitted value or
the default value. The default is now bundled. Consequently, MySQL now
is always built with SSL support. (Bug #25942414)
-------------------------------------------------------------------
(pkgsrc changes)
- Removed ssl option both from PKG_{SUPPORTED,SUGGESTED}_OPTIONS.
  This may give error if ssl is explicitly designated, but I believe
  that is the (kind of) upstream intension.
  (or left ssl in SUPPORTED and ignore it ?)


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/databases/mysql55-client/Makefile.common
cvs rdiff -u -r1.55 -r1.56 pkgsrc/databases/mysql55-client/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mysql55-client/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql55-client/Makefile.common
diff -u pkgsrc/databases/mysql55-client/Makefile.common:1.57 pkgsrc/databases/mysql55-client/Makefile.common:1.58
--- pkgsrc/databases/mysql55-client/Makefile.common:1.57        Tue Apr 11 15:18:12 2017
+++ pkgsrc/databases/mysql55-client/Makefile.common     Wed May  3 12:37:01 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.57 2017/04/11 15:18:12 mef Exp $
+# $NetBSD: Makefile.common,v 1.58 2017/05/03 12:37:01 mef Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=      mysql-5.5.55
+DISTNAME=      mysql-5.5.56
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
@@ -59,6 +59,7 @@ CMAKE_ARGS+=          -DINSTALL_SCRIPTDIR="bin"
 CMAKE_ARGS+=           -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
 CMAKE_ARGS+=           -DINSTALL_SUPPORTFILESDIR="share/mysql"
 CMAKE_ARGS+=           -DMYSQL_DATADIR=${MYSQL_DATADIR}
+CMAKE_ARGS+=            -DWITH_SSL=system
 
 # always use our own readline, not MySQL bundled one
 CMAKE_ARGS+=           -DWITH_LIBEDIT=OFF
@@ -131,3 +132,6 @@ CMAKE_ARGS+=        -DREADLINE_FOUND=system
 CMAKE_ARGS+=   -DREADLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
+PKG_SUPPORTED_OPTIONS+=        dtrace embedded-server ndb-cluster sphinx

Index: pkgsrc/databases/mysql55-client/distinfo
diff -u pkgsrc/databases/mysql55-client/distinfo:1.55 pkgsrc/databases/mysql55-client/distinfo:1.56
--- pkgsrc/databases/mysql55-client/distinfo:1.55       Tue Apr 11 15:18:12 2017
+++ pkgsrc/databases/mysql55-client/distinfo    Wed May  3 12:37:01 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.55 2017/04/11 15:18:12 mef Exp $
+$NetBSD: distinfo,v 1.56 2017/05/03 12:37:01 mef Exp $
 
-SHA1 (mysql-5.5.55.tar.gz) = 8ab934610e09e5325e143680a201d86ba7f2f70d
-RMD160 (mysql-5.5.55.tar.gz) = e84fb5d38673f6c357f96d157519831e42e0e30e
-SHA512 (mysql-5.5.55.tar.gz) = 3da7a45665e54fd77461980e3096937470aaa6308d89c8b5b9bee54ca11050cc08aab56063f07fb0f166e564329576a1be52ec8815e855ccca9e1076a03faac9
-Size (mysql-5.5.55.tar.gz) = 21040959 bytes
+SHA1 (mysql-5.5.56.tar.gz) = e8005b7612aa65bd11fc1e2f8bc11dad3f46ac39
+RMD160 (mysql-5.5.56.tar.gz) = 9ef621da171dcbe020dbb3f685b39ce89f47c4bb
+SHA512 (mysql-5.5.56.tar.gz) = 58aec4cfc82abac5bb9d5e5594d2545c979910af5b7bbcfe339f9590d157244c869a83659f89a2cca09254353ecb52d2dcb3e2cd55e117219e2a72c54187a975
+Size (mysql-5.5.56.tar.gz) = 21025832 bytes
 SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
 RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
 SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689

Index: pkgsrc/databases/mysql55-client/options.mk
diff -u pkgsrc/databases/mysql55-client/options.mk:1.12 pkgsrc/databases/mysql55-client/options.mk:1.13
--- pkgsrc/databases/mysql55-client/options.mk:1.12     Thu Aug  4 10:09:46 2016
+++ pkgsrc/databases/mysql55-client/options.mk  Wed May  3 12:37:01 2017
@@ -1,20 +1,14 @@
-# $NetBSD: options.mk,v 1.12 2016/08/04 10:09:46 adam Exp $
+# $NetBSD: options.mk,v 1.13 2017/05/03 12:37:01 mef Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql5
 
 # ndb-cluster does not configure with cmake
-PKG_SUPPORTED_OPTIONS+=        dtrace embedded-server ndb-cluster sphinx ssl
-PKG_SUGGESTED_OPTIONS+=        embedded-server ssl
+PKG_SUPPORTED_OPTIONS+=        dtrace embedded-server ndb-cluster sphinx
+PKG_SUGGESTED_OPTIONS+=        embedded-server
 
 .include "../../mk/bsd.options.mk"
 
-# Enable OpenSSL support
-.if !empty(PKG_OPTIONS:Mssl)
 .      include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+=           -DWITH_SSL=system
-.else
-CMAKE_ARGS+=           -DWITH_SSL=no
-.endif
 
 # Enable DTrace support
 .if !empty(PKG_OPTIONS:Mdtrace)