[csw-devel] SF.net SVN: gar:[15962] csw/mgar/pkg/memcached/trunk

wilbury at users.sourceforge.net wilbury at users.sourceforge.net
Sun Oct 23 14:12:01 CEST 2011


Revision: 15962
          http://gar.svn.sourceforge.net/gar/?rev=15962&view=rev
Author:   wilbury
Date:     2011-10-23 12:12:01 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
memcached/trunk: Update to 1.4.9

Modified Paths:
--------------
    csw/mgar/pkg/memcached/trunk/Makefile
    csw/mgar/pkg/memcached/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/memcached/trunk/files/0001-Fix-memcached_dtrace.d-and-add-touch-command.patch

Modified: csw/mgar/pkg/memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/memcached/trunk/Makefile	2011-10-23 10:44:13 UTC (rev 15961)
+++ csw/mgar/pkg/memcached/trunk/Makefile	2011-10-23 12:12:01 UTC (rev 15962)
@@ -1,5 +1,5 @@
 NAME = memcached
-VERSION = 1.4.5
+VERSION = 1.4.9
 CATEGORIES = net
 
 DESCRIPTION = Distributed memory object caching system
@@ -12,18 +12,20 @@
 MASTER_SITES = http://memcached.googlecode.com/files/
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
-# Use patches until this is applied:
-#   https://github.com/memcached/memcached/pull/3
+## Use patches until this is applied:
+##   https://github.com/memcached/memcached/pull/3
 PATCHFILES += 0001-Fix-alignment-check-as-84148994-0x05040302.patch
 PATCHFILES += 0002-Take-endianness-into-account-on-alignment-check.patch
-
-# The addition of more status field made the data arrive in multiple packets
-# leading to broken tests when it is not waited for more packages.
+#
+## The addition of more status field made the data arrive in multiple packets
+## leading to broken tests when it is not waited for more packages.
 PATCHFILES += 0003-Make-sure-to-wait-for-data.patch
-
-# Looks like the data structure is not clean on sparcv9 (only!)
+#
+## Looks like the data structure is not clean on sparcv9 (only!)
 PATCHFILES += 0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch
 
+PATCHFILES += 0001-Fix-memcached_dtrace.d-and-add-touch-command.patch
+
 # If we enable GIT patching this makes a .git repo in $WORKSRC.
 # Unfortunatly this triggers maintainer mode for t/whitespace.t which
 # then fails because the developer GIT repo contains more things than the
@@ -35,7 +37,7 @@
 
 VENDOR_URL = http://memcached.org/
 
-BUILD_DEP_PKGS = CSWlibevent-devel
+BUILD_DEP_PKGS = CSWlibevent-dev
 RUNTIME_DEP_PKGS = CSWlibevent2-0-5
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
@@ -51,5 +53,7 @@
 CONFIGURE_ARGS-sol5.10 += --enable-dtrace
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL))
 
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-amd64
+
 include gar/category.mk
 

Modified: csw/mgar/pkg/memcached/trunk/checksums
===================================================================
--- csw/mgar/pkg/memcached/trunk/checksums	2011-10-23 10:44:13 UTC (rev 15961)
+++ csw/mgar/pkg/memcached/trunk/checksums	2011-10-23 12:12:01 UTC (rev 15962)
@@ -1 +1 @@
-583441a25f937360624024f2881e5ea8  memcached-1.4.5.tar.gz
+e55fd8144f3a36189f42c12ceb22832b  memcached-1.4.9.tar.gz

Added: csw/mgar/pkg/memcached/trunk/files/0001-Fix-memcached_dtrace.d-and-add-touch-command.patch
===================================================================
--- csw/mgar/pkg/memcached/trunk/files/0001-Fix-memcached_dtrace.d-and-add-touch-command.patch	                        (rev 0)
+++ csw/mgar/pkg/memcached/trunk/files/0001-Fix-memcached_dtrace.d-and-add-touch-command.patch	2011-10-23 12:12:01 UTC (rev 15962)
@@ -0,0 +1,34 @@
+From b8f575fd06bcb98a44d633e290358361543645f7 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sun, 23 Oct 2011 13:59:56 +0200
+Subject: [PATCH] Fix memcached_dtrace.d and add ``touch'' command.
+
+---
+ memcached_dtrace.d |   11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/memcached_dtrace.d b/memcached_dtrace.d
+index eeffb6f..59a1a89 100644
+--- a/memcached_dtrace.d
++++ b/memcached_dtrace.d
+@@ -207,6 +207,17 @@ provider memcached {
+    probe command__add(int connid, const char *key, int keylen, int size, int64_t casid);
+ 
+    /**
++    * Fired for an touch-command.
++    * @param connid connection id
++    * @param key requested key
++    * @param keylen length of the key
++    * @param size the new size of the key's data (or signed int -1 if
++    *             not found)
++    * @param casid the casid for the item
++    */
++   probe command__touch(int connid, const char *key, int keylen, int size, int64_t casid);
++
++   /**
+     * Fired for a set-command.
+     * @param connid connection id
+     * @param key requested key
+-- 
+1.7.6.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list