[oe-commits] [meta-openembedded] 21/37: memcached: Upgrade to 1.4.36

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 30ea154da67833d5500dbeafea29bec10f41d12a
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Sun Apr 23 22:20:51 2017 -0700

    memcached: Upgrade to 1.4.36
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../memcached/memcached/redundant_comparison.patch          | 13 -------------
 .../memcached/{memcached_1.4.33.bb => memcached_1.4.36.bb}  |  8 ++++----
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch b/meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch
deleted file mode 100644
index ed86ffa..0000000
--- a/meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: memcached-1.4.33/items.c
-===================================================================
---- memcached-1.4.33.orig/items.c
-+++ memcached-1.4.33/items.c
-@@ -148,7 +148,7 @@ item *do_item_alloc(char *key, const siz
-     uint8_t nsuffix;
-     item *it = NULL;
-     char suffix[40];
--    if (nbytes < 2 || nkey < 0)
-+    if (nbytes < 2)
-         return 0;
- 
-     size_t ntotal = item_make_header(nkey + 1, flags, nbytes, suffix, &nsuffix);
diff --git a/meta-networking/recipes-support/memcached/memcached_1.4.33.bb b/meta-networking/recipes-support/memcached/memcached_1.4.36.bb
similarity index 87%
rename from meta-networking/recipes-support/memcached/memcached_1.4.33.bb
rename to meta-networking/recipes-support/memcached/memcached_1.4.36.bb
index da9a693..48c3c9e 100644
--- a/meta-networking/recipes-support/memcached/memcached_1.4.33.bb
+++ b/meta-networking/recipes-support/memcached/memcached_1.4.36.bb
@@ -20,10 +20,10 @@ RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \
     "
 
 SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \
-           file://redundant_comparison.patch \
-           file://memcached-add-hugetlbfs-check.patch"
-SRC_URI[md5sum] = "2d7f6476283cd36e21e521d901d37a8f"
-SRC_URI[sha256sum] = "83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d"
+           file://memcached-add-hugetlbfs-check.patch \
+           "
+SRC_URI[md5sum] = "1e028fbab7288911fcaa5ed2a21817fe"
+SRC_URI[sha256sum] = "773b6bb20bf80223ca6a15d75f570fbab346ad11ec98595e5af5e33f54bd82d8"
 
 # set the same COMPATIBLE_HOST as libhugetlbfs
 COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux'

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.