diff --git a/net/memcached/Makefile b/net/memcached/Makefile index 211cfe054d..0bad81b359 100644 --- a/net/memcached/Makefile +++ b/net/memcached/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=memcached -PKG_VERSION:=1.4.24 -PKG_RELEASE:=2 +PKG_VERSION:=1.4.26 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://memcached.org/files -PKG_MD5SUM:=4d6e8c90e2068580526c7579dd7f37f6 +PKG_MD5SUM:=59b7bbfbc9cde5731bf4446e1e37b440 PKG_INSTALL:=1 PKG_MAINTAINER:=Thomas Heil PKG_LICENSE:=permissive free software license diff --git a/net/memcached/patches/001-musl-compat.patch b/net/memcached/patches/001-musl-compat.patch deleted file mode 100644 index 558931e4f5..0000000000 --- a/net/memcached/patches/001-musl-compat.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- memcached-1.4.15.orig/assoc.c -+++ memcached-1.4.15/assoc.c -@@ -14,8 +14,8 @@ - #include "memcached.h" - #include - #include --#include - #include -+#include - #include - #include - #include ---- memcached-1.4.15.orig/items.c -+++ memcached-1.4.15/items.c -@@ -2,13 +2,13 @@ - #include "memcached.h" - #include - #include --#include - #include - #include - #include - #include - #include - #include -+#include - #include - #include - #include ---- memcached-1.4.15.orig/slabs.c -+++ memcached-1.4.15/slabs.c -@@ -10,7 +10,6 @@ - #include "memcached.h" - #include - #include --#include - #include - #include - #include -@@ -18,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/net/memcached/patches/100-fix_iov_max.patch b/net/memcached/patches/100-fix_iov_max.patch index 1a5da94b05..55a980ca5d 100644 --- a/net/memcached/patches/100-fix_iov_max.patch +++ b/net/memcached/patches/100-fix_iov_max.patch @@ -1,5 +1,7 @@ ---- a/memcached.c -+++ b/memcached.c +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 * Brad Fitzpatrick @@ -11,7 +13,7 @@ #include "memcached.h" #include #include -@@ -29,9 +33,6 @@ +@@ -30,9 +34,6 @@ #define _P1003_1B_VISIBLE #endif /* need this to get IOV_MAX on some platforms. */