Upgrade to 0.27.

This commit is contained in:
Vanilla I. Shu
2009-03-31 07:59:35 +00:00
parent 3084092c09
commit 754e0a0166
4 changed files with 41 additions and 36 deletions

View File

@@ -6,7 +6,7 @@
#
PORTNAME= libmemcached
PORTVERSION= 0.26
PORTVERSION= 0.27
PORTREVISION= 0
CATEGORIES= databases
MASTER_SITES= http://download.tangent.org/

View File

@@ -1,3 +1,3 @@
MD5 (libmemcached-0.26.tar.gz) = a53eaa92785b7835f2a2b784e9805748
SHA256 (libmemcached-0.26.tar.gz) = aac6bdbe1cea98aa6fbcc3c6d7339180d96932b718a4a387aefbb56249a85cda
SIZE (libmemcached-0.26.tar.gz) = 443639
MD5 (libmemcached-0.27.tar.gz) = 64522b532ea35ac2ecc9b29e79e3515f
SHA256 (libmemcached-0.27.tar.gz) = 0f170c30e91ca044178c071fa55a3bcaeb476582342d99733d2c763924bc79c9
SIZE (libmemcached-0.27.tar.gz) = 451421

View File

@@ -0,0 +1,37 @@
--- configure.orig 2009-03-30 13:26:57.000000000 +0800
+++ configure 2009-03-31 15:55:57.000000000 +0800
@@ -21054,7 +21054,7 @@
{ $as_echo "$as_me:$LINENO: result: $have_htoll" >&5
$as_echo "$have_htoll" >&6; }
- if test "x$have_htoll" == "xno"; then
+ if test "x$have_htoll" = "xno"; then
BUILD_BYTEORDER_TRUE=
BUILD_BYTEORDER_FALSE='#'
else
@@ -21395,14 +21395,14 @@
MEMC_BINARY="$withval"
fi
- if test x$withval == xyes
+ if test $withval = yes
then
MEMC_BINARY=memcached
fi
# just ignore the user if --without-memcached is passed.. it is
# only used by make test
- if test x$withval == xno
+ if test $withval = no
then
MEMC_BINARY=memcached
fi
@@ -21454,7 +21454,7 @@
fi
-if test x$MEMC_BINARY == "xno"
+if test $MEMC_BINARY = "no"
then
{ { $as_echo "$as_me:$LINENO: error: \"could not find memcached binary\"" >&5
$as_echo "$as_me: error: \"could not find memcached binary\"" >&2;}

View File

@@ -1,32 +0,0 @@
--- libmemcached/memcached_connect.c.orig 2008-10-23 06:19:25.000000000 -0700
+++ libmemcached/memcached_connect.c 2008-10-23 06:23:16.000000000 -0700
@@ -225,6 +225,7 @@
{
struct pollfd fds[1];
int error;
+ socklen_t len;
memset(&fds, 0, sizeof(struct pollfd));
fds[0].fd= ptr->fd;
@@ -237,6 +238,7 @@
}
else if (error != 1 || fds[0].revents & POLLERR)
{
+closesock:
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
WATCHPOINT_NUMBER(ptr->root->connect_timeout);
@@ -259,6 +261,13 @@
return MEMCACHED_ERRNO;
}
+ len = sizeof (error);
+ if (getsockopt (ptr->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0)
+ goto closesock;
+
+ if (error > 0)
+ goto closesock;
+
break;
}
/* We are spinning waiting on connect */