pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/databases/mysql56-client/patches mysql56-client: remov...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7d722e523a4
branches:  trunk
changeset: 402681:f7d722e523a4
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Oct 14 19:45:41 2019 +0000

description:
mysql56-client: remove unused patches

diffstat:

 databases/mysql56-client/patches/patch-mysys__ssl_my__aes__openssl.cc |  118 ----------
 databases/mysql56-client/patches/patch-sql_mysqld.cc                  |   42 ---
 databases/mysql56-client/patches/patch-sql_rpl__slave.cc              |   39 ---
 databases/mysql56-client/patches/patch-vio_vio.c                      |   17 -
 databases/mysql56-client/patches/patch-vio_viosslfactories.c          |   44 ---
 5 files changed, 0 insertions(+), 260 deletions(-)

diffs (280 lines):

diff -r 51ff132bf1e0 -r f7d722e523a4 databases/mysql56-client/patches/patch-mysys__ssl_my__aes__openssl.cc
--- a/databases/mysql56-client/patches/patch-mysys__ssl_my__aes__openssl.cc     Mon Oct 14 19:44:46 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-$NetBSD: patch-mysys__ssl_my__aes__openssl.cc,v 1.1 2019/09/06 10:01:44 taca Exp $
-
-* Allow build with OpenSSL 1.1.
-
---- mysys_ssl/my_aes_openssl.cc.orig   2019-06-10 10:25:32.000000000 +0000
-+++ mysys_ssl/my_aes_openssl.cc
-@@ -108,33 +108,46 @@ int my_aes_encrypt(const unsigned char *
-                    const unsigned char *key, uint32 key_length,
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
--  EVP_CIPHER_CTX ctx;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX stack_ctx;
-+  EVP_CIPHER_CTX *ctx= &stack_ctx;
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   const EVP_CIPHER *cipher= aes_evp_type(mode);
-   int u_len, f_len;
-   /* The real key to be used for encryption */
-   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
-   my_aes_create_key(key, key_length, rkey, mode);
- 
--  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--  if (!EVP_EncryptInit(&ctx, cipher, rkey, iv))
-+  if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
-     goto aes_error;                             /* Error */
--  if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
-+  if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
-     goto aes_error;                             /* Error */
--  if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length))
-+  if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length))
-     goto aes_error;                             /* Error */
- 
--  if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len))
-+  if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return u_len + f_len;
- 
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+    EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return MY_AES_BAD_DATA;
- }
- 
-@@ -145,7 +158,12 @@ int my_aes_decrypt(const unsigned char *
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
- 
--  EVP_CIPHER_CTX ctx;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX stack_ctx;
-+  EVP_CIPHER_CTX *ctx= &stack_ctx;
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   const EVP_CIPHER *cipher= aes_evp_type(mode);
-   int u_len, f_len;
- 
-@@ -153,27 +171,33 @@ int my_aes_decrypt(const unsigned char *
-   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
- 
-   my_aes_create_key(key, key_length, rkey, mode);
--  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--  EVP_CIPHER_CTX_init(&ctx);
--
--  if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv))
-+  if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
-     goto aes_error;                             /* Error */
--  if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
-+  if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
-     goto aes_error;                             /* Error */
--  if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length))
-+  if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length))
-     goto aes_error;                             /* Error */
--  if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len))
-+  if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return u_len + f_len;
- 
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return MY_AES_BAD_DATA;
- }
- 
diff -r 51ff132bf1e0 -r f7d722e523a4 databases/mysql56-client/patches/patch-sql_mysqld.cc
--- a/databases/mysql56-client/patches/patch-sql_mysqld.cc      Mon Oct 14 19:44:46 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-sql_mysqld.cc,v 1.5 2019/09/06 10:01:44 taca Exp $
-
-* Allow build with OpenSSL 1.1.
-
---- sql/mysqld.cc.orig 2019-06-10 10:25:32.000000000 +0000
-+++ sql/mysqld.cc
-@@ -2759,9 +2759,9 @@ bool one_thread_per_connection_end(THD *
-   }
- 
-   // Clean up errors now, before possibly waiting for a new connection.
--#ifndef EMBEDDED_LIBRARY
--  ERR_remove_state(0);
--#endif
-+#if !defined(EMBEDDED_LIBRARY) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- 
-   delete thd;
- 
-@@ -4358,7 +4358,11 @@ static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
- #ifndef HAVE_YASSL
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   CRYPTO_malloc_init();
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  OPENSSL_malloc_init();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- #endif
-   ssl_start();
- #ifndef EMBEDDED_LIBRARY
-@@ -4372,7 +4376,9 @@ static int init_ssl()
-                                         opt_ssl_cipher, &error,
-                                           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
-+    ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-     if (!ssl_acceptor_fd)
-     {
-       sql_print_warning("Failed to setup SSL");
diff -r 51ff132bf1e0 -r f7d722e523a4 databases/mysql56-client/patches/patch-sql_rpl__slave.cc
--- a/databases/mysql56-client/patches/patch-sql_rpl__slave.cc  Mon Oct 14 19:44:46 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-sql_rpl__slave.cc,v 1.3 2019/09/06 10:01:44 taca Exp $
-
-* Allow build with OpenSSL 1.1.
-
---- sql/rpl_slave.cc.orig      2019-06-10 10:25:32.000000000 +0000
-+++ sql/rpl_slave.cc
-@@ -5143,7 +5143,9 @@ err:
-   mysql_mutex_unlock(&mi->run_lock);
-   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   return(0);                                    // Avoid compiler warnings
- }
-@@ -5334,7 +5336,9 @@ err:
-   }
- 
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   DBUG_RETURN(0); 
- }
-@@ -6482,7 +6486,9 @@ log '%s' at position %s, relay log '%s' 
- 
-   DBUG_LEAVE;                            // Must match DBUG_ENTER()
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   return 0;                             // Avoid compiler warnings
- }
diff -r 51ff132bf1e0 -r f7d722e523a4 databases/mysql56-client/patches/patch-vio_vio.c
--- a/databases/mysql56-client/patches/patch-vio_vio.c  Mon Oct 14 19:44:46 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-vio_vio.c,v 1.3 2019/09/06 10:01:44 taca Exp $
-
-* Allow build with OpenSSL 1.1.
-
---- vio/vio.c.orig     2019-06-10 10:25:32.000000000 +0000
-+++ vio/vio.c
-@@ -384,7 +384,9 @@ void vio_end(void)
-   yaSSL_CleanUp();
- #elif defined(HAVE_OPENSSL)
-   // This one is needed on the client side
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   ERR_free_strings();
-   EVP_cleanup();
-   CRYPTO_cleanup_all_ex_data();
diff -r 51ff132bf1e0 -r f7d722e523a4 databases/mysql56-client/patches/patch-vio_viosslfactories.c
--- a/databases/mysql56-client/patches/patch-vio_viosslfactories.c      Mon Oct 14 19:44:46 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-vio_viosslfactories.c,v 1.3 2019/09/06 10:01:44 taca Exp $
-
-* Allow build with OpenSSL 1.1.
-
---- vio/viosslfactories.c.orig 2019-06-10 10:25:32.000000000 +0000
-+++ vio/viosslfactories.c
-@@ -68,13 +68,21 @@ static DH *get_dh2048(void)
-   DH *dh;
-   if ((dh=DH_new()))
-   {
--    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
--    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--    if (! dh->p || ! dh->g)
--    {
-+    BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-+    BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-+    if (!p || !g
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+        || !DH_set0_pqg(dh, p, NULL, g)
-+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-+    ) {
-+      /* DH_free() will free 'p' and 'g' at once. */
-       DH_free(dh);
--      dh=0;
-+      return NULL;
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    dh->p= p;
-+    dh->g= g;
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   }
-   return(dh);
- }
-@@ -230,8 +238,8 @@ new_VioSSLFd(const char *key_file, const
-     DBUG_RETURN(0);
- 
-   if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ?
--                                         TLSv1_client_method() :
--                                         TLSv1_server_method())))
-+                                         SSLv23_client_method() :
-+                                         SSLv23_server_method())))
-   {
-     *error= SSL_INITERR_MEMFAIL;
-     DBUG_PRINT("error", ("%s", sslGetErrString(*error)));



Home | Main Index | Thread Index | Old Index