diff --git a/.gitignore b/.gitignore index 8b22896..0752f44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/memcached-1.4.34.tar.gz +/memcached-1.4.35.tar.gz diff --git a/memcached-1.4.34-gcc7fmt.patch b/memcached-1.4.34-gcc7fmt.patch deleted file mode 100644 index 55c4352..0000000 --- a/memcached-1.4.34-gcc7fmt.patch +++ /dev/null @@ -1,17 +0,0 @@ - -gcc -Wformat-truncation thinks this might truncate. - -https://github.com/memcached/memcached/pull/256 - -diff -uap memcached-1.4.34/util.c.gcc7fmt memcached-1.4.34/util.c ---- memcached-1.4.34/util.c.gcc7fmt -+++ memcached-1.4.34/util.c -@@ -18,7 +18,7 @@ - if (isalnum(x) || x == '-' || x == '.' || x == '_' || x == '~') { - uriencode_map[x] = NULL; - } else { -- snprintf(str, 4, "%%%02X", x); -+ snprintf(str, 4, "%%%02hhX", (unsigned char)x); - uriencode_map[x] = str; - str += 3; /* lobbing off the \0 is fine */ - } diff --git a/memcached.spec b/memcached.spec index 1bfdf3c..3fb2886 100644 --- a/memcached.spec +++ b/memcached.spec @@ -3,7 +3,7 @@ %bcond_without sasl Name: memcached -Version: 1.4.34 +Version: 1.4.35 Release: 3%{?dist} Epoch: 0 Summary: High Performance, Distributed Memory Object Cache @@ -15,7 +15,6 @@ Source0: http://www.memcached.org/files/%{name}-%{version}.tar.gz Source1: memcached.sysconfig Patch1: memcached-unit.patch -Patch2: memcached-1.4.34-gcc7fmt.patch BuildRequires: libevent-devel systemd-units BuildRequires: perl-generators @@ -44,7 +43,6 @@ access to the memcached binary include files. %prep %setup -q %patch1 -p1 -b .unit -%patch2 -p1 -b .gcc7fmt %build # compile with full RELRO diff --git a/sources b/sources index fd0dfda..a141d31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (memcached-1.4.34.tar.gz) = e91aa784674501313cd7464bad22f1898b998c836492a52efe68d097a01249a4fffd3b23b79af86957dd3dc11794f2bff476a4891b9cfa172ff9c29dfb50789f +SHA512 (memcached-1.4.35.tar.gz) = f42f12ce950d0dd83049f3ece588facc0617f0fc0010f428eb92efcf5a0a5422e110dcef6cff34e5feb5e7a115efa8b82fb09e26f2ff8bb112ebb5fb9adcaf4d