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

Dan McGee dan at archlinux.org
Tue Sep 4 23:45:24 UTC 2012


    Date: Tuesday, September 4, 2012 @ 19:45:23
  Author: dan
Revision: 166159

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  memcached/repos/extra-i686/PKGBUILD
    (from rev 166158, memcached/trunk/PKGBUILD)
  memcached/repos/extra-i686/memcached.conf
    (from rev 166158, memcached/trunk/memcached.conf)
  memcached/repos/extra-i686/memcached.install
    (from rev 166158, memcached/trunk/memcached.install)
  memcached/repos/extra-i686/memcached.service
    (from rev 166158, memcached/trunk/memcached.service)
  memcached/repos/extra-i686/memcached.sh
    (from rev 166158, memcached/trunk/memcached.sh)
  memcached/repos/extra-x86_64/PKGBUILD
    (from rev 166158, memcached/trunk/PKGBUILD)
  memcached/repos/extra-x86_64/memcached.conf
    (from rev 166158, memcached/trunk/memcached.conf)
  memcached/repos/extra-x86_64/memcached.install
    (from rev 166158, memcached/trunk/memcached.install)
  memcached/repos/extra-x86_64/memcached.service
    (from rev 166158, memcached/trunk/memcached.service)
  memcached/repos/extra-x86_64/memcached.sh
    (from rev 166158, memcached/trunk/memcached.sh)
Deleted:
  memcached/repos/extra-i686/ChangeLog
  memcached/repos/extra-i686/PKGBUILD
  memcached/repos/extra-i686/memcached.conf
  memcached/repos/extra-i686/memcached.sh
  memcached/repos/extra-x86_64/ChangeLog
  memcached/repos/extra-x86_64/PKGBUILD
  memcached/repos/extra-x86_64/memcached.conf
  memcached/repos/extra-x86_64/memcached.sh

--------------------------------+
 extra-i686/ChangeLog           |   24 -------
 extra-i686/PKGBUILD            |   76 +++++++++++------------
 extra-i686/memcached.conf      |    8 +-
 extra-i686/memcached.install   |   21 ++++++
 extra-i686/memcached.service   |   11 +++
 extra-i686/memcached.sh        |  126 +++++++++++++++++++--------------------
 extra-x86_64/ChangeLog         |   24 -------
 extra-x86_64/PKGBUILD          |   76 +++++++++++------------
 extra-x86_64/memcached.conf    |    8 +-
 extra-x86_64/memcached.install |   21 ++++++
 extra-x86_64/memcached.service |   11 +++
 extra-x86_64/memcached.sh      |  126 +++++++++++++++++++--------------------
 12 files changed, 274 insertions(+), 258 deletions(-)

Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2012-09-04 23:44:35 UTC (rev 166158)
+++ extra-i686/ChangeLog	2012-09-04 23:45:23 UTC (rev 166159)
@@ -1,24 +0,0 @@
-2011-02-07 Ionut Biru <ibiru at archlinux.org>
-	* Rebuild 1.4.5 against libevent 2.0.10
-
-2011-01-31 Dan McGee <dan at archlinux.org>
-	* Rebuild 1.4.5 with gcc 4.5.X patch accepted upstream
-
-2009-11-14 Dan McGee <dan at archlinux.org>
-	* Bump to 1.4.3
-	* Added memcached-tool to package
-
-2009-09-13 Dan McGee <dan at archlinux.org>
-	* Bump to 1.4.1
-	* Add new required conf.d option MEMCACHED_USER
-	* Rework the way we store the PID for init script usage
-
-2009-04-12 Dan McGee <dan at archlinux.org>
-	* Bump to 1.2.8
-
-2009-04-05 Dan McGee <dan at archlinux.org>
-	* Bump to 1.2.7
-
-2008-12-13 Dan McGee <dan at archlinux.org>
-	* Added conf file to backup array
-	* Fixed the not quite right default config

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-09-04 23:44:35 UTC (rev 166158)
+++ extra-i686/PKGBUILD	2012-09-04 23:45:23 UTC (rev 166159)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Michael Irwin <6d6469 at gmail.com>
-
-pkgname=memcached
-pkgver=1.4.14
-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')
-source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        memcached.conf
-		memcached.sh)
-changelog=ChangeLog
-sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef'
-            '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
-            '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
-
-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
-  # This POS is entirely RedHat specific, so not including it now
-  #install -D -m 755 scripts/memcached.service "$pkgdir"/lib/systemd/system/memcached.service
-  #sed -i -e 's#^EnvironmentFile.*#EnvironmentFile=/etc/conf.d/memcached#' "$pkgdir"/lib/systemd/system/memcached.service
-  install -D -m 644 "$srcdir/memcached.conf" "$pkgdir"/etc/conf.d/memcached
-  install -D -m 755 "$srcdir/memcached.sh" "$pkgdir"/etc/rc.d/memcached
-}

Copied: memcached/repos/extra-i686/PKGBUILD (from rev 166158, memcached/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-09-04 23:45:23 UTC (rev 166159)
@@ -0,0 +1,38 @@
+# $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
+}

Deleted: extra-i686/memcached.conf
===================================================================
--- extra-i686/memcached.conf	2012-09-04 23:44:35 UTC (rev 166158)
+++ extra-i686/memcached.conf	2012-09-04 23:45:23 UTC (rev 166159)
@@ -1,4 +0,0 @@
-# user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="nobody"
-# see 'memcached -h' for available options
-MEMCACHED_ARGS="-l 127.0.0.1 -t 1"

Copied: memcached/repos/extra-i686/memcached.conf (from rev 166158, memcached/trunk/memcached.conf)
===================================================================
--- extra-i686/memcached.conf	                        (rev 0)
+++ extra-i686/memcached.conf	2012-09-04 23:45:23 UTC (rev 166159)
@@ -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"

Copied: memcached/repos/extra-i686/memcached.install (from rev 166158, memcached/trunk/memcached.install)
===================================================================
--- extra-i686/memcached.install	                        (rev 0)
+++ extra-i686/memcached.install	2012-09-04 23:45:23 UTC (rev 166159)
@@ -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
+}

Copied: memcached/repos/extra-i686/memcached.service (from rev 166158, memcached/trunk/memcached.service)
===================================================================
--- extra-i686/memcached.service	                        (rev 0)
+++ extra-i686/memcached.service	2012-09-04 23:45:23 UTC (rev 166159)
@@ -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	2012-09-04 23:44:35 UTC (rev 166158)
+++ extra-i686/memcached.sh	2012-09-04 23:45:23 UTC (rev 166159)
@@ -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

Copied: memcached/repos/extra-i686/memcached.sh (from rev 166158, memcached/trunk/memcached.sh)
===================================================================
--- extra-i686/memcached.sh	                        (rev 0)
+++ extra-i686/memcached.sh	2012-09-04 23:45:23 UTC (rev 166159)
@@ -0,0 +1,63 @@
+#!/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/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2012-09-04 23:44:35 UTC (rev 166158)
+++ extra-x86_64/ChangeLog	2012-09-04 23:45:23 UTC (rev 166159)
@@ -1,24 +0,0 @@
-2011-02-07 Ionut Biru <ibiru at archlinux.org>
-	* Rebuild 1.4.5 against libevent 2.0.10
-
-2011-01-31 Dan McGee <dan at archlinux.org>
-	* Rebuild 1.4.5 with gcc 4.5.X patch accepted upstream
-
-2009-11-14 Dan McGee <dan at archlinux.org>
-	* Bump to 1.4.3
-	* Added memcached-tool to package
-
-2009-09-13 Dan McGee <dan at archlinux.org>
-	* Bump to 1.4.1
-	* Add new required conf.d option MEMCACHED_USER
-	* Rework the way we store the PID for init script usage
-
-2009-04-12 Dan McGee <dan at archlinux.org>
-	* Bump to 1.2.8
-
-2009-04-05 Dan McGee <dan at archlinux.org>
-	* Bump to 1.2.7
-
-2008-12-13 Dan McGee <dan at archlinux.org>
-	* Added conf file to backup array
-	* Fixed the not quite right default config

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-09-04 23:44:35 UTC (rev 166158)
+++ extra-x86_64/PKGBUILD	2012-09-04 23:45:23 UTC (rev 166159)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Michael Irwin <6d6469 at gmail.com>
-
-pkgname=memcached
-pkgver=1.4.14
-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')
-source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        memcached.conf
-		memcached.sh)
-changelog=ChangeLog
-sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef'
-            '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
-            '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
-
-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
-  # This POS is entirely RedHat specific, so not including it now
-  #install -D -m 755 scripts/memcached.service "$pkgdir"/lib/systemd/system/memcached.service
-  #sed -i -e 's#^EnvironmentFile.*#EnvironmentFile=/etc/conf.d/memcached#' "$pkgdir"/lib/systemd/system/memcached.service
-  install -D -m 644 "$srcdir/memcached.conf" "$pkgdir"/etc/conf.d/memcached
-  install -D -m 755 "$srcdir/memcached.sh" "$pkgdir"/etc/rc.d/memcached
-}

Copied: memcached/repos/extra-x86_64/PKGBUILD (from rev 166158, memcached/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-09-04 23:45:23 UTC (rev 166159)
@@ -0,0 +1,38 @@
+# $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
+}

Deleted: extra-x86_64/memcached.conf
===================================================================
--- extra-x86_64/memcached.conf	2012-09-04 23:44:35 UTC (rev 166158)
+++ extra-x86_64/memcached.conf	2012-09-04 23:45:23 UTC (rev 166159)
@@ -1,4 +0,0 @@
-# user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="nobody"
-# 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 166158, memcached/trunk/memcached.conf)
===================================================================
--- extra-x86_64/memcached.conf	                        (rev 0)
+++ extra-x86_64/memcached.conf	2012-09-04 23:45:23 UTC (rev 166159)
@@ -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"

Copied: memcached/repos/extra-x86_64/memcached.install (from rev 166158, memcached/trunk/memcached.install)
===================================================================
--- extra-x86_64/memcached.install	                        (rev 0)
+++ extra-x86_64/memcached.install	2012-09-04 23:45:23 UTC (rev 166159)
@@ -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
+}

Copied: memcached/repos/extra-x86_64/memcached.service (from rev 166158, memcached/trunk/memcached.service)
===================================================================
--- extra-x86_64/memcached.service	                        (rev 0)
+++ extra-x86_64/memcached.service	2012-09-04 23:45:23 UTC (rev 166159)
@@ -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	2012-09-04 23:44:35 UTC (rev 166158)
+++ extra-x86_64/memcached.sh	2012-09-04 23:45:23 UTC (rev 166159)
@@ -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

Copied: memcached/repos/extra-x86_64/memcached.sh (from rev 166158, memcached/trunk/memcached.sh)
===================================================================
--- extra-x86_64/memcached.sh	                        (rev 0)
+++ extra-x86_64/memcached.sh	2012-09-04 23:45:23 UTC (rev 166159)
@@ -0,0 +1,63 @@
+#!/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