Update to 1.4.31
ok sthen@
This commit is contained in:
parent
e4cdf0ad1d
commit
c881b8e974
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.31 2016/03/09 14:50:11 giovanni Exp $
|
||||
# $OpenBSD: Makefile,v 1.32 2016/09/02 14:20:31 giovanni Exp $
|
||||
|
||||
COMMENT= distributed memory object caching system
|
||||
|
||||
DISTNAME= memcached-1.4.25
|
||||
REVISION= 0
|
||||
DISTNAME= memcached-1.4.31
|
||||
CATEGORIES= misc
|
||||
|
||||
HOMEPAGE= http://www.memcached.org/
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (memcached-1.4.25.tar.gz) = 8FhDezwiTTIZGammu04+7bIxLtcYwMrwh/8vBKt5Xdo=
|
||||
SIZE (memcached-1.4.25.tar.gz) = 359709
|
||||
SHA256 (memcached-1.4.31.tar.gz) = d85fgguv6Uwzv3vYYmjZvNs7dvaBKNeVsQbbU9UocH8=
|
||||
SIZE (memcached-1.4.31.tar.gz) = 389502
|
||||
|
@ -1,16 +1,17 @@
|
||||
$OpenBSD: patch-items_c,v 1.11 2016/03/09 14:50:11 giovanni Exp $
|
||||
$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 Nov 20 02:18:56 2015
|
||||
+++ items.c Sat Mar 5 22:20:56 2016
|
||||
@@ -460,9 +460,9 @@ char *item_cachedump(const unsigned int slabs_clsid, c
|
||||
--- 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 */
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-memcached_c,v 1.10 2016/03/09 14:50:11 giovanni Exp $
|
||||
--- memcached.c.orig Thu Nov 19 08:19:56 2015
|
||||
+++ memcached.c Sun Mar 6 22:32:48 2016
|
||||
$OpenBSD: patch-memcached_c,v 1.11 2016/09/02 14:20:31 giovanni Exp $
|
||||
--- memcached.c.orig Fri Jun 24 19:41:24 2016
|
||||
+++ memcached.c Thu Jun 30 00:02:09 2016
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <sys/uio.h>
|
||||
#include <ctype.h>
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-memcached_c,v 1.10 2016/03/09 14:50:11 giovanni Exp $
|
||||
|
||||
/* some POSIX systems need the following definition
|
||||
* to get mlockall flags out of sys/mman.h. */
|
||||
@@ -5766,6 +5767,32 @@ int main (int argc, char **argv) {
|
||||
@@ -6100,6 +6101,32 @@ int main (int argc, char **argv) {
|
||||
|
||||
if (pid_file != NULL) {
|
||||
save_pid(pid_file);
|
||||
|
Loading…
x
Reference in New Issue
Block a user