Adding jabberd2

6 files changed, 227 insertions, 10 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 7b35a2900a69..39b9ed263668 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.18 2004/04/08 02:00:51 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.19 2004/04/08 22:16:18 humpback Exp $
+
+*jabberd-2.0 (08 Apr 2004)
+
+  08 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>; jabberd-2.0.ebuild,
+  files/README.Gentoo, files/jabber.rc6-r7:
+  Adding jabberd2 to portage. This must stay hardmasked because it needs further
+  testing.
 
 *jabberd-1.4.3-r3 (08 Apr 2004)
 
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 3c034d3cb0ca..1fedf1d331fc 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,7 +1,8 @@
 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
 MD5 e7dabcd4bd0bdfff7949e413c7b5ad08 jabberd-1.4.3-r2.ebuild 5092
-MD5 a4eb1707bb05ec68434426c3234ca2fd ChangeLog 3021
+MD5 b0340ff981ef8233fd7d71b11c96b3ac ChangeLog 3263
 MD5 6ec3a063b494e17a853ba109879bc9f6 jabberd-1.4.3-r3.ebuild 5234
+MD5 989559d1dafcd3c0d9123e81f3cb97dc jabberd-2.0.ebuild 4847
 MD5 feb892dd78b8949abf9821f99224a1c1 jabberd-1.4.3-r1.ebuild 5122
 MD5 577eb7826ce2cf3a4c1181ea32c47b20 files/jabber.rc6-r5 881
 MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
@@ -10,9 +11,10 @@ MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
 MD5 0bf75251324b3e2fc7d4200844ac7c35 files/jabber.rc6-r6 960
 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r2 129
 MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
-MD5 81c072f3baa333893b646e32b4df9497 files/jabber.rc6-r7 725
+MD5 581e75f5efa2e81db08d901fc0a94648 files/jabber.rc6-r7 1788
 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r3 129
+MD5 d07e9280a9fed9f133b6900d542a81df files/digest-jabberd-2.0 65
 MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r1 129
-MD5 99c4b2c5dcdc8de6ba26a0775d4b8967 files/README.Gentoo 807
+MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
 MD5 dd22fe7ddafdf30acaafc5d815b0b31a files/jabber-conf.d 399
diff --git a/net-im/jabberd/files/README.Gentoo b/net-im/jabberd/files/README.Gentoo
index 53ff900a4ee5..8ce6f52cc3a7 100644
--- a/net-im/jabberd/files/README.Gentoo
+++ b/net-im/jabberd/files/README.Gentoo
@@ -1,3 +1,7 @@
+This instructions are valid if you are using jabberd14 as the main server. If
+you are going to use jabberd2 you must edit /etc/confd/jabberd and change 
+jabberd14 to jabberd2.
+
 This is a small help to get you started with Jabber in Gentoo.
 Edit /etc/jabber/multiple.xml . This is the main jabber server config file.
 There change all references to localhost with the FQDN (Fully Qualified Domain 
diff --git a/net-im/jabberd/files/digest-jabberd-2.0 b/net-im/jabberd/files/digest-jabberd-2.0
new file mode 100644
index 000000000000..bbd3891ccd0e
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.0
@@ -0,0 +1 @@
+MD5 0f794b00e480a7b4c36d858d4d0095bf jabberd-2.0s2.tar.gz 780944
diff --git a/net-im/jabberd/files/jabber.rc6-r7 b/net-im/jabberd/files/jabber.rc6-r7
index c552b9d91c98..2fc8059a5e7c 100644
--- a/net-im/jabberd/files/jabber.rc6-r7
+++ b/net-im/jabberd/files/jabber.rc6-r7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r7,v 1.1 2004/04/08 02:00:51 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r7,v 1.2 2004/04/08 22:16:18 humpback Exp $
 
 depend() {
 	need net
@@ -13,18 +13,53 @@ start() {
 	if [ "${JABBERD}" = "jabberd14" ]
 	then
 		jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
+	else
+		ebegin "   Router"
+			start-stop-daemon --start -b -q -x /usr/bin/router
+		eend $?
+		ebegin "   Resolver"
+			start-stop-daemon --start -b -q -x /usr/bin/resolver
+		eend $?
+		ebegin "   Session Manager"
+			start-stop-daemon --start -b -q -x /usr/bin/sm
+		eend $?
+		ebegin "   Client to Server Component"
+			start-stop-daemon --start -b -q -x /usr/bin/c2s
+		eend $?
+		ebegin "   Server to Server Component"
+			start-stop-daemon --start -b -q -x /usr/bin/s2s
+		eend $?	
 	fi
+	
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping main Jabber Component"
 	kill `/var/log/jabber/jabberd14.pid`
-	sleep 2
-        if ( -f /var/log/jabber/jabberd14.pid ); then
-		kill -9 `cat /var/log/jabber/jabberd14.pid`
-		rm -f /var/log/jabber/jabberd14.pid
+	if [ "${JABBERD}" = "jabberd14" ]
+	then
+		sleep 2
+        		if ( -f /var/log/jabber/jabberd14.pid ); then
+				kill -9 `cat /var/log/jabber/jabberd14.pid`
+				rm -f /var/log/jabber/jabberd14.pid
+			fi
+	else
+		ebegin "   Router"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/router.pid
+		eend $?
+		ebegin "   Resolver"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/resolver.pid
+		eend $?
+		ebegin "   Session Manager"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/sm.pid
+		eend $?
+		ebegin "   Client to Server Component"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/c2s.pid
+		eend $?
+		ebegin "   Server to Server Component"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/s2s.pid
+		eend $?
 	fi
-						        fi
 	eend $?
 }
diff --git a/net-im/jabberd/jabberd-2.0.ebuild b/net-im/jabberd/jabberd-2.0.ebuild
new file mode 100644
index 000000000000..e40e65ba485b
--- /dev/null
+++ b/net-im/jabberd/jabberd-2.0.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.ebuild,v 1.1 2004/04/08 22:16:18 humpback Exp $
+
+MY_PV="2.0s2"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://www.jabberstudio.org/files/jabberd2/${PN}-${MY_PV}.tar.gz"
+
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="ldap ipv6 mysql postgres pam berkdb"
+
+DEPEND="!net-im/jabber-server
+	>=dev-libs/openssl-0.9.6i
+	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_compile() {
+	storage="fs"
+	authreg="anon"
+
+	if [ `use db` ]; then
+		storage="${storage} db"
+		authreg="${authreg} db"
+	fi
+	if [ `use mysql` ]; then
+		storage="${storage} mysql"
+		authreg="${authreg} mysql"
+	fi
+	if [ `use postgres` ]; then
+		storage="${myconf} pgsql"
+		authreg="${authreg} pgsql"
+	fi
+	if [ `use pam` ]; then
+		authreg="${authreg} pam"
+	fi
+	if [ `use ldap` ]; then
+		authreg="${authreg} ldap"
+	fi
+
+	if [ `use ipv6` ]; then
+		enables="${enables} --enable-ipv6"
+	fi
+
+	cd ${S}
+
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--enable-debug \
+		--enable-storage="${storage}" \
+		--enable-authreg="${authreg}" \
+		${enables} || die
+	make || die
+
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	exeinto /etc/jabberd
+	dodir /var/jabberd
+	dodir /var/jabberd/pid
+	dodir /var/jabberd/log
+	dodir /var/jabberd/db
+	touch ${D}/var/jabberd/log/c2s.log
+	touch ${D}/var/jabberd/log/resolver.log
+	touch ${D}/var/jabberd/log/router.log
+	touch ${D}/var/jabberd/log/s2s.log
+	touch ${D}/var/jabberd/log/sm.log
+	doexe ${FILESDIR}/self-cert.sh
+	insinto /etc/conf.d ; newins ${FILESDIR}/jabber-conf.d jabber
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r7 jabber
+
+	dodoc AUTHORS PROTOCOL README
+
+	docinto tools ; dodoc tools/db-setup.mysql tools/db-setup.pgsql tools/migrate.pl tools/pipe-auth.pl
+
+	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
+	if [ -z $test_group ]
+	then
+		enewgroup jabber
+	fi
+
+	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
+	if [ -z $test_user ]
+	then
+		enewuser jabber -1 /bin/false /var/spool/jabber jabber
+	fi
+
+	fowners jabber:jabber /etc/jabberd
+	fowners jabber:jabber /etc/jabberd/c2s.xml
+	fowners jabber:jabber /etc/jabberd/c2s.xml.dist
+	fowners jabber:jabber /etc/jabberd/jabberd.cfg
+	fowners jabber:jabber /etc/jabberd/jabberd.cfg.dist
+	fowners jabber:jabber /etc/jabberd/resolver.xml
+	fowners jabber:jabber /etc/jabberd/resolver.xml.dist
+	fowners jabber:jabber /etc/jabberd/router-users.xml
+	fowners jabber:jabber /etc/jabberd/router-users.xml.dist
+	fowners jabber:jabber /etc/jabberd/router.xml
+	fowners jabber:jabber /etc/jabberd/router.xml.dist
+	fowners jabber:jabber /etc/jabberd/s2s.xml
+	fowners jabber:jabber /etc/jabberd/s2s.xml.dist
+	fowners jabber:jabber /etc/jabberd/self-cert.sh
+	fowners jabber:jabber /etc/jabberd/sm.xml
+	fowners jabber:jabber /etc/jabberd/sm.xml.dist
+	fowners jabber:jabber /etc/jabberd/templates
+
+	fowners jabber:jabber /var/jabberd
+	fowners jabber:jabber /var/jabberd/db
+	fowners jabber:jabber /var/jabberd/log
+	fowners jabber:jabber /var/jabberd/pid
+	fowners jabber:jabber /var/jabberd/log/c2s.log
+	fowners jabber:jabber /var/jabberd/log/resolver.log
+	fowners jabber:jabber /var/jabberd/log/router.log
+	fowners jabber:jabber /var/jabberd/log/s2s.log
+	fowners jabber:jabber /var/jabberd/log/sm.log
+	fperms 660 /etc/jabberd/c2s.xml
+	fperms 660 /etc/jabberd/c2s.xml.dist
+	fperms 660 /etc/jabberd/jabberd.cfg
+	fperms 660 /etc/jabberd/jabberd.cfg.dist
+	fperms 660 /etc/jabberd/resolver.xml
+	fperms 660 /etc/jabberd/resolver.xml.dist
+	fperms 660 /etc/jabberd/router-users.xml
+	fperms 660 /etc/jabberd/router-users.xml.dist
+	fperms 660 /etc/jabberd/router.xml
+	fperms 660 /etc/jabberd/router.xml.dist
+	fperms 660 /etc/jabberd/s2s.xml
+	fperms 660 /etc/jabberd/s2s.xml.dist
+	fperms 760 /etc/jabberd/self-cert.sh
+	fperms 660 /etc/jabberd/sm.xml
+	fperms 660 /etc/jabberd/sm.xml.dist
+	fperms 660 /etc/jabberd/templates
+	fperms o-rwx /usr/bin/jabberd
+}
+
+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"
+		einfo
+	fi
+}