18132841 upgrade memcached to 1.4.17 s11u1-sru
authorApril Chin <april.chin@oracle.com>
Fri, 31 Jan 2014 17:06:17 -0800
branchs11u1-sru
changeset 2929 44b96fbacc57
parent 2927 262a25d50d74
child 2933 0b4ea6b320b4
18132841 upgrade memcached to 1.4.17 18038368 problem in DATABASE/MEMCACHED
components/memcached/Makefile
components/memcached/memcached.license
components/memcached/patches/01-tests.patch
components/memcached/patches/tests.patch
--- a/components/memcached/Makefile	Fri Jan 31 10:31:32 2014 -0800
+++ b/components/memcached/Makefile	Fri Jan 31 17:06:17 2014 -0800
@@ -20,19 +20,19 @@
 #
 
 #
-# Copyright (c) 2011, 2012, 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)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/memcached/memcached.license	Fri Jan 31 10:31:32 2014 -0800
+++ b/components/memcached/memcached.license	Fri Jan 31 17:06:17 2014 -0800
@@ -1,8 +1,8 @@
--------------------
-- memcached 1.4.5 -
--------------------
+--------------------
+- memcached 1.4.17 -
+--------------------
 
-Oracle Internal Tracking Number 5711
+Oracle Internal Tracking Number 16265
 
 Copyright (c) 2003, Danga Interactive, Inc.
 All rights reserved.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/memcached/patches/01-tests.patch	Fri Jan 31 17:06:17 2014 -0800
@@ -0,0 +1,16 @@
+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
[email protected]@ -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
+-	$(srcdir)/sizes
+-	$(srcdir)/testapp
+-	prove $(srcdir)/t
++	./sizes
++	./testapp
++	prove ./t
+ 	@if test `basename $(PROFILER)` = "gcov"; then \
+ 	  for file in memcached_debug-*.gc??; do \
+ 	    mv -f $$file `echo $$file | sed 's/memcached_debug-//'`; \
--- a/components/memcached/patches/tests.patch	Fri Jan 31 10:31:32 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- 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
[email protected]@ -1194,9 +1194,9 @@
- 	$(DTRACE) $(DTRACEFLAGS) -G -o memcached_debug_dtrace.o -s ${srcdir}/memcached_dtrace.d $(memcached_debug_OBJECTS)
- 
- test:	memcached-debug sizes testapp
--	$(srcdir)/sizes
--	$(srcdir)/testapp
--	prove $(srcdir)/t
-+	./sizes
-+	./testapp
-+	prove ./t
- 	@if test `basename $(PROFILER)` = "gcov"; then \
- 	  for file in memcached_debug-*.gc??; do \
- 	    mv -f $$file `echo $$file | sed 's/memcached_debug-//'`; \