More work to help jabberd2 (bug 43851)

8 files changed, 239 insertions, 4 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 8e4f5d108647..7b35a2900a69 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.17 2004/03/28 23:52:02 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.18 2004/04/08 02:00:51 humpback Exp $
+
+*jabberd-1.4.3-r3 (08 Apr 2004)
+
+  08 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild, files/jabber-conf.d,
+  files/jabber.rc6-r7:
+  Adding hard masked -r3 version that will only start the main server. See bug
+  43851
 
   29 Mar 2004; Gustavo Felisberto <humpback@gentoo.org>; files/self-cert.sh:
   Small fix in self-cert.sh thanks to Tom Forsythe <gentoobugs@animelover.com>
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index a29141d2dda9..2893d2860a38 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,6 +1,7 @@
 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
-MD5 2f02daea89a3dab49419c0c8ceed6f89 jabberd-1.4.3-r2.ebuild 5129
+MD5 e2eab6b4968aef9670daa529369de1bf jabberd-1.4.3-r2.ebuild 5092
 MD5 045ac2f1880be4d74a242f3531d63cee ChangeLog 2747
+MD5 27071f7739b3632a64e013105db473e3 jabberd-1.4.3-r3.ebuild 5234
 MD5 feb892dd78b8949abf9821f99224a1c1 jabberd-1.4.3-r1.ebuild 5122
 MD5 577eb7826ce2cf3a4c1181ea32c47b20 files/jabber.rc6-r5 881
 MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
@@ -8,6 +9,10 @@ MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
 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 ea6df75ac7ab4ef8ba7d153fa41a05cd files/jabber.rc6-r7 626
+MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r3 129
 MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r1 129
 MD5 99c4b2c5dcdc8de6ba26a0775d4b8967 files/README.Gentoo 807
+MD5 726a4f0cce0b264c156cd2bd3d834f08 files/jabber-conf.d 300
diff --git a/net-im/jabberd/files/digest-jabberd-1.4.3-r3 b/net-im/jabberd/files/digest-jabberd-1.4.3-r3
new file mode 100644
index 000000000000..09bdcd16d472
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-1.4.3-r3
@@ -0,0 +1,2 @@
+MD5 a3e964d6fa07b5d850302ae0512f94c6 jabberd-1.4.3.tar.gz 258016
+MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204
diff --git a/net-im/jabberd/files/jabber-conf.d b/net-im/jabberd/files/jabber-conf.d
new file mode 100644
index 000000000000..d75bc37ea8db
--- /dev/null
+++ b/net-im/jabberd/files/jabber-conf.d
@@ -0,0 +1,8 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber-conf.d,v 1.1 2004/04/08 02:00:51 humpback Exp $
+
+# Configure which is the default jabberd server. Right now it only knows about
+# jabberd14 . In the future jabberd2 will also be available.
+
+JABBERD="jabberd14"
diff --git a/net-im/jabberd/files/jabber.rc6-r7 b/net-im/jabberd/files/jabber.rc6-r7
new file mode 100644
index 000000000000..c552b9d91c98
--- /dev/null
+++ b/net-im/jabberd/files/jabber.rc6-r7
@@ -0,0 +1,30 @@
+#!/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 $
+
+depend() {
+	need net
+	provide jabber-server
+}
+
+start() {
+	ebegin "Starting main Jabber Component"
+	if [ "${JABBERD}" = "jabberd14" ]
+	then
+		jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
+	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
+	fi
+						        fi
+	eend $?
+}
diff --git a/net-im/jabberd/files/multiple-xml-patch-01 b/net-im/jabberd/files/multiple-xml-patch-01
new file mode 100644
index 000000000000..04364d7f5803
--- /dev/null
+++ b/net-im/jabberd/files/multiple-xml-patch-01
@@ -0,0 +1,11 @@
+--- jabber.xml	2004-03-28 17:41:06.867787280 +0100
++++ jabber2.xml	2004-03-28 17:40:49.470432080 +0100
+@@ -670,7 +670,7 @@
+   <!--
+   This specifies the file to store the pid of the process in.
+   -->
+-  <pidfile>./jabber.pid</pidfile>
++  <pidfile>/var/log/jabber/jabberd14.pid</pidfile>
+ 
+ 
+ </jabber>
diff --git a/net-im/jabberd/jabberd-1.4.3-r2.ebuild b/net-im/jabberd/jabberd-1.4.3-r2.ebuild
index 5459d8a16fb3..825937982268 100644
--- a/net-im/jabberd/jabberd-1.4.3-r2.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-1.4.3-r2.ebuild,v 1.3 2004/03/27 21:38:52 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r2.ebuild,v 1.4 2004/04/08 02:00:51 humpback Exp $
 
 S="${WORKDIR}/jabberd-${PV}"
 DESCRIPTION="Open Source Jabber Server"
@@ -11,7 +11,6 @@ SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
-IUSE="ssl ldap ipv6 msn oscar yahoo"
 
 DEPEND="!net-im/jabber-server
 	=dev-libs/pth-1.4.0
diff --git a/net-im/jabberd/jabberd-1.4.3-r3.ebuild b/net-im/jabberd/jabberd-1.4.3-r3.ebuild
new file mode 100644
index 000000000000..c77054e8ca03
--- /dev/null
+++ b/net-im/jabberd/jabberd-1.4.3-r3.ebuild
@@ -0,0 +1,172 @@
+# 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-1.4.3-r3.ebuild,v 1.1 2004/04/08 02:00:51 humpback Exp $
+
+S="${WORKDIR}/jabberd-${PV}"
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
+	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="ssl ldap ipv6 msn oscar yahoo"
+
+DEPEND="!net-im/jabber-server
+	=dev-libs/pth-1.4.0
+	ssl? ( >=dev-libs/openssl-0.9.6i )
+	ldap? ( =net-nds/openldap-2* )"
+
+PDEPEND="msn? ( net-im/msn-transport )
+		 oscar? ( net-im/aim-transport )
+		 yahoo? ( net-im/yahoo-transport )
+		 icq? ( net-im/jit )"
+
+src_unpack() {
+	unpack jabberd-${PV}.tar.gz
+	cd ${S}
+	use ldap	&& unpack xdb_ldap-1.0.tar.gz
+	epatch ${FILESDIR}/multiple-xml-patch-00
+	epatch ${FILESDIR}/multiple-xml-patch-01
+	mv jabber.xml multiple.xml
+}
+
+src_compile() {
+	# These can cause problems with certain configure scripts used...
+	unset LC_ALL LC_CTYPE
+
+
+	local myconf
+	cd ${S}
+	use ssl && myconf="--enable-ssl"
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+
+	mv jabberd/jabberd.c jabberd/jabberd.c.orig
+	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
+	rm -f jabberd/jabberd.c.orig
+	./configure ${myconf} || die
+	make || die
+
+	if use ldap; then
+		cd ${S}/xdb_ldap/src
+		make all || die
+	fi
+}
+
+src_install() {
+	insinto /etc/conf.d ; newins ${FILESDIR}/jabber-conf.d jabber
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r7 jabber
+	dodir /usr/sbin /etc/jabber /usr/lib/jabberd /var/log/jabber /usr/include/jabberd
+	touch ${D}/var/log/jabber/error.log
+	touch ${D}/var/log/jabber/record.log
+	dodir /var/spool/jabber
+	keepdir /var/spool/jabber/
+	keepdir /var/log/jabber/
+	dodir /var/run
+
+	exeinto /usr/sbin
+	doexe jabberd/jabberd
+	insinto /usr/lib/jabberd
+	doins platform-settings
+	doins jsm/jsm.so
+	doins xdb_file/xdb_file.so
+	doins pthsock/pthsock_client.so
+	doins dnsrv/dnsrv.so
+	doins dialback/dialback.so
+	if [ `use ldap` ]; then
+		insinto /etc/jabber
+		doins xdb_ldap/jabber.schema
+		doins xdb_ldap/slapd.conf
+		doins config/xdb-ldap.xml
+		insinto /usr/lib/jabberd
+		doins xdb_ldap/src/xdb_ldap.so
+	fi
+	insinto /etc/jabber
+	doins multiple.xml
+	exeinto /etc/jabber
+	doexe ${FILESDIR}/self-cert.sh
+
+	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
+
+	dodoc README UPGRADE ${FILESDIR}/README.Gentoo
+
+	fowners jabber:jabber /etc/jabber
+	fowners jabber:jabber /usr/sbin/jabberd
+	fowners jabber:jabber /var/log/jabber
+	fowners jabber:jabber /var/log/jabber/error.log
+	fowners jabber:jabber /var/log/jabber/record.log
+	fowners jabber:jabber /var/spool/jabber
+
+	fperms o-rwx /etc/jabber
+	fperms o-rwx /usr/sbin/jabberd
+	fperms o-rwx /var/log/jabber
+	fperms o-rwx /var/log/jabber/error.log
+	fperms o-rwx /var/log/jabber/record.log
+	fperms o-rwx /var/spool/jabber
+	fperms u+rwx /usr/sbin/jabberd
+
+	fperms g-x /etc/jabber
+	fperms g-x /usr/sbin/jabberd
+	fperms g-x /var/log/jabber
+	fperms g-x /var/log/jabber/error.log
+	fperms g-x /var/log/jabber/record.log
+	fperms g-x /var/spool/jabber
+
+	fperms g+rw /etc/jabber
+	fperms g+rw /usr/sbin/jabberd
+	fperms g+rw /var/log/jabber
+	fperms g+rw /var/log/jabber/error.log
+	fperms g+rw /var/log/jabber/record.log
+	fperms g+rw /var/spool/jabber
+	fperms u+xs /usr/sbin/jabberd
+
+	#Install header files for transports to use
+	cd ${S}/jabberd
+	tar cf - `find . -name \*.h` | (cd ${D}/usr/include/jabberd ; tar xvf -)
+	assert "Failed to install header files to /usr/include/jabberd"
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "Change 'localhost' to your server's domainname in the"
+	einfo "/etc/jabber/*.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/jabber/self-cert.sh"
+	fi
+	if [ `use ldap` ]; then
+		einfo
+		einfo "In order to use the ldap backend, you need to copy"
+		einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
+		einfo "directory on your ldap server. You will also need to"
+		einfo "include the schema in your slapd.conf file and retsart openldap."
+		einfo "An example slapd.conf file is included in /etc/jabber."
+		einfo "The xdb_ldap backend expects your ldap server to handle"
+		einfo "StartTLS or run in ldaps mode."
+	fi
+	einfo
+	einfo "The various IM transports for jabber are now separate packages,"
+	einfo "which you will need to install separately if you want them:"
+	einfo "net-im/jit - ICQ transport (You can use aim-transport for icq but JIT is better)"
+	einfo "net-im/msn-transport - MSN transport (USE=msn)"
+	einfo "net-im/jud - Jabber User Directory"
+	einfo "net-im/yahoo-transport - Yahoo IM system (USE=yahoo)"
+	einfo "net-im/aim-transport - AOL transport (USE=oscar)"
+	einfo "net-im/mu-conference - Jabber multi user conference"
+	einfo
+	einfo "Please read /usr/share/doc/${PF}/README.Gentoo.gz"
+	einfo
+}