Version bump.

(Portage version: 2.1.4_rc14)

5 files changed, 202 insertions, 1 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 8f0de90969a3..2d859c75124b 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.7 2008/01/08 10:26:07 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.8 2008/01/09 07:43:59 nelchael Exp $
+
+*jabberd2-2.1.21 (09 Jan 2008)
+
+  09 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd2-2.1.21.init, +files/jabberd2-2.1.21.pamd,
+  +jabberd2-2.1.21.ebuild:
+  Version bump.
 
   08 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/jabberd2-2.1.20.init, +files/jabberd2-2.1.20.pamd:
diff --git a/net-im/jabberd2/files/digest-jabberd2-2.1.21 b/net-im/jabberd2/files/digest-jabberd2-2.1.21
new file mode 100644
index 000000000000..149579c80afa
--- /dev/null
+++ b/net-im/jabberd2/files/digest-jabberd2-2.1.21
@@ -0,0 +1,3 @@
+MD5 fdbdee3823d1ea6b4ee5d118d7f4b24e jabberd-2.1.21.tar.bz2 643184
+RMD160 e691f068563a94579a12974fde65caa207e9728a jabberd-2.1.21.tar.bz2 643184
+SHA256 5122d6b8cdd78a1d940a3d82d7b39f036c4078d24148ef9a0a65824337fe1251 jabberd-2.1.21.tar.bz2 643184
diff --git a/net-im/jabberd2/files/jabberd2-2.1.21.init b/net-im/jabberd2/files/jabberd2-2.1.21.init
new file mode 100644
index 000000000000..2774aadeadbc
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.1.21.init
@@ -0,0 +1,77 @@
+#!/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/jabberd2/files/jabberd2-2.1.21.init,v 1.1 2008/01/09 07:44:00 nelchael Exp $
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+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
+	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+	eindent
+	for service in ${services}; do
+
+		cfgfile=$(echo ${service} | cut -d ':' -f 2)
+		service=$(echo ${service} | cut -d ':' -f 1)
+		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} \
+			--pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \
+			-- -c ${cfgfile}
+		eend $?
+
+	done
+	eoutdent
+
+}
+
+stop() {
+
+	einfo "Stopping Jabber Server"
+	stopJabberServices
+
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.1.21.pamd b/net-im/jabberd2/files/jabberd2-2.1.21.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.1.21.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/jabberd2/jabberd2-2.1.21.ebuild b/net-im/jabberd2/jabberd2-2.1.21.ebuild
new file mode 100644
index 000000000000..34f381040793
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.1.21.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.1.21.ebuild,v 1.1 2008/01/09 07:43:59 nelchael Exp $
+
+inherit db-use eutils pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.xiaoka.com/"
+SRC_URI="http://ftp.xiaoka.com/${PN}/releases/jabberd-${PV}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug memdebug ipv6 ldap mysql pam pipe sasl postgres sqlite"
+
+DEPEND=">=net-im/jabber-base-0.01
+	dev-libs/expat
+	dev-libs/openssl
+	>=net-misc/gsasl-0.2.14
+	net-dns/libidn
+	ldap? ( net-nds/openldap )
+	>=sys-libs/db-4.1.24
+	pam? ( virtual/pam )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( >=dev-db/sqlite-3 )
+	!net-im/jabberd"
+
+S="${WORKDIR}/jabberd-${PV}"
+
+src_compile() {
+
+	if use sasl; then
+		localconf="--enable-sasl=gsasl"
+	fi
+
+	if use debug; then
+		localconf="${localconf} --enable-debug"
+		# --enable-pool-debug is currently broken
+		use memdebug && localconf="${localconf} --enable-nad-debug"
+	else
+		if use memdebug; then
+			ewarn
+			ewarn '"memdebug" requires "debug" enabled.'
+			ewarn
+		fi
+	fi
+
+	econf \
+		--sysconfdir=/etc/jabber \
+		--enable-db \
+		--with-extra-include-path=$(db_includedir) \
+		${localconf} \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable mysql) \
+		$(use_enable pam) \
+		$(use_enable pipe) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		|| 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}/jabberd2-${PV}.init" jabberd || die "newinitd failed"
+	newpamd "${FILESDIR}/jabberd2-${PV}.pamd" jabberd || die "newpamd failed"
+
+	dodoc AUTHORS BUGS PROTOCOL README UPGRADE
+	docinto tools
+	dodoc tools/db-setup{.mysql,-status.mysql,.pgsql,.sqlite}
+	dodoc tools/{migrate.pl,pipe-auth.pl}
+
+	cd "${D}/etc/jabber/"
+	sed -i \
+		-e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \
+		-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \
+		-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \
+		*.xml *.xml.dist || die "sed failed"
+	sed -i \
+		-e 's,<module>mysql</module>,<module>db</module>,' \
+		c2s.xml* || die "sed failed"
+	sed -i \
+		-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
+		sm.xml* || die "sed failed"
+
+}
+
+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
+
+}