--- a/components/memcached/Makefile Thu Jan 16 02:14:47 2014 -0800
+++ b/components/memcached/Makefile Thu Jan 16 15:21:32 2014 -0800
@@ -20,19 +20,19 @@
#
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= memcached
-COMPONENT_VERSION= 1.4.5
+COMPONENT_VERSION= 1.4.17
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://memcached.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:9571b4b85484e46b3b10f07ccba77a1fa97d60660b32859f990effefb3005f91
-COMPONENT_ARCHIVE_URL= http://memcached.googlecode.com/files/$(COMPONENT_ARCHIVE)
+ sha256:d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458
+COMPONENT_ARCHIVE_URL= http://memcached.org/files/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= database/memcached
include ../../make-rules/prep.mk
--- a/components/memcached/memcached.p5m Thu Jan 16 02:14:47 2014 -0800
+++ b/components/memcached/memcached.p5m Thu Jan 16 15:21:32 2014 -0800
@@ -18,29 +18,29 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-set name=pkg.fmri value=pkg:/service/memcached@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/service/memcached@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The memcached memory object cache"
set name=com.oracle.info.description value="the memcached memory object cache"
-set name=com.oracle.info.tpno value=5711
-set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=com.oracle.info.tpno value=16265
+set name=info.classification \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/067
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2009/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license memcached.license license='BSD'
-
+#
file Solaris/auth_attr path=etc/security/auth_attr.d/memcached
file Solaris/prof_attr path=etc/security/prof_attr.d/memcached
-file usr/lib/$(MACH64)/memcached path=usr/lib/memcached mode=0555
file Solaris/memcached.xml \
path=lib/svc/manifest/application/database/memcached.xml
file Solaris/memcached path=lib/svc/method/memcached
file path=usr/include/memcached/protocol_binary.h
+file usr/lib/$(MACH64)/memcached path=usr/lib/memcached mode=0555
file Solaris/memcached.1m path=usr/share/man/man1m/memcached.1m
+#
+license memcached.license license=BSD
--- a/components/memcached/patches/01-tests.patch Thu Jan 16 02:14:47 2014 -0800
+++ b/components/memcached/patches/01-tests.patch Thu Jan 16 15:21:32 2014 -0800
@@ -1,6 +1,7 @@
---- memcached-1.4.5/Makefile.in.orig Mon May 9 12:37:54 2011
-+++ memcached-1.4.5/Makefile.in Mon May 9 12:38:40 2011
-@@ -1194,9 +1194,9 @@
+diff -ru memcached-1.4.17-orig/Makefile.in memcached-1.4.17/Makefile.in
+--- memcached-1.4.17-orig/Makefile.in Fri Dec 20 13:48:33 2013
++++ memcached-1.4.17/Makefile.in Tue Jan 7 12:52:05 2014
+@@ -1306,9 +1306,9 @@
$(DTRACE) $(DTRACEFLAGS) -G -o memcached_debug_dtrace.o -s ${srcdir}/memcached_dtrace.d $(memcached_debug_OBJECTS)
test: memcached-debug sizes testapp
--- a/components/memcached/patches/02-memcached-items-c.patch Thu Jan 16 02:14:47 2014 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-This patch fixes the memcached bug
-https://code.google.com/p/memcached/issues/detail?id=306,
-which is not yet fixed upstream as of memcached v1.4.15.
-When we upgrade to an upstream version which fixes this problem,
-we can delete this patch.
-Part of the fix comes from the above bug location.
-The full fix is here:
-http://debian.2.n7.nabble.com/attachment/2851013/0/memcached_1.4.13-0.2.debdiff
-
---- memcached-1.4.5-orig/items.c 2010-04-03 00:07:16.000000000 -0700
-+++ memcached-1.4.5/items.c 2013-03-15 16:26:17.095818000 -0700
-@@ -468,9 +468,17 @@ item *do_item_get(const char *key, const
-
- if (settings.verbose > 2) {
- if (it == NULL) {
-- fprintf(stderr, "> NOT FOUND %s", key);
-+ int ii;
-+ fprintf(stderr, "> NOT FOUND ");
-+ for (ii = 0; ii < nkey; ++ii) {
-+ fprintf(stderr, "%c", key[ii]);
-+ }
- } else {
-- fprintf(stderr, "> FOUND KEY %s", ITEM_key(it));
-+ int ii;
-+ fprintf(stderr, "> FOUND KEY ");
-+ for (ii = 0; ii < it->nkey; ++ii) {
-+ fprintf(stderr, "%c", ITEM_key(it)[ii]);
-+ }
- was_found++;
- }
- }
---- memcached-1.4.5-orig/memcached.c 2010-04-03 12:51:29.000000000 -0700
-+++ memcached-1.4.5/memcached.c 2013-01-15 17:30:53.964483000 -0800
-@@ -2001,7 +2001,12 @@ static void process_bin_delete(conn *c)
- assert(c != NULL);
-
- if (settings.verbose > 1) {
-- fprintf(stderr, "Deleting %s\n", key);
-+ int ii;
-+ fprintf(stderr, "Deleting ");
-+ for (ii = 0; ii < nkey; ++ii) {
-+ fprintf(stderr, "%c", key[ii]);
-+ }
-+ fprintf(stderr, "\n");
- }
-
- if (settings.detail_enabled) {