diff options
| -rw-r--r-- | devel/memcached/Makefile | 5 | ||||
| -rw-r--r-- | devel/memcached/PLIST | 3 | ||||
| -rw-r--r-- | devel/memcached/distinfo | 12 | ||||
| -rw-r--r-- | devel/memcached/patches/patch-aa | 38 |
4 files changed, 29 insertions, 29 deletions
diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile index 16c36ce4a9f..a156de9fa91 100644 --- a/devel/memcached/Makefile +++ b/devel/memcached/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2015/06/12 10:48:51 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2015/12/08 17:41:56 adam Exp $ -DISTNAME= memcached-1.4.22 -PKGREVISION= 1 +DISTNAME= memcached-1.4.25 CATEGORIES= devel MASTER_SITES= http://www.memcached.org/files/ diff --git a/devel/memcached/PLIST b/devel/memcached/PLIST index 20e7ebce219..587984f3176 100644 --- a/devel/memcached/PLIST +++ b/devel/memcached/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.11 2015/05/21 22:22:31 rodent Exp $ +@comment $NetBSD: PLIST,v 1.12 2015/12/08 17:41:56 adam Exp $ bin/memcached bin/memcached-tool include/memcached/protocol_binary.h man/man1/memcached.1 +share/doc/memcached/new_lru.txt share/doc/memcached/protocol.txt share/doc/memcached/readme.txt share/doc/memcached/threads.txt diff --git a/devel/memcached/distinfo b/devel/memcached/distinfo index bd2ae1b72ee..ed09424bf3b 100644 --- a/devel/memcached/distinfo +++ b/devel/memcached/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.25 2015/11/03 03:27:49 agc Exp $ +$NetBSD: distinfo,v 1.26 2015/12/08 17:41:56 adam Exp $ -SHA1 (memcached-1.4.22.tar.gz) = 5968d357d504a1f52622f9f8a3e85c29558acaa5 -RMD160 (memcached-1.4.22.tar.gz) = 2cde1cec77d312a118fbb74514021e95a3a84395 -SHA512 (memcached-1.4.22.tar.gz) = 4189b8422eb3bda47beb7dbafaf38156fd7fbde6cda9dac2cf89423c2a10262df929f6eca64f238d3db8e7e66a39e3bddf36e48331cf651cfbbf12f923f9183c -Size (memcached-1.4.22.tar.gz) = 346632 bytes +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 (patch-Makefile.in) = 4c21920e41bdad77dc8ff39c62001aea0d73c78a -SHA1 (patch-aa) = f1cf7fdf89e3dac1264385bdffb98b41b879462c +SHA1 (patch-aa) = c26799e8963177e7ed173c080048dd829c03170e SHA1 (patch-ab) = 76af28c72db1e2b15da61f04e64464d3b42c5c10 SHA1 (patch-configure) = d44e07c0c38029df4f10bb5411049595b5a8ffbb SHA1 (patch-memcached.c) = 3c39c873332704c8d269de4a3c7049281bf101c6 diff --git a/devel/memcached/patches/patch-aa b/devel/memcached/patches/patch-aa index 2a510979dcf..d720b66a7a2 100644 --- a/devel/memcached/patches/patch-aa +++ b/devel/memcached/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.8 2015/05/21 14:07:10 rodent Exp $ +$NetBSD: patch-aa,v 1.9 2015/12/08 17:41:56 adam Exp $ time_t changes ---- items.c.orig 2015-01-01 07:50:52.000000000 +0000 +--- items.c.orig 2015-11-20 01:18:56.000000000 +0000 +++ items.c -@@ -440,9 +440,9 @@ char *do_item_cachedump(const unsigned i +@@ -460,9 +460,9 @@ 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 */ @@ -16,19 +16,19 @@ time_t changes if (bufcurr + len + 6 > memlimit) /* 6 is END\r\n\0 */ break; memcpy(buffer + bufcurr, temp, len); -@@ -506,13 +506,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", current_time - tails[i]->time); -+ APPEND_NUM_FMT_STAT(fmt, i, "age", "%jd", current_time - tails[i]->time); - APPEND_NUM_FMT_STAT(fmt, i, "evicted", - "%llu", (unsigned long long)itemstats[i].evicted); - APPEND_NUM_FMT_STAT(fmt, i, "evicted_nonzero", - "%llu", (unsigned long long)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", - "%llu", (unsigned long long)itemstats[i].outofmemory); - APPEND_NUM_FMT_STAT(fmt, i, "tailrepairs", +@@ -576,13 +576,13 @@ void item_stats(ADD_STAT add_stats, void + if (settings.expirezero_does_not_evict) + 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", |