Import memcached 1.1.11

memcached is a high-performance, distributed memory object caching
system, generic in nature, but intended for use in speeding up dynamic
web applications by alleviating database load.

help and ok naddy@
This commit is contained in:
alek 2004-11-10 20:23:31 +00:00
parent e0061a3990
commit 02a7781ac7
7 changed files with 102 additions and 0 deletions

25
misc/memcached/Makefile Normal file
View File

@ -0,0 +1,25 @@
# $OpenBSD: Makefile,v 1.1.1.1 2004/11/10 20:23:31 alek Exp $
COMMENT= "distributed memory object caching system"
DISTNAME= memcached-1.1.11
CATEGORIES= misc
HOMEPAGE= http://www.danga.com/memcached/
MAINTAINER= Aleksander Piotrowski <alek@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/dist/
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-libevent=/usr
NO_REGRESS= Yes
.include <bsd.port.mk>

3
misc/memcached/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (memcached-1.1.11.tar.gz) = f42301c02e4223a1f2298dd3d3c30d90
RMD160 (memcached-1.1.11.tar.gz) = 368029eb8751a8483846bb0a66d3bf12f157634d
SHA1 (memcached-1.1.11.tar.gz) = 2aae771cfa79db39e797c8fa5ee0ebff3ddfed56

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/11/10 20:23:31 alek Exp $
--- Makefile.in.orig Sat Oct 9 14:21:11 2004
+++ Makefile.in Sat Oct 9 14:21:31 2004
@@ -224,6 +224,7 @@ install-man1:
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ inst=`basename $$i`; \
echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
$(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
done

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-items_c,v 1.1.1.1 2004/11/10 20:23:31 alek Exp $
--- items.c.orig Wed Nov 10 18:38:19 2004
+++ items.c Wed Nov 10 18:38:49 2004
@@ -228,7 +228,7 @@ char *item_cachedump(unsigned int slabs_
break;
if (!it)
break;
- sprintf(temp, "ITEM %s [%u b; %lu s]\r\n", ITEM_key(it), it->nbytes - 2, it->time);
+ sprintf(temp, "ITEM %s [%u b; %u s]\r\n", ITEM_key(it), it->nbytes - 2, it->time);
len = strlen(temp);
if (bufcurr + len +5 > memlimit) /* 5 is END\r\n */
break;
@@ -257,7 +257,7 @@ void item_stats(char *buffer, int buflen
for (i=0; i<LARGEST_ID; i++) {
if (tails[i])
- bufcurr += sprintf(bufcurr, "STAT items:%u:number %u\r\nSTAT items:%u:age %lu\r\n",
+ bufcurr += sprintf(bufcurr, "STAT items:%u:number %u\r\nSTAT items:%u:age %u\r\n",
i, sizes[i], i, now - tails[i]->time);
}
strcpy(bufcurr, "END");

View File

@ -0,0 +1,36 @@
$OpenBSD: patch-memcached_c,v 1.1.1.1 2004/11/10 20:23:31 alek Exp $
--- memcached.c.orig Wed Nov 10 16:32:50 2004
+++ memcached.c Wed Nov 10 18:37:25 2004
@@ -21,7 +21,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/resource.h>
/* some POSIX systems need the following definition
* to get mlockall flags out of sys/mman.h. */
@@ -320,11 +320,11 @@ void process_stat(conn *c, char *command
getrusage(RUSAGE_SELF, &usage);
pos += sprintf(pos, "STAT pid %u\r\n", pid);
- pos += sprintf(pos, "STAT uptime %lu\r\n", now - stats.started);
+ pos += sprintf(pos, "STAT uptime %u\r\n", now - stats.started);
pos += sprintf(pos, "STAT time %u\r\n", now);
pos += sprintf(pos, "STAT version " VERSION "\r\n");
- pos += sprintf(pos, "STAT rusage_user %u:%u\r\n", usage.ru_utime.tv_sec, usage.ru_utime.tv_usec);
- pos += sprintf(pos, "STAT rusage_system %u:%u\r\n", usage.ru_stime.tv_sec, usage.ru_stime.tv_usec);
+ pos += sprintf(pos, "STAT rusage_user %lu:%lu\r\n", usage.ru_utime.tv_sec, usage.ru_utime.tv_usec);
+ pos += sprintf(pos, "STAT rusage_system %lu:%lu\r\n", usage.ru_stime.tv_sec, usage.ru_stime.tv_usec);
pos += sprintf(pos, "STAT curr_items %u\r\n", stats.curr_items);
pos += sprintf(pos, "STAT total_items %u\r\n", stats.total_items);
pos += sprintf(pos, "STAT bytes %llu\r\n", stats.curr_bytes);
@@ -504,7 +504,7 @@ void process_command(conn *c, char *comm
int len, res;
item *it;
- res = sscanf(command, "%*s %250s %u %lu %d\n", key, &flags, &expire, &len);
+ res = sscanf(command, "%*s %250s %u %u %d\n", key, &flags, &expire, &len);
if (res!=4 || strlen(key)==0 ) {
out_string(c, "CLIENT_ERROR bad command line format");
return;

3
misc/memcached/pkg/DESCR Normal file
View File

@ -0,0 +1,3 @@
memcached is a high-performance, distributed memory object caching
system, generic in nature, but intended for use in speeding up dynamic
web applications by alleviating database load.

3
misc/memcached/pkg/PLIST Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/11/10 20:23:31 alek Exp $
bin/memcached
@man man/man1/memcached.1