Work on jabberd2 integration

6 files changed, 97 insertions, 8 deletions

diff --git a/net-im/jit/ChangeLog b/net-im/jit/ChangeLog
index 5dcc05e46e3e..238019a5a4ba 100644
--- a/net-im/jit/ChangeLog
+++ b/net-im/jit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jit
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.6 2004/03/28 19:17:16 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.7 2004/04/07 16:52:34 humpback Exp $
+
+*jit-1.1.6-r3 (07 Apr 2004)
+
+  07 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r3.ebuild,
+  files/jit.xml:
+  This version adds the ability of starting jit as a independent service. See
+  bug 43851. Also fixed a small bug in the jit.xml Bug 43854
 
   28 Mar 2004; Jason Wever <weeve@gentoo.org> jit-1.1.6-r2.ebuild,
   files/jit-sparc.patch:
diff --git a/net-im/jit/Manifest b/net-im/jit/Manifest
index b015898eed56..a05fa4d774e1 100644
--- a/net-im/jit/Manifest
+++ b/net-im/jit/Manifest
@@ -1,10 +1,13 @@
-MD5 577b47cb79cb62d5156e1f3de97a3e2c ChangeLog 1149
-MD5 492ca41aaaa6f45ca67c1ce998a58fb9 jit-1.1.6-r1.ebuild 1005
 MD5 7d27c541bb957c44cc27768a404f3705 jit-1.1.6-r2.ebuild 1118
+MD5 492ca41aaaa6f45ca67c1ce998a58fb9 jit-1.1.6-r1.ebuild 1005
 MD5 7790f4556753d2a09382cb1123d3253c metadata.xml 403
-MD5 de04a2ef800e243b5c5f46fab4d4059d files/jit-sparc.patch 422
-MD5 54f7c7c05a3bf14a77d8a9e592079c18 files/README.Gentoo 1479
+MD5 37dba543ec802748010f0f505e9a7863 jit-1.1.6-r3.ebuild 1322
+MD5 2b1818d7fef00d8a9edab87f813ed19a ChangeLog 1416
 MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6-r1 61
-MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6-r2 61
 MD5 50412e85cf54ff2a36e6b51564731c82 files/jit-patch-00 1271
-MD5 1b9cebaa84401871db0325d28a7cd51a files/jit.xml 3943
+MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6-r3 61
+MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6-r2 61
+MD5 de04a2ef800e243b5c5f46fab4d4059d files/jit-sparc.patch 422
+MD5 4bdf8575caa96a3290537133b5ed16e8 files/jit-transport.init 427
+MD5 2823c4cf16925056ce9b9094bc47b0bd files/jit.xml 4007
+MD5 54f7c7c05a3bf14a77d8a9e592079c18 files/README.Gentoo 1479
diff --git a/net-im/jit/files/digest-jit-1.1.6-r3 b/net-im/jit/files/digest-jit-1.1.6-r3
new file mode 100644
index 000000000000..6ce790b0931e
--- /dev/null
+++ b/net-im/jit/files/digest-jit-1.1.6-r3
@@ -0,0 +1 @@
+MD5 950f6b82ab5e0542535108fd54409363 jit-1.1.6.tar.gz 275246
diff --git a/net-im/jit/files/jit-transport.init b/net-im/jit/files/jit-transport.init
new file mode 100644
index 000000000000..8c82c7bf5de9
--- /dev/null
+++ b/net-im/jit/files/jit-transport.init
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting ICQ Jabber Transport"
+	/usr/sbin/jabberd -d -c /etc/jabber/jit.xml -H /var/spool/jabber >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping ICQ Jabber Transport"
+	kill `cat /var/log/jabber/jit.pid`
+	sleep 2
+	if ( -f /var/log/jabber/jit.pid ); then
+		kill -9 `cat /var/log/jabber/jit.pid`
+		rm -f /var/log/jabber/jit.pid
+	fi
+	eend $?
+}
diff --git a/net-im/jit/files/jit.xml b/net-im/jit/files/jit.xml
index 005c528e1613..cb2dd053f533 100644
--- a/net-im/jit/files/jit.xml
+++ b/net-im/jit/files/jit.xml
@@ -90,7 +90,7 @@
       <no_jabber_roster/>
       
       <!-- File with stats -->        
-      <user_count_file>session_count.log</user_count_file>
+      <user_count_file>/var/log/jabber/jit.session_count.log</user_count_file>
       
       <!-- Interval beetween checking sessions: ping, messages, acks -->                 
       <session_check>5</session_check>
@@ -122,6 +122,8 @@
 
   </service>
 
+<pidfile>/var/log/jabber/jit.pid</pidfile>
+
   <!--
      The settings here have to match the setting you made
      in your main Jabber server's configuration file.
diff --git a/net-im/jit/jit-1.1.6-r3.ebuild b/net-im/jit/jit-1.1.6-r3.ebuild
new file mode 100644
index 000000000000..3bb1dca13290
--- /dev/null
+++ b/net-im/jit/jit-1.1.6-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6-r3.ebuild,v 1.1 2004/04/07 16:52:34 humpback Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="ICQ transport for WPjabber/Jabberd"
+HOMEPAGE="http://jit.jabberstudio.org/"
+SRC_URI="http://www.jabberstudio.org/files/jit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+KEYWORDS="~x86 ~sparc"
+
+DEPEND=""
+RDEPEND=">=net-im/jabberd-1.4.3"
+
+
+src_compile() {
+	epatch ${FILESDIR}/jit-patch-00
+	[ `use sparc` ] && epatch ${FILESDIR}/jit-sparc.patch
+	./configure
+	emake || die
+	cp ${S}/jabberd/jabberd ${S}/jabberd/jit-wpjabber
+}
+
+src_install() {
+	dodir /etc/jabber /usr/lib/jabber /usr/sbin
+	insinto /usr/lib/wpjabber
+	doins jit/jit.so
+	exeinto /usr/sbin
+	doexe jabberd/jit-wpjabber
+	insinto /etc/jabber
+	doins ${FILESDIR}/jit.xml
+	fowners jabber:jabber /usr/sbin/jit-wpjabber
+	fperms o-rwx /etc/jabber
+	fperms u+xs /usr/sbin/jit-wpjabber
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/jit-transport.init jit-transport
+	dodoc ${FILESDIR}/README.Gentoo
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "Please read /usr/share/doc/${P}/README.Gentoo.gz"
+	einfo "And please notice that now jit-transport comes with a init.d script"
+	einfo "dont forget to add it to your runlevel."
+	einfo
+}