1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/memcached/memcached.patch Wed Sep 21 14:10:37 2011 +0200
1.3 @@ -0,0 +1,77 @@
1.4 +Index: libmemcached-0.48/Makefile.in
1.5 +--- libmemcached-0.48/Makefile.in.orig 2011-03-16 04:40:31.000000000 +0100
1.6 ++++ libmemcached-0.48/Makefile.in 2011-03-18 18:43:52.000000000 +0100
1.7 +@@ -95,10 +95,7 @@
1.8 + clients/memerror$(EXEEXT) clients/memflush$(EXEEXT) \
1.9 + clients/memrm$(EXEEXT) clients/memstat$(EXEEXT) \
1.10 + $(am__EXEEXT_1)
1.11 +-noinst_PROGRAMS = tests/atomsmasher$(EXEEXT) tests/hashplus$(EXEEXT) \
1.12 +- tests/memplus$(EXEEXT) tests/startservers$(EXEEXT) \
1.13 +- tests/testapp$(EXEEXT) tests/testhashkit$(EXEEXT) \
1.14 +- tests/testplus$(EXEEXT) tests/testudp$(EXEEXT) $(am__EXEEXT_3)
1.15 ++noinst_PROGRAMS =
1.16 + check_PROGRAMS = $(am__EXEEXT_2)
1.17 + @BUILD_DOCS_TRUE@am__append_1 = test-docs
1.18 + DIST_COMMON = README $(am__configure_deps) \
1.19 +@@ -138,7 +135,7 @@
1.20 + @DTRACE_NEEDS_OBJECTS_TRUE@am__append_13 = libmemcached/libmemcached_probes.o
1.21 + @DTRACE_NEEDS_OBJECTS_TRUE@am__append_14 = libmemcached/libmemcached_probes.o
1.22 + @HAVE_SASL_TRUE@am__append_15 = $(LIBSASL)
1.23 +-@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_16 = clients/memslap
1.24 ++@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_16 =
1.25 + @BUILD_BYTEORDER_TRUE@am__append_17 = libmemcached/libbyteorder.la
1.26 + @INCLUDE_HSIEH_SRC_TRUE@am__append_18 = libhashkit/hsieh.c
1.27 + @INCLUDE_MURMUR_SRC_TRUE@am__append_19 = libhashkit/murmur.c
1.28 +@@ -409,7 +406,7 @@
1.29 + libtest_libtest_la_LIBADD =
1.30 + am_libtest_libtest_la_OBJECTS = libtest/test.lo
1.31 + libtest_libtest_la_OBJECTS = $(am_libtest_libtest_la_OBJECTS)
1.32 +-@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memslap$(EXEEXT)
1.33 ++@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 =
1.34 + @HAVE_LIBGTEST_TRUE@am__EXEEXT_2 = unittests/unittests$(EXEEXT)
1.35 + @HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = example/memcached_light$(EXEEXT)
1.36 + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
1.37 +Index: libmemcached-0.48/configure
1.38 +--- libmemcached-0.48/configure.orig 2011-03-16 04:40:33.000000000 +0100
1.39 ++++ libmemcached-0.48/configure 2011-03-18 18:43:13.000000000 +0100
1.40 +@@ -17719,8 +17719,8 @@
1.41 +
1.42 + fi
1.43 +
1.44 +- CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
1.45 +- CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
1.46 ++ CC_WARNINGS="${BASE_WARNINGS} ${CC_WARNINGS_FULL}"
1.47 ++ CXX_WARNINGS="${BASE_WARNINGS} -Wnon-virtual-dtor -Wno-long-long ${CXX_WARNINGS_FULL}"
1.48 +
1.49 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to use -Wmissing-declarations from C++" >&5
1.50 + $as_echo_n "checking whether it is safe to use -Wmissing-declarations from C++... " >&6; }
1.51 +Index: libmemcached-0.48/support/libmemcached.pc.in
1.52 +--- libmemcached-0.48/support/libmemcached.pc.in.orig 2011-02-22 05:06:22.000000000 +0100
1.53 ++++ libmemcached-0.48/support/libmemcached.pc.in 2011-03-18 18:43:13.000000000 +0100
1.54 +@@ -8,3 +8,4 @@
1.55 + Version: @VERSION@
1.56 + Libs: @LTLIBSASL@ @LTLIBSASL2@ -L${libdir} -lmemcached
1.57 + Cflags: -I${includedir}
1.58 ++Requires: libevent sasl
1.59 +Index: memcached-1.4.6/configure
1.60 +--- memcached-1.4.6/configure.orig 2010-04-03 23:26:12.000000000 +0200
1.61 ++++ memcached-1.4.6/configure 2011-03-18 18:43:13.000000000 +0100
1.62 +@@ -7914,7 +7914,6 @@
1.63 + elif test "$GCC" = "yes"
1.64 + then
1.65 + GCC_VERSION=`$CC -dumpversion`
1.66 +- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
1.67 + case $GCC_VERSION in
1.68 + 4.4.*)
1.69 + CFLAGS="$CFLAGS -fno-strict-aliasing"
1.70 +Index: memcached-1.4.6/thread.c
1.71 +--- memcached-1.4.6/thread.c.orig 2010-04-03 09:07:16.000000000 +0200
1.72 ++++ memcached-1.4.6/thread.c 2011-03-18 18:43:13.000000000 +0100
1.73 +@@ -602,6 +602,7 @@
1.74 + perror("Can't allocate thread descriptors");
1.75 + exit(1);
1.76 + }
1.77 ++ memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads);
1.78 +
1.79 + dispatcher_thread.base = main_base;
1.80 + dispatcher_thread.thread_id = pthread_self();
