From a668dcb4ca00533d77b8c0ab43ad2d15ffcc9f48 Mon Sep 17 00:00:00 2001 From: giovanni Date: Tue, 5 May 2015 15:43:03 +0000 Subject: [PATCH] Update to 1.4.24 ok gonzalo@ --- misc/memcached/Makefile | 5 ++--- misc/memcached/distinfo | 4 ++-- misc/memcached/patches/patch-configure | 8 ++++---- misc/memcached/patches/patch-items_c | 8 ++++---- misc/memcached/pkg/PLIST | 3 ++- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/misc/memcached/Makefile b/misc/memcached/Makefile index fe93d5f381f..480787229ba 100644 --- a/misc/memcached/Makefile +++ b/misc/memcached/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.28 2015/02/19 08:01:59 giovanni Exp $ +# $OpenBSD: Makefile,v 1.29 2015/05/05 15:43:03 giovanni Exp $ COMMENT= distributed memory object caching system -DISTNAME= memcached-1.4.21 -REVISION= 1 +DISTNAME= memcached-1.4.24 CATEGORIES= misc HOMEPAGE= http://www.memcached.org/ diff --git a/misc/memcached/distinfo b/misc/memcached/distinfo index d18baf6d582..d7a82dbcb74 100644 --- a/misc/memcached/distinfo +++ b/misc/memcached/distinfo @@ -1,2 +1,2 @@ -SHA256 (memcached-1.4.21.tar.gz) = MB6+QcaG+lwKjjnN9Joy8h/Mk1c1h5IhbfsxXRYmDo0= -SIZE (memcached-1.4.21.tar.gz) = 345892 +SHA256 (memcached-1.4.24.tar.gz) = CKQmxQTs9kYzFR7sEFhYR1TS9U5i5e0taAhVlAFhflU= +SIZE (memcached-1.4.24.tar.gz) = 354917 diff --git a/misc/memcached/patches/patch-configure b/misc/memcached/patches/patch-configure index 26be2ed6338..410c1236bf0 100644 --- a/misc/memcached/patches/patch-configure +++ b/misc/memcached/patches/patch-configure @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.6 2014/11/04 15:11:05 giovanni Exp $ ---- configure.orig Mon Oct 13 06:06:29 2014 -+++ configure Fri Oct 31 14:56:50 2014 +$OpenBSD: patch-configure,v 1.7 2015/05/05 15:43:03 giovanni Exp $ +--- configure.orig Sat Apr 25 22:53:45 2015 ++++ configure Mon May 4 13:05:07 2015 @@ -6435,7 +6435,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h elif test "$GCC" = "yes" then GCC_VERSION=`$CC -dumpversion` - CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" -+ CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations" ++ CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -pedantic -Wmissing-declarations" case $GCC_VERSION in 4.4.*) CFLAGS="$CFLAGS -fno-strict-aliasing" diff --git a/misc/memcached/patches/patch-items_c b/misc/memcached/patches/patch-items_c index 4069f9d2f4e..2f736fc9ed8 100644 --- a/misc/memcached/patches/patch-items_c +++ b/misc/memcached/patches/patch-items_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-items_c,v 1.9 2015/02/19 08:01:59 giovanni Exp $ +$OpenBSD: patch-items_c,v 1.10 2015/05/05 15:43:03 giovanni Exp $ printf format string fix for long long time_t ---- items.c.orig Mon Oct 13 05:33:10 2014 -+++ items.c Fri Oct 31 14:56:50 2014 -@@ -440,9 +440,9 @@ char *do_item_cachedump(const unsigned int slabs_clsid +--- items.c.orig Sat Apr 25 22:47:33 2015 ++++ items.c Mon May 4 12:52:52 2015 +@@ -459,9 +459,9 @@ char *item_cachedump(const unsigned int slabs_clsid, c /* 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 */ diff --git a/misc/memcached/pkg/PLIST b/misc/memcached/pkg/PLIST index aa11e177b8d..b1726af31c0 100644 --- a/misc/memcached/pkg/PLIST +++ b/misc/memcached/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2014/11/04 15:11:05 giovanni Exp $ +@comment $OpenBSD: PLIST,v 1.9 2015/05/05 15:43:03 giovanni Exp $ @newgroup _memcached:637 @newuser _memcached:637:_memcached:daemon:memcache daemon:/var/empty:/sbin/nologin @bin bin/memcached @@ -6,6 +6,7 @@ include/memcached/ include/memcached/protocol_binary.h @man man/man1/memcached.1 share/doc/memcached/ +share/doc/memcached/new_lru.txt share/doc/memcached/protocol.txt share/doc/memcached/readme.txt share/doc/memcached/threads.txt