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

Conflicts:
	community-testing/freewrl/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gnash/PKGBUILD
	community-testing/gource/PKGBUILD
	community-testing/gpac/PKGBUILD
	community-testing/rss-glx/PKGBUILD
	community-testing/smc/PKGBUILD
	community/blobby2/PKGBUILD
	community/jack2/PKGBUILD
	community/kleansweep/PKGBUILD
	core/gcc/PKGBUILD
	extra/at/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/sqlite/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gst-plugins-base/PKGBUILD
	gnome-unstable/gstreamer/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/libtool-multilib/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	staging/mesa/PKGBUILD
	testing/bzflag/PKGBUILD
	testing/cabal-install/PKGBUILD
	testing/cairo/PKGBUILD
	testing/gcc/PKGBUILD
	testing/glew/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/libtool/PKGBUILD
	testing/mesa/PKGBUILD
	testing/nx/PKGBUILD
	testing/xf86-video-ati/PKGBUILD
	testing/xf86-video-intel/PKGBUILD
	testing/xf86-video-intel/xf86-video-intel.install
	testing/xf86-video-nouveau/PKGBUILD
	testing/xine-lib/PKGBUILD
	testing/xorg-server/PKGBUILD

2 files changed, 28 insertions, 5 deletions

diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index 551c508e1..abb8aff3f 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73545 2012-07-09 12:52:21Z spupykin $
+# $Id: PKGBUILD 77108 2012-10-05 10:15:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ejabberd
 pkgver=2.1.11
-pkgrel=3
+pkgrel=4
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.ejabberd.im/"
@@ -14,11 +14,13 @@ depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2')
 backup=(etc/ejabberd/ejabberd.cfg etc/logrotate.d/ejabberd)
 install=$pkgname.install
 source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz"
-        "$pkgname.logrotate"
-        "$pkgname")
+	"$pkgname.logrotate"
+	"$pkgname"
+	"ejabberd.service")
 md5sums=('a70b040c4e7602f47718c8afe8780d50'
          'f97c8a96160f30e0aecc9526c12e6606'
-         '2338a6230ce5f9f60be6dddcfa39bc7e')
+         '2338a6230ce5f9f60be6dddcfa39bc7e'
+         'bc4552b833e1927fce52acdbc6d76fb2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver/src"
@@ -35,6 +37,7 @@ package() {
   install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
   chmod ug+r "$pkgdir/etc/$pkgname/"*
   rm -rf "$pkgdir/var/lock"
+  install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service
new file mode 100644
index 000000000..47e5f2e27
--- /dev/null
+++ b/community/ejabberd/ejabberd.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=oneshot
+User=ejabberd
+Group=jabber
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/sbin/ejabberdctl \
+		--config /etc/ejabberd/ejabberd.cfg \
+		--ctl-config /etc/ejabberd/ejabberdctl.cfg \
+		--logs "/var/log/ejabberd" \
+		--spool "/var/lib/ejabberd" start
+ExecStop=/usr/sbin/ejabberdctl stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target