memcached/memcached.patch@9fe04d4d4e5a (annotated)
memcached/memcached.patch
Mon, 17 Sep 2012 19:10:10 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 17 Sep 2012 19:10:10 +0200
- changeset 689
- 9fe04d4d4e5a
- parent 379
- 5974eb964eec
- permissions
- -rw-r--r--
Update to new version of vendor software although Oracle fails to deliver.
More specifically, newer db(3) patch revisions exist but Oracle has
removed them from the canonical download server URI for Berkely DB.
| michael@576 | 1 | Index: libmemcached-1.0.10/Makefile.in |
| michael@576 | 2 | --- libmemcached-1.0.10/Makefile.in.orig 2012-07-31 07:05:24.000000000 +0200 |
| michael@576 | 3 | +++ libmemcached-1.0.10/Makefile.in 2012-08-01 18:22:44.000000000 +0200 |
| michael@576 | 4 | @@ -868,7 +868,7 @@ |
| michael@576 | 5 | @BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memaslap$(EXEEXT) |
| michael@576 | 6 | @HAVE_LIBEVENT_TRUE@am__EXEEXT_2 = example/memcached_light$(EXEEXT) |
| michael@576 | 7 | @HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = memcached/memcached$(EXEEXT) |
| michael@576 | 8 | -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) |
| michael@576 | 9 | +PROGRAMS = $(bin_PROGRAMS) |
| michael@576 | 10 | am_clients_memaslap_OBJECTS = clients/memaslap.$(OBJEXT) \ |
| michael@576 | 11 | clients/ms_conn.$(OBJEXT) clients/ms_setting.$(OBJEXT) \ |
| michael@576 | 12 | clients/ms_sigsegv.$(OBJEXT) clients/ms_stats.$(OBJEXT) \ |
| michael@576 | 13 | Index: libmemcached-1.0.10/support/libmemcached.pc.in |
| michael@576 | 14 | --- libmemcached-1.0.10/support/libmemcached.pc.in.orig 2012-07-31 07:04:00.000000000 +0200 |
| michael@576 | 15 | +++ libmemcached-1.0.10/support/libmemcached.pc.in 2012-08-01 17:56:52.000000000 +0200 |
| michael@576 | 16 | @@ -9,3 +9,4 @@ |
| michael@378 | 17 | Version: @VERSION@ |
| michael@576 | 18 | Libs: -L${libdir} -lmemcached -lmemcachedutil |
| michael@378 | 19 | Cflags: -I${includedir} |
| michael@378 | 20 | +Requires: libevent sasl |
| michael@576 | 21 | Index: memcached-1.4.14/configure |
| michael@576 | 22 | --- memcached-1.4.14/configure.orig 2012-07-30 22:56:58.000000000 +0200 |
| michael@576 | 23 | +++ memcached-1.4.14/configure 2012-08-01 17:56:52.000000000 +0200 |
| michael@576 | 24 | @@ -6261,7 +6261,6 @@ |
| michael@378 | 25 | elif test "$GCC" = "yes" |
| michael@378 | 26 | then |
| michael@378 | 27 | GCC_VERSION=`$CC -dumpversion` |
| michael@378 | 28 | - CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" |
| michael@378 | 29 | case $GCC_VERSION in |
| michael@378 | 30 | 4.4.*) |
| michael@378 | 31 | CFLAGS="$CFLAGS -fno-strict-aliasing" |
| michael@576 | 32 | Index: memcached-1.4.14/sasl_defs.c |
| michael@576 | 33 | --- memcached-1.4.14/sasl_defs.c.orig 2012-02-02 07:01:29.000000000 +0100 |
| michael@576 | 34 | +++ memcached-1.4.14/sasl_defs.c 2012-08-01 17:56:52.000000000 +0200 |
| michael@576 | 35 | @@ -148,7 +148,7 @@ |
| michael@576 | 36 | { SASL_CB_SERVER_USERDB_CHECKPASS, sasl_server_userdb_checkpass, NULL }, |
| michael@576 | 37 | #endif |
| michael@576 | 38 | |
| michael@576 | 39 | - { SASL_CB_LOG, (sasl_callback_ft)sasl_log, NULL }, |
| michael@576 | 40 | + { SASL_CB_LOG, sasl_log, NULL }, |
| michael@576 | 41 | |
| michael@576 | 42 | #ifdef HAVE_SASL_CB_GETCONF |
| michael@576 | 43 | { SASL_CB_GETCONF, sasl_getconf, NULL }, |
| michael@576 | 44 | Index: memcached-1.4.14/thread.c |
| michael@576 | 45 | --- memcached-1.4.14/thread.c.orig 2012-07-30 22:28:21.000000000 +0200 |
| michael@576 | 46 | +++ memcached-1.4.14/thread.c 2012-08-01 17:56:52.000000000 +0200 |
| michael@576 | 47 | @@ -703,6 +703,7 @@ |
| michael@378 | 48 | perror("Can't allocate thread descriptors"); |
| michael@378 | 49 | exit(1); |
| michael@378 | 50 | } |
| michael@378 | 51 | + memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads); |
| michael@378 | 52 | |
| michael@378 | 53 | dispatcher_thread.base = main_base; |
| michael@378 | 54 | dispatcher_thread.thread_id = pthread_self(); |
