michael@576: Index: libmemcached-1.0.10/Makefile.in michael@576: --- libmemcached-1.0.10/Makefile.in.orig 2012-07-31 07:05:24.000000000 +0200 michael@576: +++ libmemcached-1.0.10/Makefile.in 2012-08-01 18:22:44.000000000 +0200 michael@576: @@ -868,7 +868,7 @@ michael@576: @BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memaslap$(EXEEXT) michael@576: @HAVE_LIBEVENT_TRUE@am__EXEEXT_2 = example/memcached_light$(EXEEXT) michael@576: @HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = memcached/memcached$(EXEEXT) michael@576: -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) michael@576: +PROGRAMS = $(bin_PROGRAMS) michael@576: am_clients_memaslap_OBJECTS = clients/memaslap.$(OBJEXT) \ michael@576: clients/ms_conn.$(OBJEXT) clients/ms_setting.$(OBJEXT) \ michael@576: clients/ms_sigsegv.$(OBJEXT) clients/ms_stats.$(OBJEXT) \ michael@576: Index: libmemcached-1.0.10/support/libmemcached.pc.in michael@576: --- libmemcached-1.0.10/support/libmemcached.pc.in.orig 2012-07-31 07:04:00.000000000 +0200 michael@576: +++ libmemcached-1.0.10/support/libmemcached.pc.in 2012-08-01 17:56:52.000000000 +0200 michael@576: @@ -9,3 +9,4 @@ michael@378: Version: @VERSION@ michael@576: Libs: -L${libdir} -lmemcached -lmemcachedutil michael@378: Cflags: -I${includedir} michael@378: +Requires: libevent sasl michael@576: Index: memcached-1.4.14/configure michael@576: --- memcached-1.4.14/configure.orig 2012-07-30 22:56:58.000000000 +0200 michael@576: +++ memcached-1.4.14/configure 2012-08-01 17:56:52.000000000 +0200 michael@576: @@ -6261,7 +6261,6 @@ michael@378: elif test "$GCC" = "yes" michael@378: then michael@378: GCC_VERSION=`$CC -dumpversion` michael@378: - CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" michael@378: case $GCC_VERSION in michael@378: 4.4.*) michael@378: CFLAGS="$CFLAGS -fno-strict-aliasing" michael@576: Index: memcached-1.4.14/sasl_defs.c michael@576: --- memcached-1.4.14/sasl_defs.c.orig 2012-02-02 07:01:29.000000000 +0100 michael@576: +++ memcached-1.4.14/sasl_defs.c 2012-08-01 17:56:52.000000000 +0200 michael@576: @@ -148,7 +148,7 @@ michael@576: { SASL_CB_SERVER_USERDB_CHECKPASS, sasl_server_userdb_checkpass, NULL }, michael@576: #endif michael@576: michael@576: - { SASL_CB_LOG, (sasl_callback_ft)sasl_log, NULL }, michael@576: + { SASL_CB_LOG, sasl_log, NULL }, michael@576: michael@576: #ifdef HAVE_SASL_CB_GETCONF michael@576: { SASL_CB_GETCONF, sasl_getconf, NULL }, michael@576: Index: memcached-1.4.14/thread.c michael@576: --- memcached-1.4.14/thread.c.orig 2012-07-30 22:28:21.000000000 +0200 michael@576: +++ memcached-1.4.14/thread.c 2012-08-01 17:56:52.000000000 +0200 michael@576: @@ -703,6 +703,7 @@ michael@378: perror("Can't allocate thread descriptors"); michael@378: exit(1); michael@378: } michael@378: + memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads); michael@378: michael@378: dispatcher_thread.base = main_base; michael@378: dispatcher_thread.thread_id = pthread_self();