CVS commit: pkgsrc/devel/memcached

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Sep  5 09:34:51 UTC 2019

Modified Files:
        pkgsrc/devel/memcached: Makefile distinfo
        pkgsrc/devel/memcached/patches: patch-items.c patch-memcached.c

Log Message:
memcached: updated to 1.5.17

1.5.17:
Fixes
fix strncpy call in stats conns to avoid ASAN violation
extstore: fix indentation
add error handling when calling dup function
add unlock when item_cachedump malloc failed
extstore: emulate pread(v) for macOS
fix off-by-one in logger to allow CAS commands to be logged.
use strdup for explicitly configured slab sizes
move mem_requested from slabs.c to items.c (internal cleanup)

New Features
add server address to the "stats conns" output
log client connection id with fetchers and mutations
Add a handler for seccomp crashes


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/memcached/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/memcached/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/memcached/patches/patch-items.c \
    pkgsrc/devel/memcached/patches/patch-memcached.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/memcached/Makefile
diff -u pkgsrc/devel/memcached/Makefile:1.63 pkgsrc/devel/memcached/Makefile:1.64
--- pkgsrc/devel/memcached/Makefile:1.63        Sun Aug 11 13:18:46 2019
+++ pkgsrc/devel/memcached/Makefile     Thu Sep  5 09:34:51 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2019/08/11 13:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2019/09/05 09:34:51 adam Exp $
 
-DISTNAME=      memcached-1.5.16
-PKGREVISION=   1
+DISTNAME=      memcached-1.5.17
 CATEGORIES=    devel
 MASTER_SITES=  http://www.memcached.org/files/
 

Index: pkgsrc/devel/memcached/distinfo
diff -u pkgsrc/devel/memcached/distinfo:1.35 pkgsrc/devel/memcached/distinfo:1.36
--- pkgsrc/devel/memcached/distinfo:1.35        Sun May 26 19:37:42 2019
+++ pkgsrc/devel/memcached/distinfo     Thu Sep  5 09:34:51 2019
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.35 2019/05/26 19:37:42 adam Exp $
+$NetBSD: distinfo,v 1.36 2019/09/05 09:34:51 adam Exp $
 
-SHA1 (memcached-1.5.16.tar.gz) = 06a9661638cb20232d0ccea088f52ca10b959968
-RMD160 (memcached-1.5.16.tar.gz) = 018d4e53a0c14a66a414a0a99b49f14937324dea
-SHA512 (memcached-1.5.16.tar.gz) = 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0
-Size (memcached-1.5.16.tar.gz) = 487868 bytes
+SHA1 (memcached-1.5.17.tar.gz) = 479b16693f5c3de1309a1726586b6b6e28dcd9c0
+RMD160 (memcached-1.5.17.tar.gz) = 3eddca3f58457ef0e0d0b667dfd2f687c1e84bc3
+SHA512 (memcached-1.5.17.tar.gz) = 533c916015d738ff4c7ba8420654ae15b19370b3e959b89d43bc60cae1bda65d36906be05fad44a025ea1878570a8c1a36041c4e4c0cdf0cea84e6bb0e7ba325
+Size (memcached-1.5.17.tar.gz) = 490891 bytes
 SHA1 (patch-Makefile.in) = c292d9ecc04c18925731a2710676789972584fe8
 SHA1 (patch-configure) = d44e07c0c38029df4f10bb5411049595b5a8ffbb
-SHA1 (patch-items.c) = ee082c7ebe234b3e8cc170e01bca56ed4275e6de
+SHA1 (patch-items.c) = 33e9ff564f755fa2ef201978cb509800ea400fa0
 SHA1 (patch-logger.h) = 130c573e07b7d9b6caff1c98e40b36a96cb3c064
-SHA1 (patch-memcached.c) = 3c39c873332704c8d269de4a3c7049281bf101c6
+SHA1 (patch-memcached.c) = ce42a0b1aea95b1e4126b08310ac7276cadcdaef

Index: pkgsrc/devel/memcached/patches/patch-items.c
diff -u pkgsrc/devel/memcached/patches/patch-items.c:1.2 pkgsrc/devel/memcached/patches/patch-items.c:1.3
--- pkgsrc/devel/memcached/patches/patch-items.c:1.2    Tue Nov 14 14:13:52 2017
+++ pkgsrc/devel/memcached/patches/patch-items.c        Thu Sep  5 09:34:51 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-items.c,v 1.2 2017/11/14 14:13:52 fhajny Exp $
+$NetBSD: patch-items.c,v 1.3 2019/09/05 09:34:51 adam Exp $
 
 time_t changes
 
---- items.c.orig       2017-11-04 21:49:54.000000000 +0000
+--- items.c.orig       2019-08-29 22:13:13.000000000 +0000
 +++ items.c
-@@ -588,10 +588,10 @@ char *item_cachedump(const unsigned int 
+@@ -606,10 +606,10 @@ char *item_cachedump(const unsigned int 
          /* 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 */
@@ -17,12 +17,13 @@ time_t changes
          if (bufcurr + len + 6 > memlimit)  /* 6 is END\r\n\0 */
              break;
          memcpy(buffer + bufcurr, temp, len);
-@@ -768,13 +768,13 @@ void item_stats(ADD_STAT add_stats, void
+@@ -787,14 +787,14 @@ void item_stats(ADD_STAT add_stats, void
              APPEND_NUM_FMT_STAT(fmt, n, "age_hot", "%u", age_hot);
              APPEND_NUM_FMT_STAT(fmt, n, "age_warm", "%u", age_warm);
          }
 -        APPEND_NUM_FMT_STAT(fmt, n, "age", "%u", age);
 +        APPEND_NUM_FMT_STAT(fmt, n, "age", "%jd", age);
+         APPEND_NUM_FMT_STAT(fmt, n, "mem_requested", "%llu", (unsigned long long)totals.mem_requested);
          APPEND_NUM_FMT_STAT(fmt, n, "evicted",
                              "%llu", (unsigned long long)totals.evicted);
          APPEND_NUM_FMT_STAT(fmt, n, "evicted_nonzero",
Index: pkgsrc/devel/memcached/patches/patch-memcached.c
diff -u pkgsrc/devel/memcached/patches/patch-memcached.c:1.2 pkgsrc/devel/memcached/patches/patch-memcached.c:1.3
--- pkgsrc/devel/memcached/patches/patch-memcached.c:1.2        Thu May 21 22:21:08 2015
+++ pkgsrc/devel/memcached/patches/patch-memcached.c    Thu Sep  5 09:34:51 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-memcached.c,v 1.2 2015/05/21 22:21:08 rodent Exp $
+$NetBSD: patch-memcached.c,v 1.3 2019/09/05 09:34:51 adam Exp $
 
-Fix this the right way thanks to joerg@.
+time_t changes
 
---- memcached.c.orig   2015-01-01 07:50:52.000000000 +0000
+--- memcached.c.orig   2019-08-29 22:13:13.000000000 +0000
 +++ memcached.c
-@@ -2764,8 +2764,8 @@ static void process_stats_conns(ADD_STAT
-                 APPEND_NUM_STAT(i, "addr", "%s", conn_name);
+@@ -3593,8 +3593,8 @@ static void process_stats_conns(ADD_STAT
+                 }
                  APPEND_NUM_STAT(i, "state", "%s",
                          state_text(conns[i]->state));
 -                APPEND_NUM_STAT(i, "secs_since_last_cmd", "%d",