[134816] trunk/dports/databases/mysql56

[pixilla at macports.org]

Revision: 134816
          https://trac.macports.org/changeset/134816
Author:   pixilla at macports.org
Date:     2015-04-07 18:50:40 -0700 (Tue, 07 Apr 2015)
Log Message:
-----------
databases/mysql56:
- Update version to 5.6.24. Close #47371
- Remove ssl patch. See #47371

Modified Paths:
--------------
    trunk/dports/databases/mysql56/Portfile

Removed Paths:
-------------
    trunk/dports/databases/mysql56/files/patch-cmake-ssl.cmake.diff

Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile	2015-04-07 23:23:55 UTC (rev 134815)
+++ trunk/dports/databases/mysql56/Portfile	2015-04-08 01:50:40 UTC (rev 134816)
@@ -6,7 +6,7 @@
 
 name                mysql56
 set name_mysql      ${name}
-version             5.6.23
+version             5.6.24
 # Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
 # version bump.
 set revision_client 0
@@ -47,10 +47,6 @@
     patchfiles-append   patch-scripts-mysql_install_db.pl.in.diff \
                         patch-scripts-mysql_secure_installation.pl.in.diff
 
-    # Patch cmake/ssl.cmake to be compatible with OpenSSL 1.0.2.
-    # http://bugs.mysql.com/bug.php?id=75622
-    patchfiles-append   patch-cmake-ssl.cmake.diff
-
     if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } {
         # Disallow clang versions older than the clang version which caused the problem
         #compiler.blacklist {clang < 425}
@@ -63,8 +59,8 @@
         configure.compiler gcc
     }
 
-    checksums           rmd160  90e1b18264493434d986f39962d249c176b8469a \
-                        sha256  3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098
+    checksums           rmd160  cc1b8e7347e3b0bc0c94a35c1611d1cb82f80799 \
+                        sha256  37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb
 
     depends_lib-append  port:zlib port:tcp_wrappers
     depends_run-append  port:mysql_select

Deleted: trunk/dports/databases/mysql56/files/patch-cmake-ssl.cmake.diff
===================================================================
--- trunk/dports/databases/mysql56/files/patch-cmake-ssl.cmake.diff	2015-04-07 23:23:55 UTC (rev 134815)
+++ trunk/dports/databases/mysql56/files/patch-cmake-ssl.cmake.diff	2015-04-08 01:50:40 UTC (rev 134816)
@@ -1,11 +0,0 @@
---- a/cmake/ssl.cmake	2015-01-19 08:48:32.000000000 -0500
-+++ b/cmake/ssl.cmake	2015-02-11 00:41:55.000000000 -0500
-@@ -166,7 +166,7 @@
-     # Encoded as MNNFFPPS: major minor fix patch status
-     FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-       OPENSSL_VERSION_NUMBER
--      REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-+      REGEX "^#[\t ]+define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-     )
-     STRING(REGEX REPLACE
-       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150407/b9e7d20a/attachment.html>