Security update to 1.4.32, one patch applied upstream

ok sthen@
This commit is contained in:
giovanni 2016-10-25 21:08:48 +00:00
parent 746a44badc
commit 70869f23c3
3 changed files with 4 additions and 23 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.32 2016/09/02 14:20:31 giovanni Exp $
# $OpenBSD: Makefile,v 1.33 2016/10/25 21:08:48 giovanni Exp $
COMMENT= distributed memory object caching system
DISTNAME= memcached-1.4.31
DISTNAME= memcached-1.4.32
CATEGORIES= misc
HOMEPAGE= http://www.memcached.org/

View File

@ -1,2 +1,2 @@
SHA256 (memcached-1.4.31.tar.gz) = d85fgguv6Uwzv3vYYmjZvNs7dvaBKNeVsQbbU9UocH8=
SIZE (memcached-1.4.31.tar.gz) = 389502
SHA256 (memcached-1.4.32.tar.gz) = VLuazV+7tzzR+/pny8azAQCaKDWibIpMPbpjSgw9h10=
SIZE (memcached-1.4.32.tar.gz) = 389771

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-items_c,v 1.12 2016/09/02 14:20:31 giovanni Exp $
printf format string fix for long long time_t
--- items.c.orig Fri Jun 24 19:41:24 2016
+++ items.c Thu Jun 30 00:03:36 2016
@@ -467,10 +467,10 @@ 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 */
- 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",
key_temp, it->nbytes - 2,
it->exptime == 0 ? 0 :
- (unsigned long)it->exptime + process_started);
+ (unsigned long long)it->exptime + process_started);
if (bufcurr + len + 6 > memlimit) /* 6 is END\r\n\0 */
break;
memcpy(buffer + bufcurr, temp, len);