[arch-commits] Commit in memcached/repos/extra-x86_64 (9 files)
Levente Polyak
anthraxx at archlinux.org
Thu Mar 25 22:12:19 UTC 2021
Date: Thursday, March 25, 2021 @ 22:12:19
Author: anthraxx
Revision: 410982
archrelease: copy trunk to extra-x86_64
Added:
memcached/repos/extra-x86_64/PKGBUILD
(from rev 410981, memcached/trunk/PKGBUILD)
memcached/repos/extra-x86_64/memcached-1.6.8-seccomp-rt_sigreturn.patch
(from rev 410981, memcached/trunk/memcached-1.6.8-seccomp-rt_sigreturn.patch)
memcached/repos/extra-x86_64/memcached.service.patch
(from rev 410981, memcached/trunk/memcached.service.patch)
memcached/repos/extra-x86_64/memcached.sysusers
(from rev 410981, memcached/trunk/memcached.sysusers)
memcached/repos/extra-x86_64/memcached.tmpfiles
(from rev 410981, memcached/trunk/memcached.tmpfiles)
Deleted:
memcached/repos/extra-x86_64/PKGBUILD
memcached/repos/extra-x86_64/memcached.service.patch
memcached/repos/extra-x86_64/memcached.sysusers
memcached/repos/extra-x86_64/memcached.tmpfiles
--------------------------------------------+
PKGBUILD | 111 ++++++++++---------
memcached-1.6.8-seccomp-rt_sigreturn.patch | 12 ++
memcached.service.patch | 150 +++++++++++++--------------
memcached.sysusers | 2
memcached.tmpfiles | 2
5 files changed, 146 insertions(+), 131 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-25 22:12:13 UTC (rev 410981)
+++ PKGBUILD 2021-03-25 22:12:19 UTC (rev 410982)
@@ -1,54 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Dan McGee <dan at archlinux.org>
-# Contributor: Michael Irwin <6d6469 at gmail.com>
-
-pkgname=memcached
-pkgver=1.6.7
-pkgrel=1
-pkgdesc='Distributed memory object caching system'
-url='https://memcached.org/'
-arch=('x86_64')
-license=('GPL')
-depends=('libevent' 'libseccomp' 'libseccomp.so')
-optdepends=('perl: for memcached-tool usage')
-source=(https://www.memcached.org/files/${pkgname}-${pkgver}.tar.gz
- memcached.service.patch
- memcached.tmpfiles
- memcached.sysusers)
-sha512sums=('8b4c44ae4da8577cc5431aaca6118fdba27c42418a51a6d319d9040a975371a2fda9fcea2cb44c3d20c92f08961cb5f0ddd28c2f4cd12986b73c9342d91ea2c8'
- 'dd21f49062054c601469f9abc9ee39a0f06c604e8805e7bc9bf2cfa65429962f93e7ac67764257c578fc15b1e75394956f350162c99b084c76a6e14d9331f31f'
- '960705ff74d25afed477e0b2a5872a3a4fb49ed3105a351f0d0224abc947778f9dbda81e80be94ab636da4a8411a9dd56a8fd4513e5b86a3096a14fa67f1548b'
- 'e6ddcab9a6fee024072b6363ef60aa176ed258369bf3a17d475f19b1f410ffd6195b9c5737dc5b1371e8974b44bdbdaa109927acaeb54fb40302a5d67d7c13a8')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 < ../memcached.service.patch
- sed -e 's/^##safer##//g' -i scripts/*.service
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure \
- --prefix=/usr \
- --enable-seccomp
- make
-}
-
-check() {
- cd ${pkgname}-${pkgver}
- make test
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- install -Dm 755 scripts/memcached-tool -t "${pkgdir}/usr/bin"
- install -Dm 644 scripts/memcached-tool.1 -t "${pkgdir}/usr/share/man/man1"
-
- install -Dm 644 scripts/*.service -t "${pkgdir}/usr/lib/systemd/system"
- install -Dm 644 ../memcached.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/memcached.conf"
- install -Dm 644 ../memcached.sysusers "${pkgdir}/usr/lib/sysusers.d/memcached.conf"
-}
-
-# vim: ts=2 sw=2 et:
Copied: memcached/repos/extra-x86_64/PKGBUILD (from rev 410981, memcached/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-25 22:12:19 UTC (rev 410982)
@@ -0,0 +1,57 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Dan McGee <dan at archlinux.org>
+# Contributor: Michael Irwin <6d6469 at gmail.com>
+
+pkgname=memcached
+pkgver=1.6.9
+pkgrel=1
+pkgdesc='Distributed memory object caching system'
+url='https://memcached.org/'
+arch=('x86_64')
+license=('GPL')
+depends=('glibc' 'libevent' 'libseccomp' 'libseccomp.so')
+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'
+ 'dd21f49062054c601469f9abc9ee39a0f06c604e8805e7bc9bf2cfa65429962f93e7ac67764257c578fc15b1e75394956f350162c99b084c76a6e14d9331f31f'
+ '960705ff74d25afed477e0b2a5872a3a4fb49ed3105a351f0d0224abc947778f9dbda81e80be94ab636da4a8411a9dd56a8fd4513e5b86a3096a14fa67f1548b'
+ 'e6ddcab9a6fee024072b6363ef60aa176ed258369bf3a17d475f19b1f410ffd6195b9c5737dc5b1371e8974b44bdbdaa109927acaeb54fb40302a5d67d7c13a8'
+ '8fa35ad24b80e5a00d4a3de5625d8dc819d38c53aa5a5c7c43dfddbb4103d27bad08210c11d3415740104766676c5c614de0b317996bb16b55adc471b6dbb73b')
+
+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() {
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --enable-seccomp
+ make
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ make test
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm 755 scripts/memcached-tool -t "${pkgdir}/usr/bin"
+ install -Dm 644 scripts/memcached-tool.1 -t "${pkgdir}/usr/share/man/man1"
+
+ install -Dm 644 scripts/*.service -t "${pkgdir}/usr/lib/systemd/system"
+ install -Dm 644 ../memcached.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/memcached.conf"
+ install -Dm 644 ../memcached.sysusers "${pkgdir}/usr/lib/sysusers.d/memcached.conf"
+}
+
+# vim: ts=2 sw=2 et:
Copied: memcached/repos/extra-x86_64/memcached-1.6.8-seccomp-rt_sigreturn.patch (from rev 410981, memcached/trunk/memcached-1.6.8-seccomp-rt_sigreturn.patch)
===================================================================
--- memcached-1.6.8-seccomp-rt_sigreturn.patch (rev 0)
+++ memcached-1.6.8-seccomp-rt_sigreturn.patch 2021-03-25 22:12:19 UTC (rev 410982)
@@ -0,0 +1,12 @@
+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);
Deleted: memcached.service.patch
===================================================================
--- memcached.service.patch 2021-03-25 22:12:13 UTC (rev 410981)
+++ memcached.service.patch 2021-03-25 22:12:19 UTC (rev 410982)
@@ -1,75 +0,0 @@
-From f74056bec3910ef03b6e993084731b482ba359ba Mon Sep 17 00:00:00 2001
-From: anthraxx <levente at leventepolyak.net>
-Date: Wed, 19 Dec 2018 01:00:32 +0100
-Subject: [PATCH] modern configuration purely using systemd overrides
-
----
- scripts/memcached.service | 12 ++++++++++--
- scripts/memcached at .service | 15 +++++++++------
- 2 files changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/scripts/memcached.service b/scripts/memcached.service
-index 88a4b8a..3a1e87e 100644
---- a/scripts/memcached.service
-+++ b/scripts/memcached.service
-@@ -7,6 +7,9 @@
- #
- # [Service]
- # Environment=OPTIONS="-l 127.0.0.1,::1"
-+#
-+# To use the "instanced" version of this, just start 'memcached at 11211' or
-+# whatever port you'd like.
-
-
- [Unit]
-@@ -14,8 +17,13 @@ Description=memcached daemon
- After=network.target
-
- [Service]
--EnvironmentFile=/etc/sysconfig/memcached
--ExecStart=/usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS
-+User=memcached
-+Environment=CACHESIZE=64
-+Environment=MAXCONN=1024
-+Environment=LISTEN="-l 127.0.0.1,::1"
-+Environment=OPTIONS="-o modern,drop_privileges"
-+ExecStart=/usr/bin/memcached -m ${CACHESIZE} -c ${MAXCONN} $LISTEN $OPTIONS
-+Restart=always
-
- # Set up a new file system namespace and mounts private /tmp and /var/tmp
- # directories so this service cannot access the global directories and
-diff --git a/scripts/memcached at .service b/scripts/memcached at .service
-index 4e9f1d7..e666da9 100644
---- a/scripts/memcached at .service
-+++ b/scripts/memcached at .service
-@@ -9,18 +9,21 @@
- # Environment=OPTIONS="-l 127.0.0.1,::1"
- #
- # To use the "instanced" version of this, just start 'memcached at 11211' or
--# whatever port you'd like. If /etc/sysconfig/memcached.<port> exists, it
--# will be read first, so you can set different parameters for a given
--# instance.
-+# whatever port you'd like.
-+
-
- [Unit]
- Description=memcached daemon
- After=network.target
-
- [Service]
--EnvironmentFile=/etc/sysconfig/memcached
--EnvironmentFile=-/etc/sysconfig/memcached.%i
--ExecStart=/usr/bin/memcached -p %i -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS
-+User=memcached
-+Environment=CACHESIZE=64
-+Environment=MAXCONN=1024
-+Environment=LISTEN="-l 127.0.0.1,::1"
-+Environment=OPTIONS="-o modern,drop_privileges"
-+ExecStart=/usr/bin/memcached -p %i -m ${CACHESIZE} -c ${MAXCONN} $LISTEN $OPTIONS
-+Restart=always
-
- # Set up a new file system namespace and mounts private /tmp and /var/tmp
- # directories so this service cannot access the global directories and
---
-2.20.1
-
Copied: memcached/repos/extra-x86_64/memcached.service.patch (from rev 410981, memcached/trunk/memcached.service.patch)
===================================================================
--- memcached.service.patch (rev 0)
+++ memcached.service.patch 2021-03-25 22:12:19 UTC (rev 410982)
@@ -0,0 +1,75 @@
+From f74056bec3910ef03b6e993084731b482ba359ba Mon Sep 17 00:00:00 2001
+From: anthraxx <levente at leventepolyak.net>
+Date: Wed, 19 Dec 2018 01:00:32 +0100
+Subject: [PATCH] modern configuration purely using systemd overrides
+
+---
+ scripts/memcached.service | 12 ++++++++++--
+ scripts/memcached at .service | 15 +++++++++------
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/scripts/memcached.service b/scripts/memcached.service
+index 88a4b8a..3a1e87e 100644
+--- a/scripts/memcached.service
++++ b/scripts/memcached.service
+@@ -7,6 +7,9 @@
+ #
+ # [Service]
+ # Environment=OPTIONS="-l 127.0.0.1,::1"
++#
++# To use the "instanced" version of this, just start 'memcached at 11211' or
++# whatever port you'd like.
+
+
+ [Unit]
+@@ -14,8 +17,13 @@ Description=memcached daemon
+ After=network.target
+
+ [Service]
+-EnvironmentFile=/etc/sysconfig/memcached
+-ExecStart=/usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS
++User=memcached
++Environment=CACHESIZE=64
++Environment=MAXCONN=1024
++Environment=LISTEN="-l 127.0.0.1,::1"
++Environment=OPTIONS="-o modern,drop_privileges"
++ExecStart=/usr/bin/memcached -m ${CACHESIZE} -c ${MAXCONN} $LISTEN $OPTIONS
++Restart=always
+
+ # Set up a new file system namespace and mounts private /tmp and /var/tmp
+ # directories so this service cannot access the global directories and
+diff --git a/scripts/memcached at .service b/scripts/memcached at .service
+index 4e9f1d7..e666da9 100644
+--- a/scripts/memcached at .service
++++ b/scripts/memcached at .service
+@@ -9,18 +9,21 @@
+ # Environment=OPTIONS="-l 127.0.0.1,::1"
+ #
+ # To use the "instanced" version of this, just start 'memcached at 11211' or
+-# whatever port you'd like. If /etc/sysconfig/memcached.<port> exists, it
+-# will be read first, so you can set different parameters for a given
+-# instance.
++# whatever port you'd like.
++
+
+ [Unit]
+ Description=memcached daemon
+ After=network.target
+
+ [Service]
+-EnvironmentFile=/etc/sysconfig/memcached
+-EnvironmentFile=-/etc/sysconfig/memcached.%i
+-ExecStart=/usr/bin/memcached -p %i -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS
++User=memcached
++Environment=CACHESIZE=64
++Environment=MAXCONN=1024
++Environment=LISTEN="-l 127.0.0.1,::1"
++Environment=OPTIONS="-o modern,drop_privileges"
++ExecStart=/usr/bin/memcached -p %i -m ${CACHESIZE} -c ${MAXCONN} $LISTEN $OPTIONS
++Restart=always
+
+ # Set up a new file system namespace and mounts private /tmp and /var/tmp
+ # directories so this service cannot access the global directories and
+--
+2.20.1
+
Deleted: memcached.sysusers
===================================================================
--- memcached.sysusers 2021-03-25 22:12:13 UTC (rev 410981)
+++ memcached.sysusers 2021-03-25 22:12:19 UTC (rev 410982)
@@ -1 +0,0 @@
-u memcached - - -
Copied: memcached/repos/extra-x86_64/memcached.sysusers (from rev 410981, memcached/trunk/memcached.sysusers)
===================================================================
--- memcached.sysusers (rev 0)
+++ memcached.sysusers 2021-03-25 22:12:19 UTC (rev 410982)
@@ -0,0 +1 @@
+u memcached - - -
Deleted: memcached.tmpfiles
===================================================================
--- memcached.tmpfiles 2021-03-25 22:12:13 UTC (rev 410981)
+++ memcached.tmpfiles 2021-03-25 22:12:19 UTC (rev 410982)
@@ -1 +0,0 @@
-d /run/memcached 0775 memcached memcached -
Copied: memcached/repos/extra-x86_64/memcached.tmpfiles (from rev 410981, memcached/trunk/memcached.tmpfiles)
===================================================================
--- memcached.tmpfiles (rev 0)
+++ memcached.tmpfiles 2021-03-25 22:12:19 UTC (rev 410982)
@@ -0,0 +1 @@
+d /run/memcached 0775 memcached memcached -
More information about the arch-commits
mailing list