new version of jabber-server

6 files changed, 90 insertions, 112 deletions

diff --git a/net-im/jabber-server/files/digest-jabber-server-1.4.1 b/net-im/jabber-server/files/digest-jabber-server-1.4.2
index 4429a2adf1e6..c9e989acb5b9 100644
--- a/net-im/jabber-server/files/digest-jabber-server-1.4.1
+++ b/net-im/jabber-server/files/digest-jabber-server-1.4.2
@@ -1,7 +1,7 @@
 MD5 a3c18654d41ebfaa3c74117004bf7d93 aim-transport-0.9.24c.tar.gz 298241
 MD5 01b825d9f917674f25fdba29255d081b conference-0.4.1.tar.gz 9645
 MD5 a08ef678fa8d768d7696af5bb85d1e34 irc-transport-0.1.1-1.4.linux.tar.gz 126244
-MD5 fc7afba8969e53c5e3b662156d1cdeae jabber-1.4.1.tar.gz 641361
+MD5 e5a0f96ba804a1626e37806d17114e1e jabber-1.4.2.tar.gz 691919
 MD5 a057e8dd5966fa0d26ded03697ba395a jud-0.4.tar.gz 3950
 MD5 251cd4b6cfc6c52a0f15c3ff2bfbfff9 msn-transport-1.1.tar.gz 24399
 MD5 0850f8d36d7b1e8df656fa84d03c82ba yahoo-transport-0.8-1.4.linux.tar.gz 143828
diff --git a/net-im/jabber-server/files/jabber-server b/net-im/jabber-server/files/jabber-server
index e5b0b14fa2d0..c05d0d6165a6 100644
--- a/net-im/jabber-server/files/jabber-server
+++ b/net-im/jabber-server/files/jabber-server
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-cd /usr/jabber
+cd /usr/jabber-1.4.2
+chown -R jabber.jabber /usr/jabber
 su - jabber -c "./jabberd/jabberd &"
diff --git a/net-im/jabber-server/files/jabber-server-1.4.1-gentoo.diff b/net-im/jabber-server/files/jabber-server-1.4.1-gentoo.diff
deleted file mode 100644
index 287d6204f62f..000000000000
--- a/net-im/jabber-server/files/jabber-server-1.4.1-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- jabberd/jabberd.c	Thu Feb  1 21:46:49 2001
-+++ jabberd/jabberd.c.new	Sat Dec 15 14:26:44 2001
-@@ -137,7 +137,7 @@
-     }
- 
-     if((home = ghash_get(cmd__line,"H")) == NULL)
--        home = pstrdup(jabberd__runtime,HOME);
-+        home = "/usr/jabber";
- #endif
- 
-     /* change the current working directory so everything is "local" */
diff --git a/net-im/jabber-server/files/jabber.rc6 b/net-im/jabber-server/files/jabber.rc6
index 2cf76c95b092..3101de7d2db7 100644
--- a/net-im/jabber-server/files/jabber.rc6
+++ b/net-im/jabber-server/files/jabber.rc6
@@ -1,15 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/files/jabber.rc6,v 1.1 2001/12/16 01:20:50 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/files/jabber.rc6,v 1.2 2002/02/13 16:04:42 verwilst Exp $
+
 depend() {
         need net
 }
 
 checkconfig() {
-        if [ ! -e /usr/jabber/jabber.xml ] ; then
+        if [ ! -e /usr/jabber-1.4.2/jabber.xml ] ; then
                 eerror "You need an  /usr/jabber/jabber.xml file first"
-                eerror "You can use ./usr/jabber/ServSetup to set up your server.."
                 return 1
         fi
 }
@@ -23,6 +23,6 @@ start() {
 
 stop() {
         ebegin "Stopping Jabber Server"
-        start-stop-daemon --stop --quiet --pidfile /usr/jabber/jabber.pid
+        start-stop-daemon --stop --quiet --pidfile /usr/jabber-1.4.2/jabber.pid
         eend $?
 }
diff --git a/net-im/jabber-server/jabber-server-1.4.1.ebuild b/net-im/jabber-server/jabber-server-1.4.1.ebuild
deleted file mode 100644
index c62c081a6cc7..000000000000
--- a/net-im/jabber-server/jabber-server-1.4.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.1.ebuild,v 1.4 2002/02/09 11:47:57 verwilst Exp $
-
-S="${WORKDIR}/jabber-1.4.1"
-HOMEPAGE="http://www.jabber.org"
-DESCRIPTION="Open Source Jabber Server & Transports"
-SLOT="0"
-SRC_URI="http://download.jabber.org/dists/1.4/final/jabber-1.4.1.tar.gz
-		 http://download.jabber.org/dists/transports/aim-transport/aim-transport-0.9.24c.tar.gz
-		 http://download.jabber.org/dists/1.4/final/conference-0.4.1.tar.gz
-		 http://download.jabber.org/dists/transports/irc-transport/irc-transport-0.1.1-1.4.linux.tar.gz
-		 http://download.jabber.org/dists/1.4/final/jud-0.4.tar.gz
-		 http://download.jabber.org/dists/1.4/final/msn-transport-1.1.tar.gz
-		 http://download.jabber.org/dists/1.4/final/yahoo-transport-0.8-1.4.linux.tar.gz"
-
-DEPEND="virtual/glibc
-	virtual/python
-	>=dev-libs/pth-1.4.0
-	>=app-admin/sudo-1.6.3_p7"
-
-src_compile() {
-
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-	./configure || die
-	make || die
-	mkdir -p ${D}/usr/jabber
-	cp -rf ${S} ${D}/usr/jabber
-
-	cp -rf ${WORKDIR}/conference-0.4.1 ${S}
-	cd ${S}/conference-0.4.1
-	make || die
-
-	cp -rf ${WORKDIR}/jud-0.4 ${S}
-	cd ${S}/jud-0.4
-	make || die
-
-	cp -rf ${WORKDIR}/aim-transport-0.9.24c ${S}
-	cd ${S}/aim-transport-0.9.24c
-	CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd" ./configure || die
-	make || die
-
-	cp -rf ${WORKDIR}/msn-transport-1.1 ${S}
-	cd ${S}/msn-transport-1.1
-	make || die
-
-	cp -rf ${WORKDIR}/yahoo-transport-0.8-1.4 ${S}
-	cd ${S}/yahoo-transport-0.8-1.4
-	CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd" ./configure || die
-	make || die
-
-	cd ${S}
-	echo " " > error.log
-	echo " " > record.log
-
-	mv jabber.xml jabber.xml.bak
-	mkdir -p ${D}/etc/init.d/
-	cp ${FILESDIR}/ServSetup ${S}
-	cp ${FILESDIR}/SetupEngine.py ${S}
-	cp ${FILESDIR}/WriteEngine.py ${S}
-	chmod a+x ${S}/ServSetup
-
-}
-
-src_install() {
-
-	cd ${S}
-	/usr/sbin/userdel jabber
-	/usr/sbin/groupdel jabber
-	/usr/sbin/useradd jabber -d /usr/jabber -m
-	/usr/sbin/groupadd jabber
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6 jabber
-	exeinto /usr/sbin ; doexe ${FILESDIR}/jabber-server
-	mkdir -p ${D}/usr/jabber
-	cp -rf * ${D}/usr/jabber/
-
-	chown -R jabber.jabber ${D}/usr/jabber
-}
-
-pkg_postinst() {
-
-	echo
-	echo "##########################################################################"
-	echo "# Done!								       #"
-	echo "# Now go to /usr/jabber, and configure your server before starting it.   #"
-	echo "# Have fun!							       #"
-	echo "##########################################################################"
-	echo
-
-}
-
-
diff --git a/net-im/jabber-server/jabber-server-1.4.2.ebuild b/net-im/jabber-server/jabber-server-1.4.2.ebuild
new file mode 100644
index 000000000000..a4b3a219e838
--- /dev/null
+++ b/net-im/jabber-server/jabber-server-1.4.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# Author Bart Verwilst <verwilst@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2.ebuild,v 1.1 2002/02/13 16:04:42 verwilst Exp $
+
+S="${WORKDIR}/jabber-${PV}"
+DESCRIPTION="Open Source Jabber Server & AIM,MSN,ICQ,Yahoo en conference transports"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://download.jabber.org/stable/jabber-${PV}.tar.gz
+	 http://download.jabber.org/dists/transports/aim-transport/aim-transport-0.9.24c.tar.gz
+         http://download.jabber.org/dists/1.4/final/conference-0.4.1.tar.gz
+         http://download.jabber.org/dists/transports/irc-transport/irc-transport-0.1.1-1.4.linux.tar.gz
+         http://download.jabber.org/dists/1.4/final/jud-0.4.tar.gz
+         http://download.jabber.org/dists/1.4/final/msn-transport-1.1.tar.gz
+         http://download.jabber.org/dists/1.4/final/yahoo-transport-0.8-1.4.linux.tar.gz"
+
+DEPEND="virtual/glibc
+	>=dev-libs/pth-1.4.0"
+
+src_unpack() {
+
+	unpack jabber-${PV}.tar.gz
+	cd ${S}
+	unpack msn-transport-1.1.tar.gz
+	unpack aim-transport-0.9.24c.tar.gz
+	unpack conference-0.4.1.tar.gz
+	unpack irc-transport-0.1.1-1.4.linux.tar.gz
+	unpack jud-0.4.tar.gz
+	unpack yahoo-transport-0.8-1.4.linux.tar.gz
+
+}
+
+src_compile() {
+	
+	cd ${S}
+	if [ "`use ssl`" ] ; then
+		mv configure configure.orig
+		sed 's:WANT_SSL=0:WANT_SSL=1:' configure.orig > configure
+		rm -f configure.orig
+		chmod 750 configure
+	fi
+	mv jabberd/jabberd.c jabberd/jabberd.c.orig
+	sed 's:pstrdup(jabberd__runtime,HOME):"/usr/jabber-1.4.2":' jabberd/jabberd.c.orig > jabberd/jabberd.c
+	rm -f jabberd/jabberd.c.orig
+	./configure || die
+	make || die
+
+        cd ${S}/conference-0.4.1
+        make || die
+
+        cd ${S}/jud-0.4
+        make || die
+
+        cd ${S}/aim-transport-0.9.24c
+        CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd" ./configure || die
+        make || die
+
+        cd ${S}/msn-transport-1.1
+        make || die
+
+        cd ${S}/yahoo-transport-0.8-1.4
+        CPPFLAGS="$CPPFLAGS -I../jabberd -I../../jabberd" ./configure || die
+        make || die
+
+}
+
+
+src_install() {
+
+        cd ${S}
+        /usr/sbin/userdel jabber
+        /usr/sbin/groupdel jabber
+        /usr/sbin/useradd jabber -d /usr/jabber -m
+        /usr/sbin/groupadd jabber
+
+        exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6 jabber
+        exeinto /usr/sbin ; doexe ${FILESDIR}/jabber-server
+        mkdir -p ${D}/usr/jabber
+        cp -rf * ${D}/usr/jabber/
+
+        chown -R jabber.jabber ${D}/usr/jabber
+
+}