Wed Apr 15 09:07:15 2009 UTC ()
Update memcached to 1.2.8

Critical bug affecting multithreaded builds
Many minor bugfixes, new statistics, minor new features.
Major crash fixes, DTrace support, minor updates.
Minor bugfixes, build support for opensolaris, ipv6 support,
"noreply" mode for many commands, largepage support for solaris.
Made out of memory errors more clear and added eviction/OOM tracking
per slab class.
Many bug and platform fixes since 1.2.2. New threading support for
stat queries. New commands 'append', 'prepend', 'gets', and 'cas'.


(mjl)
diff -r1.19 -r1.20 pkgsrc/devel/memcached/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/memcached/PLIST
diff -r1.7 -r1.8 pkgsrc/devel/memcached/distinfo
diff -r1.4 -r0 pkgsrc/devel/memcached/patches/patch-ab
diff -r0 -r1.1 pkgsrc/devel/memcached/patches/patch-ac
diff -r0 -r1.1 pkgsrc/devel/memcached/patches/patch-ad

cvs diff -r1.19 -r1.20 pkgsrc/devel/memcached/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/memcached/Makefile 2009/02/27 22:53:46 1.19
+++ pkgsrc/devel/memcached/Makefile 2009/04/15 09:07:15 1.20
@@ -1,28 +1,32 @@ @@ -1,28 +1,32 @@
1# $NetBSD: Makefile,v 1.19 2009/02/27 22:53:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2009/04/15 09:07:15 mjl Exp $
2# 2#
3 3
4DISTNAME= memcached-1.2.2 4DISTNAME= memcached-1.2.8
5PKGREVISION= 4 5# PKGREVISION= 4
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://www.danga.com/memcached/dist/ 7MASTER_SITES= http://www.danga.com/memcached/dist/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.danga.com/memcached/ 10HOMEPAGE= http://www.danga.com/memcached/
11COMMENT= High-performance distributed memory object caching system 11COMMENT= High-performance distributed memory object caching system
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
 15USE_TOOLS+= perl
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16 17
 18REPLACE_PERL= scripts/memcached-tool
 19
17CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} 20CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent}
18 21
19INSTALLATION_DIRS= bin share/doc/${PKGBASE} ${PKGMANDIR}/man1 sbin 22INSTALLATION_DIRS= bin share/doc/${PKGBASE} ${PKGMANDIR}/man1 sbin
20 23
21do-install: 24do-install:
22 ${INSTALL_PROGRAM} ${WRKSRC}/memcached ${DESTDIR}${PREFIX}/sbin 25 ${INSTALL_PROGRAM} ${WRKSRC}/memcached ${DESTDIR}${PREFIX}/sbin
23 ${INSTALL_DATA} ${WRKSRC}/doc/memcached.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 26 ${INSTALL_DATA} ${WRKSRC}/doc/memcached.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
24 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 27 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 28 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${DESTDIR}${PREFIX}/sbin
25 29
26.include "../../devel/libevent/buildlink3.mk" 30.include "../../devel/libevent/buildlink3.mk"
27BUILDLINK_API_DEPENDS.libevent+= libevent>=1.0 31BUILDLINK_API_DEPENDS.libevent+= libevent>=1.0
28.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/devel/memcached/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/memcached/PLIST 2007/08/20 17:02:40 1.3
+++ pkgsrc/devel/memcached/PLIST 2009/04/15 09:07:15 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1@comment $NetBSD: PLIST,v 1.3 2007/08/20 17:02:40 abs Exp $ 1@comment $NetBSD: PLIST,v 1.4 2009/04/15 09:07:15 mjl Exp $
2man/man1/memcached.1 2man/man1/memcached.1
3sbin/memcached 3sbin/memcached
 4sbin/memcached-tool
 5share/doc/memcached/binary-protocol-plan.txt
4share/doc/memcached/memory_management.txt 6share/doc/memcached/memory_management.txt
5share/doc/memcached/protocol.txt 7share/doc/memcached/protocol.txt
6share/doc/memcached/threads.txt 8share/doc/memcached/threads.txt
7@dirrm share/doc/memcached 9@dirrm share/doc/memcached

cvs diff -r1.7 -r1.8 pkgsrc/devel/memcached/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/memcached/distinfo 2007/08/30 19:32:49 1.7
+++ pkgsrc/devel/memcached/distinfo 2009/04/15 09:07:15 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2007/08/30 19:32:49 joerg Exp $ 1$NetBSD: distinfo,v 1.8 2009/04/15 09:07:15 mjl Exp $
2 2
3SHA1 (memcached-1.2.2.tar.gz) = b2160f63ffe6e50681b3dd13a192153130897366 3SHA1 (memcached-1.2.8.tar.gz) = 6f99414f37cc5b1a6866d9b3ec9254c2ebda237a
4RMD160 (memcached-1.2.2.tar.gz) = 78dd094efb9b17a5e80a631690b929b3a4427854 4RMD160 (memcached-1.2.8.tar.gz) = 8866865f57b6914fca98f3cf5ae0942f7e94ba00
5Size (memcached-1.2.2.tar.gz) = 166201 bytes 5Size (memcached-1.2.8.tar.gz) = 221285 bytes
6SHA1 (patch-aa) = 70b649a987f48a1811014ad92c7cc61299d7d6fe 6SHA1 (patch-aa) = 70b649a987f48a1811014ad92c7cc61299d7d6fe
7SHA1 (patch-ab) = 3668463dd4f7881588cfe32a20f17e8ce19478ab 7SHA1 (patch-ac) = c2a057b617f23ed2fc681dcd7b9072e62a5ae039
 8SHA1 (patch-ad) = d9cf95fda0d81c95e797b37c4e9211adc6d5a15d

File Deleted: pkgsrc/devel/memcached/patches/Attic/patch-ab

File Added: pkgsrc/devel/memcached/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2009/04/15 09:07:15 mjl Exp $

--- configure.orig	2009-04-15 10:39:37.000000000 +0200
+++ configure	2009-04-15 10:39:59.000000000 +0200
@@ -3807,7 +3807,7 @@
   enableval=$enable_dtrace;
 fi
 
-if test "x$enable_dtrace" == "xyes"; then
+if test "x$enable_dtrace" = "xyes"; then
   # Extract the first word of "dtrace", so it can be a program name with args.
 set dummy dtrace; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3880,7 +3880,7 @@
   enableval=$enable_64bit;
 fi
 
-if test "x$enable_64bit" == "xyes"
+if test "x$enable_64bit" = "xyes"
 then
     org_cflags=$CFLAGS
     CFLAGS=-m64
@@ -5842,7 +5842,7 @@
   enableval=$enable_threads;
 fi
 
-if test "x$enable_threads" == "xyes"; then
+if test "x$enable_threads" = "xyes"; then
   { $as_echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
 $as_echo_n "checking for library containing pthread_create... " >&6; }
 if test "${ac_cv_search_pthread_create+set}" = set; then

File Added: pkgsrc/devel/memcached/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.1 2009/04/15 09:07:15 mjl Exp $

Note: Patch from FreeBSD memcached port

--- thread.c.orig	2009-01-27 00:34:19.000000000 -0200
+++ thread.c	2009-01-27 00:34:04.000000000 -0200
@@ -644,6 +644,7 @@
         perror("Can't allocate thread descriptors");
         exit(1);
     }
+    memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads);
 
     threads[0].base = main_base;
     threads[0].thread_id = pthread_self();