9 files changed, 268 insertions, 12 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 7db35988f2c0..5df721aab994 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabberd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.45 2004/12/15 13:43:45 humpback Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.46 2005/01/31 23:05:41 humpback Exp $
+
+*jabberd-2.0_p20050119 (31 Jan 2005)
+
+  31 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +jabberd-2.0_p20050119.ebuild:
+  Adding cvs snapshot hardmasked. Credit to Wolfram Schlich
+  <wschlich@gentoo.org> for updating alot of stuff here.
 
   15 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>;
   jabberd-2.0-r2.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 42d8ad260525..5485d97106fa 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,13 +1,20 @@
-MD5 f19ba01c0b3abbc0427f354fbfb5f929 ChangeLog 7276
-MD5 677fabb53514adcdea9a6c829b667cff jabberd-1.4.3-r3.ebuild 5585
-MD5 7930f680be01ad7d74ad73c6d7284e46 jabberd-1.4.3-r4.ebuild 5810
-MD5 c52b5f28130bf79439d18ab3a7cec87c jabberd-2.0-r2.ebuild 4965
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 97cd095502db083dd1b029caf460d5b2 ChangeLog 7522
+MD5 2cc41baeec19e5c18858de63d4ee53d2 jabberd-1.4.3-r3.ebuild 5585
+MD5 c192b6d78e9a9652b30d815fc9dc9e32 jabberd-1.4.3-r4.ebuild 5810
+MD5 f81b4c2b73367e5bed25722aa45e2533 jabberd-2.0-r2.ebuild 4965
+MD5 87bfa160e668718aa2a2b7944c67b100 jabberd-2.0_p20050119.ebuild 3513
 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
 MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r3 129
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
 MD5 0d59ca6b46e061b4b1d1673fce93487f files/digest-jabberd-2.0-r2 65
+MD5 241fdbe6af83f9f39f14becf5e051ba2 files/digest-jabberd-2.0_p20050119 74
 MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
+MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
+MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
 MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874
 MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953
 MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
@@ -18,3 +25,10 @@ MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112
 MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
 MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
 MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB/rnN8zY1VwezZiERAqdxAJ0SS0QKgZC6rJWtWSOjuTouFJnjaACcCDwJ
+yahyLilsIhJpZAbn7zGLx6A=
+=DSJj
+-----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/files/digest-jabberd-2.0_p20050119 b/net-im/jabberd/files/digest-jabberd-2.0_p20050119
new file mode 100644
index 000000000000..a7f2db9b5e16
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.0_p20050119
@@ -0,0 +1 @@
+MD5 71936dfb35aa08b245ff85fccdbf8615 jabberd-2.0cvs20050119.tar.gz 739689
diff --git a/net-im/jabberd/files/jabber.init.bundled b/net-im/jabberd/files/jabber.init.bundled
new file mode 100755
index 000000000000..92910a741682
--- /dev/null
+++ b/net-im/jabberd/files/jabber.init.bundled
@@ -0,0 +1,24 @@
+#!/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/jabber.init.bundled,v 1.1 2005/01/31 23:05:41 humpback Exp $
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+start() {
+	ebegin "Starting Jabber Server"
+	start-stop-daemon --start -c jabber:jabber \
+		-b --make-pidfile --pidfile /var/jabberd/pid/jabberd.pid \
+		-q -x /usr/bin/jabberd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Jabber Server"
+	start-stop-daemon --stop -q --pidfile /var/jabberd/pid/jabberd.pid
+	eend $?
+}
diff --git a/net-im/jabberd/files/jabber.init.gentoo b/net-im/jabberd/files/jabber.init.gentoo
new file mode 100755
index 000000000000..35117b4bd4b0
--- /dev/null
+++ b/net-im/jabberd/files/jabber.init.gentoo
@@ -0,0 +1,91 @@
+#!/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/jabber.init.gentoo,v 1.1 2005/01/31 23:05:41 humpback Exp $
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+components="router resolver sm c2s s2s"
+
+my_start() {
+	ebegin "-> Starting ${i}"
+	component=${i}
+#	pidfile=/var/jabberd/pid/${component}.pid
+#	## remove components pidfile
+#	rm -f "${pidfile}" >/dev/null 2>&1
+	## start component
+	start-stop-daemon --start -c jabber:jabber -b \
+		-q -x /usr/bin/${component} >/dev/null 2>&1
+#	## check if pidfile exists
+#	if [ ! -f "${pidfile}" ]; then
+#		false
+#	## check if pidfile contains the pid of a running process
+#	elif ! ps -p "$(< ${pidfile})" -o pid= >/dev/null 2>&1; then
+#		false
+#	fi
+	eend $?
+}
+
+my_stop() {
+	ebegin "-> Stopping ${i}"
+	component=${i}
+	pidfile=/var/jabberd/pid/${component}.pid
+	start-stop-daemon --stop -q --pidfile ${pidfile} >/dev/null 2>&1
+#	if [ -f "${pidfile}" ] && ps -p "$(< ${pidfile})" -o pid= >/dev/null 2>&1; then
+#		false
+#	fi
+#	## remove components pidfile
+#	rm -f "${pidfile}" >/dev/null 2>&1
+	eend $?
+}
+
+start() {
+	ebegin "Starting Jabber Server"
+	local started=''
+	local failed=''
+	for i in ${components}; do
+		if ! my_start ${i}; then
+			failed="${failed:+${failed} }${i}"
+		else
+			started="${started:+${started} }${i}"
+		fi
+	done
+	if [ -n "${failed}" ]; then
+		eerror
+		eerror "The following components failed to start:"
+		eerror "-> ${failed}"
+		eerror
+		eerror "Trying to stop started components"
+		for i in ${started}; do
+			my_stop ${i}
+		done
+		false
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Jabber Server"
+	local failed=''
+	for i in ${components}; do
+		if ! my_stop ${i}; then
+			failed="${failed:+${failed} }${i}"
+		fi
+	done
+	if [ -n "${failed}" ]; then
+		eerror
+		eerror "The following components failed to stop:"
+		eerror "-> ${failed}"
+		eerror
+		eerror "Please kill the processes manually and reset"
+		eerror "this service to a stopped state using"
+		eerror "-> ${0} zap"
+		eerror
+		false
+	fi
+	eend $?
+}
diff --git a/net-im/jabberd/jabberd-1.4.3-r3.ebuild b/net-im/jabberd/jabberd-1.4.3-r3.ebuild
index be2e1c5ad56d..f4740bdecbdd 100644
--- a/net-im/jabberd/jabberd-1.4.3-r3.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r3.ebuild,v 1.13 2004/09/20 22:32:18 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r3.ebuild,v 1.14 2005/01/31 23:05:41 humpback Exp $
 
 inherit eutils
 
diff --git a/net-im/jabberd/jabberd-1.4.3-r4.ebuild b/net-im/jabberd/jabberd-1.4.3-r4.ebuild
index b3bd0807bc8f..500ccfd29315 100644
--- a/net-im/jabberd/jabberd-1.4.3-r4.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r4.ebuild,v 1.5 2004/12/02 16:44:31 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r4.ebuild,v 1.6 2005/01/31 23:05:41 humpback Exp $
 
 inherit eutils
 
diff --git a/net-im/jabberd/jabberd-2.0-r2.ebuild b/net-im/jabberd/jabberd-2.0-r2.ebuild
index 025da2b2151c..d22a90102f76 100644
--- a/net-im/jabberd/jabberd-2.0-r2.ebuild
+++ b/net-im/jabberd/jabberd-2.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0-r2.ebuild,v 1.2 2004/12/15 13:43:45 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0-r2.ebuild,v 1.3 2005/01/31 23:05:41 humpback Exp $
 
 inherit eutils
 
diff --git a/net-im/jabberd/jabberd-2.0_p20050119.ebuild b/net-im/jabberd/jabberd-2.0_p20050119.ebuild
new file mode 100644
index 000000000000..454e3e704340
--- /dev/null
+++ b/net-im/jabberd/jabberd-2.0_p20050119.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0_p20050119.ebuild,v 1.1 2005/01/31 23:05:41 humpback Exp $
+
+inherit eutils
+
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://www.marquard.net/jabber/files/${P/_p/cvs}.tar.gz"
+MY_P="${PN}-2.0cvs"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="debug ldap ipv6 mysql postgres pam berkdb ssl"
+
+DEPEND="!net-im/jabber-server
+	>=dev-libs/openssl-0.9.6i
+	>=net-dns/libidn-0.3.5
+	ldap? ( >=net-nds/openldap-2.1 )
+	berkdb? ( >=sys-libs/db-4.1.25 )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )"
+
+pkg_setup() {
+	if ! use postgres && ! use mysql && ! use berkdb;  then
+		eerror
+		eerror "For this version of jabberd you must have"
+		eerror "at least one of 'mysql', 'postgres' and/or 'berkdb'"
+		eerror "in the USE variable in /etc/make.conf."
+		eerror
+		die "Look at the error message above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
+src_compile() {
+	local myopts="--enable-fs"
+	use berkdb >&/dev/null && myopts="${myopts} --enable-db"
+	use mysql >&/dev/null && myopts="${myopts} --enable-mysql" || myopts="${myopts} --disable-mysql"
+	use postgres >&/dev/null && myopts="${myopts} --enable-pgsql"
+	use pam >&/dev/null && myopts="${myopts} --enable-pam"
+	use ldap >&/dev/null && myopts="${myopts} --enable-ldap"
+	use ipv6 >&/dev/null && myopts="${myopts} --enable-ipv6"
+
+	use debug && {
+		append-flags -O -ggdb -DDEBUG
+		RESTRICT="${RESTRICT} nostrip"
+		myopts="${myopts} --enable-debug"
+	}
+
+	econf ${myopts} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+#	DON'T USE EINSTALL HERE! it breaks the Makefile's sysconfdir!
+#	einstall || die "make install failed"
+	make DESTDIR=${D} install || die "make install failed"
+
+	## add user and group
+	enewgroup jabber
+	enewuser jabber -1 /bin/false /var/jabberd jabber
+
+	## set binary permissions
+	fowners :jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
+	fperms o= /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
+
+	## jabberd working directory
+	dodir /var/jabberd{,/{db,log,pid}}
+	fowners jabber:jabber /var/jabberd{,/{db,log,pid}}
+	for i in router resolver sm c2s s2s; do
+		for j in log pid; do
+			touch ${D}/var/jabberd/${j}/${i}.${j}
+			fowners jabber:jabber /var/jabberd/${j}/${i}.${j}
+		done
+	done
+
+	#� jabberd config & init script
+	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.bundled jabber
+#	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.gentoo jabber
+	exeinto /etc/jabberd; doexe ${FILESDIR}/self-cert.sh
+	# directories
+	fowners jabber:jabber /etc/jabberd{,/templates}
+	fperms 770 /etc/jabberd{,/templates}
+	# ssl script
+	fowners jabber:jabber /etc/jabberd/self-cert.sh
+	fperms 770 /etc/jabberd/self-cert.sh
+	# config files
+	for i in jabberd.cfg {router,router-users,resolver,sm,c2s,s2s,templates/roster}.xml; do
+		fowners jabber:jabber /etc/jabberd/${i}{,.dist}
+		fperms 660 /etc/jabberd/${i}{,.dist}
+	done
+
+	## documentation
+	dodoc AUTHORS PROTOCOL README
+	docinto tools
+	for i in db-setup.{mysql,pgsql} migrate.pl pipe-auth.pl; do
+		dodoc tools/${i}
+	done
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Change 'localhost' to your server's domainname in the"
+	einfo "/etc/jabberd/*.xml configs first"
+	einfo "Server admins should be added to the "jabber" group"
+	if use ssl; then
+		einfo
+		einfo "To enable SSL connections, execute /etc/jabberd/self-cert.sh"
+	fi
+	einfo
+}