mysql56 @5.6.22_0: update to 5.6.23

[Schamschula (Marius Schamschula)]

mysql56 has been updated to version 5.6.23. Unfortunately, my build dies as I get

/opt/local/var/macports/build/_Users_marius_Development_MacPorts_ports_databases_mysql56/mysql56/work/mysql-5.6.23/sql/mysqld.cc:7779:10: error: use of undeclared identifier 'yaSSL_ASN1_TIME_to_string'
  return yaSSL_ASN1_TIME_to_string(time, buf, len);
         ^
1 error generated.

[pixilla (Bradley Giesbrecht)]

mschamschula: Will you be attaching the "patch-sql-mysqld.cc.diff" included in Portfile-mysql56.diff​?

[steven.pearce@…]

I am also getting this error. I upgraded my ports from 2.3.2 to 2.3.3 and when bulding mysql I see the following. although I notice the directory is slightly different as mine refers to mysql-5.6.22.

:info:build /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_databases_mysql56/mysql56/work/mysql-5.6.22/sql/mysqld.cc:7779:10: error: use of undeclared identifier 'yaSSL_ASN1_TIME_to_string'

I notice you are asking for patch-sql-mysqld.cc.diff, if you tell me where that file would be located I will attach it for you.

[Schamschula (Marius Schamschula)]

Replying to pixilla@…:

mschamschula: Will you be attaching the "patch-sql-mysqld.cc.diff" included in Portfile-mysql56.diff​?

Sure. The attached version of the patch file is on elf many variants I tried. However, the build still fails.

[Themanwithoutaplan]

Cc Me!

[Schamschula (Marius Schamschula)]

Apparently pixilla committed r132791, essentially Portfile-mysql56.diff. My builds under Mavericks and Yosemite still fail at the same point.

[evandrix (Lee Wei Yeong)]

Cc Me!

[asedeno@…]

Cc Me!

[asedeno@…]

Upstream bug: ​http://bugs.mysql.com/bug.php?id=75622

The change that broke things was in OpenSSL 1.0.2. The fix is updating a regex in cmake/ssl.cmake to account for some extra whitespace.

I've applied the suggested patch locally and got things working. I'll start putting a patch together now, and will attach it if this hasn't been fixed before I'm done.

[Schamschula (Marius Schamschula)]

I've recast asedeno's patch to patch cmake/ssl.cmake directly, as I could not find files/patch-cmake-ssl.cmake.diff under mysql56.

This does work for me.

[asedeno@…]

It wasn't there because files/patch-cmake-ssl.cmake.diff is created by my patch. That was an svn diff of my checkout of the macports source tree.

[pixilla (Bradley Giesbrecht)]

Replying to asedeno@…:

Upstream bug: ​http://bugs.mysql.com/bug.php?id=75622

The change that broke things was in OpenSSL 1.0.2. The fix is updating a regex in cmake/ssl.cmake to account for some extra whitespace.

I've applied the suggested patch locally and got things working. I'll start putting a patch together now, and will attach it if this hasn't been fixed before I'm done.

Are you building mysql56 with the non-default +openssl variant?

[pixilla (Bradley Giesbrecht)]

Replying to mschamschula@…:

Apparently pixilla committed ​https://trac.macports.org/changeset/132791, essentially Portfile-mysql56.diff. My builds under Mavericks and Yosemite still fail at the same point.

I committed after a successful build of mysql56 5.6.23 on Mavericks. Your attached log appears to be truncated.

[asedeno@…]

Replying to pixilla@…:

Are you building mysql56 with the non-default +openssl variant?

Nope.

asedeno@Groose:~$ port installed | grep mysql56
  mysql56 @5.6.23_0 (active)

However, I do have OpenSSL installed.

asedeno@Groose:~$ port installed | grep openssl
  openssl @1.0.2_0 (active)

[asedeno@…]

Looking more closely at the Portfile, the openssl variant does nothing and what it should do is unconditionally enabled. It's been that way since last June. r120632

[pixilla (Bradley Giesbrecht)]

Replying to asedeno@…:

Looking more closely at the Portfile, the openssl variant does nothing and what it should do is unconditionally enabled. It's been that way since last June. r120632

Thanks for the reminder.

[Themanwithoutaplan]

I've just tried building from a checkout but I'm still getting the same error (on 10.10.2). Anything special I need to do?

[pixilla (Bradley Giesbrecht)]

asedeno: Thanks for the patch. Builds on all MacPorts buildbots. See r132850

[asedeno@…]

Replying to pixilla@…:

asedeno: Thanks for the patch. Builds on all MacPorts buildbots. See r132850

Thanks for applying it. It just occurred to me that I took the wrong (less general) fix from the upstream bug, though.

The added [\t ]+ should have been [\t ]*

I can send another patch or open another bug if you like.

[pixilla (Bradley Giesbrecht)]

Like this?

files/patch-cmake-ssl.cmake.diff

@@ -5 +5 @@
      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].*"
++      REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
      )
      STRING(REGEX REPLACE
        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"

[asedeno@…]

Replying to pixilla@…:

Like this?

files/patch-cmake-ssl.cmake.diff

@@ -5 +5 @@
      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].*"
++      REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
      )
      STRING(REGEX REPLACE
        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"

Just like that. I'll have to remember the inline diff thing for later.