diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile index 22340610087a4..1c386835bcf28 100644 --- a/devel/memcached/Makefile +++ b/devel/memcached/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.53 2017/02/16 11:10:53 adam Exp $ -DISTNAME= memcached-1.4.34 +DISTNAME= memcached-1.5.3 CATEGORIES= devel MASTER_SITES= http://www.memcached.org/files/ diff --git a/devel/memcached/distinfo b/devel/memcached/distinfo index 79323c85063a2..93d2b5011a441 100644 --- a/devel/memcached/distinfo +++ b/devel/memcached/distinfo @@ -1,11 +1,11 @@ $NetBSD: distinfo,v 1.27 2017/02/16 11:10:53 adam Exp $ -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 (memcached-1.5.3.tar.gz) = 9331ef99f1b7fedfe476062faed8c0ffb5528d8f +RMD160 (memcached-1.5.3.tar.gz) = 037c34da08ffd282709f0dfbd3c6c2f963cba59e +SHA512 (memcached-1.5.3.tar.gz) = b28282c579891e7c5508eb5ab4680b933aa76e8e4a8fe575c996fd4e750f2b4b35ee734d01ae0f280cf4cf6e0530f7f6a95c2e07be3660b07c5ade6ad3c835e2 +Size (memcached-1.5.3.tar.gz) = 409131 bytes +SHA1 (patch-Makefile.in) = d1c67f0e4333c16e1541ea5f2e0bc47b9dc2002f SHA1 (patch-configure) = d44e07c0c38029df4f10bb5411049595b5a8ffbb -SHA1 (patch-items.c) = ddc0fe0dd390de5e20dbcbc73085000c629259c0 +SHA1 (patch-items.c) = ee082c7ebe234b3e8cc170e01bca56ed4275e6de SHA1 (patch-logger.h) = 130c573e07b7d9b6caff1c98e40b36a96cb3c064 SHA1 (patch-memcached.c) = 3c39c873332704c8d269de4a3c7049281bf101c6 diff --git a/devel/memcached/patches/patch-Makefile.in b/devel/memcached/patches/patch-Makefile.in index 1da68f6ab42fd..4398f06852829 100644 --- a/devel/memcached/patches/patch-Makefile.in +++ b/devel/memcached/patches/patch-Makefile.in @@ -3,18 +3,9 @@ $NetBSD: patch-Makefile.in,v 1.4 2015/05/21 14:07:10 rodent Exp $ Don't build programs that won't be installed List test prerequisite. ---- Makefile.in.orig 2015-01-01 07:53:30.000000000 +0000 +--- Makefile.in.orig 2017-11-04 21:53:37.000000000 +0000 +++ Makefile.in -@@ -112,7 +112,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 \ - jenkins_hash.c jenkins_hash.h murmur3_hash.c murmur3_hash.h \ - slabs.c slabs.h items.c items.h assoc.c assoc.h thread.c \ -@@ -1478,7 +1478,7 @@ memcached_dtrace.o: $(memcached_OBJECTS) +@@ -1729,7 +1729,7 @@ memcached_dtrace.o: $(memcached_OBJECTS) memcached_debug_dtrace.o: $(memcached_debug_OBJECTS) $(DTRACE) $(DTRACEFLAGS) -G -o memcached_debug_dtrace.o -s ${srcdir}/memcached_dtrace.d $(memcached_debug_OBJECTS) @@ -22,4 +13,4 @@ List test prerequisite. +test: memcached-debug sizes testapp timedrun $(srcdir)/sizes $(srcdir)/testapp - prove $(srcdir)/t + @if test -n "${PARALLEL}"; then \ diff --git a/devel/memcached/patches/patch-items.c b/devel/memcached/patches/patch-items.c index 5ee39df690615..73a7ec00154be 100644 --- a/devel/memcached/patches/patch-items.c +++ b/devel/memcached/patches/patch-items.c @@ -2,9 +2,9 @@ time_t changes ---- items.c.orig 2017-01-08 01:10:24.000000000 +0000 +--- items.c.orig 2017-11-04 21:49:54.000000000 +0000 +++ items.c -@@ -489,10 +489,10 @@ char *item_cachedump(const unsigned int +@@ -588,10 +588,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,9 +17,9 @@ time_t changes 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]); - } +@@ -768,13 +768,13 @@ 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);