update to pecl-memcache 3.0.6, ok william@

- 3.0.4 was generating bogus 'delete' commands in some cases;
I noticed this when trying to use memcache as a session storage
backend with Roundcube webmail - this update fixes this.
This commit is contained in:
sthen 2012-04-16 17:44:38 +00:00
parent 37d6d73b38
commit 34aecae927
6 changed files with 35 additions and 48 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2011/11/16 15:56:38 robert Exp $
# $OpenBSD: Makefile,v 1.15 2012/04/16 17:44:38 sthen Exp $
SHARED_ONLY= Yes
COMMENT= PHP interface to memcached
DISTNAME= memcache-3.0.4
REVISION= 2
DISTNAME= memcache-3.0.6
PKGNAME= pecl-${DISTNAME}
CATEGORIES= www

View File

@ -1,5 +1,5 @@
MD5 (memcache-3.0.4.tgz) = B5M84BkSdCAeppBc1QnFsA==
RMD160 (memcache-3.0.4.tgz) = /VxVCi/Dbk5Tikc943+6r51WhbA=
SHA1 (memcache-3.0.4.tgz) = lEDetI/Vmapl+WY5RqOfq3s+hvw=
SHA256 (memcache-3.0.4.tgz) = a5npLxuzI+6PdqAcLFTYEA+Vjiq4bMIqq0lsu478pqo=
SIZE (memcache-3.0.4.tgz) = 54283
MD5 (memcache-3.0.6.tgz) = I8KhVI8/x2WLmLHGDm2DsQ==
RMD160 (memcache-3.0.6.tgz) = W26VRmGLv1etrsdN2XD75tbcnd8=
SHA1 (memcache-3.0.6.tgz) = 6wySLfP1ykWbzOheFB83nTtJDKc=
SHA256 (memcache-3.0.6.tgz) = z2hx8JRO44AixfhJEPMG2DsPUVZLvAhiSiFeBthIZhg=
SIZE (memcache-3.0.6.tgz) = 54717

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-memcache_binary_protocol_c,v 1.1 2012/04/16 17:44:38 sthen Exp $
--- memcache_binary_protocol.c.orig Mon Apr 11 05:56:53 2011
+++ memcache_binary_protocol.c Thu Apr 12 21:53:47 2012
@@ -24,8 +24,9 @@
#endif
#include <stdint.h>
-#include <arpa/inet.h>
+#include <sys/types.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include "memcache_pool.h"
#include "ext/standard/php_smart_str.h"

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-memcache_pool_c,v 1.1 2012/04/16 17:44:38 sthen Exp $
--- memcache_pool.c.orig Mon Apr 11 05:56:53 2011
+++ memcache_pool.c Thu Apr 12 21:53:54 2012
@@ -24,6 +24,8 @@
#endif
#include <zlib.h>
+#include <sys/types.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include "php.h"

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-memcache_pool_h,v 1.1 2010/04/06 02:08:45 william Exp $
Fixed PECL bug #16059 (Build error: 'MSG_NOSIGNAL' undeclared)
svn revision 277039
--- memcache_pool.h.orig Sun Feb 22 11:01:43 2009
+++ memcache_pool.h Thu Mar 18 13:46:55 2010
@@ -25,6 +25,14 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
#include <stdint.h>
#include <string.h>
@@ -40,6 +48,15 @@
#else
#define ZSTR_VAL(v) (v).s
#endif
+
+/*
+ * Mac OS X has no MSG_NOSIGNAL but >= 10.2 comes with SO_NOSIGPIPE which is a setsockopt() option
+ * and not a send() parameter as MSG_NOSIGNAL. OpenBSD has none of the options so we need to ignore
+ * SIGPIPE events
+ */
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif /*MSG_NOSIGNAL*/
/* use lowest byte for flags */
#define MMC_SERIALIZED 0x0001

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2011/07/09 00:04:11 robert Exp $
@comment $OpenBSD: PLIST,v 1.4 2012/04/16 17:44:38 sthen Exp $
@comment lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.a
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini