From 5d556c2a068914bc03725ae93e4764dfa8be7f12 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 25 Jun 2021 14:28:11 +0200
Subject: remove internal AES implementation and use libcrypto  
 https://github.com/awesomized/libmemcached/pull/114 fix build ussing upstream
 patch to update catch version

---
 libmemcached-awesome.spec | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'libmemcached-awesome.spec')

diff --git a/libmemcached-awesome.spec b/libmemcached-awesome.spec
index e4f58e7..adc0a30 100644
--- a/libmemcached-awesome.spec
+++ b/libmemcached-awesome.spec
@@ -24,11 +24,14 @@
 Name:      %{libname}-awesome
 Summary:   Client library and command line tools for memcached server
 Version:   %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:   1%{?dist}
+Release:   2%{?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
 
+Patch0:    %{name}-catch.patch
+Patch1:    %{name}-aes.patch
+
 BuildRequires: cmake >= 3.9
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -39,6 +42,7 @@ BuildRequires: bison
 BuildRequires: memcached
 BuildRequires: systemtap-sdt-devel
 BuildRequires: libevent-devel > 2
+BuildRequires: openssl-devel
 
 Provides:      bundled(bobjenkins-hash)
 # package rename
@@ -102,14 +106,13 @@ memtouch    Touches a key
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
+%patch1 -p1
 
 # drop test hanging in mock
 # and requiring some memcached build options
 rm test/tests/memcached/sasl.cpp
 
-# Workaround to https://github.com/awesomized/libmemcached/issues/113
-sed -e 's/MINSIGSTKSZ/8192/' -i test/lib/catch.hpp
-
 
 %build
 %cmake \
@@ -179,6 +182,11 @@ rm -r %{buildroot}%{_datadir}/doc/%{name}/
 
 
 %changelog
+* Fri Jun 25 2021 Remi Collet <remi@remirepo.net> - 1.1.0-2
+- remove internal AES implementation and use libcrypto
+  https://github.com/awesomized/libmemcached/pull/114
+- fix build ussing upstream patch to update catch version
+
 * Thu Jun 24 2021 Remi Collet <remi@remirepo.net> - 1.1.0-1
 - Initial RPM from libmemcached-awesome
   from old libmemcached spec file
-- 
cgit