[arch-commits] Commit in memcached/repos (18 files)
Dan McGee
dan at nymeria.archlinux.org
Sun May 12 16:29:01 UTC 2013
Date: Sunday, May 12, 2013 @ 18:29:01
Author: dan
Revision: 185263
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
memcached/repos/extra-i686/PKGBUILD
(from rev 185262, memcached/trunk/PKGBUILD)
memcached/repos/extra-i686/memcached.conf
(from rev 185262, memcached/trunk/memcached.conf)
memcached/repos/extra-i686/memcached.install
(from rev 185262, memcached/trunk/memcached.install)
memcached/repos/extra-i686/memcached.service
(from rev 185262, memcached/trunk/memcached.service)
memcached/repos/extra-x86_64/PKGBUILD
(from rev 185262, memcached/trunk/PKGBUILD)
memcached/repos/extra-x86_64/memcached.conf
(from rev 185262, memcached/trunk/memcached.conf)
memcached/repos/extra-x86_64/memcached.install
(from rev 185262, memcached/trunk/memcached.install)
memcached/repos/extra-x86_64/memcached.service
(from rev 185262, memcached/trunk/memcached.service)
Deleted:
memcached/repos/extra-i686/PKGBUILD
memcached/repos/extra-i686/memcached.conf
memcached/repos/extra-i686/memcached.install
memcached/repos/extra-i686/memcached.service
memcached/repos/extra-i686/memcached.sh
memcached/repos/extra-x86_64/PKGBUILD
memcached/repos/extra-x86_64/memcached.conf
memcached/repos/extra-x86_64/memcached.install
memcached/repos/extra-x86_64/memcached.service
memcached/repos/extra-x86_64/memcached.sh
--------------------------------+
/PKGBUILD | 62 ++++++++++++++++++++++++++++++++++++++
/memcached.conf | 8 ++++
/memcached.install | 42 ++++++++++++++++++++++++++
/memcached.service | 22 +++++++++++++
extra-i686/PKGBUILD | 38 -----------------------
extra-i686/memcached.conf | 4 --
extra-i686/memcached.install | 21 -------------
extra-i686/memcached.service | 11 ------
extra-i686/memcached.sh | 63 ---------------------------------------
extra-x86_64/PKGBUILD | 38 -----------------------
extra-x86_64/memcached.conf | 4 --
extra-x86_64/memcached.install | 21 -------------
extra-x86_64/memcached.service | 11 ------
extra-x86_64/memcached.sh | 63 ---------------------------------------
14 files changed, 134 insertions(+), 274 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-i686/PKGBUILD 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Michael Irwin <6d6469 at gmail.com>
-
-pkgname=memcached
-pkgver=1.4.15
-pkgrel=1
-pkgdesc="A distributed memory object caching system"
-arch=(i686 x86_64)
-url="http://memcached.org/"
-license=('GPL')
-depends=('libevent')
-optdepends=('perl: for memcached-tool usage')
-backup=('etc/conf.d/memcached')
-install=memcached.install
-source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
- memcached.conf
- memcached.sh
- memcached.service)
-sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4'
- '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47'
- '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb'
- '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
- install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached
- install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached
- install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
-}
Copied: memcached/repos/extra-i686/PKGBUILD (from rev 185262, memcached/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-05-12 16:29:01 UTC (rev 185263)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Michael Irwin <6d6469 at gmail.com>
+
+pkgname=memcached
+pkgver=1.4.15
+pkgrel=2
+pkgdesc="A distributed memory object caching system"
+arch=(i686 x86_64)
+url="http://memcached.org/"
+license=('GPL')
+depends=('libevent')
+optdepends=('perl: for memcached-tool usage')
+install=memcached.install
+source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
+ memcached.service)
+sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4'
+ '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
+ install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
+}
Deleted: extra-i686/memcached.conf
===================================================================
--- extra-i686/memcached.conf 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-i686/memcached.conf 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,4 +0,0 @@
-# user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="memcached"
-# see 'memcached -h' for available options
-MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
Copied: memcached/repos/extra-i686/memcached.conf (from rev 185262, memcached/trunk/memcached.conf)
===================================================================
--- extra-i686/memcached.conf (rev 0)
+++ extra-i686/memcached.conf 2013-05-12 16:29:01 UTC (rev 185263)
@@ -0,0 +1,4 @@
+# user to run memcached as; also used for pid file ownership
+MEMCACHED_USER="memcached"
+# see 'memcached -h' for available options
+MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
Deleted: extra-i686/memcached.install
===================================================================
--- extra-i686/memcached.install 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-i686/memcached.install 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,21 +0,0 @@
-post_install() {
- if ! getent group memcached >/dev/null; then
- groupadd --system memcached
- fi
- if ! getent passwd memcached >/dev/null; then
- useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- if getent passwd memcached >/dev/null; then
- userdel memcached
- fi
- if getent group memcached >/dev/null; then
- groupdel memcached
- fi
-}
Copied: memcached/repos/extra-i686/memcached.install (from rev 185262, memcached/trunk/memcached.install)
===================================================================
--- extra-i686/memcached.install (rev 0)
+++ extra-i686/memcached.install 2013-05-12 16:29:01 UTC (rev 185263)
@@ -0,0 +1,21 @@
+post_install() {
+ if ! getent group memcached >/dev/null; then
+ groupadd --system memcached
+ fi
+ if ! getent passwd memcached >/dev/null; then
+ useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ if getent passwd memcached >/dev/null; then
+ userdel memcached
+ fi
+ if getent group memcached >/dev/null; then
+ groupdel memcached
+ fi
+}
Deleted: extra-i686/memcached.service
===================================================================
--- extra-i686/memcached.service 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-i686/memcached.service 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Memcached Daemon
-After=network.target
-
-[Service]
-User=memcached
-# Remove '-l 127.0.0.1' to listen on all addresses
-ExecStart=/usr/bin/memcached -l 127.0.0.1
-
-[Install]
-WantedBy=multi-user.target
Copied: memcached/repos/extra-i686/memcached.service (from rev 185262, memcached/trunk/memcached.service)
===================================================================
--- extra-i686/memcached.service (rev 0)
+++ extra-i686/memcached.service 2013-05-12 16:29:01 UTC (rev 185263)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Memcached Daemon
+After=network.target
+
+[Service]
+User=memcached
+# Remove '-l 127.0.0.1' to listen on all addresses
+ExecStart=/usr/bin/memcached -l 127.0.0.1
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-i686/memcached.sh
===================================================================
--- extra-i686/memcached.sh 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-i686/memcached.sh 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/memcached
-
-PIDFILE='/var/run/memcached.pid'
-
-getpid() {
- local pid
- pid=$(cat $PIDFILE 2>/dev/null)
- # if the process is no longer valid, don't return it
- if [ -n "$pid" ]; then
- if ! ps -p $pid >/dev/null; then
- rm -f $PIDFILE
- pid=""
- fi
- fi
- echo $pid
-}
-
-PID="$(getpid)"
-
-case "$1" in
- start)
- stat_busy "Starting memcached"
- # memcached is retarded and doesn't write to the pidfile
- # before it drops permissions
- if [ -n "$PID" ]; then
- stat_fail
- elif [ -z "$MEMCACHED_USER" ]; then
- echo "MEMCACHED_USER must be defined in /etc/conf.d/memcached"
- stat_fail
- else
- touch $PIDFILE && chown $MEMCACHED_USER $PIDFILE
- /usr/bin/memcached -d -P $PIDFILE -u $MEMCACHED_USER $MEMCACHED_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon memcached
- stat_done
- fi
- fi
- ;;
- stop)
- stat_busy "Stopping memcached"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f $PIDFILE
- rm_daemon memcached
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-x86_64/PKGBUILD 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Michael Irwin <6d6469 at gmail.com>
-
-pkgname=memcached
-pkgver=1.4.15
-pkgrel=1
-pkgdesc="A distributed memory object caching system"
-arch=(i686 x86_64)
-url="http://memcached.org/"
-license=('GPL')
-depends=('libevent')
-optdepends=('perl: for memcached-tool usage')
-backup=('etc/conf.d/memcached')
-install=memcached.install
-source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
- memcached.conf
- memcached.sh
- memcached.service)
-sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4'
- '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47'
- '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb'
- '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
- install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached
- install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached
- install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
-}
Copied: memcached/repos/extra-x86_64/PKGBUILD (from rev 185262, memcached/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-05-12 16:29:01 UTC (rev 185263)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Michael Irwin <6d6469 at gmail.com>
+
+pkgname=memcached
+pkgver=1.4.15
+pkgrel=2
+pkgdesc="A distributed memory object caching system"
+arch=(i686 x86_64)
+url="http://memcached.org/"
+license=('GPL')
+depends=('libevent')
+optdepends=('perl: for memcached-tool usage')
+install=memcached.install
+source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
+ memcached.service)
+sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4'
+ '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
+ install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
+}
Deleted: extra-x86_64/memcached.conf
===================================================================
--- extra-x86_64/memcached.conf 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-x86_64/memcached.conf 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,4 +0,0 @@
-# user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="memcached"
-# see 'memcached -h' for available options
-MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
Copied: memcached/repos/extra-x86_64/memcached.conf (from rev 185262, memcached/trunk/memcached.conf)
===================================================================
--- extra-x86_64/memcached.conf (rev 0)
+++ extra-x86_64/memcached.conf 2013-05-12 16:29:01 UTC (rev 185263)
@@ -0,0 +1,4 @@
+# user to run memcached as; also used for pid file ownership
+MEMCACHED_USER="memcached"
+# see 'memcached -h' for available options
+MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
Deleted: extra-x86_64/memcached.install
===================================================================
--- extra-x86_64/memcached.install 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-x86_64/memcached.install 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,21 +0,0 @@
-post_install() {
- if ! getent group memcached >/dev/null; then
- groupadd --system memcached
- fi
- if ! getent passwd memcached >/dev/null; then
- useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- if getent passwd memcached >/dev/null; then
- userdel memcached
- fi
- if getent group memcached >/dev/null; then
- groupdel memcached
- fi
-}
Copied: memcached/repos/extra-x86_64/memcached.install (from rev 185262, memcached/trunk/memcached.install)
===================================================================
--- extra-x86_64/memcached.install (rev 0)
+++ extra-x86_64/memcached.install 2013-05-12 16:29:01 UTC (rev 185263)
@@ -0,0 +1,21 @@
+post_install() {
+ if ! getent group memcached >/dev/null; then
+ groupadd --system memcached
+ fi
+ if ! getent passwd memcached >/dev/null; then
+ useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ if getent passwd memcached >/dev/null; then
+ userdel memcached
+ fi
+ if getent group memcached >/dev/null; then
+ groupdel memcached
+ fi
+}
Deleted: extra-x86_64/memcached.service
===================================================================
--- extra-x86_64/memcached.service 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-x86_64/memcached.service 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Memcached Daemon
-After=network.target
-
-[Service]
-User=memcached
-# Remove '-l 127.0.0.1' to listen on all addresses
-ExecStart=/usr/bin/memcached -l 127.0.0.1
-
-[Install]
-WantedBy=multi-user.target
Copied: memcached/repos/extra-x86_64/memcached.service (from rev 185262, memcached/trunk/memcached.service)
===================================================================
--- extra-x86_64/memcached.service (rev 0)
+++ extra-x86_64/memcached.service 2013-05-12 16:29:01 UTC (rev 185263)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Memcached Daemon
+After=network.target
+
+[Service]
+User=memcached
+# Remove '-l 127.0.0.1' to listen on all addresses
+ExecStart=/usr/bin/memcached -l 127.0.0.1
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/memcached.sh
===================================================================
--- extra-x86_64/memcached.sh 2013-05-12 16:28:47 UTC (rev 185262)
+++ extra-x86_64/memcached.sh 2013-05-12 16:29:01 UTC (rev 185263)
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/memcached
-
-PIDFILE='/var/run/memcached.pid'
-
-getpid() {
- local pid
- pid=$(cat $PIDFILE 2>/dev/null)
- # if the process is no longer valid, don't return it
- if [ -n "$pid" ]; then
- if ! ps -p $pid >/dev/null; then
- rm -f $PIDFILE
- pid=""
- fi
- fi
- echo $pid
-}
-
-PID="$(getpid)"
-
-case "$1" in
- start)
- stat_busy "Starting memcached"
- # memcached is retarded and doesn't write to the pidfile
- # before it drops permissions
- if [ -n "$PID" ]; then
- stat_fail
- elif [ -z "$MEMCACHED_USER" ]; then
- echo "MEMCACHED_USER must be defined in /etc/conf.d/memcached"
- stat_fail
- else
- touch $PIDFILE && chown $MEMCACHED_USER $PIDFILE
- /usr/bin/memcached -d -P $PIDFILE -u $MEMCACHED_USER $MEMCACHED_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon memcached
- stat_done
- fi
- fi
- ;;
- stop)
- stat_busy "Stopping memcached"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f $PIDFILE
- rm_daemon memcached
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
More information about the arch-commits
mailing list