memcached/memcached.patch

Thu, 04 Oct 2012 20:30:05 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 04 Oct 2012 20:30:05 +0200
changeset 715
c10fb90893b9
parent 379
5974eb964eec
permissions
-rw-r--r--

Correct out of date build configuration, porting to Solaris 11 network
link infrastructure and new libpcap logic. This additionally allows for
device drivers in subdirectories of /dev. Correct packaged nmap
personalities and signatures to work out of the box. Finally, hack
arpd logic to properly close sockets and quit on TERM by repeating
signaling in the run command script. Sadly, all this fails to correct
the run time behaviour of honeyd which fails to bind to the IP layer.

     1 Index: libmemcached-1.0.10/Makefile.in
     2 --- libmemcached-1.0.10/Makefile.in.orig	2012-07-31 07:05:24.000000000 +0200
     3 +++ libmemcached-1.0.10/Makefile.in	2012-08-01 18:22:44.000000000 +0200
     4 @@ -868,7 +868,7 @@
     5  @BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memaslap$(EXEEXT)
     6  @HAVE_LIBEVENT_TRUE@am__EXEEXT_2 = example/memcached_light$(EXEEXT)
     7  @HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = memcached/memcached$(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.10/support/libmemcached.pc.in
    14 --- libmemcached-1.0.10/support/libmemcached.pc.in.orig	2012-07-31 07:04:00.000000000 +0200
    15 +++ libmemcached-1.0.10/support/libmemcached.pc.in	2012-08-01 17:56:52.000000000 +0200
    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.14/configure
    22 --- memcached-1.4.14/configure.orig	2012-07-30 22:56:58.000000000 +0200
    23 +++ memcached-1.4.14/configure	2012-08-01 17:56:52.000000000 +0200
    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.14/sasl_defs.c
    33 --- memcached-1.4.14/sasl_defs.c.orig	2012-02-02 07:01:29.000000000 +0100
    34 +++ memcached-1.4.14/sasl_defs.c	2012-08-01 17:56:52.000000000 +0200
    35 @@ -148,7 +148,7 @@
    36     { SASL_CB_SERVER_USERDB_CHECKPASS, sasl_server_userdb_checkpass, NULL },
    37  #endif
    39 -   { SASL_CB_LOG, (sasl_callback_ft)sasl_log, NULL },
    40 +   { SASL_CB_LOG, sasl_log, NULL },
    42  #ifdef HAVE_SASL_CB_GETCONF
    43     { SASL_CB_GETCONF, sasl_getconf, NULL },
    44 Index: memcached-1.4.14/thread.c
    45 --- memcached-1.4.14/thread.c.orig	2012-07-30 22:28:21.000000000 +0200
    46 +++ memcached-1.4.14/thread.c	2012-08-01 17:56:52.000000000 +0200
    47 @@ -703,6 +703,7 @@
    48          perror("Can't allocate thread descriptors");
    49          exit(1);
    50      }
    51 +    memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads);
    53      dispatcher_thread.base = main_base;
    54      dispatcher_thread.thread_id = pthread_self();

mercurial