extra/memcached to 1.6.10-1

This commit is contained in:
Kevin Mihelich 2021-07-26 19:06:46 +00:00
parent 6136f9a09e
commit 526e34de13
2 changed files with 4 additions and 19 deletions

View file

@ -6,7 +6,7 @@
# - remove depend on libseccomp, don't configure with --enable-seccomp; problematic on ARM
pkgname=memcached
pkgver=1.6.9
pkgver=1.6.10
pkgrel=1
pkgdesc='Distributed memory object caching system'
url='https://memcached.org/'
@ -17,19 +17,16 @@ optdepends=('perl: for memcached-tool usage')
source=(https://www.memcached.org/files/${pkgname}-${pkgver}.tar.gz
memcached.service.patch
memcached.tmpfiles
memcached.sysusers
memcached-1.6.8-seccomp-rt_sigreturn.patch)
sha512sums=('2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c'
memcached.sysusers)
sha512sums=('46d41c87afd0fb3a15bd418d757a25f93bee7d052653a488b4bc29a795826b9c238590cd9ee602ca4e5f645ece74685c644a9bb12bb58ff79b098c4fcf5b3835'
'dd21f49062054c601469f9abc9ee39a0f06c604e8805e7bc9bf2cfa65429962f93e7ac67764257c578fc15b1e75394956f350162c99b084c76a6e14d9331f31f'
'960705ff74d25afed477e0b2a5872a3a4fb49ed3105a351f0d0224abc947778f9dbda81e80be94ab636da4a8411a9dd56a8fd4513e5b86a3096a14fa67f1548b'
'e6ddcab9a6fee024072b6363ef60aa176ed258369bf3a17d475f19b1f410ffd6195b9c5737dc5b1371e8974b44bdbdaa109927acaeb54fb40302a5d67d7c13a8'
'8fa35ad24b80e5a00d4a3de5625d8dc819d38c53aa5a5c7c43dfddbb4103d27bad08210c11d3415740104766676c5c614de0b317996bb16b55adc471b6dbb73b')
'e6ddcab9a6fee024072b6363ef60aa176ed258369bf3a17d475f19b1f410ffd6195b9c5737dc5b1371e8974b44bdbdaa109927acaeb54fb40302a5d67d7c13a8')
prepare() {
cd ${pkgname}-${pkgver}
patch -Np1 < ../memcached.service.patch
sed -e 's/^##safer##//g' -i scripts/*.service
patch -Np1 < ../memcached-1.6.8-seccomp-rt_sigreturn.patch
}
build() {

View file

@ -1,12 +0,0 @@
diff --git a/linux_priv.c b/linux_priv.c
index 401e02a..19ceb10 100644
--- a/linux_priv.c
+++ b/linux_priv.c
@@ -129,6 +129,7 @@ void drop_worker_privileges(void) {
int rc = 0;
rc |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sigreturn), 0);
+ rc |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0);
rc |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigprocmask), 0);
rc |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(futex), 0);
rc |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(epoll_wait), 0);