[oe,meta-networking,10/17] memcached: Upgrade to 1.4.36

Message ID 20170424052058.4952-10-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-multimedia,01/17] musicbrainz: Upgrade to 5.1.0
Related show

Commit Message

Khem Raj April 24, 2017, 5:20 a.m.
Signed-off-by: Khem Raj <raj.khem@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(-)
 delete mode 100644 meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch
 rename meta-networking/recipes-support/memcached/{memcached_1.4.33.bb => memcached_1.4.36.bb} (87%)

-- 
2.12.2

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch hide | download patch | download mbox

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 ed86ffae4..000000000
--- 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 da9a693ac..48c3c9ee2 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'