Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/haskell-stm/PKGBUILD
	community-staging/haskell-syb/PKGBUILD
	community/cantata/PKGBUILD
	community/linux-tools/PKGBUILD
	community/python-pymongo/PKGBUILD
	core/less/PKGBUILD
	extra/alsa-plugins/PKGBUILD
	extra/avfs/PKGBUILD
	extra/cups/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdemultimedia-mplayerthumbs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mysql/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vim/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	multilib/lib32-alsa-lib/PKGBUILD
	multilib/lib32-alsa-plugins/PKGBUILD
	multilib/lib32-fontconfig/PKGBUILD
	staging/ghc/PKGBUILD
	staging/ghc/build.mk
	staging/haskell-http/PKGBUILD
	staging/haskell-mtl/PKGBUILD
	staging/haskell-network/PKGBUILD
	staging/haskell-parsec/PKGBUILD
	staging/haskell-random/PKGBUILD
	staging/haskell-text/PKGBUILD
	staging/haskell-transformers/PKGBUILD
	staging/haskell-zlib/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/coreutils/coreutils.install
	testing/dhcpcd/PKGBUILD
	testing/kactivities/PKGBUILD
	testing/kdeaccessibility-jovie/PKGBUILD
	testing/kdeaccessibility-kaccessible/PKGBUILD
	testing/kdeaccessibility-kmag/PKGBUILD
	testing/kdeaccessibility-kmousetool/PKGBUILD
	testing/kdeaccessibility-kmouth/PKGBUILD
	testing/kdeadmin/PKGBUILD
	testing/kdeartwork/PKGBUILD
	testing/kdebase-konsole/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase/PKGBUILD
	testing/kdebindings-kimono/PKGBUILD
	testing/kdebindings-korundum/PKGBUILD
	testing/kdebindings-kross/PKGBUILD
	testing/kdebindings-perlkde/PKGBUILD
	testing/kdebindings-perlqt/PKGBUILD
	testing/kdebindings-python/PKGBUILD
	testing/kdebindings-qtruby/PKGBUILD
	testing/kdebindings-qyoto/PKGBUILD
	testing/kdebindings-smokegen/PKGBUILD
	testing/kdebindings-smokekde/PKGBUILD
	testing/kdebindings-smokeqt/PKGBUILD
	testing/kdeedu-analitza/PKGBUILD
	testing/kdeedu-blinken/PKGBUILD
	testing/kdeedu-cantor/PKGBUILD
	testing/kdeedu-kalgebra/PKGBUILD
	testing/kdeedu-kalzium/PKGBUILD
	testing/kdeedu-kanagram/PKGBUILD
	testing/kdeedu-kbruch/PKGBUILD
	testing/kdeedu-kgeography/PKGBUILD
	testing/kdeedu-khangman/PKGBUILD
	testing/kdeedu-kig/PKGBUILD
	testing/kdeedu-kiten/PKGBUILD
	testing/kdeedu-klettres/PKGBUILD
	testing/kdeedu-kmplot/PKGBUILD
	testing/kdeedu-kstars/PKGBUILD
	testing/kdeedu-ktouch/PKGBUILD
	testing/kdeedu-kturtle/PKGBUILD
	testing/kdeedu-kwordquiz/PKGBUILD
	testing/kdeedu-marble/PKGBUILD
	testing/kdeedu-pairs/PKGBUILD
	testing/kdeedu-parley/PKGBUILD
	testing/kdeedu-rocs/PKGBUILD
	testing/kdeedu-step/PKGBUILD
	testing/kdegames/PKGBUILD
	testing/kdegraphics-gwenview/PKGBUILD
	testing/kdegraphics-kamera/PKGBUILD
	testing/kdegraphics-kcolorchooser/PKGBUILD
	testing/kdegraphics-kgamma/PKGBUILD
	testing/kdegraphics-kolourpaint/PKGBUILD
	testing/kdegraphics-kruler/PKGBUILD
	testing/kdegraphics-ksaneplugin/PKGBUILD
	testing/kdegraphics-ksnapshot/PKGBUILD
	testing/kdegraphics-mobipocket/PKGBUILD
	testing/kdegraphics-okular/PKGBUILD
	testing/kdegraphics-strigi-analyzer/PKGBUILD
	testing/kdegraphics-svgpart/PKGBUILD
	testing/kdegraphics-thumbnailers/PKGBUILD
	testing/kdemultimedia-audiocd-kio/PKGBUILD
	testing/kdemultimedia-dragonplayer/PKGBUILD
	testing/kdemultimedia-ffmpegthumbs/PKGBUILD
	testing/kdemultimedia-juk/PKGBUILD
	testing/kdemultimedia-kmix/PKGBUILD
	testing/kdemultimedia-kscd/PKGBUILD
	testing/kdemultimedia-mplayerthumbs/PKGBUILD
	testing/kdenetwork/PKGBUILD
	testing/kdepim-runtime/PKGBUILD
	testing/kdepim/PKGBUILD
	testing/kdepimlibs/PKGBUILD
	testing/kdeplasma-addons/PKGBUILD
	testing/kdesdk-kate/PKGBUILD
	testing/kdesdk/PKGBUILD
	testing/kdetoys/PKGBUILD
	testing/kdeutils-filelight/PKGBUILD
	testing/kdeutils-kcalc/PKGBUILD
	testing/kdeutils-kcharselect/PKGBUILD
	testing/kdeutils-kdf/PKGBUILD
	testing/kdeutils-kfloppy/PKGBUILD
	testing/kdeutils-kgpg/PKGBUILD
	testing/kdeutils-kremotecontrol/PKGBUILD
	testing/kdeutils-ktimer/PKGBUILD
	testing/kdeutils-kwallet/PKGBUILD
	testing/kdeutils-superkaramba/PKGBUILD
	testing/kdeutils-sweeper/PKGBUILD
	testing/kdewebdev/PKGBUILD
	testing/kmod/PKGBUILD
	testing/libkcddb/PKGBUILD
	testing/libkcompactdisc/PKGBUILD
	testing/libkdcraw/PKGBUILD
	testing/libkdeedu/PKGBUILD
	testing/libkexiv2/PKGBUILD
	testing/libkipi/PKGBUILD
	testing/libksane/PKGBUILD
	testing/libmpc/PKGBUILD
	testing/nepomuk-core/PKGBUILD
	testing/procps-ng/PKGBUILD
	testing/sudo/PKGBUILD
	testing/sysvinit/PKGBUILD
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

4 files changed, 45 insertions, 13 deletions

diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index 0ed5a8b24..d929a0d5c 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164340 2012-07-31 00:50:49Z dan $
+# $Id: PKGBUILD 166159 2012-09-04 23:45:23Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
-pkgver=1.4.14
+pkgver=1.4.15
 pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64 'mips64el')
@@ -12,13 +12,15 @@ 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)
-changelog=ChangeLog
-sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef'
-            '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
-            '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
+		memcached.sh
+		memcached.service)
+sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4'
+            '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47'
+            '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb'
+            '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -30,9 +32,7 @@ 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
+  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
 }
diff --git a/extra/memcached/memcached.conf b/extra/memcached/memcached.conf
index bf120b059..4415e1a55 100644
--- a/extra/memcached/memcached.conf
+++ b/extra/memcached/memcached.conf
@@ -1,4 +1,4 @@
 # user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="nobody"
+MEMCACHED_USER="memcached"
 # see 'memcached -h' for available options
 MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
diff --git a/extra/memcached/memcached.install b/extra/memcached/memcached.install
new file mode 100644
index 000000000..d6dca8d23
--- /dev/null
+++ b/extra/memcached/memcached.install
@@ -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
+}
diff --git a/extra/memcached/memcached.service b/extra/memcached/memcached.service
new file mode 100644
index 000000000..c6e15fb7c
--- /dev/null
+++ b/extra/memcached/memcached.service
@@ -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