From ae36c057c62532a263aa6af4ef62f1b1abaa8716 Mon Sep 17 00:00:00 2001
From: Tomas Korbar <tkorbar@redhat.com>
Date: Thu, 11 Nov 2021 14:54:11 +0100
Subject: [PATCH] Remove aes implementation from the sources completely

Resolves: rhbz#1995795
---
 libmemcached-awesome-aes2.patch | 24 ++++++++++++++++++++++++
 libmemcached-awesome.spec       |  9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 libmemcached-awesome-aes2.patch

diff --git a/libmemcached-awesome-aes2.patch b/libmemcached-awesome-aes2.patch
new file mode 100644
index 0000000..0807fcd
--- /dev/null
+++ b/libmemcached-awesome-aes2.patch
@@ -0,0 +1,24 @@
+diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt
+index b820d27b..fb732fcf 100644
+--- a/src/libhashkit/CMakeLists.txt
++++ b/src/libhashkit/CMakeLists.txt
+@@ -17,7 +17,6 @@ set(libhashkit_sources
+         murmur3.cc
+         murmur3_api.cc
+         one_at_a_time.cc
+-        rijndael.cc
+         str_algorithm.cc
+         strerror.cc
+         string.cc
+@@ -53,6 +52,10 @@ if(ENABLE_OPENSSL_CRYPTO)
+         endif()
+ endif()
+ 
++if (NOT OPENSSL_CRYPTO_LIBRARY)
++        set (libhashkit_sources ${libhashkit_sources} rijndael.cc)
++endif()
++
+ configure_file(hashkitcon.h.in hashkitcon.h @ONLY)
+ 
+ install(TARGETS libhashkit EXPORT libhashkit-targets
+
diff --git a/libmemcached-awesome.spec b/libmemcached-awesome.spec
index 0996b32..9d9b1b6 100644
--- a/libmemcached-awesome.spec
+++ b/libmemcached-awesome.spec
@@ -24,7 +24,7 @@
 Name:      %{libname}-awesome
 Summary:   Client library and command line tools for memcached server
 Version:   %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:   9%{?dist}
+Release:   10%{?dist}
 License:   BSD
 URL:       https://github.com/%{gh_owner}/%{gh_project}
 Source0:   https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
@@ -35,6 +35,8 @@ Patch2:    %{name}-config.patch
 Patch3:    %{name}-macro.patch
 Patch4:    %{name}-testing.patch
 Patch5:    %{name}-udp-test.patch
+# rhbz#1995795
+Patch6:	   %{name}-aes2.patch
 
 BuildRequires: cmake >= 3.9
 BuildRequires: gcc
@@ -117,6 +119,7 @@ memtouch    Touches a key
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # drop test hanging in mock
 # and requiring some memcached build options
@@ -196,6 +199,10 @@ rm -r %{buildroot}%{_datadir}/doc/%{name}/
 
 
 %changelog
+* Thu Nov 11 2021 Tomas Korbar <tkorbar@redhat.com> - 1.1.0-10
+- Remove aes implementation from the sources completely
+- Resolves: rhbz#1995795
+
 * Fri Aug 06 2021 Tomas Korbar <tkorbar@redhat.com> - 1.1.0-9
 - Disable unstable test for udp
 - Related: rhbz#1981785