diff --git a/memcached-1.4.15.tar.gz b/memcached-1.4.15.tar.gz deleted file mode 100644 index b15a2db..0000000 --- a/memcached-1.4.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4 -size 324451 diff --git a/memcached-1.4.20.tar.gz b/memcached-1.4.20.tar.gz new file mode 100644 index 0000000..65d076f --- /dev/null +++ b/memcached-1.4.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25d121408eed0b1522308ff3520819b130f04ba0554c68a673af23a915a54018 +size 337380 diff --git a/memcached-1.4.x_delete_verbose_mode_dos.patch b/memcached-1.4.x_delete_verbose_mode_dos.patch deleted file mode 100644 index 2015034..0000000 --- a/memcached-1.4.x_delete_verbose_mode_dos.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d711492c32626c0d7ba201791a681a5bffebcedf Mon Sep 17 00:00:00 2001 -From: Jeremy Sowden -Date: Wed, 9 Jan 2013 15:43:41 +0000 -Subject: [PATCH] Fix buffer-overrun when logging key to delete in binary - protocol. - - ---- - memcached.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - - -diff --git a/memcached.c b/memcached.c -index d157b4e..1fd87c9 100644 ---- a/memcached.c -+++ b/memcached.c -@@ -2150,7 +2150,12 @@ static void process_bin_delete(conn *c) { - assert(c != NULL); - - if (settings.verbose > 1) { -- fprintf(stderr, "Deleting %s\n", key); -+ int ii; -+ fprintf(stderr, "Deleting "); -+ for (ii = 0; ii < nkey; ++ii) { -+ fprintf(stderr, "%c", key[ii]); -+ } -+ fprintf(stderr, "\n"); - } - - if (settings.detail_enabled) { --- -1.7.10.4 diff --git a/memcached-autofoo.patch b/memcached-autofoo.patch index ae12bc4..d346c28 100644 --- a/memcached-autofoo.patch +++ b/memcached-autofoo.patch @@ -1,78 +1,30 @@ Index: configure.ac =================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -1,61 +1,15 @@ --AC_PREREQ(2.52) -+AC_PREREQ([2.60]) +--- configure.ac.orig 2014-06-16 18:19:32.036988018 +0200 ++++ configure.ac 2014-06-16 18:20:40.767987896 +0200 +@@ -1,13 +1,16 @@ + AC_PREREQ(2.52) m4_include([version.m4]) m4_include([m4/c99-backport.m4]) -AC_INIT(memcached, VERSION_NUMBER, memcached@googlegroups.com) -AC_CANONICAL_SYSTEM -+AC_INIT([memcached],[VERSION_NUMBER],[memcached@googlegroups.com]) ++AC_INIT([memcached], [VERSION_NUMBER], memcached@googlegroups.com) +AC_CANONICAL_TARGET AC_CONFIG_SRCDIR(memcached.c) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AM_CONFIG_HEADER(config.h) - --AC_PROG_CC -- --dnl ********************************************************************** --dnl DETECT_ICC ([ACTION-IF-YES], [ACTION-IF-NO]) --dnl --dnl check if this is the Intel ICC compiler, and if so run the ACTION-IF-YES --dnl sets the $ICC variable to "yes" or "no" --dnl ********************************************************************** --AC_DEFUN([DETECT_ICC], --[ -- ICC="no" -- AC_MSG_CHECKING([for icc in use]) -- if test "$GCC" = "yes"; then -- dnl check if this is icc acting as gcc in disguise -- AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER], -- AC_MSG_RESULT([no]) -- [$2], -- AC_MSG_RESULT([yes]) -- [$1] -- ICC="yes") -- else -- AC_MSG_RESULT([no]) -- [$2] -- fi --]) -- --DETECT_ICC([], []) -- --dnl ********************************************************************** --dnl DETECT_SUNCC ([ACTION-IF-YES], [ACTION-IF-NO]) --dnl --dnl check if this is the Sun Studio compiler, and if so run the ACTION-IF-YES --dnl sets the $SUNCC variable to "yes" or "no" --dnl ********************************************************************** --AC_DEFUN([DETECT_SUNCC], --[ -- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) -- AS_IF(test "x$SUNCC" = "xyes", [$1], [$2]) -- --]) -- --DETECT_SUNCC([CFLAGS="-mt $CFLAGS"], []) --AS_IF([test "$ICC" = "yes" -o "$GCC" = "yes"], -- [CFLAGS="$CFLAGS -pthread"]) -- --if test "$ICC" = "no"; then -- AC_PROG_CC_C99 --fi +AM_INIT_AUTOMAKE([foreign -Wall -Wno-portability tar-pax subdir-objects]) +AC_CONFIG_HEADERS([config.h]) - ++ + AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE - AM_PROG_CC_C_O - AC_PROG_INSTALL -@@ -78,14 +32,11 @@ AC_DEFUN([AC_C_DETECT_SASL_CB_GETCONF], + dnl ********************************************************************** + dnl DETECT_ICC ([ACTION-IF-YES], [ACTION-IF-NO]) +@@ -102,14 +105,11 @@ AC_DEFUN([AC_C_DETECT_SASL_CB_GETCONF], [ AC_CACHE_CHECK([for SASL_CB_GETCONF], [ac_cv_c_sasl_cb_getconf], @@ -90,7 +42,7 @@ Index: configure.ac ]) AS_IF([test "$ac_cv_c_sasl_cb_getconf" = "yes"], [AC_DEFINE([HAVE_SASL_CB_GETCONF], 1, -@@ -168,23 +119,6 @@ fi +@@ -200,23 +200,6 @@ fi AC_SUBST(PROFILER_FLAGS) @@ -114,7 +66,7 @@ Index: configure.ac # Issue 213: Search for clock_gettime to help people linking # with a static version of libevent AC_SEARCH_LIBS(clock_gettime, rt) -@@ -193,91 +127,7 @@ AC_SEARCH_LIBS(clock_gettime, rt) +@@ -225,91 +208,7 @@ AC_SEARCH_LIBS(clock_gettime, rt) AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(gethostbyname, nsl) @@ -207,7 +159,7 @@ Index: configure.ac dnl ---------------------------------------------------------------------------- -@@ -306,14 +156,14 @@ dnl ************************************ +@@ -338,14 +237,14 @@ dnl ************************************ AC_DEFUN([AC_HAVE_SASL_CALLBACK_FT], [AC_CACHE_CHECK(for sasl_callback_ft, ac_cv_has_sasl_callback_ft, [ @@ -225,7 +177,7 @@ Index: configure.ac ac_cv_has_sasl_callback_ft=yes ],[ ac_cv_has_sasl_callback_ft=no -@@ -335,18 +185,15 @@ AC_DEFUN([AC_C_DETECT_UINT64_SUPPORT], +@@ -367,18 +266,15 @@ AC_DEFUN([AC_C_DETECT_UINT64_SUPPORT], [ AC_CACHE_CHECK([for print macros for integers (C99 section 7.8.1)], [ac_cv_c_uint64_support], @@ -247,7 +199,7 @@ Index: configure.ac ]) ]) -@@ -365,12 +212,12 @@ dnl Check if the type socklen_t is defin +@@ -397,12 +293,12 @@ dnl Check if the type socklen_t is defin AC_DEFUN([AC_C_SOCKLEN_T], [AC_CACHE_CHECK(for socklen_t, ac_cv_c_socklen_t, [ @@ -263,7 +215,7 @@ Index: configure.ac ac_cv_c_socklen_t=yes ],[ ac_cv_c_socklen_t=no -@@ -409,35 +256,6 @@ fi +@@ -441,35 +337,6 @@ fi AC_C_ENDIAN @@ -299,7 +251,7 @@ Index: configure.ac AC_CHECK_FUNCS(mlockall) AC_CHECK_FUNCS(getpagesizes) -@@ -484,13 +302,13 @@ dnl These were added in 4.1.2, but 32bit +@@ -526,13 +393,13 @@ dnl These were added in 4.1.2, but 32bit dnl lacks testable defines. have_gcc_atomics=no AC_MSG_CHECKING(for GCC atomics) @@ -316,7 +268,7 @@ Index: configure.ac AC_MSG_RESULT($have_gcc_atomics) dnl Check for the requirements for running memcached with less privileges -@@ -527,29 +345,5 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS], +@@ -569,29 +436,5 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS], [test "x$enable_docs" != "xno" -a "x$XML2RFC" != "xno" -a "x$XSLTPROC" != "xno"]) @@ -348,8 +300,8 @@ Index: configure.ac AC_OUTPUT Index: Makefile.am =================================================================== ---- Makefile.am.orig -+++ Makefile.am +--- Makefile.am.orig 2014-06-16 18:19:32.036988018 +0200 ++++ Makefile.am 2014-06-16 18:19:56.080987975 +0200 @@ -1,3 +1,6 @@ +AM_CFLAGS = -pthread -Wall -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls +AM_CPPFLAGS = -include $(top_builddir)/config.h @@ -357,7 +309,7 @@ Index: Makefile.am bin_PROGRAMS = memcached pkginclude_HEADERS = protocol_binary.h noinst_PROGRAMS = memcached-debug sizes testapp timedrun -@@ -32,11 +35,12 @@ memcached_SOURCES += sasl_defs.c +@@ -34,11 +37,12 @@ memcached_SOURCES += sasl_defs.c endif memcached_debug_SOURCES = $(memcached_SOURCES) diff --git a/memcached.changes b/memcached.changes index fe1cf7c..d135c62 100644 --- a/memcached.changes +++ b/memcached.changes @@ -1,3 +1,83 @@ +------------------------------------------------------------------- +Mon Jun 16 16:27:47 UTC 2014 - mrueckert@suse.de + +- update to 1.4.20 + - Fix a race condition causing new connections to appear closed, + causing an inifinte loop. +- additional changes from 1.4.19 + - Fix endianness detection during configure. + - Fixes a performance regression with binary protocol (up to + 20%) + - Fix rare segfault in incr/decr. + - disable tail_repair_time by default. + - Likely not needed anymore, and can rarely cause bugs. + - use the right hashpower for the item_locks table. Small perf + improvement. + - Fix crash for LRU crawler while using lock elision (haswell+ + processors) +- additional changes from 1.4.18 + - Fixes + - fix LRU contention for first minute of uptime + - This made some synthetic benchmarks look awful. + - Make hash table algorithm selectable + - Don't lose item_size_max units in command line + - Add a "stats conns" command to show the states of open + connections. + - Allow caller-specific error text in binary protocol + - Stop returning ASCII error messages to binary clients + - Fix reference leak in binary protocol "get" and "touch" + handlers + - Fix reference leak in process_get_command() + - New Features + - New "stats conns" command, which will show you what currently + open connections are up to, how idle they've been, etc. + - The jenkins hash was getting a little long in the tooth, and + we might want to add specific hash algorithms for different + platforms in the future. This makes it selectable in some + sense. We've initially added murmur3 hash to the lineup and + that seems to run a tiny bit faster in some tests. -o + hash_algorithm=murmur3 + - A new background thread emerges! Currently experimental, so + the syntax might change. If you run into bugs please let us + know (though it's been testing fine in torture tests so far). +- additional changes from 1.4.17 + - Fixes + - Fix potential segfault in incr/decr routine. + - Fix potential unbounded key prints (leading to crashes in + logging code) + - Fix bug which allowed invalid SASL credentials to + authenticate. + - Fix udp mode when listening on ipv6 addresses. + - Fix for incorrect length of initial value set via binary + increment protocol. + - New Features + - Add linux accept4() support. Removes one syscall for each new + tcp connection + - scripts/memcached-tool gets "settings" and "sizes" commands. + - Add parameter (-F) to disable flush_all. Useful if you never + want to be able to run a full cache flush on production + instances. +- additional changes from 1.4.16 + - Fixes + - Builds on OS X Mavericks (with clang) + - Add statistics for allocation failures + - Issue 294 : Check for allocation failure + - Make tail leak expiry time configurable (-o + tail_repair_time=60) + - Fix segfault on specially crafted packet. + - Close connection on update_event error while parsing new + commands + - Don't truncate maxbytes stat from 'stats settings' + - Add the "shutdown" command to the server. This allows for + better + - automation + - fix enable-sasl-pwdb + - New Features + Adjusting tail repair time: -o tail_repair_time=60 (in seconds) +- dropped memcached-1.4.x_delete_verbose_mode_dos.patch: + included upstream +- freshed memcached-autofoo.patch + ------------------------------------------------------------------- Tue Jan 15 11:44:05 UTC 2013 - mrueckert@suse.de diff --git a/memcached.spec b/memcached.spec index d490d0e..f7947fc 100644 --- a/memcached.spec +++ b/memcached.spec @@ -21,7 +21,7 @@ %endif Name: memcached -Version: 1.4.15 +Version: 1.4.20 Release: 0 %define pkg_name memcached %define pkg_version %{version} @@ -52,7 +52,6 @@ Source4: memcached.service Patch0: memcached-1.4.5.dif Patch1: memcached-autofoo.patch Patch2: memcached-use-endian_h.patch -Patch3: memcached-1.4.x_delete_verbose_mode_dos.patch # Summary: A high-performance, distributed memory object caching system License: BSD-3-Clause @@ -78,7 +77,6 @@ miss. %patch0 %patch1 %patch2 -%patch3 -p1 %build autoreconf -fiv