Date: Monday, January 7, 2019 @ 21:30:43 Author: anthraxx Revision: 343089
archrelease: copy trunk to testing-x86_64 Added: memcached/repos/testing-x86_64/PKGBUILD (from rev 343088, memcached/trunk/PKGBUILD) memcached/repos/testing-x86_64/memcached.service.patch (from rev 343088, memcached/trunk/memcached.service.patch) memcached/repos/testing-x86_64/memcached.sysusers (from rev 343088, memcached/trunk/memcached.sysusers) memcached/repos/testing-x86_64/memcached.tmpfiles (from rev 343088, memcached/trunk/memcached.tmpfiles) Deleted: memcached/repos/testing-x86_64/PKGBUILD memcached/repos/testing-x86_64/memcached.service.patch memcached/repos/testing-x86_64/memcached.sysusers memcached/repos/testing-x86_64/memcached.tmpfiles -------------------------+ PKGBUILD | 116 +++++++++++++++++------------------ memcached.service.patch | 150 +++++++++++++++++++++++----------------------- memcached.sysusers | 2 memcached.tmpfiles | 2 4 files changed, 135 insertions(+), 135 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-01-07 21:30:37 UTC (rev 343088) +++ PKGBUILD 2019-01-07 21:30:43 UTC (rev 343089) @@ -1,58 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Contributor: Dan McGee <d...@archlinux.org> -# Contributor: Michael Irwin <6d6...@gmail.com> - -pkgname=memcached -pkgver=1.5.12 -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) -sha256sums=('c02f97d5685617b209fbe25f3464317b234d765b427d254c2413410a5c095b29' - '303375f1245db0f3bf82faa6cb935639d8194c760fec45f105eecaaec22436a5' - 'c4d0ae2218b99a276ff6e0084ae81e66add0ca9347e4bde70e9172db6e44002a' - '228c4f536f3c9f9eee4e11226ec8846a22d4ba46c2d3bf2811413efcc322609a') -sha512sums=('95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8' - '79b69d3b48ab04ff76607d52de61cfca471edb376d2a08fc2c1b9b259c097d04499d1f326ba06fd058a039de145be475cd3527007dffb2256a0b5c2ea7548a88' - '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/PKGBUILD (from rev 343088, memcached/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-01-07 21:30:43 UTC (rev 343089) @@ -0,0 +1,58 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Dan McGee <d...@archlinux.org> +# Contributor: Michael Irwin <6d6...@gmail.com> + +pkgname=memcached +pkgver=1.5.12 +pkgrel=2 +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) +sha256sums=('c02f97d5685617b209fbe25f3464317b234d765b427d254c2413410a5c095b29' + '40f81304f13d12c18986aa45f66ab65ac9886ff3e81548303a02295cce857296' + 'c4d0ae2218b99a276ff6e0084ae81e66add0ca9347e4bde70e9172db6e44002a' + '228c4f536f3c9f9eee4e11226ec8846a22d4ba46c2d3bf2811413efcc322609a') +sha512sums=('95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8' + '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: Deleted: memcached.service.patch =================================================================== --- memcached.service.patch 2019-01-07 21:30:37 UTC (rev 343088) +++ memcached.service.patch 2019-01-07 21:30:43 UTC (rev 343089) @@ -1,75 +0,0 @@ -From f74056bec3910ef03b6e993084731b482ba359ba Mon Sep 17 00:00:00 2001 -From: anthraxx <leve...@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@.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@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 -o 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@.service b/scripts/memcached@.service -index 4e9f1d7..e666da9 100644 ---- a/scripts/memcached@.service -+++ b/scripts/memcached@.service -@@ -9,18 +9,21 @@ - # Environment=OPTIONS="-l 127.0.0.1,::1" - # - # To use the "instanced" version of this, just start 'memcached@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 -o 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.service.patch (from rev 343088, memcached/trunk/memcached.service.patch) =================================================================== --- memcached.service.patch (rev 0) +++ memcached.service.patch 2019-01-07 21:30:43 UTC (rev 343089) @@ -0,0 +1,75 @@ +From f74056bec3910ef03b6e993084731b482ba359ba Mon Sep 17 00:00:00 2001 +From: anthraxx <leve...@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@.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@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@.service b/scripts/memcached@.service +index 4e9f1d7..e666da9 100644 +--- a/scripts/memcached@.service ++++ b/scripts/memcached@.service +@@ -9,18 +9,21 @@ + # Environment=OPTIONS="-l 127.0.0.1,::1" + # + # To use the "instanced" version of this, just start 'memcached@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 2019-01-07 21:30:37 UTC (rev 343088) +++ memcached.sysusers 2019-01-07 21:30:43 UTC (rev 343089) @@ -1 +0,0 @@ -u memcached - - - Copied: memcached/repos/testing-x86_64/memcached.sysusers (from rev 343088, memcached/trunk/memcached.sysusers) =================================================================== --- memcached.sysusers (rev 0) +++ memcached.sysusers 2019-01-07 21:30:43 UTC (rev 343089) @@ -0,0 +1 @@ +u memcached - - - Deleted: memcached.tmpfiles =================================================================== --- memcached.tmpfiles 2019-01-07 21:30:37 UTC (rev 343088) +++ memcached.tmpfiles 2019-01-07 21:30:43 UTC (rev 343089) @@ -1 +0,0 @@ -d /run/memcached 0775 memcached memcached - Copied: memcached/repos/testing-x86_64/memcached.tmpfiles (from rev 343088, memcached/trunk/memcached.tmpfiles) =================================================================== --- memcached.tmpfiles (rev 0) +++ memcached.tmpfiles 2019-01-07 21:30:43 UTC (rev 343089) @@ -0,0 +1 @@ +d /run/memcached 0775 memcached memcached -