More work to help jabberd2 (bug 43851)

6 files changed, 87 insertions, 6 deletions

diff --git a/net-im/yahoo-transport/ChangeLog b/net-im/yahoo-transport/ChangeLog
index be1f99fa9568..cc2bb15e68c8 100644
--- a/net-im/yahoo-transport/ChangeLog
+++ b/net-im/yahoo-transport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/yahoo-transport
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/yahoo-transport/ChangeLog,v 1.4 2004/02/26 03:27:04 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/yahoo-transport/ChangeLog,v 1.5 2004/04/08 02:14:56 humpback Exp $
+
+*yahoo-transport-2.3.0-r2 (08 Apr 2004)
+
+  08 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  yahoo-transport-2.3.0-r2.ebuild, files/yahootrans.xml:
+  Adding version 20040131-r1 and it's init script, helps fix bug 43851.
 
   25 Feb 2004; Jason Wever <weeve@gentoo.org> yahoo-transport-2.3.0-r1.ebuild:
   Added ~sparc keyword, helps resolve bug #42928.
diff --git a/net-im/yahoo-transport/Manifest b/net-im/yahoo-transport/Manifest
index 9e43cde08d29..cdddd4fc24ca 100644
--- a/net-im/yahoo-transport/Manifest
+++ b/net-im/yahoo-transport/Manifest
@@ -1,9 +1,12 @@
-MD5 fcd88102e257e0c2736c62f4a23eb73d ChangeLog 1026
-MD5 5c223c6896440b679a2ab2fe0c27df87 metadata.xml 322
 MD5 de61b137877e644eaccff82299d6bd42 yahoo-transport-2.3.0.ebuild 931
+MD5 5c223c6896440b679a2ab2fe0c27df87 metadata.xml 322
+MD5 fcd88102e257e0c2736c62f4a23eb73d ChangeLog 1026
 MD5 d29badbe80a8d6095a14cd8a8d72efc3 yahoo-transport-2.3.0-r1.ebuild 1169
-MD5 31c9597366163e1bee5dc028112f312c files/README.Gentoo 1525
+MD5 6f2ae527e9cbe47a7532bf37d9d8a2e3 yahoo-transport-2.3.0-r2.ebuild 1379
 MD5 25e82b074896a885889f7f45e84872c0 files/digest-yahoo-transport-2.3.0 72
-MD5 850986afafb4e6fdbc0643e72d9f22b7 files/yahoo-makefile.patch 507
-MD5 10650b31cf064823c24a162d4eb562c8 files/yahootrans.xml 739
 MD5 69d3e0efaec60f6e43d96bc566772ba2 files/digest-yahoo-transport-2.3.0-r1 144
+MD5 850986afafb4e6fdbc0643e72d9f22b7 files/yahoo-makefile.patch 507
+MD5 08ceef62612049225eff1b23061f72b4 files/yahootrans.xml 791
+MD5 9b7d0dcd85d23542d8b8e9ed7df2fc8d files/yahoo-transport.init 456
+MD5 69d3e0efaec60f6e43d96bc566772ba2 files/digest-yahoo-transport-2.3.0-r2 144
+MD5 31c9597366163e1bee5dc028112f312c files/README.Gentoo 1525
diff --git a/net-im/yahoo-transport/files/digest-yahoo-transport-2.3.0-r2 b/net-im/yahoo-transport/files/digest-yahoo-transport-2.3.0-r2
new file mode 100644
index 000000000000..412c1191daa9
--- /dev/null
+++ b/net-im/yahoo-transport/files/digest-yahoo-transport-2.3.0-r2
@@ -0,0 +1,2 @@
+MD5 281136e9934dd9e9221739a83bac4a2e yahoo-transport-2.3.0.tar.gz 44757
+MD5 8ff89895881d81c8ac7aff2788c745a2 yahoo-transport+newauth.diff 86348
diff --git a/net-im/yahoo-transport/files/yahoo-transport.init b/net-im/yahoo-transport/files/yahoo-transport.init
new file mode 100644
index 000000000000..37705109f1d1
--- /dev/null
+++ b/net-im/yahoo-transport/files/yahoo-transport.init
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting Yahoo Jabber Transport"
+	jabberd -B -c /etc/jabber/yahootrans.xml -H /var/spool/jabber >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping Yahoo Jabber Transport"
+	kill `cat /var/log/jabber/yahootrans.pid`
+	sleep 2
+	if ( -f /var/log/jabber/yahootrans.pid ); then
+		kill -9 `cat /var/log/jabber/yahootrans.pid`
+		rm -f /var/log/jabber/yahootrans.pid
+	fi
+	eend $?
+}
diff --git a/net-im/yahoo-transport/files/yahootrans.xml b/net-im/yahoo-transport/files/yahootrans.xml
index 9fe64642cfcc..72418ab22f87 100644
--- a/net-im/yahoo-transport/files/yahootrans.xml
+++ b/net-im/yahoo-transport/files/yahootrans.xml
@@ -21,4 +21,5 @@
       <charmap>CP1252</charmap>
     </config>
   </service>
+  <pidfile>/var/log/jabber/yahootrans.pid</pidfile>
 </jabber>
diff --git a/net-im/yahoo-transport/yahoo-transport-2.3.0-r2.ebuild b/net-im/yahoo-transport/yahoo-transport-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..d30dbff23aee
--- /dev/null
+++ b/net-im/yahoo-transport/yahoo-transport-2.3.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/yahoo-transport/yahoo-transport-2.3.0-r2.ebuild,v 1.1 2004/04/08 02:14:56 humpback Exp $
+
+DESCRIPTION="Open Source Jabber Server Yahoo transport"
+HOMEPAGE="http://yahoo-transport-2.jabberstudio.org/"
+SRC_URI="http://www.jabberstudio.org/files/yahoo-transport-2/${P}.tar.gz
+	http://dev.gentoo.org/~humpback/yahoo-transport+newauth.diff"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~x86"
+SLOT="0"
+
+DEPEND=">=net-im/jabberd-1.4.3-r3"
+
+src_unpack() {
+		unpack ${P}.tar.gz
+		cd ${S}
+		epatch ${FILESDIR}/yahoo-makefile.patch
+		#This applies a patch to the auth scheme
+		#http://mailman.jabber.org/pipermail/jadmin/2004-January/013922.html
+		epatch ${DISTDIR}/yahoo-transport+newauth.diff
+}
+
+src_compile() {
+		  emake || die
+}
+
+src_install() {
+		 dodir /etc/jabber /usr/lib/jabberd
+		 insinto /usr/lib/jabberd
+		 doins yahoo-transport.so
+		 insinto /etc/jabber
+		 doins  ${FILESDIR}/yahootrans.xml
+		 exeinto /etc/init.d
+		 newexe ${FILESDIR}/yahoo-transport.init yahoo-transport
+		 dodoc README ${FILESDIR}/README.Gentoo
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read /usr/share/doc/${P}/README.Gentoo.gz"
+	einfo "And please notice that now msn-transport comes with a init.d script"
+	einfo "dont forget to add it to your runlevel."
+	einfo
+}