memcached.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  1. Index: libmemcached-1.0.15/Makefile.in
  2. --- libmemcached-1.0.15/Makefile.in.orig 2012-12-18 05:30:21.000000000 +0100
  3. +++ libmemcached-1.0.15/Makefile.in 2012-12-18 21:37:14.000000000 +0100
  4. @@ -924,7 +924,7 @@
  5. @HAVE_DTRACE_FALSE@am__EXEEXT_3 = \
  6. @HAVE_DTRACE_FALSE@ tests/libmemcached-1.0/internals$(EXEEXT)
  7. @BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_4 = example/memcached_light$(EXEEXT)
  8. -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
  9. +PROGRAMS = $(bin_PROGRAMS)
  10. am_clients_memaslap_OBJECTS = clients/memaslap.$(OBJEXT) \
  11. clients/ms_conn.$(OBJEXT) clients/ms_setting.$(OBJEXT) \
  12. clients/ms_sigsegv.$(OBJEXT) clients/ms_stats.$(OBJEXT) \
  13. Index: libmemcached-1.0.15/support/libmemcached.pc.in
  14. --- libmemcached-1.0.15/support/libmemcached.pc.in.orig 2012-10-20 11:00:09.000000000 +0200
  15. +++ libmemcached-1.0.15/support/libmemcached.pc.in 2012-12-18 21:07:47.000000000 +0100
  16. @@ -9,3 +9,4 @@
  17. Version: @VERSION@
  18. Libs: -L${libdir} -lmemcached -lmemcachedutil
  19. Cflags: -I${includedir}
  20. +Requires: libevent sasl
  21. Index: memcached-1.4.15/configure
  22. --- memcached-1.4.15/configure.orig 2012-09-04 02:13:01.000000000 +0200
  23. +++ memcached-1.4.15/configure 2012-12-18 21:07:47.000000000 +0100
  24. @@ -6261,7 +6261,6 @@
  25. elif test "$GCC" = "yes"
  26. then
  27. GCC_VERSION=`$CC -dumpversion`
  28. - CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
  29. case $GCC_VERSION in
  30. 4.4.*)
  31. CFLAGS="$CFLAGS -fno-strict-aliasing"
  32. Index: memcached-1.4.15/sasl_defs.c
  33. --- memcached-1.4.15/sasl_defs.c.orig 2012-02-02 07:01:29.000000000 +0100
  34. +++ memcached-1.4.15/sasl_defs.c 2012-12-18 21:07:47.000000000 +0100
  35. @@ -148,7 +148,7 @@
  36. { SASL_CB_SERVER_USERDB_CHECKPASS, sasl_server_userdb_checkpass, NULL },
  37. #endif
  38. - { SASL_CB_LOG, (sasl_callback_ft)sasl_log, NULL },
  39. + { SASL_CB_LOG, sasl_log, NULL },
  40. #ifdef HAVE_SASL_CB_GETCONF
  41. { SASL_CB_GETCONF, sasl_getconf, NULL },
  42. Index: memcached-1.4.15/thread.c
  43. --- memcached-1.4.15/thread.c.orig 2012-09-03 20:23:23.000000000 +0200
  44. +++ memcached-1.4.15/thread.c 2012-12-18 21:07:47.000000000 +0100
  45. @@ -812,6 +812,7 @@
  46. perror("Can't allocate thread descriptors");
  47. exit(1);
  48. }
  49. + memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads);
  50. dispatcher_thread.base = main_base;
  51. dispatcher_thread.thread_id = pthread_self();