From 09e7ae53fdc8456828c47414eff926c25b424823 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Apr 2017 22:20:51 -0700 Subject: memcached: Upgrade to 1.4.36 Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../memcached/memcached/redundant_comparison.patch | 13 ------ .../recipes-support/memcached/memcached_1.4.33.bb | 52 ---------------------- .../recipes-support/memcached/memcached_1.4.36.bb | 52 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 65 deletions(-) delete mode 100644 meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch delete mode 100644 meta-networking/recipes-support/memcached/memcached_1.4.33.bb create mode 100644 meta-networking/recipes-support/memcached/memcached_1.4.36.bb 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 ed86ffae4d..0000000000 --- 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.33.bb deleted file mode 100644 index da9a693ac7..0000000000 --- a/meta-networking/recipes-support/memcached/memcached_1.4.33.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "A high-performance memory object caching system" -DESCRIPTION = "\ - memcached optimizes specific high-load serving applications that are designed \ - to take advantage of its versatile no-locking memory access system. Clients \ - are available in several different programming languages, to suit the needs \ - of the specific application. Traditionally this has been used in mod_perl \ - apps to avoid storing large chunks of data in Apache memory, and to share \ - this burden across several machines." -SECTION = "web" -HOMEPAGE = "http://memcached.org/" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" - -inherit autotools - -DEPENDS += "libevent" -RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ - perl-module-tie-hash bash \ - " - -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" - -# set the same COMPATIBLE_HOST as libhugetlbfs -COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux' - -python __anonymous () { - endianness = d.getVar('SITEINFO_ENDIANNESS') - if endianness == 'le': - d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=little") - else: - d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" - -inherit update-rc.d - -INITSCRIPT_NAME = "memcached" -INITSCRIPT_PARAMS = "defaults" - -do_install_append() { - install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached - mkdir -p ${D}/usr/share/memcached/scripts - install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts - install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts -} diff --git a/meta-networking/recipes-support/memcached/memcached_1.4.36.bb b/meta-networking/recipes-support/memcached/memcached_1.4.36.bb new file mode 100644 index 0000000000..48c3c9ee29 --- /dev/null +++ b/meta-networking/recipes-support/memcached/memcached_1.4.36.bb @@ -0,0 +1,52 @@ +SUMMARY = "A high-performance memory object caching system" +DESCRIPTION = "\ + memcached optimizes specific high-load serving applications that are designed \ + to take advantage of its versatile no-locking memory access system. Clients \ + are available in several different programming languages, to suit the needs \ + of the specific application. Traditionally this has been used in mod_perl \ + apps to avoid storing large chunks of data in Apache memory, and to share \ + this burden across several machines." +SECTION = "web" +HOMEPAGE = "http://memcached.org/" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" + +inherit autotools + +DEPENDS += "libevent" +RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ + perl-module-tie-hash bash \ + " + +SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ + 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' + +python __anonymous () { + endianness = d.getVar('SITEINFO_ENDIANNESS') + if endianness == 'le': + d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=little") + else: + d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" + +inherit update-rc.d + +INITSCRIPT_NAME = "memcached" +INITSCRIPT_PARAMS = "defaults" + +do_install_append() { + install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached + mkdir -p ${D}/usr/share/memcached/scripts + install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts + install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts +} -- cgit 1.2.3-korg