Accepting request 112310 from network:utilities

update to 1.4.13 (forwarded request 112305 from tabraham1)

OBS-URL: https://build.opensuse.org/request/show/112310
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/memcached?expand=0&rev=18
This commit is contained in:
Stephan Kulow 2012-04-03 15:39:18 +00:00 committed by Git OBS Bridge
commit 5dece46cb1
6 changed files with 135 additions and 53 deletions

View File

@ -1,40 +0,0 @@
diff -rdBu memcached-1.4.0-rc1/memcached.h memcached-1.4.0-my/memcached.h
--- memcached-1.4.0-rc1/memcached.h 2009-05-29 00:51:56.000000000 +0400
+++ memcached-1.4.0-my/memcached.h 2009-06-07 22:32:52.000000000 +0400
@@ -75,21 +75,21 @@
/* warning: don't use these macros with a function, as it evals its arg twice */
#define ITEM_get_cas(i) ((uint64_t)(((i)->it_flags & ITEM_CAS) ? \
- *(uint64_t*)&((i)->end[0]) : 0x0))
+ *(uint64_t*)((char*)(i) + sizeof(*i)) : 0x0))
#define ITEM_set_cas(i,v) { if ((i)->it_flags & ITEM_CAS) { \
- *(uint64_t*)&((i)->end[0]) = v; } }
+ *(uint64_t*)((char*)(i) + sizeof(*i)) = v; } }
-#define ITEM_key(item) (((char*)&((item)->end[0])) \
+#define ITEM_key(item) ((char*)(item) + sizeof(*item) \
+ (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-#define ITEM_suffix(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
+#define ITEM_suffix(item) ((char*)(item) + sizeof(*item) + (item)->nkey + 1 \
+ (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-#define ITEM_data(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
+#define ITEM_data(item) ((char*)(item) + sizeof(*item) + (item)->nkey + 1 \
+ (item)->nsuffix \
+ (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-#define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + 1 \
+#define ITEM_ntotal(item) (sizeof(*item) + (item)->nkey + 1 \
+ (item)->nsuffix + (item)->nbytes \
+ (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
@@ -285,7 +285,6 @@
uint8_t it_flags; /* ITEM_* above */
uint8_t slabs_clsid;/* which slab class we're in */
uint8_t nkey; /* key length, w/terminating null and padding */
- void * end[];
/* if it_flags & ITEM_CAS we have 8 bytes CAS */
/* then null-terminated key */
/* then " flags length\r\n" (no terminating null) */

3
memcached-1.4.13.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:335ccd7904dea31b1884438f70ad650df6e38e9e368e975226435e447884ec69
size 270674

View File

@ -1,6 +1,6 @@
--- memcached.c
+++ memcached.c 2010/05/06 11:40:56
@@ -2335,15 +2335,18 @@
--- memcached.c.orig 2012-04-02 20:24:27.715193171 -0400
+++ memcached.c 2012-04-02 20:27:08.442183805 -0400
@@ -2498,15 +2498,19 @@
inline static void process_stats_detail(conn *c, const char *command) {
assert(c != NULL);
@ -8,6 +8,7 @@
+ char on[] = "on";
+ char off[] = "off";
+ char dump[] = "dump";
+
+ if (strcmp(command, on) == 0) {
settings.detail_enabled = 1;
out_string(c, "OK");

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fa96149dce1c606d89853b86d9ee332d69bade7878b7d9804f425bd3e071d12
size 251814

View File

@ -1,3 +1,126 @@
-------------------------------------------------------------------
Tue Apr 3 00:54:39 UTC 2012 - tabraham@novell.com
- removed fix-strict-aliasing.patch deprecated by this release
- Update to version 1.4.13
* Fix inline issue with older compilers (gcc 4.2.2)
* Better detection of sasl_callback_ft
- Changes from version 1.4.12
Fixes:
* fix glitch with flush_all (exptime)
* Skip SASL tests unless RUN_SASL_TESTS is defined.
* Look around for saslpasswd2 (typically not in the user's path).
* build fix: Define sasl_callback_ft on older versions of sasl.
* fix segfault when sending a zero byte command
* fix warning in UDP test
* properly detect GCC atomics
* tests: loop on short binary packet reads
* fix slabs_reassign tests on 32bit hosts
- Changes from version 1.4.11
Fixes:
* bug237 : Don't compute incorrect argc for timedrun
* fix 'age' stat for stats items
* binary deletes were not ticking stats counters
* Fix a race condition from 1.4.10 on item_remove
* close some idiotic race conditions
* initial slab automover
* slab reassignment
* clean do_item_get logic a bit. fix race.
* clean up the do_item_alloc logic
* shorten lock for item allocation more
* Fix to build with cyrus sasl 2.1.25
New features:
* Slab page reassignment and bug fixes over 1.4.10.
- Changes from version 1.4.10
Fixes:
* Disable issue 140 's test.
* Push cache_lock deeper into item_alloc
* Use item partitioned lock for as much as possible
* Remove the depth search from item_alloc
* Move hash calls outside of cache_lock
* Use spinlocks for main cache lock
* Remove uncommon branch from asciiprot hot path
* Allow all tests to run as root
New features:
* tested improvements in speed between 3 and 6 worker
threads (-t 3 to -t 6) More than 6 reduced speed
- Changes from version 1.4.9
* Add a systemd service file
* Fix some minor typos in the protocol doc
* Issue 224 - check retval of main event loop
* Fix -c so maxconns can be raised above default.
- Changes from version 1.4.8
Fixes:
* Fix to write correct pid from start-memcached
* Fix to enable LRU when using binary protocol
* Upgrade stats items counters to 64bit
* Add new stats expired_unfetched, evicted_unfetched
* Allow setting initial size of the hash table
* Expose stats for the internal hash table
* bug220 : incr would sometimes return the previous item's CAS
* Fixed bug on multi get processing
* Experimental maxconns_fast option
* Add an ASCII touch command
* Add binary GATK/GATKQ
* Backport binary TOUCH/GAT/GATQ commands
* Issue 221 : Increment treats leading spaces as 0
* Fix compile error on OS X
New features:
* touch commands
* fast connection limit handling
* internal hash table
* expored_unfetched, evicted_unfetched
- Changes from version 1.4.7
Fixes:
* Use a monotonically increasing timer
* Immediately expire items when given a negative expiration time
* fix memcached-tool to print about all slabs
* Properly daemonize memcached for debian
* Don't permanently close UDP listeners on error
* Allow memcached-init to start multiple instances (not recommended)
* Issue 214 : Search for network libraries before searching for libevent
* Issue 213 : Search for clock_gettime in librt
* Issue 115 : accont for CAS in item_size_ok
* Fix incredibly slim race for maxconns handler. Should no longer hang ever
* Issue 183 - Reclaim items dead by flush_all
* Issue 200 : Don't fire dtrace probe as the last thing in a function
New features:
* monotonic clock
- Changes from version 1.4.6
* Gcc on Solaris sparc wants -R and not -rpath
* Issue 121 : Set the runtime path when --with-libevent is used
* Fix autogen failure when unable to find supported command.
* fix race crash for accepting new connections
* fix incr/decr race conditions for binary prot
* fix incr/decr race conditions for ASCII prot
* Compile fix (-Werror=unused-but-set-variable warnings)
* Bind each UDP socket to an a single worker thread in multiport env
* Add support for using multiple ports
* Issue 154 : pid file out of sync (created before socket binding)
* Issue 163 : Buggy mem_requested values
* Fix cross compilation issues in configure
* Issue 140 - Fix age for items stats
* Issue 131 - ChangeLog is outdated
* Issue 155 : bind to multiple interface
* Issue 161 incorrect allocation in cache_create
* Fix type-punning issues exposed with GCC 4.5.1
* Simplify stats aggregation code
* Reverse backward expected/actual params in test
* Issue 152 : Fix error message from mget
* Refuse to start if we detect libevent 1.12
* Fix compilation issue on Solaris 9 wrt isspace() macro - Resolves
issue 111
New features:
* multiple port binding
-------------------------------------------------------------------
Fri May 27 12:41:52 UTC 2011 - coolo@novell.com

View File

@ -1,7 +1,7 @@
#
# spec file for package memcached
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,8 +19,8 @@
Name: memcached
Version: 1.4.5
Release: 7
Version: 1.4.13
Release: 0
%define pkg_name memcached
%define pkg_version %{version}
#
@ -44,8 +44,7 @@ Source1: %{pkg_name}.init
Source2: %{pkg_name}.sysconfig
Source3: memcached-rpmlintrc
#
Patch0: fix-strict-aliasing.patch
Patch1: memcached-1.4.5.dif
Patch0: memcached-1.4.5.dif
#
Summary: A high-performance, distributed memory object caching system
@ -64,8 +63,7 @@ miss.
%prep
%setup -n %{pkg_name}-%{pkg_version}
%patch0 -p1
%patch1
%patch0
%build
export CFLAGS="%{optflags} -g"