From 042f81aa659b554f65aeefa85388470503e0234e Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 1 Mar 2018 10:37:38 +0100
Subject: [PATCH] update to 1.5.6 (UDP port disabled by default)

---
 .gitignore                    |  2 +-
 memcached-format_errors.patch | 32 --------------------------------
 memcached.spec                |  4 +---
 sources                       |  2 +-
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 memcached-format_errors.patch

diff --git a/.gitignore b/.gitignore
index a547e7a..703d9bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/memcached-1.5.5.tar.gz
+/memcached-1.5.6.tar.gz
diff --git a/memcached-format_errors.patch b/memcached-format_errors.patch
deleted file mode 100644
index 53a9c65..0000000
--- a/memcached-format_errors.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit aa5cc9ad74c871970c2d93c114e1d2c125b63e81
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Tue Jan 30 13:28:08 2018 +0100
-
-    fix gcc warnings
-
-diff --git a/items.c b/items.c
-index 400048b..519764f 100644
---- a/items.c
-+++ b/items.c
-@@ -925,7 +925,7 @@ void item_stats_sizes(ADD_STAT add_stats, void *c) {
-         int i;
-         for (i = 0; i < stats_sizes_buckets; i++) {
-             if (stats_sizes_hist[i] != 0) {
--                char key[8];
-+                char key[12];
-                 snprintf(key, sizeof(key), "%d", i * 32);
-                 APPEND_STAT(key, "%u", stats_sizes_hist[i]);
-             }
-diff --git a/memcached.c b/memcached.c
-index a8a724c..dba7941 100644
---- a/memcached.c
-+++ b/memcached.c
-@@ -3338,7 +3338,7 @@ static void process_stats_conns(ADD_STAT add_stats, void *c) {
-     int i;
-     char key_str[STAT_KEY_LEN];
-     char val_str[STAT_VAL_LEN];
--    char conn_name[MAXPATHLEN + sizeof("unix:")];
-+    char conn_name[MAXPATHLEN + sizeof("unix:") + sizeof("65535")];
-     int klen = 0, vlen = 0;
- 
-     assert(add_stats);
diff --git a/memcached.spec b/memcached.spec
index 2a6ab98..d468cb6 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -4,7 +4,7 @@
 %bcond_with seccomp
 
 Name:           memcached
-Version:        1.5.5
+Version:        1.5.6
 Release:        2%{?dist}
 Epoch:          0
 Summary:        High Performance, Distributed Memory Object Cache
@@ -16,7 +16,6 @@ Source0:        http://www.memcached.org/files/%{name}-%{version}.tar.gz
 Source1:        memcached.sysconfig
 
 Patch1:         memcached-unit.patch
-Patch2:         memcached-format_errors.patch
 
 BuildRequires:  libevent-devel systemd
 BuildRequires:  perl-generators
@@ -44,7 +43,6 @@ access to the memcached binary include files.
 %prep
 %setup -q
 %patch1 -p1 -b .unit
-%patch2 -p1 -b .format_errors
 
 %build
 # compile with full RELRO
diff --git a/sources b/sources
index 571b238..b1a7de7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (memcached-1.5.5.tar.gz) = 38883600398b5d9378bb57508ed94b80ed2c4ef0e2610e328a60bcb79268f85c67c99159993040b36eac964138822862fa78f62c649560abc4818233b1b2f3d0
+SHA512 (memcached-1.5.6.tar.gz) = b8bb3b69358a476c6f11f42e89565dd0261cba3f1eaa6b0999dba7c2cb2d7c5e9ca24dedc6b7fd46ec78e40e52d66fe4694ebafd6bbd4557d25d66757d9024a4