From dc296a34b7bc5b23b624e92ad07ae3d53b1d1b6d Mon Sep 17 00:00:00 2001
From: Tomas Korbar <tkorbar@redhat.com>
Date: Thu, 30 Jan 2020 10:14:04 +0100
Subject: [PATCH] update to 1.5.21

make memcached gcc 10 compliant

Resolves: rhbz#1794007
---
 .gitignore                   |  1 +
 memcached-1.5.21-gcc10.patch | 32 ++++++++++++++++++++++++++++++++
 memcached.spec               | 11 +++++++++--
 sources                      |  2 +-
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 memcached-1.5.21-gcc10.patch

diff --git a/.gitignore b/.gitignore
index d637e74..943163d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /memcached-selinux-1.0.2.tar.gz
 /memcached-1.5.18.tar.gz
 /memcached-1.5.20.tar.gz
+/memcached-1.5.21.tar.gz
diff --git a/memcached-1.5.21-gcc10.patch b/memcached-1.5.21-gcc10.patch
new file mode 100644
index 0000000..e4a2676
--- /dev/null
+++ b/memcached-1.5.21-gcc10.patch
@@ -0,0 +1,32 @@
+commit 85fa7f7eb112163ac791af8e52a85bfa28e261dc
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Fri Jan 24 08:59:15 2020 +0100
+
+    Make memcached gcc 10 compliant
+
+diff --git a/hash.c b/hash.c
+index a0c3036..b5ff28a 100644
+--- a/hash.c
++++ b/hash.c
+@@ -4,6 +4,8 @@
+ #include "jenkins_hash.h"
+ #include "murmur3_hash.h"
+ 
++hash_func hash;
++
+ int hash_init(enum hashfunc_type type) {
+     switch(type) {
+         case JENKINS_HASH:
+diff --git a/hash.h b/hash.h
+index 059d1e2..3b2a984 100644
+--- a/hash.h
++++ b/hash.h
+@@ -2,7 +2,7 @@
+ #define    HASH_H
+ 
+ typedef uint32_t (*hash_func)(const void *key, size_t length);
+-hash_func hash;
++extern hash_func hash;
+ 
+ enum hashfunc_type {
+     JENKINS_HASH=0, MURMUR3_HASH
diff --git a/memcached.spec b/memcached.spec
index 41308c3..08532c9 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -11,8 +11,8 @@
 %global selinuxmoduledir	%{selinuxmodulename}-selinux-%{selinuxmodulever}
 
 Name:           memcached
-Version:        1.5.20
-Release:        2%{?dist}
+Version:        1.5.21
+Release:        1%{?dist}
 Epoch:          0
 Summary:        High Performance, Distributed Memory Object Cache
 
@@ -24,6 +24,7 @@ Source1:        memcached.sysconfig
 Source2:        https://releases.pagure.org/memcached-selinux/memcached-selinux-1.0.2.tar.gz
 
 Patch1:         memcached-unit.patch
+Patch2:         memcached-1.5.21-gcc10.patch
 
 BuildRequires:  gcc libevent-devel systemd
 BuildRequires:  perl-generators
@@ -68,6 +69,8 @@ optimised for use with this version of memcached.
 # and SELinux policy sources into memcached-selinux-X.X
 %setup -q -b 2
 %patch1 -p1 -b .unit
+#accepted upstream in https://github.com/memcached/memcached/pull/601
+%patch2 -p1 -b .gcc-10
 
 %build
 %configure \
@@ -173,6 +176,10 @@ fi
 %license ../%{selinuxmoduledir}/COPYING
 
 %changelog
+* Thu Jan 30 2020 Tomas Korbar <tkorbar@redhat.com> - 0:1.5.21-1
+- update to 1.5.21
+- make memcached gcc 10 compliant
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.5.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 454173a..2c9d41e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (memcached-1.5.20.tar.gz) = 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d
+SHA512 (memcached-1.5.21.tar.gz) = 4ade3e15e6821b76f086b4933f5599248f8de7e7b2ae106dc8ecbc8a5073a1966e4c3956413fd57387bb88fca2c0e95b9a3ce7bfce19c42bec584a3268f06998
 SHA512 (memcached-selinux-1.0.2.tar.gz) = 7db24bbf10d002cfa5870aa0f937197c26d7b885b0652fc5c426919a4e7039274963a5677e7306e7b05927a40cecfef9054de523e273b36a4b3bee7ca27ae48c