From 76c1f2d8c70584788a4a9df8736e60e0b5e32737 Mon Sep 17 00:00:00 2001
From: Tomas Korbar <tkorbar@redhat.com>
Date: Thu, 19 Mar 2020 16:16:17 +0100
Subject: [PATCH] Update to 1.6.1

Resolves: rhbz#1811480
---
 .gitignore                   |  1 +
 memcached-1.5.21-gcc10.patch | 32 --------------------------------
 memcached.spec               | 10 +++++-----
 sources                      |  2 +-
 4 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 memcached-1.5.21-gcc10.patch

diff --git a/.gitignore b/.gitignore
index 7c55946..7ad20d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /memcached-1.5.20.tar.gz
 /memcached-1.5.21.tar.gz
 /memcached-1.5.22.tar.gz
+/memcached-1.6.1.tar.gz
diff --git a/memcached-1.5.21-gcc10.patch b/memcached-1.5.21-gcc10.patch
deleted file mode 100644
index e4a2676..0000000
--- a/memcached-1.5.21-gcc10.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 1da7b5e..d55b0f8 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -11,8 +11,8 @@
 %global selinuxmoduledir	%{selinuxmodulename}-selinux-%{selinuxmodulever}
 
 Name:           memcached
-Version:        1.5.22
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        High Performance, Distributed Memory Object Cache
 
@@ -24,7 +24,6 @@ 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
@@ -69,8 +68,6 @@ 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 \
@@ -176,6 +173,9 @@ fi
 %license ../%{selinuxmoduledir}/COPYING
 
 %changelog
+* Thu Mar 19 2020 Tomas Korbar <tkorbar@redhat.com> - 0:1.6.1-1
+- Update to 1.6.1
+
 * Wed Mar 04 2020 Tomas Korbar <tkorbar@redhat.com> - 0:1.5.22-2
 - Enable TLS by default
 
diff --git a/sources b/sources
index 999695b..30a8ad3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (memcached-1.5.22.tar.gz) = 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
+SHA512 (memcached-1.6.1.tar.gz) = 1010486284026331a11c600ea524cf6e76266261d38a515bce00ff057984fd993983c38118356d4b447b83fac7d5938bdc8b2e818d29f3dc3ab6a821694bb5ad
 SHA512 (memcached-selinux-1.0.2.tar.gz) = 7db24bbf10d002cfa5870aa0f937197c26d7b885b0652fc5c426919a4e7039274963a5677e7306e7b05927a40cecfef9054de523e273b36a4b3bee7ca27ae48c