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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Feb 4 17:17:08 CET 2011


Revision: 13193
          http://gar.svn.sourceforge.net/gar/?rev=13193&view=rev
Author:   dmichelsen
Date:     2011-02-04 16:17:08 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
memcached: Update to 1.4.5 and add lots of fixes

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

Added Paths:
-----------
    csw/mgar/pkg/memcached/trunk/files/0001-Fix-alignment-check-as-84148994-0x05040302.patch
    csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch
    csw/mgar/pkg/memcached/trunk/files/0002-Take-endianness-into-account-on-alignment-check.patch

Modified: csw/mgar/pkg/memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/memcached/trunk/Makefile	2011-02-04 16:16:54 UTC (rev 13192)
+++ csw/mgar/pkg/memcached/trunk/Makefile	2011-02-04 16:17:08 UTC (rev 13193)
@@ -1,5 +1,5 @@
 NAME = memcached
-VERSION = 1.4.4
+VERSION = 1.4.5
 CATEGORIES = net
 
 DESCRIPTION = Distributed memory object caching system
@@ -12,23 +12,45 @@
 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
+PATCHFILES += 0001-Fix-alignment-check-as-84148994-0x05040302.patch
+PATCHFILES += 0002-Take-endianness-into-account-on-alignment-check.patch
+
+PATCHFILES += 0001-Make-sure-to-wait-for-data.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
+# distributed release tarball.
+NOGITPATCH = 1
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-SPKG_SOURCEURL = http://www.danga.com/memcached/
+VENDOR_URL = http://memcached.org/
 
 BUILD_DEP_PKGS = CSWlibevent-devel
-RUNTIME_DEP_PKGS = CSWlibevent
+RUNTIME_DEP_PKGS = CSWlibevent2-0-5
 
-# Solaris 8 Sparc does work, but Solaris 8 x86 has many failed tests due to
-# errors in Solaris 8 itself. For consistency we build from Solaris 9 on for
-# both ISAs.
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
+# Make special version for Solaris 10 with enabled DTrace
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
+# SASL is not 64 bit yet!
+#CONFIGURE_ARGS += --enable-sasl
+#CONFIGURE_ARGS += --enable-sasl-pwdb
 
-SKIPTEST ?= 1
+CONFIGURE_ARGS-sol5.10 += --enable-dtrace
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL))
 
+# From Trond Norbye:
+# The 101 test is a "bogus" test (it is there to prove that a deadlock is in the
+# client and not in the memcached server) and it will suck up all resources on the box...
+#SKIP_TEST_101 = 1
+#EXTRA_TEST_EXPORTS = SKIP_TEST_101
+
 include gar/category.mk
 

Modified: csw/mgar/pkg/memcached/trunk/checksums
===================================================================
--- csw/mgar/pkg/memcached/trunk/checksums	2011-02-04 16:16:54 UTC (rev 13192)
+++ csw/mgar/pkg/memcached/trunk/checksums	2011-02-04 16:17:08 UTC (rev 13193)
@@ -1 +1 @@
-5ca5b24de347e97ac1f48f3785b4178a  memcached-1.4.4.tar.gz
+583441a25f937360624024f2881e5ea8  memcached-1.4.5.tar.gz

Added: csw/mgar/pkg/memcached/trunk/files/0001-Fix-alignment-check-as-84148994-0x05040302.patch
===================================================================
--- csw/mgar/pkg/memcached/trunk/files/0001-Fix-alignment-check-as-84148994-0x05040302.patch	                        (rev 0)
+++ csw/mgar/pkg/memcached/trunk/files/0001-Fix-alignment-check-as-84148994-0x05040302.patch	2011-02-04 16:17:08 UTC (rev 13193)
@@ -0,0 +1,25 @@
+From 0bbc9aaa1c7648670375cd2ed23754f736ac12aa Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 19 Jan 2011 14:16:22 +0100
+Subject: [PATCH 1/2] Fix alignment check as 84148994 == 0x05040302
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a1b703..1fc9ebc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,7 +423,7 @@ AC_DEFUN([AC_C_ALIGNMENT],
+        *ptr = 0x1;
+ 
+        // catch unaligned word access (ARM cpus)
+-       *buf =  1; *(buf +1) = 2; *(buf + 2) = 2; *(buf + 3) = 3; *(buf + 4) = 4;
++       *buf =  1; *(buf +1) = 2; *(buf + 2) = 3; *(buf + 3) = 4; *(buf + 4) = 5;
+        int* i = (int*)(buf+1);
+        return (84148994 == i) ? 0 : 1;
+     ])
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch
===================================================================
--- csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch	                        (rev 0)
+++ csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch	2011-02-04 16:17:08 UTC (rev 13193)
@@ -0,0 +1,29 @@
+From 393936cffd43bd2070c902f55b88dbde9e4c56f4 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 4 Feb 2011 16:58:41 +0100
+Subject: [PATCH] Make sure to wait for data
+
+---
+ t/binary.t |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/t/binary.t b/t/binary.t
+index 1108b8e..de7555e 100755
+--- a/t/binary.t
++++ b/t/binary.t
+@@ -535,7 +535,11 @@ sub _handle_single_response {
+     my $self = shift;
+     my $myopaque = shift;
+ 
+-    $self->{socket}->recv(my $response, ::MIN_RECV_BYTES);
++    my $response;
++    do {
++      $self->{socket}->recv(my $lresponse, ::MIN_RECV_BYTES);
++      $response .= $lresponse;
++    } while( length($response) < ::MIN_RECV_BYTES );
+     Test::More::is(length($response), ::MIN_RECV_BYTES, "Expected read length");
+ 
+     my ($magic, $cmd, $keylen, $extralen, $datatype, $status, $remaining,
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/memcached/trunk/files/0002-Take-endianness-into-account-on-alignment-check.patch
===================================================================
--- csw/mgar/pkg/memcached/trunk/files/0002-Take-endianness-into-account-on-alignment-check.patch	                        (rev 0)
+++ csw/mgar/pkg/memcached/trunk/files/0002-Take-endianness-into-account-on-alignment-check.patch	2011-02-04 16:17:08 UTC (rev 13193)
@@ -0,0 +1,31 @@
+From 9990a716a025efad8d53a6788b8614c9bfd89075 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 19 Jan 2011 14:50:32 +0100
+Subject: [PATCH 2/2] Take endianness into account on alignment check
+
+---
+ configure.ac |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1fc9ebc..98b6812 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -425,7 +425,13 @@ AC_DEFUN([AC_C_ALIGNMENT],
+        // catch unaligned word access (ARM cpus)
+        *buf =  1; *(buf +1) = 2; *(buf + 2) = 3; *(buf + 3) = 4; *(buf + 4) = 5;
+        int* i = (int*)(buf+1);
+-       return (84148994 == i) ? 0 : 1;
++       return (
++#ifdef ENDIAN_BIG
++                0x02030405
++#else
++                0x05040302
++#endif
++                        == *i) ? 0 : 1;
+     ])
+   ],[
+     ac_cv_c_alignment=none
+-- 
+1.7.3.2
+


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