diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-23 22:20:51 -0700 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2017-04-25 16:10:26 -0400 |
commit | 09e7ae53fdc8456828c47414eff926c25b424823 (patch) | |
tree | 1948f20e5beff400a4dc9150810c4c383a517de0 /meta-networking/recipes-support | |
parent | dec5adef4958e144c1168ac1db187bfde3e758e7 (diff) | |
download | meta-openembedded-09e7ae53fdc8456828c47414eff926c25b424823.tar.gz |
memcached: Upgrade to 1.4.36
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support')
-rw-r--r-- | meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch | 13 | ||||
-rw-r--r-- | meta-networking/recipes-support/memcached/memcached_1.4.36.bb (renamed from meta-networking/recipes-support/memcached/memcached_1.4.33.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 ed86ffae4..000000000 --- a/meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: memcached-1.4.33/items.c | ||
2 | =================================================================== | ||
3 | --- memcached-1.4.33.orig/items.c | ||
4 | +++ memcached-1.4.33/items.c | ||
5 | @@ -148,7 +148,7 @@ item *do_item_alloc(char *key, const siz | ||
6 | uint8_t nsuffix; | ||
7 | item *it = NULL; | ||
8 | char suffix[40]; | ||
9 | - if (nbytes < 2 || nkey < 0) | ||
10 | + if (nbytes < 2) | ||
11 | return 0; | ||
12 | |||
13 | 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 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 \ | |||
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ | 22 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ |
23 | file://redundant_comparison.patch \ | 23 | file://memcached-add-hugetlbfs-check.patch \ |
24 | file://memcached-add-hugetlbfs-check.patch" | 24 | " |
25 | SRC_URI[md5sum] = "2d7f6476283cd36e21e521d901d37a8f" | 25 | SRC_URI[md5sum] = "1e028fbab7288911fcaa5ed2a21817fe" |
26 | SRC_URI[sha256sum] = "83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d" | 26 | SRC_URI[sha256sum] = "773b6bb20bf80223ca6a15d75f570fbab346ad11ec98595e5af5e33f54bd82d8" |
27 | 27 | ||
28 | # set the same COMPATIBLE_HOST as libhugetlbfs | 28 | # set the same COMPATIBLE_HOST as libhugetlbfs |
29 | COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux' | 29 | COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux' |