diff options
| -rw-r--r-- | libmemcached-awesome-aes.patch | 19 | ||||
| -rw-r--r-- | libmemcached-awesome-catch.patch | 52 |
2 files changed, 19 insertions, 52 deletions
diff --git a/libmemcached-awesome-aes.patch b/libmemcached-awesome-aes.patch index f7636a8..bf0e84a 100644 --- a/libmemcached-awesome-aes.patch +++ b/libmemcached-awesome-aes.patch @@ -1436,3 +1436,22 @@ index d73b54e7..77414110 100644 #define memcached_is_initialized(__object) ((__object)->options.is_initialized) #define memcached_is_purging(__object) ((__object)->state.is_purging) #define memcached_is_processing_input(__object) ((__object)->state.is_processing_input) + + +diff -up ./src/libhashkit/aes.cc.old ./src/libhashkit/aes.cc +--- ./src/libhashkit/aes.cc.old 2021-06-25 14:53:38.891064258 +0200 ++++ ./src/libhashkit/aes.cc 2021-06-25 14:53:45.840043166 +0200 +@@ -37,10 +37,10 @@ bool aes_initialize(const unsigned char + return false; + } + +- if (EVP_CIPHER_CTX_init(encryption_context) != 1 || +- EVP_EncryptInit_ex(encryption_context, EVP_aes_256_cbc(), NULL, key, ++ EVP_CIPHER_CTX_init(encryption_context); ++ EVP_CIPHER_CTX_init(decryption_context); ++ if (EVP_EncryptInit_ex(encryption_context, EVP_aes_256_cbc(), NULL, key, + aes_iv) != 1 || +- EVP_CIPHER_CTX_init(decryption_context) != 1 || + EVP_DecryptInit_ex(decryption_context, EVP_aes_256_cbc(), NULL, key, + aes_iv) != 1) { + return false; diff --git a/libmemcached-awesome-catch.patch b/libmemcached-awesome-catch.patch index 79e7d93..3950dd1 100644 --- a/libmemcached-awesome-catch.patch +++ b/libmemcached-awesome-catch.patch @@ -11,58 +11,6 @@ Subject: [PATCH] fix gh issue #113 4 files changed, 368 insertions(+), 205 deletions(-) create mode 100755 scripts/download_catch2.sh -diff --git a/ChangeLog-1.1.md b/ChangeLog-1.1.md -index c5ff5971..719140ff 100644 ---- a/ChangeLog-1.1.md -+++ b/ChangeLog-1.1.md -@@ -1,5 +1,13 @@ - # ChangeLog v1.1 - -+## v 1.1.1 -+ -+> released TBD -+ -+* Fix [gh #113](https://github.com/awesomized/libmemcached/issues/105): -+ Build failure with Catch2 < 2.13.5. -+ -+ - ## v 1.1.0 - - > released 2021-06-23 -diff --git a/docs/source/ChangeLog-1.1.rst b/docs/source/ChangeLog-1.1.rst -index 6a9cb3c1..4e31142d 100644 ---- a/docs/source/ChangeLog-1.1.rst -+++ b/docs/source/ChangeLog-1.1.rst -@@ -5,6 +5,18 @@ - ChangeLog v1.1 - ============== - -+v 1.1.1 -+------- -+ -+.. -+ -+ released TBD -+ -+ -+ -+* Fix `gh #113 <https://github.com/awesomized/libmemcached/issues/105>`_\ : -+ Build failure with Catch2 < 2.13.5. -+ - v 1.1.0 - ------- - -diff --git a/scripts/download_catch2.sh b/scripts/download_catch2.sh -new file mode 100755 -index 00000000..24383983 ---- /dev/null -+++ b/scripts/download_catch2.sh -@@ -0,0 +1,5 @@ -+#!/bin/bash -+curl -sSLO $(curl -sSI https://github.com/catchorg/Catch2/releases/latest | sed -ne '\,^[Ll]ocation: *, !d -+s,[Ll]ocation: *\(.*\)/tag/,\1/download/, -+s,.$,/catch.hpp, -+p') diff --git a/test/lib/catch.hpp b/test/lib/catch.hpp index cf1fae15..36eaeb27 100644 --- a/test/lib/catch.hpp |