OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 03-May-2009 19:41:49 Branch: HEAD Handle: 2009050318414900 Modified files: openpkg-src/memcached memcached.patch memcached.spec Log: modifying package: memcached-1.3.0 20090416 -> 20090503 Summary: Revision Changes Path 1.27 +35 -14 openpkg-src/memcached/memcached.patch 1.63 +2 -2 openpkg-src/memcached/memcached.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/memcached/memcached.patch ============================================================================ $ cvs diff -u -r1.26 -r1.27 memcached.patch --- openpkg-src/memcached/memcached.patch 16 Apr 2009 06:04:37 -0000 1.26 +++ openpkg-src/memcached/memcached.patch 3 May 2009 17:41:49 -0000 1.27 @@ -1,15 +1,16 @@ -Index: Cache-Memcached-1.24/Makefile.PL ---- Cache-Memcached-1.24/Makefile.PL.orig 2009-01-30 08:59:11 +0100 -+++ Cache-Memcached-1.24/Makefile.PL 2009-01-30 08:59:11 +0100 -@@ -11,3 +11,4 @@ - AUTHOR => 'Brad Fitzpatrick <b...@danga.com>') : ()), - ); - -+ Index: libmemcached-0.28/configure ---- libmemcached-0.28/configure.orig 2009-01-29 22:06:18 +0100 -+++ libmemcached-0.28/configure 2009-01-30 09:01:27 +0100 -@@ -21285,14 +21285,14 @@ +--- libmemcached-0.28/configure.orig 2009-04-15 03:56:46 +0200 ++++ libmemcached-0.28/configure 2009-05-03 19:32:12 +0200 +@@ -21054,7 +21054,7 @@ + + { $as_echo "$as_me:$LINENO: result: $have_htoll" >&5 + $as_echo "$have_htoll" >&6; } +- if test "x$have_htoll" == "xno"; then ++ if test "x$have_htoll" = "xno"; then + BUILD_BYTEORDER_TRUE= + BUILD_BYTEORDER_FALSE='#' + else +@@ -21395,14 +21395,14 @@ MEMC_BINARY="$withval" fi @@ -26,9 +27,18 @@ then MEMC_BINARY=memcached fi +@@ -21454,7 +21454,7 @@ + fi + + +-if test x$MEMC_BINARY == "xno" ++if test x$MEMC_BINARY = "xno" + then + { { $as_echo "$as_me:$LINENO: error: \"could not find memcached binary\"" >&5 + $as_echo "$as_me: error: \"could not find memcached binary\"" >&2;} Index: libmemcached-0.28/libmemcached/memcached.h ---- libmemcached-0.28/libmemcached/memcached.h.orig 2009-01-29 21:29:50 +0100 -+++ libmemcached-0.28/libmemcached/memcached.h 2009-01-30 08:59:04 +0100 +--- libmemcached-0.28/libmemcached/memcached.h.orig 2009-04-15 03:56:22 +0200 ++++ libmemcached-0.28/libmemcached/memcached.h 2009-05-03 19:30:01 +0200 @@ -10,6 +10,7 @@ #ifndef __MEMCACHED_H__ #define __MEMCACHED_H__ @@ -39,7 +49,7 @@ #if !defined(__cplusplus) Index: memcached-1.3.0/memcached.h --- memcached-1.3.0/memcached.h.orig 2008-03-30 10:40:44 +0200 -+++ memcached-1.3.0/memcached.h 2009-01-30 08:59:04 +0100 ++++ memcached-1.3.0/memcached.h 2009-05-03 19:30:01 +0200 @@ -8,6 +8,7 @@ #include <sys/types.h> #include <sys/socket.h> @@ -48,3 +58,14 @@ #include <netinet/in.h> #include <event.h> #include <netdb.h> +Index: memcached-1.3.0/thread.c +--- memcached-1.3.0/thread.c.orig 2008-03-30 10:40:44 +0200 ++++ memcached-1.3.0/thread.c 2009-05-03 19:30:01 +0200 +@@ -641,6 +641,7 @@ + perror("Can't allocate thread descriptors"); + exit(1); + } ++ memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads); + + threads[0].base = main_base; + threads[0].thread_id = pthread_self(); @@ . patch -p0 <<'@@ .' Index: openpkg-src/memcached/memcached.spec ============================================================================ $ cvs diff -u -r1.62 -r1.63 memcached.spec --- openpkg-src/memcached/memcached.spec 18 Apr 2009 13:12:42 -0000 1.62 +++ openpkg-src/memcached/memcached.spec 3 May 2009 17:41:49 -0000 1.63 @@ -25,7 +25,7 @@ %define V_memcached 1.3.0 %define V_libmemcache 1.4.0.rc2 %define V_libmemcached 0.28 -%define V_cache_memcached 1.24 +%define V_cache_memcached 1.25 # package information Name: memcached @@ -38,7 +38,7 @@ Group: System License: GPL Version: %{V_memcached} -Release: 20090416 +Release: 20090503 # list of sources Source0: http://www.danga.com/memcached/dist/memcached-%{V_memcached}.tar.gz @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org