4 files changed, 84 insertions, 80 deletions

diff --git a/net-im/jabberd/files/digest-jabberd-2.1.11 b/net-im/jabberd/files/digest-jabberd-2.1.11
new file mode 100644
index 0000000..ae7be5e
--- a/dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.1.11
@@ -0,0 +1,3 @@
+MD5 e4c257a74618fc34e288d0eb4cbf4a2f jabberd-2.1.11.tar.bz2 1034039
+RMD160 540f9f510351c369938005acb7013ea41d77f5b8 jabberd-2.1.11.tar.bz2 1034039
+SHA256 e99a70102896ce28e5e427234ddaa852aacd8a38700264741a40f5781919bea8 jabberd-2.1.11.tar.bz2 1034039
diff --git a/net-im/jabberd/files/jabberd-2.1.11.init b/net-im/jabberd/files/jabberd-2.1.11.init
new file mode 100644
index 0000000..6984352
--- a/dev/null
+++ b/net-im/jabberd/files/jabberd-2.1.11.init
@@ -0,0 +1,75 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+        need net
+        use mysql postgresql slapd
+        provide jabber-server
+}
+
+function stopJabberServices() {
+
+        eindent
+        for pidfile in /var/run/jabber/*.pid; do
+                if [[ -f "$pidfile" ]]; then
+                        service=$(basename "$pidfile" .pid)
+                        ebegin "Stopping $service"
+                        start-stop-daemon \
+                                --stop \
+                                --pidfile "$pidfile"
+                        eend $?
+                fi
+        done
+        eoutdent
+
+}
+
+start() {
+
+        einfo "Starting Jabber Server ..."
+        local services=$(grep -v '^\(#.*\)\?$' /etc/jabber/jabberd.cfg | awk '{print $1 ":" $2}')
+        eindent
+        for service in $services ; do
+
+                cfgfile=${service/*:/}
+                service=${service/:*/}
+                if [[ ! -f "$cfgfile" ]]; then
+                        if [[ -f "/etc/jabber/${service}.xml" ]]; then
+                                cfgfile="/etc/jabber/${service}.xml"
+                        else
+                                eerror "Can't find: $cfgfile or default /etc/jabber/${service}.xml"
+                                stopJabberServices
+                                return 1
+                        fi
+                fi
+
+                executable="/usr/bin/$service"
+
+                if [[ ! -f "$executable" ]]; then
+                        eerror "Can't find executable: $executable"
+                        stopJabberServices
+                        return 1
+                fi
+
+                ebegin "Starting $service (${cfgfile})"
+                start-stop-daemon \
+                        --background \
+                        --start  \
+                        --chuid jabber:jabber \
+                        --exec "/usr/bin/$service" \
+                        -- -c "$cfgfile"
+                eend $?
+
+        done
+        eoutdent
+
+}
+
+stop() {
+
+        einfo "Stopping Jabber Server"
+        stopJabberServices
+
+}
diff --git a/net-im/jabberd/files/jabberd-2.1.11.pamd b/net-im/jabberd/files/jabberd-2.1.11.pamd
new file mode 100644
index 0000000..2c5a534
--- a/dev/null
+++ b/net-im/jabberd/files/jabberd-2.1.11.pamd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth       required     pam_nologin.so
+auth       include      system-auth
+account    include      system-auth
+session    include      system-auth
diff --git a/net-im/jabberd/files/jabberd-2.1.4.init b/net-im/jabberd/files/jabberd-2.1.4.init
deleted file mode 100644
index fee8d2e..0000000
--- a/net-im/jabberd/files/jabberd-2.1.4.init
+++ b/dev/null
@@ -1,80 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-2.0.11.init,v 1.3 2007/01/09 10:38:59 nelchael Exp $
-
-depend() {
-        need net
-        use mysql postgresql slapd
-        provide jabber-server
-}
-
-function stopJabberServices() {
-
-        eindent
-        for pidfile in /var/run/jabber/*.pid; do
-                if [[ -f "${pidfile}" ]]; then
-                        service=$(basename ${pidfile/.pid/})
-                        ebegin "Stopping ${service}"
-                        start-stop-daemon \
-                                --stop \
-                                --pidfile ${pidfile}
-                        eend $?
-                fi
-        done
-        eoutdent
-
-}
-
-start() {
-
-        einfo "Starting Jabber Server ..."
-        local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
-        local tempPidHack=/var/run/jabber/start_stop_daemon.pid
-        eindent
-        for service in ${services}; do
-
-                cfgfile=${service/*:/}
-                service=${service/:*/}
-                if [[ ! -f "${cfgfile}" ]]; then
-                        if [[ -f "/etc/jabber/${service}.xml" ]]; then
-                                cfgfile="/etc/jabber/${service}.xml"
-                        else
-                                eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
-                                stopJabberServices
-                                return 1
-                        fi
-                fi
-
-                executable=/usr/bin/${service}
-
-                if [[ ! -f "${executable}" ]]; then
-                        eerror "Can't find executable: ${executable}"
-                        stopJabberServices
-                        return 1
-                fi
-
-                rm -f ${tempPidHack} &> /dev/null
-                ebegin "Starting ${service} (${cfgfile})"
-                start-stop-daemon \
-                        --background \
-                        --start  \
-                        --chuid jabber:jabber \
-                        --exec /usr/bin/${service} \
-                        --pid ${tempPidHack} \
-                        --make-pidfile \
-                        -- -c ${cfgfile}
-                eend $?
-                rm -f ${tempPidHack} &> /dev/null
-
-        done
-        eoutdent
-
-}
-
-stop() {
-
-        einfo "Stopping Jabber Server"
-        stopJabberServices
-
-}