[arch-commits] Commit in memcached/repos (5 files)

[Felix Yan]

    Date: Sunday, March 29, 2020 @ 18:45:07
  Author: felixonmars
Revision: 378665

archrelease: copy trunk to testing-x86_64

Added:
  memcached/repos/testing-x86_64/
  memcached/repos/testing-x86_64/PKGBUILD
    (from rev 378664, memcached/trunk/PKGBUILD)
  memcached/repos/testing-x86_64/memcached.service.patch
    (from rev 378664, memcached/trunk/memcached.service.patch)
  memcached/repos/testing-x86_64/memcached.sysusers
    (from rev 378664, memcached/trunk/memcached.sysusers)
  memcached/repos/testing-x86_64/memcached.tmpfiles
    (from rev 378664, memcached/trunk/memcached.tmpfiles)

-------------------------+
 PKGBUILD                |   54 +++++++++++++++++++++++++++++++++
 memcached.service.patch |   75 ++++++++++++++++++++++++++++++++++++++++++++++
 memcached.sysusers      |    1 
 memcached.tmpfiles      |    1 
 4 files changed, 131 insertions(+)

Copied: memcached/repos/testing-x86_64/PKGBUILD (from rev 378664, memcached/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2020-03-29 18:45:07 UTC (rev 378665)
@@ -0,0 +1,54 @@
+# 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.0
+pkgrel=1
+pkgdesc='Distributed memory object caching system'
+url='https://memcached.org/'
+arch=('x86_64')
+license=('GPL')
+depends=('libevent' 'libseccomp')
+optdepends=('perl: for memcached-tool usage')
+source=(https://www.memcached.org/files/${pkgname}-${pkgver}.tar.gz
+        memcached.service.patch
+        memcached.tmpfiles
+        memcached.sysusers)
+sha512sums=('e20dfab3ebfda97f94696ffedd98f8048bf101ed184f4e8925841bfadfe486d56848ab4eea68f3265baba6588ff7ec6b50664b1e9b7bda1c5b2c379481448b85'
+            '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/testing-x86_64/memcached.service.patch (from rev 378664, memcached/trunk/memcached.service.patch)
===================================================================
--- testing-x86_64/memcached.service.patch	                        (rev 0)
+++ testing-x86_64/memcached.service.patch	2020-03-29 18:45:07 UTC (rev 378665)
@@ -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
+

Copied: memcached/repos/testing-x86_64/memcached.sysusers (from rev 378664, memcached/trunk/memcached.sysusers)
===================================================================
--- testing-x86_64/memcached.sysusers	                        (rev 0)
+++ testing-x86_64/memcached.sysusers	2020-03-29 18:45:07 UTC (rev 378665)
@@ -0,0 +1 @@
+u memcached - - -

Copied: memcached/repos/testing-x86_64/memcached.tmpfiles (from rev 378664, memcached/trunk/memcached.tmpfiles)
===================================================================
--- testing-x86_64/memcached.tmpfiles	                        (rev 0)
+++ testing-x86_64/memcached.tmpfiles	2020-03-29 18:45:07 UTC (rev 378665)
@@ -0,0 +1 @@
+d /run/memcached 0775 memcached memcached -