Update to 1.4.20, ~2 years of development, Changelog available at https://code.google.com/p/memcached/wiki/ReleaseNotes Comments ? Ok ? Cheers Giovanni
Index: Makefile =================================================================== RCS file: /var/cvs/ports/misc/memcached/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile 5 Jan 2014 13:32:43 -0000 1.24 +++ Makefile 13 Jul 2014 22:09:54 -0000 @@ -2,8 +2,7 @@ COMMENT= distributed memory object caching system -DISTNAME= memcached-1.4.14 -REVISION= 1 +DISTNAME= memcached-1.4.20 CATEGORIES= misc HOMEPAGE= http://www.memcached.org/ @@ -13,8 +12,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB= c event pthread -MASTER_SITES= https://memcached.googlecode.com/files/ -MASTER_SITES0= ${HOMEPAGE}/dist/ +MASTER_SITES= http://memcached.org/files/ CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-libevent=/usr \ Index: distinfo =================================================================== RCS file: /var/cvs/ports/misc/memcached/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 29 Nov 2012 22:10:01 -0000 1.13 +++ distinfo 13 Jul 2014 22:09:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (memcached-1.4.14.tar.gz) = 8uKtjujSVvLDdI1/dB3N39Cra97Ob6HBhIToPzERVu8= -SIZE (memcached-1.4.14.tar.gz) = 321262 +SHA256 (memcached-1.4.20.tar.gz) = JdEhQI7tCxUiMI/zUggZsTDwS6BVTGimc68jqRWlQBg= +SIZE (memcached-1.4.20.tar.gz) = 337380 Index: patches/patch-configure =================================================================== RCS file: /var/cvs/ports/misc/memcached/patches/patch-configure,v retrieving revision 1.4 diff -u -p -r1.4 patch-configure --- patches/patch-configure 23 Aug 2012 17:51:22 -0000 1.4 +++ patches/patch-configure 13 Jul 2014 22:13:24 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.4 2012/08/23 17:51:22 ajacoutot Exp $ ---- configure.orig Thu Feb 2 21:24:20 2012 -+++ configure Fri Mar 30 21:27:25 2012 -@@ -6261,7 +6261,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h +--- configure.orig Sun May 11 09:38:24 2014 ++++ configure Mon Jul 14 00:10:07 2014 +@@ -6368,7 +6368,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h elif test "$GCC" = "yes" then GCC_VERSION=`$CC -dumpversion` Index: patches/patch-items_c =================================================================== RCS file: /var/cvs/ports/misc/memcached/patches/patch-items_c,v retrieving revision 1.6 diff -u -p -r1.6 patch-items_c --- patches/patch-items_c 5 Jan 2014 13:32:43 -0000 1.6 +++ patches/patch-items_c 13 Jul 2014 22:13:24 -0000 @@ -5,9 +5,9 @@ printf format string fix for long long t and fix buffer-overrun when logging keys (CVE-2013-0179) https://github.com/memcached/memcached/commit/fbe823d9a61b5149cd6e3b5e17bd28dd3b8dd760 ---- items.c.orig Mon Jul 30 22:23:37 2012 -+++ items.c Thu Jan 2 17:02:16 2014 -@@ -389,9 +389,9 @@ char *do_item_cachedump(const unsigned int slabs_clsid +--- items.c.orig Fri May 2 00:10:56 2014 ++++ items.c Mon Jul 14 00:10:07 2014 +@@ -410,9 +410,9 @@ char *do_item_cachedump(const unsigned int slabs_clsid /* Copy the key since it may not be null-terminated in the struct */ strncpy(key_temp, ITEM_key(it), it->nkey); key_temp[it->nkey] = 0x00; /* terminate */ @@ -19,23 +19,3 @@ https://github.com/memcached/memcached/c if (bufcurr + len + 6 > memlimit) /* 6 is END\r\n\0 */ break; memcpy(buffer + bufcurr, temp, len); -@@ -510,9 +510,17 @@ item *do_item_get(const char *key, const size_t nkey, - - if (settings.verbose > 2) { - if (it == NULL) { -- fprintf(stderr, "> NOT FOUND %s", key); -+ int ii; -+ fprintf(stderr, "> NOT FOUND "); -+ for (ii = 0; ii < nkey; ++ii) { -+ fprintf(stderr, "%c", key[ii]); -+ } - } else { -- fprintf(stderr, "> FOUND KEY %s", ITEM_key(it)); -+ int ii; -+ fprintf(stderr, "> FOUND KEY "); -+ for (ii = 0; ii < it->nkey; ++ii) { -+ fprintf(stderr, "%c", ITEM_key(it)[ii]); -+ } - was_found++; - } - } Index: patches/patch-memcached_c =================================================================== RCS file: patches/patch-memcached_c diff -N patches/patch-memcached_c --- patches/patch-memcached_c 5 Jan 2014 13:32:43 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ -$OpenBSD: patch-memcached_c,v 1.8 2014/01/05 13:32:43 jasper Exp $ - -buffer-overrun when logging keys (CVE-2013-0179) -https://github.com/memcached/memcached/commit/fbe823d9a61b5149cd6e3b5e17bd28dd3b8dd760 - -and fix segfault on specially crafted packet (CVE-2011-4971) -https://github.com/memcached/memcached/commit/6695ccbc525c36d693aaa3e8337b36aa0c784424 - ---- memcached.c.orig Mon Jul 30 22:26:47 2012 -+++ memcached.c Thu Jan 2 16:59:32 2014 -@@ -2149,7 +2149,12 @@ static void process_bin_delete(conn *c) { - assert(c != NULL); - - if (settings.verbose > 1) { -- fprintf(stderr, "Deleting %s\n", key); -+ int ii; -+ fprintf(stderr, "Deleting "); -+ for (ii = 0; ii < nkey; ++ii) { -+ fprintf(stderr, "%c", key[ii]); -+ } -+ fprintf(stderr, "\n"); - } - - if (settings.detail_enabled) { -@@ -3863,6 +3868,16 @@ static void drive_machine(conn *c) { - complete_nread(c); - break; - } -+ -+ /* Check if rbytes < 0, to prevent crash */ -+ if (c->rlbytes < 0) { -+ if (settings.verbose) { -+ fprintf(stderr, "Invalid rlbytes to read: len %d\n", c->rlbytes); -+ } -+ conn_set_state(c, conn_closing); -+ break; -+ } -+ - /* first check if we have leftovers in the conn_read buffer */ - if (c->rbytes > 0) { - int tocopy = c->rbytes > c->rlbytes ? c->rlbytes : c->rbytes; Index: patches/patch-t_issue_192_t =================================================================== RCS file: /var/cvs/ports/misc/memcached/patches/patch-t_issue_192_t,v retrieving revision 1.1 diff -u -p -r1.1 patch-t_issue_192_t --- patches/patch-t_issue_192_t 5 Jan 2014 13:32:43 -0000 1.1 +++ patches/patch-t_issue_192_t 13 Jul 2014 22:13:33 -0000 @@ -3,9 +3,12 @@ $OpenBSD: patch-t_issue_192_t,v 1.1 2014 Test case for CVE-2011-4971 https://github.com/memcached/memcached/commit/6695ccbc525c36d693aaa3e8337b36aa0c784424 ---- t/issue_192.t.orig Thu Jan 2 16:48:36 2014 -+++ t/issue_192.t Thu Jan 2 16:48:36 2014 -@@ -0,0 +1,20 @@ +--- t/issue_192.t.orig Mon Apr 28 07:51:18 2014 ++++ t/issue_192.t Mon Jul 14 00:10:07 2014 +@@ -18,3 +18,23 @@ ok($server->new_sock, "failed to open new socket"); + + + +#!/usr/bin/perl + +use strict; Index: pkg/PLIST =================================================================== RCS file: /var/cvs/ports/misc/memcached/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 25 Dec 2011 14:37:28 -0000 1.6 +++ pkg/PLIST 13 Jul 2014 22:17:47 -0000 @@ -8,4 +8,5 @@ include/memcached/protocol_binary.h share/doc/memcached/ share/doc/memcached/protocol.txt share/doc/memcached/readme.txt +share/doc/memcached/threads.txt @rcscript ${RCDIR}/memcached
