Pullup ticket #5214 - requested by maya

devel/memcached: security fix

Revisions pulled up:
- devel/memcached/Makefile                                      1.53
- devel/memcached/distinfo                                      1.27
- devel/memcached/patches/patch-Makefile.am                     deleted
- devel/memcached/patches/patch-aa                              deleted
- devel/memcached/patches/patch-ab                              deleted
- devel/memcached/patches/patch-items.c                         1.1
- devel/memcached/patches/patch-logger.h                        1.1

---
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Thu Feb 16 11:10:53 UTC 2017

   Modified Files:
          pkgsrc/devel/memcached: Makefile distinfo
   Added Files:
          pkgsrc/devel/memcached/patches: patch-items.c patch-logger.h
   Removed Files:
          pkgsrc/devel/memcached/patches: patch-Makefile.am patch-aa patch-ab

   Log Message:
   Changes 1.4.34:
   Add -o modern switches to -h
   metadump: Fix preventing dumping of class 63
   Fix cache_memlimit bug for > 4G values
   metadump: ensure buffer is flushed to client before finishing
   Number of small fixes/additions to new logging
   add logging endpoint for LRU crawler
   evicted_active counter for LRU maintainer
   stop pushing NULL byte into watcher stream
   Scale item hash locks more with more worker threads (minor performance)
   Further increase systemd service hardening
   Missing necessary header for atomic_inc_64_nv() used in logger.c (solaris)
   Fix print format for idle timeout thread
   Improve binary sasl security fixes
   Fix clang compile error
   Widen systemd caps to allow maxconns to increase
   Add -X option to disable cachedump/metadump
   Don't double free in lru_crawler on closed clients
   Fix segfault if metadump client goes away

6 files changed, 32 insertions, 48 deletions

diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile
index f17af8e7fd0..1a19545aa90 100644
--- a/devel/memcached/Makefile
+++ b/devel/memcached/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2016/07/09 06:38:10 wiz Exp $
+# $NetBSD: Makefile,v 1.52.4.1 2017/02/17 19:11:36 bsiegert Exp $
 
-DISTNAME=	memcached-1.4.25
-PKGREVISION=	2
+DISTNAME=	memcached-1.4.34
 CATEGORIES=	devel
 MASTER_SITES=	http://www.memcached.org/files/
 
diff --git a/devel/memcached/distinfo b/devel/memcached/distinfo
index ed09424bf3b..f5cd29598f1 100644
--- a/devel/memcached/distinfo
+++ b/devel/memcached/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.26 2015/12/08 17:41:56 adam Exp $
+$NetBSD: distinfo,v 1.26.10.1 2017/02/17 19:11:36 bsiegert Exp $
 
-SHA1 (memcached-1.4.25.tar.gz) = 7fd0ba9283c61204f196638ecf2e9295688b2314
-RMD160 (memcached-1.4.25.tar.gz) = 409abd843ec01d06f0e5cc64aeaa46ec2668699f
-SHA512 (memcached-1.4.25.tar.gz) = e037c3bbb68c4077f814f855663501af418ce3b1f8bc20f8e7eba3249aea378e55b3291457952fa4511779ec3702496fdaab5799edae7d59bc64eb6fd54ee14e
-Size (memcached-1.4.25.tar.gz) = 359709 bytes
-SHA1 (patch-Makefile.am) = 184b10f693f7aa85e3a5922790d1d2c1451c0329
+SHA1 (memcached-1.4.34.tar.gz) = 7c7214f5183c6e20c22b243e21ed1ffddb91497e
+RMD160 (memcached-1.4.34.tar.gz) = ce93048d80bdd6b8b5aa7dcc67dc24186f8e501c
+SHA512 (memcached-1.4.34.tar.gz) = e91aa784674501313cd7464bad22f1898b998c836492a52efe68d097a01249a4fffd3b23b79af86957dd3dc11794f2bff476a4891b9cfa172ff9c29dfb50789f
+Size (memcached-1.4.34.tar.gz) = 391131 bytes
 SHA1 (patch-Makefile.in) = 4c21920e41bdad77dc8ff39c62001aea0d73c78a
-SHA1 (patch-aa) = c26799e8963177e7ed173c080048dd829c03170e
-SHA1 (patch-ab) = 76af28c72db1e2b15da61f04e64464d3b42c5c10
 SHA1 (patch-configure) = d44e07c0c38029df4f10bb5411049595b5a8ffbb
+SHA1 (patch-items.c) = ddc0fe0dd390de5e20dbcbc73085000c629259c0
+SHA1 (patch-logger.h) = 130c573e07b7d9b6caff1c98e40b36a96cb3c064
 SHA1 (patch-memcached.c) = 3c39c873332704c8d269de4a3c7049281bf101c6
diff --git a/devel/memcached/patches/patch-Makefile.am b/devel/memcached/patches/patch-Makefile.am
deleted file mode 100644
index 1f496a64568..00000000000
--- a/devel/memcached/patches/patch-Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.2 2015/05/21 14:07:10 rodent Exp $
-
-List test prerequisite.
-
---- Makefile.am.orig	2015-01-01 06:49:53.000000000 +0000
-+++ Makefile.am
-@@ -75,7 +75,7 @@ EXTRA_DIST = doc scripts t memcached.spe
- 
- MOSTLYCLEANFILES = *.gcov *.gcno *.gcda *.tcov
- 
--test:	memcached-debug sizes testapp
-+test:	memcached-debug sizes testapp timedrun
- 	$(srcdir)/sizes
- 	$(srcdir)/testapp
- 	prove $(srcdir)/t
diff --git a/devel/memcached/patches/patch-ab b/devel/memcached/patches/patch-ab
deleted file mode 100644
index 0b1ef855b24..00000000000
--- a/devel/memcached/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2015/05/21 14:07:10 rodent Exp $
-
-time_t changes
-
---- memcached.h.orig	2015-01-01 07:50:52.000000000 +0000
-+++ memcached.h
-@@ -213,7 +213,7 @@ enum delta_result_type {
- };
- 
- /** Time relative to server start. Smaller than time_t on 64-bit systems. */
--typedef unsigned int rel_time_t;
-+typedef intmax_t rel_time_t;
- 
- /** Stats stored per slab (and per thread). */
- struct slab_stats {
diff --git a/devel/memcached/patches/patch-aa b/devel/memcached/patches/patch-items.c
index d720b66a7a2..9120abcf934 100644
--- a/devel/memcached/patches/patch-aa
+++ b/devel/memcached/patches/patch-items.c
@@ -1,24 +1,25 @@
-$NetBSD: patch-aa,v 1.9 2015/12/08 17:41:56 adam Exp $
+$NetBSD: patch-items.c,v 1.1.2.2 2017/02/17 19:11:36 bsiegert Exp $
 
 time_t changes
 
---- items.c.orig	2015-11-20 01:18:56.000000000 +0000
+--- items.c.orig	2017-01-08 01:10:24.000000000 +0000
 +++ items.c
-@@ -460,9 +460,9 @@ char *item_cachedump(const unsigned int 
+@@ -489,10 +489,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 */
--        len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %lu s]\r\n",
+-        len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %llu 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);
+                        it->exptime == 0 ? 0 :
+-                       (unsigned long 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);
-@@ -576,13 +576,13 @@ void item_stats(ADD_STAT add_stats, void
-             if (settings.expirezero_does_not_evict)
+@@ -615,13 +615,13 @@ void item_stats(ADD_STAT add_stats, void
                  APPEND_NUM_FMT_STAT(fmt, n, "number_noexp", "%u", lru_size_map[3]);
+             }
          }
 -        APPEND_NUM_FMT_STAT(fmt, n, "age", "%u", age);
 +        APPEND_NUM_FMT_STAT(fmt, n, "age", "%jd", age);
diff --git a/devel/memcached/patches/patch-logger.h b/devel/memcached/patches/patch-logger.h
new file mode 100644
index 00000000000..4c9a43b9e22
--- /dev/null
+++ b/devel/memcached/patches/patch-logger.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-logger.h,v 1.1.2.2 2017/02/17 19:11:36 bsiegert Exp $
+
+time_t changes
+
+--- logger.h.orig	2017-02-16 11:07:55.000000000 +0000
++++ logger.h
+@@ -11,7 +11,7 @@
+ #define GET_LOGGER() ((logger *) pthread_getspecific(logger_key));
+ 
+ /* Inlined from memcached.h - should go into sub header */
+-typedef unsigned int rel_time_t;
++typedef intmax_t rel_time_t;
+ 
+ enum log_entry_type {
+     LOGGER_ASCII_CMD = 0,