diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-05-18 07:07:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 07:07:45 -0700 |
| commit | 717168e074f7fc13824016141342ee8499ec6a71 (patch) | |
| tree | 5d6ba53db4736f22c041f7cde1936539847306d4 /net | |
| parent | e2e5eaf678e858f7e19cc99c046b30d3b5a81560 (diff) | |
| parent | 73ce3f5e6c7522c0c3e287dda223c78adbb9804c (diff) | |
Merge pull request #8901 from neheb/mem
memcached: Update to 1.5.14
Diffstat (limited to 'net')
| -rw-r--r-- | net/memcached/Makefile | 15 | ||||
| -rw-r--r-- | net/memcached/patches/100-fix_iov_max.patch | 25 |
2 files changed, 4 insertions, 36 deletions
diff --git a/net/memcached/Makefile b/net/memcached/Makefile index ec8869442..8f2b46419 100644 --- a/net/memcached/Makefile +++ b/net/memcached/Makefile @@ -9,15 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=memcached -PKG_VERSION:=1.5.2 +PKG_VERSION:=1.5.14 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://memcached.org/files -PKG_HASH:=9ac93113bdb5d037e79c61277386564ac2e5e31d49e594f11e554e4c149b7245 +PKG_SOURCE_URL:=https://memcached.org/files +PKG_HASH:=9c5bdf29a780fb6c6f7c9eaaeeda0583efdf663193758c3e316c969a510af2a9 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> - PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING @@ -30,7 +29,7 @@ define Package/memcached CATEGORY:=Network DEPENDS:=+libevent2 +libpthread TITLE:=The high-performance, distributed memory object caching system - URL:=http://memcached.org/ + URL:=https://memcached.org/ endef define Package/memcached/description @@ -54,12 +53,6 @@ CONFIGURE_ARGS += \ --disable-coverage \ --disable-sasl -TARGET_CFLAGS += \ - -std=gnu99 - -TARGET_LDFLAGS = \ - -L$(STAGING_DIR)/usr/lib/libevent -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib - define Package/memcached/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/memcached $(1)/usr/bin/ diff --git a/net/memcached/patches/100-fix_iov_max.patch b/net/memcached/patches/100-fix_iov_max.patch deleted file mode 100644 index 55a980ca5..000000000 --- a/net/memcached/patches/100-fix_iov_max.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: memcached-1.4.26/memcached.c -=================================================================== ---- memcached-1.4.26.orig/memcached.c -+++ memcached-1.4.26/memcached.c -@@ -13,6 +13,10 @@ - * Anatoly Vorobey <mellon@pobox.com> - * Brad Fitzpatrick <brad@danga.com> - */ -+#ifndef __need_IOV_MAX -+#define __need_IOV_MAX -+#endif -+ - #include "memcached.h" - #include <sys/stat.h> - #include <sys/socket.h> -@@ -30,9 +34,6 @@ - #define _P1003_1B_VISIBLE - #endif - /* need this to get IOV_MAX on some platforms. */ --#ifndef __need_IOV_MAX --#define __need_IOV_MAX --#endif - #include <pwd.h> - #include <sys/mman.h> - #include <fcntl.h> |