David Martínez
8 years ago
committed by
Fredrik Fornwall
4 changed files with 131 additions and 0 deletions
@ -0,0 +1,19 @@ |
|||
TERMUX_PKG_HOMEPAGE=https://memcached.org/ |
|||
TERMUX_PKG_DESCRIPTION="Free & open source, high-performance, distributed memory object caching system" |
|||
TERMUX_PKG_VERSION=1.4.36 |
|||
TERMUX_PKG_SRCURL=http://www.memcached.org/files/memcached-$TERMUX_PKG_VERSION.tar.gz |
|||
TERMUX_PKG_SHA256=773b6bb20bf80223ca6a15d75f570fbab346ad11ec98595e5af5e33f54bd82d8 |
|||
TERMUX_PKG_DEPENDS="libevent, libsasl" |
|||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-sasl --disable-coverage" |
|||
TERMUX_PKG_BUILD_IN_SRC=yes |
|||
|
|||
termux_step_pre_configure() { |
|||
export ac_cv_c_endian=little |
|||
|
|||
# fix SASL configuration path |
|||
perl -p -i -e "s#/etc/sasl#$TERMUX_PREFIX/etc/sasl#" $TERMUX_PKG_BUILDDIR/sasl_defs.c |
|||
|
|||
# getsubopt() taken from https://github.com/lxc/lxc/blob/master/src/include/getsubopt.c |
|||
cp $TERMUX_PKG_BUILDER_DIR/getsubopt.c $TERMUX_PKG_SRCDIR |
|||
cp $TERMUX_PKG_BUILDER_DIR/getsubopt.h $TERMUX_PKG_SRCDIR |
|||
} |
@ -0,0 +1,89 @@ |
|||
/*
|
|||
* Android c-library does not have getsubopt, |
|||
* so code lifted from uClibc |
|||
* http://git.uclibc.org/uClibc/tree/libc/unistd/getsubopt.c
|
|||
*/ |
|||
|
|||
/* Parse comma separate list into words.
|
|||
Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc. |
|||
This file is part of the GNU C Library. |
|||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. |
|||
The GNU C Library is free software; you can redistribute it and/or |
|||
modify it under the terms of the GNU Lesser General Public |
|||
License as published by the Free Software Foundation; either |
|||
version 2.1 of the License, or (at your option) any later version. |
|||
The GNU C Library is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|||
Lesser General Public License for more details. |
|||
You should have received a copy of the GNU Lesser General Public |
|||
License along with the GNU C Library; if not, write to the Free |
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA |
|||
02111-1307 USA. */ |
|||
|
|||
|
|||
#include <stdlib.h> |
|||
#include <string.h> |
|||
|
|||
char *strchrnul(const char *s, int c) |
|||
{ |
|||
char *result; |
|||
|
|||
result = strchr( s, c ); |
|||
|
|||
if( !result ) |
|||
{ |
|||
result = (char *)s + strlen( s ); |
|||
} |
|||
|
|||
return( result ); |
|||
} |
|||
|
|||
/* Parse comma separated suboption from *OPTIONP and match against
|
|||
strings in TOKENS. If found return index and set *VALUEP to |
|||
optional value introduced by an equal sign. If the suboption is |
|||
not part of TOKENS return in *VALUEP beginning of unknown |
|||
suboption. On exit *OPTIONP is set to the beginning of the next |
|||
token or at the terminating NUL character. */ |
|||
int |
|||
getsubopt (char **optionp, char *const *tokens, char **valuep) |
|||
{ |
|||
char *endp, *vstart; |
|||
int cnt; |
|||
|
|||
if (**optionp == '\0') |
|||
return -1; |
|||
|
|||
/* Find end of next token. */ |
|||
endp = strchrnul (*optionp, ','); |
|||
|
|||
/* Find start of value. */ |
|||
vstart = memchr (*optionp, '=', endp - *optionp); |
|||
if (vstart == NULL) |
|||
vstart = endp; |
|||
|
|||
/* Try to match the characters between *OPTIONP and VSTART against
|
|||
one of the TOKENS. */ |
|||
for (cnt = 0; tokens[cnt] != NULL; ++cnt) |
|||
if (strncmp (*optionp, tokens[cnt], vstart - *optionp) == 0 |
|||
&& tokens[cnt][vstart - *optionp] == '\0') |
|||
{ |
|||
/* We found the current option in TOKENS. */ |
|||
*valuep = vstart != endp ? vstart + 1 : NULL; |
|||
|
|||
if (*endp != '\0') |
|||
*endp++ = '\0'; |
|||
*optionp = endp; |
|||
|
|||
return cnt; |
|||
} |
|||
|
|||
/* The current suboption does not match any option. */ |
|||
*valuep = *optionp; |
|||
|
|||
if (*endp != '\0') |
|||
*endp++ = '\0'; |
|||
*optionp = endp; |
|||
|
|||
return -1; |
|||
} |
@ -0,0 +1,4 @@ |
|||
#ifndef _getsubopt_h |
|||
#define _getsubopt_h |
|||
int getsubopt (char **optionp, char *const *tokens, char **valuep); |
|||
#endif |
@ -0,0 +1,19 @@ |
|||
--- ../../build/memcached/cache/memcached-1.4.35/memcached.c 2017-02-26 21:09:58.000000000 +0100
|
|||
+++ ./memcached.c 2017-03-09 00:43:30.891562086 +0100
|
|||
@@ -14,6 +14,7 @@
|
|||
* Brad Fitzpatrick <brad@danga.com> |
|||
*/ |
|||
#include "memcached.h" |
|||
+#include "getsubopt.h"
|
|||
#include <sys/stat.h> |
|||
#include <sys/socket.h> |
|||
#include <sys/un.h> |
|||
@@ -50,7 +51,7 @@
|
|||
|
|||
/* FreeBSD 4.x doesn't have IOV_MAX exposed. */ |
|||
#ifndef IOV_MAX |
|||
-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__GNU__)
|
|||
+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__GNU__) || defined(__ANDROID__)
|
|||
# define IOV_MAX 1024 |
|||
/* GNU/Hurd don't set MAXPATHLEN |
|||
* http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#PATH_MAX_tt_MAX_PATH_tt_MAXPATHL */ |
Loading…
Reference in new issue