Skip to content

Commit

Permalink
[CI-Examples] Update version of Memcached
Browse files Browse the repository at this point in the history
Previous version of Memcached (v1.5.21) failed on Ubuntu 22.04 and Glibc
v2.35 with a build error:

    ‘sigignore’ is deprecated: Use the signal function instead

This was fixed in v1.6.7. So let's update Memcached to the latest
available version (v1.6.21 as of Oct 2023). This latest version uses
eventfd, so we also update the manifest template.

Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii@intel.com>
  • Loading branch information
dimakuv committed Oct 9, 2023
1 parent ed0d6b0 commit 2f07819
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CI-Examples/memcached/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARCH_LIBDIR ?= /lib/$(shell $(CC) -dumpmachine)

SRCDIR = src
MEMCACHED_SRC ?= memcached-1.5.21.tar.gz
MEMCACHED_SRC ?= memcached-1.6.21.tar.gz
MEMCACHED_MIRRORS ?= \
https://memcached.org/files \
https://packages.gramineproject.io/distfiles

MEMCACHED_SHA256 ?= e3d10c06db755b220f43d26d3b68d15ebf737a69c7663529b504ab047efe92f4
MEMCACHED_SHA256 ?= c788980efc417dd5d93c442b1c8b8769fb2018896c29de3887d22a2f143da2ee

ifeq ($(DEBUG),1)
GRAMINE_LOG_LEVEL = debug
Expand Down
2 changes: 1 addition & 1 deletion CI-Examples/memcached/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Memcached

This directory contains the Makefile and the template manifest for the most
recent version of Memcached as of this writing (v1.5.21).
recent version of Memcached as of this writing (v1.6.21).

# Prerequisites

Expand Down
4 changes: 4 additions & 0 deletions CI-Examples/memcached/memcached.manifest.template
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ loader.env.LD_LIBRARY_PATH = "/lib:/usr/{{ arch_libdir }}"
loader.uid = 1000
loader.gid = 1000

# Memcached requires `eventfd` for worker thread notifications, starting from v1.6.11. If you have a
# Memcached version older than that, we recommend to remove this insecure manifest option.
sys.insecure__allow_eventfd = true

sys.enable_sigterm_injection = true

fs.mounts = [
Expand Down

0 comments on commit 2f07819

Please sign in to comment.