Wed Apr 25 00:01:35 UTC 2012

3 files changed, 49 insertions, 49 deletions

diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index f11f987ff..9573572e7 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,46 +1,44 @@
-# $Id: PKGBUILD 65019 2012-02-20 01:58:47Z spupykin $
+# $Id: PKGBUILD 69776 2012-04-23 09:18:21Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: 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.10
-pkgrel=3
-pkgdesc="An erlang jabber server"
-arch=(i686 x86_64)
+pkgrel=4
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
 url="http://www.ejabberd.im/"
 license=("GPL")
-# TODO: replace net-tools usage in rc.d with iproute2
-depends=('expat' 'openssl' 'zlib' 'erlang' 'pam'
-	'net-tools')
-makedepends=()
-backup=(etc/ejabberd/ejabberd.cfg
-	etc/logrotate.d/ejabberd)
-install=ejabberd.install
-source=(http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tar.gz
-	ejabberd
-	ejabberd.logrotate)
-md5sums=('70f0e17983114c62893e43b6ef2e9d0c'
-         'c49bb73bdcb50ea7fcf411bbfed7629a'
-         'f97c8a96160f30e0aecc9526c12e6606')
+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}.tar.gz"
+        "$pkgname.logrotate"
+        "$pkgname")
+sha256sums=('9dc2e5889e919a7d51f2b95b83da835116631db81550a115c02e71909ad932be'
+            '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2'
+            '93f8f9a8751b9e982b332f74e71f766c3c9c4818876991cadef08fe140b83ca6')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}/src
+  cd "$srcdir/$pkgname-$pkgver/src"
 
-  sed -i "s|EJABBERDDIR = \$(DESTDIR)@prefix@/var/lib/ejabberd|EJABBERDDIR = \$(DESTDIR)@prefix@/usr/lib/ejabberd|g" ./Makefile.in
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-pam --enable-odbc
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --enable-pam --enable-odbc
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/src
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver/src"
 
-  install -D -m 0755 ${srcdir}/ejabberd ${pkgdir}/etc/rc.d/ejabberd
-  install -d ${pkgdir}/var/spool/ejabberd
-  install -d ${pkgdir}/var/lib/ejabberd
-
-  install -D -m0644 ${srcdir}/ejabberd.logrotate ${pkgdir}/etc/logrotate.d/ejabberd
-  chmod ug+r ${pkgdir}/etc/ejabberd/*
-  rm -rf $pkgdir/var/lock
+  make DESTDIR="$pkgdir" install
+  install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
+  install -d "$pkgdir/var/spool/$pkgname"
+  install -d "$pkgdir/var/lib/$pkgname"
+  install -D -m0644 "$srcdir/$pkgname.logrotate" \
+    "$pkgdir/etc/logrotate.d/$pkgname"
+  chmod ug+r "$pkgdir/etc/$pkgname/"*
+  rm -rf "$pkgdir/var/lock"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd
index 48f88d282..259d4db66 100644
--- a/community/ejabberd/ejabberd
+++ b/community/ejabberd/ejabberd
@@ -7,10 +7,10 @@ cd /var/log/ejabberd/
 
 get_pid() {
     pidof epmd >/dev/null || { echo '' ; return 0; }
-    # get port from 'epmd -names', then get pid from 'netstat -tlnp'
+    # get port from 'epmd -names', then get pid from 'ss -tlnp'
     PORT=`epmd -names | grep ejabberd | cut -f5 -d\ `
     [ -z "$PORT" ] && { echo '' ; return 0; }
-    PID=`netstat -tlnp | grep $PORT | grep -oE '[[:digit:]]+/'`
+    PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1`
     [ -z "$PID" ] && { echo '' ; return 0; }
     echo ${PID%/}
 }
diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install
index eceb73592..9d17a911e 100644
--- a/community/ejabberd/ejabberd.install
+++ b/community/ejabberd/ejabberd.install
@@ -1,24 +1,26 @@
 post_install() {
-    groupadd -r jabber
-    useradd -r -G jabber -d /var/lib/ejabberd ejabberd
-    chown -R ejabberd.jabber /var/log/ejabberd
-    chown -R ejabberd.jabber /var/spool/ejabberd
-    chown -R ejabberd.jabber /var/lib/ejabberd
-    chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
-    chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
-    chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+  groupadd -r jabber
+  useradd -r -G jabber -d /var/lib/ejabberd ejabberd
+  chown -R ejabberd.jabber /var/log/ejabberd
+  chown -R ejabberd.jabber /var/spool/ejabberd
+  chown -R ejabberd.jabber /var/lib/ejabberd
+  chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
+  chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+  chmod 4750 /usr/lib/ejabberd/priv/bin/epam
 }
 
 post_upgrade() {
-    chown -R ejabberd.jabber /var/log/ejabberd
-    chown -R ejabberd.jabber /var/spool/ejabberd
-    chown -R ejabberd.jabber /var/lib/ejabberd
-    chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
-    chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
-    chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+  chown -R ejabberd.jabber /var/log/ejabberd
+  chown -R ejabberd.jabber /var/spool/ejabberd
+  chown -R ejabberd.jabber /var/lib/ejabberd
+  chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+  chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
+  chmod 4750 /usr/lib/ejabberd/priv/bin/epam
 }
 
 post_remove() {
-    userdel ejabberd
-    groupdel jabber
+  userdel ejabberd
+  groupdel jabber
 }
+
+# vim:set ts=2 sw=2 et: