databases/mysqlwsrep56-server: Upgrade from 5.6.43 to 5.6.44

PR:		239373
Submitted by:	Teemu Ollakka <teemu.ollakka@galeracluster.com>

1 files changed, 25 insertions, 41 deletions

diff --git a/databases/mysqlwsrep56-server/files/patch-PR225888.diff b/databases/mysqlwsrep56-server/files/patch-PR225888.diff
index 0a5670c1ff10..6e64ed3ebbe5 100644
--- a/databases/mysqlwsrep56-server/files/patch-PR225888.diff
+++ b/databases/mysqlwsrep56-server/files/patch-PR225888.diff
@@ -1,6 +1,4 @@
-diff --git extra/yassl/include/openssl/ssl.h extra/yassl/include/openssl/ssl.h
-index 10fa4913b7e..ff6cb696661 100644
---- extra/yassl/include/openssl/ssl.h.orig
+--- extra/yassl/include/openssl/ssl.h.orig	2019-07-16 14:08:43 UTC
 +++ extra/yassl/include/openssl/ssl.h
 @@ -1,5 +1,5 @@
  /*
@@ -18,9 +16,7 @@ index 10fa4913b7e..ff6cb696661 100644
  unsigned long ERR_get_error(void);
  unsigned long ERR_peek_error(void);
  int           ERR_GET_REASON(int);
-diff --git extra/yassl/src/ssl.cpp extra/yassl/src/ssl.cpp
-index 39244a01b92..c992d446487 100644
---- extra/yassl/src/ssl.cpp.orig
+--- extra/yassl/src/ssl.cpp.orig	2019-07-16 14:08:43 UTC
 +++ extra/yassl/src/ssl.cpp
 @@ -1,5 +1,5 @@
  /*
@@ -29,7 +25,7 @@ index 39244a01b92..c992d446487 100644
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-@@ -1615,7 +1615,7 @@ int SSLeay_add_ssl_algorithms()  // compatibility only
+@@ -1516,7 +1516,7 @@ int SSLeay_add_ssl_algorithms()  // compatibility only
  }
  
  
@@ -38,17 +34,15 @@ index 39244a01b92..c992d446487 100644
  {
      GetErrors().Remove();
  }
-diff --git mysys_ssl/my_aes_openssl.cc mysys_ssl/my_aes_openssl.cc
-index 261ba8ab732..a0f8c147c7a 100644
---- mysys_ssl/my_aes_openssl.cc.orig
+--- mysys_ssl/my_aes_openssl.cc.orig	2019-07-16 14:08:43 UTC
 +++ mysys_ssl/my_aes_openssl.cc
 @@ -1,4 +1,4 @@
--/* Copyright (c) 2015, 2014 Oracle and/or its affiliates. All rights reserved.
+-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 +/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
  
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
-@@ -122,33 +122,46 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length,
+@@ -108,33 +108,46 @@ int my_aes_encrypt(const unsigned char *source, uint32
                     const unsigned char *key, uint32 key_length,
                     enum my_aes_opmode mode, const unsigned char *iv)
  {
@@ -103,7 +97,7 @@ index 261ba8ab732..a0f8c147c7a 100644
    return MY_AES_BAD_DATA;
  }
  
-@@ -159,7 +172,12 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
+@@ -145,7 +158,12 @@ int my_aes_decrypt(const unsigned char *source, uint32
                     enum my_aes_opmode mode, const unsigned char *iv)
  {
  
@@ -117,7 +111,7 @@ index 261ba8ab732..a0f8c147c7a 100644
    const EVP_CIPHER *cipher= aes_evp_type(mode);
    int u_len, f_len;
  
-@@ -167,27 +185,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
+@@ -153,27 +171,34 @@ int my_aes_decrypt(const unsigned char *source, uint32
    unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
  
    my_aes_create_key(key, key_length, rkey, mode);
@@ -161,11 +155,9 @@ index 261ba8ab732..a0f8c147c7a 100644
    return MY_AES_BAD_DATA;
  }
  
-diff --git sql-common/client.c sql-common/client.c
-index 19faefe8323..f1192306ccb 100644
---- sql-common/client.c.orig
+--- sql-common/client.c.orig	2019-07-16 14:08:43 UTC
 +++ sql-common/client.c
-@@ -2744,7 +2744,11 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
+@@ -1968,7 +1968,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
      goto error;
    }
  
@@ -177,11 +169,9 @@ index 19faefe8323..f1192306ccb 100644
  
    // There should not be any NULL embedded in the CN
    if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
-diff --git sql/mysqld.cc sql/mysqld.cc
-index 4acff4e4d9b..307778771be 100644
---- sql/mysqld.cc.orig
+--- sql/mysqld.cc.orig	2019-07-16 14:08:43 UTC
 +++ sql/mysqld.cc
-@@ -3408,7 +3408,11 @@ static int init_ssl()
+@@ -4511,7 +4511,11 @@ static int init_ssl()
  {
  #ifdef HAVE_OPENSSL
  #ifndef HAVE_YASSL
@@ -193,9 +183,9 @@ index 4acff4e4d9b..307778771be 100644
  #endif
    ssl_start();
  #ifndef EMBEDDED_LIBRARY
-@@ -3434,7 +3438,9 @@ static int init_ssl()
+@@ -4525,7 +4529,9 @@ static int init_ssl()
  					  opt_ssl_cipher, &error,
-                                           opt_ssl_crl, opt_ssl_crlpath, ssl_ctx_flags);
+                                           opt_ssl_crl, opt_ssl_crlpath);
      DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
 -    ERR_remove_state(0);
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
@@ -203,12 +193,10 @@ index 4acff4e4d9b..307778771be 100644
 +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
      if (!ssl_acceptor_fd)
      {
-       /*
-diff --git sql/rpl_slave.cc sql/rpl_slave.cc
-index aee13e12cb2..37a20870bd4 100644
---- sql/rpl_slave.cc.orig
+       sql_print_warning("Failed to setup SSL");
+--- sql/rpl_slave.cc.orig	2019-07-16 14:08:43 UTC
 +++ sql/rpl_slave.cc
-@@ -6026,7 +6026,9 @@ ignore_log_space_limit=%d",
+@@ -5258,7 +5258,9 @@ err:
    mysql_mutex_unlock(&mi->run_lock);
    DBUG_LEAVE;                                   // Must match DBUG_ENTER()
    my_thread_end();
@@ -219,7 +207,7 @@ index aee13e12cb2..37a20870bd4 100644
    pthread_exit(0);
    return(0);                                    // Avoid compiler warnings
  }
-@@ -6256,7 +6258,9 @@ extern "C" void *handle_slave_worker(void *arg)
+@@ -5449,7 +5451,9 @@ err:
    }
  
    my_thread_end();
@@ -230,7 +218,7 @@ index aee13e12cb2..37a20870bd4 100644
    pthread_exit(0);
    DBUG_RETURN(0); 
  }
-@@ -7597,7 +7601,9 @@ llstr(rli->get_group_master_log_pos(), llbuff));
+@@ -6663,7 +6667,9 @@ log '%s' at position %s, relay log '%s' position: %s",
  
    DBUG_LEAVE;                            // Must match DBUG_ENTER()
    my_thread_end();
@@ -241,17 +229,15 @@ index aee13e12cb2..37a20870bd4 100644
    pthread_exit(0);
    return 0;                             // Avoid compiler warnings
  }
-diff --git vio/viossl.c vio/viossl.c
-index 5622cb7ee92..f738570f832 100644
---- vio/viossl.c.orig
+--- vio/viossl.c.orig	2019-07-16 14:08:43 UTC
 +++ vio/viossl.c
 @@ -1,4 +1,4 @@
--/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+-/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-@@ -419,7 +421,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
+@@ -415,7 +415,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
        for (j = 0; j < n; j++)
        {
          SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
@@ -263,17 +249,15 @@ index 5622cb7ee92..f738570f832 100644
        }
    }
  #endif
-diff --git vio/viosslfactories.c vio/viosslfactories.c
-index f50678a37b3..d3891fd8b12 100644
---- vio/viosslfactories.c.orig
+--- vio/viosslfactories.c.orig	2019-07-16 14:08:43 UTC
 +++ vio/viosslfactories.c
 @@ -1,4 +1,4 @@
--/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
 +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-@@ -121,13 +121,21 @@ static DH *get_dh2048(void)
+@@ -68,13 +68,21 @@ static DH *get_dh2048(void)
    DH *dh;
    if ((dh=DH_new()))
    {