6 files changed, 201 insertions, 84 deletions

diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 91dbca0..813f08e 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -30,20 +30,29 @@ AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1
 MD5 3b4be327293fb0abc0cdb5dcac80d033 files/jabberd-1.4.4.init 554
 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e files/jabberd-1.4.4.init 554
 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac files/jabberd-1.4.4.init 554
+AUX jabberd-2.1.11.init 1404 RMD160 d93784cc30f573f20cd411a1a18578db46121b26 SHA1 ce0e735adbf539c809568aa2c1d3ee49f565600c SHA256 e9d004e8d83cc59f964b49c44aaf64445593ba8157d4b51df83e5e50f4625094
+MD5 eacd752c3b8eb5f2d4914ca8b3580893 files/jabberd-2.1.11.init 1404
+RMD160 d93784cc30f573f20cd411a1a18578db46121b26 files/jabberd-2.1.11.init 1404
+SHA256 e9d004e8d83cc59f964b49c44aaf64445593ba8157d4b51df83e5e50f4625094 files/jabberd-2.1.11.init 1404
+AUX jabberd-2.1.11.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
+MD5 ab77cef855566260d6a779d8d77bc78c files/jabberd-2.1.11.pamd 158
+RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd-2.1.11.pamd 158
+SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd-2.1.11.pamd 158
 AUX jabberd-2.1.4-configure.in.patch 396 RMD160 86c99a761a23e55ebce98bdffba060e18073826f SHA1 59d16a3ce6f30bdea79c67fe9051a6c4624ddac9 SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f
 MD5 0d6acfc3d4a22d09d4d17ffd202d38d8 files/jabberd-2.1.4-configure.in.patch 396
 RMD160 86c99a761a23e55ebce98bdffba060e18073826f files/jabberd-2.1.4-configure.in.patch 396
 SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f files/jabberd-2.1.4-configure.in.patch 396
-AUX jabberd-2.1.4.init 1701 RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 SHA1 95958ed179ec3c8b20dc4a2934c1a8adae08b92b SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a
-MD5 15e304cfa6bdf41c2633da7fe6063ace files/jabberd-2.1.4.init 1701
-RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 files/jabberd-2.1.4.init 1701
-SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a files/jabberd-2.1.4.init 1701
 DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
+DIST jabberd-2.1.11.tar.bz2 1034039 RMD160 540f9f510351c369938005acb7013ea41d77f5b8 SHA1 528df89fd1fc638590811bb4f14b2d0d8a498a56 SHA256 e99a70102896ce28e5e427234ddaa852aacd8a38700264741a40f5781919bea8
 DIST jabberd-2.1.4.tar.bz2 843796 RMD160 1f8ab0b8ab51508ff89085f3fe1342fdd9b54204 SHA1 c1c4b3f74bf1220e9957d0260772d0d2148f2f0c SHA256 e9823c78505c233cc228146a181614a8f191f523948480f78a716fff2921385a
 EBUILD jabberd-1.4.4-r3.ebuild 3066 RMD160 f17931e3958c08c395419c718c009578929c7b23 SHA1 1d235e8d0574e83ebe870566d409f1ae937c3de9 SHA256 c240575c4deccbef864c3415397b913252321ff291d4c1291a8fb327bbe5d057
 MD5 703d5ba2de35a3258c9fa81b9ff5fc96 jabberd-1.4.4-r3.ebuild 3066
 RMD160 f17931e3958c08c395419c718c009578929c7b23 jabberd-1.4.4-r3.ebuild 3066
 SHA256 c240575c4deccbef864c3415397b913252321ff291d4c1291a8fb327bbe5d057 jabberd-1.4.4-r3.ebuild 3066
+EBUILD jabberd-2.1.11.ebuild 2675 RMD160 19e6aa86491d5ea21a858b1028d523107c497fa2 SHA1 98a8577ed9b6a4beef05d3e0635a09eb03cd4e91 SHA256 c74804e1955e58c5359dbba72afa5ce065ba4fce4ebc6b178b57c0b3f5449c26
+MD5 d94132822cf3296f897f2c708e7d3ccc jabberd-2.1.11.ebuild 2675
+RMD160 19e6aa86491d5ea21a858b1028d523107c497fa2 jabberd-2.1.11.ebuild 2675
+SHA256 c74804e1955e58c5359dbba72afa5ce065ba4fce4ebc6b178b57c0b3f5449c26 jabberd-2.1.11.ebuild 2675
 EBUILD jabberd-2.1.4.ebuild 2330 RMD160 771bae5fbdb463758d5816c660f5ffbce196cdef SHA1 81a4d6185a55366e58127f9e6470d3a32879053b SHA256 da88c8d53aa364528d0933765cc7c687d67abed13839c3cf6f54e64ef3aeb146
 MD5 13725474b621926e462d78e105919942 jabberd-2.1.4.ebuild 2330
 RMD160 771bae5fbdb463758d5816c660f5ffbce196cdef jabberd-2.1.4.ebuild 2330
@@ -52,6 +61,10 @@ MISC ChangeLog 15464 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 SHA1 2ed0d2
 MD5 e71dbcd3a38fc84fc22dac39a6019359 ChangeLog 15464
 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 ChangeLog 15464
 SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830 ChangeLog 15464
+MISC bug 46 RMD160 9a8b102b732b3c3b39eccb9f6347d6cf7bec122b SHA1 f6559d5ed5015f880bcf3f2189b58f78b1868716 SHA256 b6390a5c94c2bf9f3fe4e1297acd915e330d189125a17ac60117e36d9df61ef9
+MD5 d15af49122242ec74cc849146b70b622 bug 46
+RMD160 9a8b102b732b3c3b39eccb9f6347d6cf7bec122b bug 46
+SHA256 b6390a5c94c2bf9f3fe4e1297acd915e330d189125a17ac60117e36d9df61ef9 bug 46
 MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
 MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
 RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
@@ -59,6 +72,9 @@ SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata
 MD5 6608e1126e4f091819d2c41a1a8843a5 files/digest-jabberd-1.4.4-r3 241
 RMD160 0c09cceb4332b70a38db717adb4bd1d244337b72 files/digest-jabberd-1.4.4-r3 241
 SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/digest-jabberd-1.4.4-r3 241
+MD5 c07f7b9a6581fa2f5ea895378ce7f7de files/digest-jabberd-2.1.11 250
+RMD160 cb7aaed13753b29cc9f5a1bce8487647ae3a39f2 files/digest-jabberd-2.1.11 250
+SHA256 6d1563e8ca5a90c87768d01e273bfd6cfbe11c93ff70249fb71eeb074b090a39 files/digest-jabberd-2.1.11 250
 MD5 25a5e186c9891488b376450459f220b0 files/digest-jabberd-2.1.4 244
 RMD160 5821ca628801138bd4a32a32e10d6a513c14fa02 files/digest-jabberd-2.1.4 244
 SHA256 145d54a062e7bc260393ab78b287789593e3d6a6a7473c9543b89d2393826d7c files/digest-jabberd-2.1.4 244
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
-
-}
diff --git a/net-im/jabberd/jabberd-2.1.11.ebuild b/net-im/jabberd/jabberd-2.1.11.ebuild
new file mode 100644
index 0000000..fc4afd4
--- a/dev/null
+++ b/net-im/jabberd/jabberd-2.1.11.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit pam eutils
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.xiaoka.com/"
+SRC_URI="http://ftp.xiaoka.com/${PN}2/releases/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug memdebug ldap mysql pam pipe postgres sqlite ssl berkdb anon fs"
+
+RDEPEND=">=net-im/jabber-base-0.01
+        ssl? ( >=dev-libs/openssl-0.9.6b )
+        idn? ( net-dns/libidn )
+        ldap? ( net-nds/openldap )
+        berkdb? ( >=sys-libs/db-4.1.25 )
+        mysql? ( virtual/mysql )
+        postgres? ( virtual/postgresql-libs )
+        sqlite? ( =dev-db/sqlite-3* )
+        dev-libs/expat
+        dev-libs/cyrus-sasl"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+
+        if use memdebug && ! use debug ; then
+                ewarn '"memdebug" requires "debug"'
+        fi
+
+        # gsasl backend is disabled due to the lack of proper gsasl in the tree
+        # TODO: rework postgres part in configure.ac
+        # TODO: conditionally add extra include path for db_includedir from
+        # db-use.eclass
+        econf \
+                --localstatedir=/var \
+                --sysconfdir=/etc/jabber \
+                $(use_enable debug) \
+                $(use_enable memdebug nad-debug) $(use_enable memdebug pool-debug) \
+                --enable-sasl=cyrus \
+                $(use_enable ssl) \
+                $(use_enable mysql) \
+                $(use_enable postgres pgsql) \
+                $(use_enable sqlite) \
+                $(use_enable berkdb db) \
+                $(use_enable ldap) \
+                $(use_enable pam) \
+                $(use_enable pipe) \
+                $(use_enable anon) \
+                $(use_enable fs) \
+                || die "econf failed"
+        emake || die "make failed"
+
+}
+
+src_install() {
+
+        make DESTDIR="${D}" install || die "make install failed"
+
+        fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
+        fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
+
+        newinitd "${FILESDIR}/jabberd-${PV}.init" jabberd || die "newinitd failed"
+        use pam && newpamd "${FILESDIR}/jabberd-${PV}.pamd" jabberd || die "newpamd failed"
+
+        dodoc AUTHORS BUGS NEWS PROTOCOL README UPGRADE
+        docinto tools
+        for i in db-* migrate.pl pipe-auth.pl; do
+                dodoc tools/${i}
+        done
+
+        cd "${D}/etc/jabber/"
+        sed -i \
+                -e 's,/var/jabberd/pid/,/var/run/jabber/,g' \
+                -e 's,/var/jabberd/log/,/var/log/jabber/,g' \
+                -e 's,/var/jabberd/db,/var/spool/jabber/,g' \
+                *.xml *.xml.dist || die "sed failed"
+        use berkdb && sed -i \
+                -e 's,<module>mysql</module>,<module>db</module>,' \
+                c2s.xml*
+
+}
+
+pkg_postinst() {
+        if use pam ; then
+                echo
+                ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+                ewarn 'be in the form of "contactname@jabberdomain".  This behavior'
+                ewarn 'is likely to change in future versions of jabberd-2. It may'
+                ewarn 'be advisable to avoid PAM authentication for the time being.'
+                echo
+                ebeep
+        fi
+}