Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 23A0F7A16E for ; Fri, 17 Feb 2017 19:11:38 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BF55C855D7; Fri, 17 Feb 2017 19:11:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4FB2C8556F for ; Fri, 17 Feb 2017 19:11:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id my9ChYZq49oP for ; Fri, 17 Feb 2017 19:11:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9DE0384CED for ; Fri, 17 Feb 2017 19:11:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 995D1FBE4; Fri, 17 Feb 2017 19:11:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1487358696126010" MIME-Version: 1.0 Date: Fri, 17 Feb 2017 19:11:36 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2016Q4] pkgsrc/devel/memcached To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20170217191136.995D1FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1487358696126010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Feb 17 19:11:36 UTC 2017 Modified Files: pkgsrc/devel/memcached [pkgsrc-2016Q4]: Makefile distinfo Added Files: pkgsrc/devel/memcached/patches [pkgsrc-2016Q4]: patch-items.c patch-logger.h Removed Files: pkgsrc/devel/memcached/patches [pkgsrc-2016Q4]: patch-Makefile.am patch-aa patch-ab Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.52.4.1 pkgsrc/devel/memcached/Makefile cvs rdiff -u -r1.26 -r1.26.10.1 pkgsrc/devel/memcached/distinfo cvs rdiff -u -r1.2 -r0 pkgsrc/devel/memcached/patches/patch-Makefile.am cvs rdiff -u -r1.9 -r0 pkgsrc/devel/memcached/patches/patch-aa \ pkgsrc/devel/memcached/patches/patch-ab cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/devel/memcached/patches/patch-items.c \ pkgsrc/devel/memcached/patches/patch-logger.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1487358696126010 Content-Disposition: inline Content-Length: 5003 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/memcached/Makefile diff -u pkgsrc/devel/memcached/Makefile:1.52 pkgsrc/devel/memcached/Makefile:1.52.4.1 --- pkgsrc/devel/memcached/Makefile:1.52 Sat Jul 9 06:38:10 2016 +++ pkgsrc/devel/memcached/Makefile Fri Feb 17 19:11:36 2017 @@ -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/ Index: pkgsrc/devel/memcached/distinfo diff -u pkgsrc/devel/memcached/distinfo:1.26 pkgsrc/devel/memcached/distinfo:1.26.10.1 --- pkgsrc/devel/memcached/distinfo:1.26 Tue Dec 8 17:41:56 2015 +++ pkgsrc/devel/memcached/distinfo Fri Feb 17 19:11:36 2017 @@ -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 Added files: Index: pkgsrc/devel/memcached/patches/patch-items.c diff -u /dev/null pkgsrc/devel/memcached/patches/patch-items.c:1.1.2.2 --- /dev/null Fri Feb 17 19:11:36 2017 +++ pkgsrc/devel/memcached/patches/patch-items.c Fri Feb 17 19:11:36 2017 @@ -0,0 +1,35 @@ +$NetBSD: patch-items.c,v 1.1.2.2 2017/02/17 19:11:36 bsiegert Exp $ + +time_t changes + +--- items.c.orig 2017-01-08 01:10:24.000000000 +0000 ++++ items.c +@@ -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; %llu s]\r\n", ++ len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %jd s]\r\n", + key_temp, it->nbytes - 2, + 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); +@@ -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); + APPEND_NUM_FMT_STAT(fmt, n, "evicted", + "%llu", (unsigned long long)totals.evicted); + APPEND_NUM_FMT_STAT(fmt, n, "evicted_nonzero", + "%llu", (unsigned long long)totals.evicted_nonzero); + APPEND_NUM_FMT_STAT(fmt, n, "evicted_time", +- "%u", totals.evicted_time); ++ "%jd", totals.evicted_time); + APPEND_NUM_FMT_STAT(fmt, n, "outofmemory", + "%llu", (unsigned long long)totals.outofmemory); + APPEND_NUM_FMT_STAT(fmt, n, "tailrepairs", Index: pkgsrc/devel/memcached/patches/patch-logger.h diff -u /dev/null pkgsrc/devel/memcached/patches/patch-logger.h:1.1.2.2 --- /dev/null Fri Feb 17 19:11:36 2017 +++ pkgsrc/devel/memcached/patches/patch-logger.h Fri Feb 17 19:11:36 2017 @@ -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, --_----------=_1487358696126010--