Changes 1.4.7:

* Use a monotonically increasing timer
* Immediately expire items when given a negative expiration time
* Fix memcached-tool to print about all slabs
* Properly daemonize memcached for debian
* Don't permanently close UDP listeners on error
* Allow memcached-init to start multiple instances (not recommended)
* Issue 214: Search for network libraries before searching for libevent
* Issue 213: Search for clock_gettime in librt
* Issue 115: accont for CAS in item_size_ok
* Fix incredibly slim race for maxconns handler. Should no longer hang ever
* Issue 183: Reclaim items dead by flush_all
* Issue 200: Don't fire dtrace probe as the last thing in a function

7 files changed, 87 insertions, 102 deletions

diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile
index b71824ce850..e2589207d61 100644
--- a/devel/memcached/Makefile
+++ b/devel/memcached/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2011/05/27 11:58:52 fhajny Exp $
-#
+# $NetBSD: Makefile,v 1.25 2011/10/03 11:53:11 adam Exp $
 
-DISTNAME=	memcached-1.4.5
+DISTNAME=	memcached-1.4.7
 CATEGORIES=	devel
 MASTER_SITES=	http://memcached.googlecode.com/files/
 
@@ -12,13 +11,11 @@ LICENSE=	2-clause-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	perl
-GNU_CONFIGURE=	yes
-
-REPLACE_PERL=		scripts/memcached-tool
-
+USE_TOOLS+=		perl
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libevent=${BUILDLINK_PREFIX.libevent}
 
+REPLACE_PERL=		scripts/memcached-tool
 RCD_SCRIPTS=		memcached
 INSTALLATION_DIRS=	share/doc/${PKGBASE} share/examples/rc.d
 
@@ -30,7 +27,7 @@ PKG_GROUPS=		${MEMCACHED_GROUP}
 PKG_USERS=		${MEMCACHED_USER}:${MEMCACHED_GROUP}
 PKG_GROUPS_VARS+=	MEMCACHED_GROUP
 PKG_USERS_VARS+=	MEMCACHED_USER
-FILES_SUBST+=		MEMCACHED_USER=${MEMCACHED_USER:Q}
+FILES_SUBST+=		MEMCACHED_USER=${MEMCACHED_USER}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/devel/memcached/PLIST b/devel/memcached/PLIST
index c4736d0c5e5..f843a1ffe15 100644
--- a/devel/memcached/PLIST
+++ b/devel/memcached/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2010/02/27 20:40:52 morr Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/10/03 11:53:11 adam Exp $
 bin/memcached
 bin/memcached-tool
 include/memcached/protocol_binary.h
 man/man1/memcached.1
 share/doc/memcached/protocol.txt
 share/doc/memcached/readme.txt
-share/doc/memcached/threads.txt
 share/examples/rc.d/memcached
diff --git a/devel/memcached/distinfo b/devel/memcached/distinfo
index aa9e0834aa2..0c5c59d3622 100644
--- a/devel/memcached/distinfo
+++ b/devel/memcached/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.10 2011/05/27 11:58:52 fhajny Exp $
+$NetBSD: distinfo,v 1.11 2011/10/03 11:53:11 adam Exp $
 
-SHA1 (memcached-1.4.5.tar.gz) = c7d6517764b82d23ae2de76b56c2494343c53f02
-RMD160 (memcached-1.4.5.tar.gz) = c1f534fbc585a1ea033bbd12d6fc94c77a085032
-Size (memcached-1.4.5.tar.gz) = 302516 bytes
-SHA1 (patch-aa) = 33959beb6857a4c0117a6a428d950c4888a197e5
-SHA1 (patch-ab) = de936862c0de76712a577896399f6ab588232890
+SHA1 (memcached-1.4.7.tar.gz) = 09e6ba550ea9f55b3116cd084b23ea2b923f9b41
+RMD160 (memcached-1.4.7.tar.gz) = 95bad7c299721fd0d6ff7c0e4b36314a7a29c792
+Size (memcached-1.4.7.tar.gz) = 307741 bytes
+SHA1 (patch-Makefile.in) = 1f1b924b47840c7aa3e2a11c03300bbce58629e2
+SHA1 (patch-aa) = 1513c6d8004242711b1c7f1d83b589edb623d772
+SHA1 (patch-ab) = 5ed8e65afebc44404c11b67cbed1012d54a4228c
+SHA1 (patch-configure) = e908620cdeee51673a80f958f3ce6d1d190c0822
diff --git a/devel/memcached/patches/patch-Makefile.in b/devel/memcached/patches/patch-Makefile.in
new file mode 100644
index 00000000000..a872616e33d
--- /dev/null
+++ b/devel/memcached/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2011/10/03 11:53:11 adam Exp $
+
+Don't build programs that won't be installed
+
+--- Makefile.in.orig	2011-09-30 07:58:24.000000000 +0000
++++ Makefile.in
+@@ -68,7 +68,7 @@ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"
+-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
++PROGRAMS = $(bin_PROGRAMS)
+ am__memcached_SOURCES_DIST = memcached.c memcached.h hash.c hash.h \
+ 	slabs.c slabs.h items.c items.h assoc.c assoc.h thread.c \
+ 	daemon.c stats.c stats.h util.c util.h trace.h cache.h \
diff --git a/devel/memcached/patches/patch-aa b/devel/memcached/patches/patch-aa
index 49b0e49b624..7111ac68329 100644
--- a/devel/memcached/patches/patch-aa
+++ b/devel/memcached/patches/patch-aa
@@ -1,53 +1,34 @@
-$NetBSD: patch-aa,v 1.4 2010/02/27 20:40:52 morr Exp $
+$NetBSD: patch-aa,v 1.5 2011/10/03 11:53:11 adam Exp $
 
-Make it compile on NetBSD and Solaris. Patch taken from memcached git.
+time_t changes
 
---- util.c.orig	2009-10-23 20:38:01.000000000 +0000
-+++ util.c
-@@ -8,6 +8,10 @@
- 
- #include "memcached.h"
- 
-+/* Avoid warnings on solaris, where isspace() is an index into an array,
-+ * and gcc uses signed chars */
-+#define xisspace(c) isspace((unsigned char)c)
-+
- bool safe_strtoull(const char *str, uint64_t *out) {
-     assert(out != NULL);
-     errno = 0;
-@@ -16,7 +20,7 @@ bool safe_strtoull(const char *str, uint
-     unsigned long long ull = strtoull(str, &endptr, 10);
-     if (errno == ERANGE)
-         return false;
--    if (isspace(*endptr) || (*endptr == '\0' && endptr != str)) {
-+    if (xisspace(*endptr) || (*endptr == '\0' && endptr != str)) {
-         if ((long long) ull < 0) {
-             /* only check for negative signs in the uncommon case when
-              * the unsigned number is so big that it's negative as a
-@@ -39,7 +43,7 @@ bool safe_strtoll(const char *str, int64
-     long long ll = strtoll(str, &endptr, 10);
-     if (errno == ERANGE)
-         return false;
--    if (isspace(*endptr) || (*endptr == '\0' && endptr != str)) {
-+    if (xisspace(*endptr) || (*endptr == '\0' && endptr != str)) {
-         *out = ll;
-         return true;
-     }
-@@ -59,7 +63,7 @@ bool safe_strtoul(const char *str, uint3
-         return false;
-     }
- 
--    if (isspace(*endptr) || (*endptr == '\0' && endptr != str)) {
-+    if (xisspace(*endptr) || (*endptr == '\0' && endptr != str)) {
-         if ((long) l < 0) {
-             /* only check for negative signs in the uncommon case when
-              * the unsigned number is so big that it's negative as a
-@@ -83,7 +87,7 @@ bool safe_strtol(const char *str, int32_
-     long l = strtol(str, &endptr, 10);
-     if (errno == ERANGE)
-         return false;
--    if (isspace(*endptr) || (*endptr == '\0' && endptr != str)) {
-+    if (xisspace(*endptr) || (*endptr == '\0' && endptr != str)) {
-         *out = l;
-         return true;
-     }
+--- items.c.orig	2011-08-10 15:44:52.000000000 +0000
++++ items.c
+@@ -383,9 +383,9 @@ char *do_item_cachedump(const unsigned i
+         /* 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 */
+-        len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %lu s]\r\n",
++        len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %jd s]\r\n",
+                        key_temp, it->nbytes - 2,
+-                       (unsigned long)it->exptime + process_started);
++                       (intmax_t)it->exptime + process_started);
+         if (bufcurr + len + 6 > memlimit)  /* 6 is END\r\n\0 */
+             break;
+         memcpy(buffer + bufcurr, temp, len);
+@@ -429,13 +429,13 @@ void do_item_stats(ADD_STAT add_stats, v
+                 continue;
+             }
+             APPEND_NUM_FMT_STAT(fmt, i, "number", "%u", sizes[i]);
+-            APPEND_NUM_FMT_STAT(fmt, i, "age", "%u", tails[i]->time);
++            APPEND_NUM_FMT_STAT(fmt, i, "age", "%jd", tails[i]->time);
+             APPEND_NUM_FMT_STAT(fmt, i, "evicted",
+                                 "%u", itemstats[i].evicted);
+             APPEND_NUM_FMT_STAT(fmt, i, "evicted_nonzero",
+                                 "%u", itemstats[i].evicted_nonzero);
+             APPEND_NUM_FMT_STAT(fmt, i, "evicted_time",
+-                                "%u", itemstats[i].evicted_time);
++                                "%jd", itemstats[i].evicted_time);
+             APPEND_NUM_FMT_STAT(fmt, i, "outofmemory",
+                                 "%u", itemstats[i].outofmemory);
+             APPEND_NUM_FMT_STAT(fmt, i, "tailrepairs",
diff --git a/devel/memcached/patches/patch-ab b/devel/memcached/patches/patch-ab
index 7107de7f5aa..c0e40326073 100644
--- a/devel/memcached/patches/patch-ab
+++ b/devel/memcached/patches/patch-ab
@@ -1,41 +1,10 @@
-$NetBSD: patch-ab,v 1.6 2010/02/27 20:40:52 morr Exp $
+$NetBSD: patch-ab,v 1.7 2011/10/03 11:53:11 adam Exp $
 
 time_t changes
 
---- items.c.orig	2009-10-23 20:38:01.000000000 +0000
-+++ items.c
-@@ -366,9 +366,9 @@ char *do_item_cachedump(const unsigned i
-         /* 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 */
--        len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %lu s]\r\n",
-+        len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %jd s]\r\n",
-                        key_temp, it->nbytes - 2,
--                       (unsigned long)it->exptime + process_started);
-+                       (intmax_t)it->exptime + process_started);
-         if (bufcurr + len + 6 > memlimit)  /* 6 is END\r\n\0 */
-             break;
-         memcpy(buffer + bufcurr, temp, len);
-@@ -394,13 +394,13 @@ void do_item_stats(ADD_STAT add_stats, v
-             int klen = 0, vlen = 0;
- 
-             APPEND_NUM_FMT_STAT(fmt, i, "number", "%u", sizes[i]);
--            APPEND_NUM_FMT_STAT(fmt, i, "age", "%u", tails[i]->time);
-+            APPEND_NUM_FMT_STAT(fmt, i, "age", "%jd", tails[i]->time);
-             APPEND_NUM_FMT_STAT(fmt, i, "evicted",
-                                 "%u", itemstats[i].evicted);
-             APPEND_NUM_FMT_STAT(fmt, i, "evicted_nonzero",
-                                 "%u", itemstats[i].evicted_nonzero);
-             APPEND_NUM_FMT_STAT(fmt, i, "evicted_time",
--                                "%u", itemstats[i].evicted_time);
-+                                "%jd", itemstats[i].evicted_time);
-             APPEND_NUM_FMT_STAT(fmt, i, "outofmemory",
-                                 "%u", itemstats[i].outofmemory);
-             APPEND_NUM_FMT_STAT(fmt, i, "tailrepairs",
-
---- memcached.h.orig	2009-11-26 00:37:49.000000000 +0000
+--- memcached.h.orig	2011-08-10 04:53:38.000000000 +0000
 +++ memcached.h
-@@ -191,7 +191,7 @@ enum delta_result_type {
+@@ -195,7 +195,7 @@ enum delta_result_type {
  };
  
  /** Time relative to server start. Smaller than time_t on 64-bit systems. */
diff --git a/devel/memcached/patches/patch-configure b/devel/memcached/patches/patch-configure
new file mode 100644
index 00000000000..8b9300a5818
--- /dev/null
+++ b/devel/memcached/patches/patch-configure
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure,v 1.1 2011/10/03 11:53:11 adam Exp $
+
+--- configure.orig	2011-08-16 22:35:45.000000000 +0000
++++ configure
+@@ -5282,7 +5282,7 @@ rm -f core conftest.err conftest.$ac_obj
+   saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"
+ else
+   if test "$GCC" = "yes"; then :
+-  saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath=$ledir/lib"
++  saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath $ledir/lib"
+ fi
+ fi
+        else
+@@ -6183,7 +6183,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confd
+ elif test "$GCC" = "yes"
+ then
+   GCC_VERSION=`$CC -dumpversion`
+-  CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
++  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
+   case $GCC_VERSION in
+     4.4.*)
+     CFLAGS="$CFLAGS -fno-strict-aliasing"