|
|
@@ -1,18 +1,18 @@
|
|
|
-Index: libmemcached-1.0.13/Makefile.in
|
|
|
---- libmemcached-1.0.13/Makefile.in.orig 2012-09-19 08:55:01.000000000 +0200
|
|
|
-+++ libmemcached-1.0.13/Makefile.in 2012-09-20 20:52:20.000000000 +0200
|
|
|
-@@ -864,7 +864,7 @@
|
|
|
- $(LDFLAGS) -o $@
|
|
|
+Index: libmemcached-1.0.14/Makefile.in
|
|
|
+--- libmemcached-1.0.14/Makefile.in.orig 2012-11-14 17:38:50.000000000 +0100
|
|
|
++++ libmemcached-1.0.14/Makefile.in 2012-11-17 10:47:34.000000000 +0100
|
|
|
+@@ -1014,7 +1014,7 @@
|
|
|
@BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memaslap$(EXEEXT)
|
|
|
- @HAVE_LIBEVENT_TRUE@am__EXEEXT_2 = example/memcached_light$(EXEEXT)
|
|
|
+ @BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__EXEEXT_2 = example/t/memcached_light$(EXEEXT)
|
|
|
+ @BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = example/memcached_light$(EXEEXT)
|
|
|
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
|
|
|
+PROGRAMS = $(bin_PROGRAMS)
|
|
|
am_clients_memaslap_OBJECTS = clients/memaslap.$(OBJEXT) \
|
|
|
clients/ms_conn.$(OBJEXT) clients/ms_setting.$(OBJEXT) \
|
|
|
clients/ms_sigsegv.$(OBJEXT) clients/ms_stats.$(OBJEXT) \
|
|
|
-Index: libmemcached-1.0.13/support/libmemcached.pc.in
|
|
|
---- libmemcached-1.0.13/support/libmemcached.pc.in.orig 2012-09-19 08:54:12.000000000 +0200
|
|
|
-+++ libmemcached-1.0.13/support/libmemcached.pc.in 2012-09-20 20:52:01.000000000 +0200
|
|
|
+Index: libmemcached-1.0.14/support/libmemcached.pc.in
|
|
|
+--- libmemcached-1.0.14/support/libmemcached.pc.in.orig 2012-10-20 11:00:09.000000000 +0200
|
|
|
++++ libmemcached-1.0.14/support/libmemcached.pc.in 2012-11-17 10:45:47.000000000 +0100
|
|
|
@@ -9,3 +9,4 @@
|
|
|
Version: @VERSION@
|
|
|
Libs: -L${libdir} -lmemcached -lmemcachedutil
|
|
|
@@ -20,7 +20,7 @@ Index: libmemcached-1.0.13/support/libmemcached.pc.in
|
|
|
+Requires: libevent sasl
|
|
|
Index: memcached-1.4.15/configure
|
|
|
--- memcached-1.4.15/configure.orig 2012-09-04 02:13:01.000000000 +0200
|
|
|
-+++ memcached-1.4.15/configure 2012-09-20 20:52:01.000000000 +0200
|
|
|
++++ memcached-1.4.15/configure 2012-11-17 10:45:47.000000000 +0100
|
|
|
@@ -6261,7 +6261,6 @@
|
|
|
elif test "$GCC" = "yes"
|
|
|
then
|
|
|
@@ -31,7 +31,7 @@ Index: memcached-1.4.15/configure
|
|
|
CFLAGS="$CFLAGS -fno-strict-aliasing"
|
|
|
Index: memcached-1.4.15/sasl_defs.c
|
|
|
--- memcached-1.4.15/sasl_defs.c.orig 2012-02-02 07:01:29.000000000 +0100
|
|
|
-+++ memcached-1.4.15/sasl_defs.c 2012-09-20 20:52:01.000000000 +0200
|
|
|
++++ memcached-1.4.15/sasl_defs.c 2012-11-17 10:45:47.000000000 +0100
|
|
|
@@ -148,7 +148,7 @@
|
|
|
{ SASL_CB_SERVER_USERDB_CHECKPASS, sasl_server_userdb_checkpass, NULL },
|
|
|
#endif
|
|
|
@@ -43,7 +43,7 @@ Index: memcached-1.4.15/sasl_defs.c
|
|
|
{ SASL_CB_GETCONF, sasl_getconf, NULL },
|
|
|
Index: memcached-1.4.15/thread.c
|
|
|
--- memcached-1.4.15/thread.c.orig 2012-09-03 20:23:23.000000000 +0200
|
|
|
-+++ memcached-1.4.15/thread.c 2012-09-20 20:52:01.000000000 +0200
|
|
|
++++ memcached-1.4.15/thread.c 2012-11-17 10:45:47.000000000 +0100
|
|
|
@@ -812,6 +812,7 @@
|
|
|
perror("Can't allocate thread descriptors");
|
|
|
exit(1);
|
