Hello community, here is the log from the commit of package memcached for openSUSE:Factory checked in at Tue Jun 22 16:34:54 CEST 2010. -------- --- memcached/memcached.changes 2009-06-05 15:26:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/memcached/memcached.changes 2010-05-06 14:10:49.000000000 +0200 @@ -1,0 +2,16 @@ +Thu May 6 12:03:59 UTC 2010 - freitag@novell.com + +- update to version 1.4.5: +This is a maintenance release with some build fixes, doc fixes, and one new stat. +Fixes: + * Properly detect CPU alignment on ARM. bug100 + * Remove 1MB assertion. bug 119 + * More automake versions supported. + * Compiler warning fixes for OpenBSD. + * potential buffer overflow in vperror + * Report errors opening pidfiles using vperror +New Features:: + * New stat: reclaimed + * sasl_pwdb for more simple auth deployments + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- memcached-1.2.8.tar.bz2 New: ---- fix-strict-aliasing.patch memcached-1.4.5.dif memcached-1.4.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ memcached.spec ++++++ --- /var/tmp/diff_new_pack.PZ7ctV/_old 2010-06-22 16:33:55.000000000 +0200 +++ /var/tmp/diff_new_pack.PZ7ctV/_new 2010-06-22 16:33:55.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package memcached (Version 1.2.8) +# spec file for package memcached (Version 1.4.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,12 +19,12 @@ Name: memcached -Version: 1.2.8 +Version: 1.4.5 Release: 1 %define pkg_name memcached %define pkg_version %{version} # -License: BSD 3-Clause +License: BSD3c Group: Productivity/Networking/Other # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,13 +37,16 @@ Conflicts: memcached-unstable %define home_dir /var/lib/%{pkg_name} # -Url: http://www.danga.com/memcached/ -# http://www.danga.com/memcached/dist/%{pkg_name}-%{pkg_version}.tar.gz -Source: http://www.danga.com/memcached/dist/%{pkg_name}-%{pkg_version}.tar.bz2 +Url: http://memcached.org/ +# http://memcached.googlecode.com/files/memcached-1.4.5.tar.gz +Source: %{pkg_name}-%{pkg_version}.tar.bz2 Source1: %{pkg_name}.init Source2: %{pkg_name}.sysconfig Source3: memcached-rpmlintrc # +Patch0: fix-strict-aliasing.patch +Patch1: memcached-1.4.5.dif +# Summary: A high-performance, distributed memory object caching system %description @@ -67,6 +70,8 @@ %prep %setup -n %{pkg_name}-%{pkg_version} +%patch0 -p1 +%patch1 %build export CFLAGS="%{optflags} -g" @@ -103,13 +108,14 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README TODO doc/*.txt +%doc AUTHORS ChangeLog COPYING NEWS README doc/*.txt %{_sbindir}/%{pkg_name} -%{_sbindir}/%{pkg_name}-debug +# %{_sbindir}/%{pkg_name}-debug %{_sbindir}/memcached-tool %{_sbindir}/rc%{pkg_name} %{_mandir}/man1/%{pkg_name}.* %{_sysconfdir}/init.d/%{pkg_name} +%{_includedir}/%{pkg_name} /var/adm/fillup-templates/sysconfig.%{pkg_name} %dir %attr(755,root,root) %{home_dir} ++++++ fix-strict-aliasing.patch ++++++ 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) */ ++++++ memcached-1.4.5.dif ++++++ --- memcached.c +++ memcached.c 2010/05/06 11:40:56 @@ -2335,15 +2335,18 @@ inline static void process_stats_detail(conn *c, const char *command) { assert(c != NULL); - if (strcmp(command, "on") == 0) { + char on[] = "on"; + char off[] = "off"; + char dump[] = "dump"; + if (strcmp(command, on) == 0) { settings.detail_enabled = 1; out_string(c, "OK"); } - else if (strcmp(command, "off") == 0) { + else if (strcmp(command, off) == 0) { settings.detail_enabled = 0; out_string(c, "OK"); } - else if (strcmp(command, "dump") == 0) { + else if (strcmp(command, dump) == 0) { int len; char *stats = stats_prefix_dump(&len); write_and_free(c, stats, len); ++++++ memcached-1.2.8.tar.bz2 -> memcached-1.4.5.tar.bz2 ++++++ ++++ 28648 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org