Add testing version of jabberd-1.4.4.

(Portage version: 2.1.2_pre1-r3)

6 files changed, 159 insertions, 4 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 8ee08748829c..408f83822500 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.71 2006/09/20 09:43:46 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.72 2006/09/27 22:31:36 nelchael Exp $
+
+*jabberd-1.4.4-r3 (27 Sep 2006)
+
+  27 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd-1.4.4-openssl-0.9.8.patch, +files/jabberd-1.4.4.init,
+  +jabberd-1.4.4-r3.ebuild:
+  Add testing version of jabberd-1.4.4.
 
   20 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml:
   Changed maintainer.
diff --git a/net-im/jabberd/files/digest-jabberd-1.4.4-r3 b/net-im/jabberd/files/digest-jabberd-1.4.4-r3
new file mode 100644
index 000000000000..612cb5d437df
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-1.4.4-r3
@@ -0,0 +1,3 @@
+MD5 395f814a6627436ba7bd235509adcbc7 jabberd-1.4.4.tar.gz 613479
+RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 jabberd-1.4.4.tar.gz 613479
+SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af jabberd-1.4.4.tar.gz 613479
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.11 b/net-im/jabberd/files/digest-jabberd-2.0.11
index 351198e2b0be..ebf6ffdabffe 100644
--- a/net-im/jabberd/files/digest-jabberd-2.0.11
+++ b/net-im/jabberd/files/digest-jabberd-2.0.11
@@ -1,3 +1,3 @@
-MD5 67d1663ed97a5ba707d5d145b1d19c55 jabberd-2.0s11.tar.gz 777466
-RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d jabberd-2.0s11.tar.gz 777466
-SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a jabberd-2.0s11.tar.gz 777466
+MD5 0d9e9ca38cb724ebb0369e8827b87694 jabberd-2.0s11.tar.gz 98304
+RMD160 1120925e6057124f955fdd7c9eb49621c9b1bb4e jabberd-2.0s11.tar.gz 98304
+SHA256 7e84d38d5032c07c2f7fa32abfebf222d51bfa800caec438ba1c038a514f91d4 jabberd-2.0s11.tar.gz 98304
diff --git a/net-im/jabberd/files/jabberd-1.4.4-openssl-0.9.8.patch b/net-im/jabberd/files/jabberd-1.4.4-openssl-0.9.8.patch
new file mode 100644
index 000000000000..12df5dfea840
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.4.4-openssl-0.9.8.patch
@@ -0,0 +1,11 @@
+diff -Nru --exclude=tags jabberd-1.4.4/jabberd/mio_ssl.c jabberd-1.4.4.fixed/jabberd/mio_ssl.c
+--- jabberd-1.4.4/jabberd/mio_ssl.c	2005-04-16 00:07:23.000000000 +0200
++++ jabberd-1.4.4.fixed/jabberd/mio_ssl.c	2006-09-12 18:23:35.000000000 +0200
+@@ -103,6 +103,7 @@
+ 
+     log_debug2(ZONE, LOGT_INIT|LOGT_CONFIG, "Handling configuration using: %s", xmlnode2str(x));
+     /* Generic SSL Inits */
++	SSL_library_init();
+ 	OpenSSL_add_all_algorithms();    
+     SSL_load_error_strings();
+ 
diff --git a/net-im/jabberd/files/jabberd-1.4.4.init b/net-im/jabberd/files/jabberd-1.4.4.init
new file mode 100644
index 000000000000..a25ac84feb6b
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.4.4.init
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-1.4.4.init,v 1.1 2006/09/27 22:31:36 nelchael Exp $
+
+depend() {
+
+	need net
+	provide jabber-server
+
+}
+
+start() {
+
+	ebegin "Starting Jabber Server"
+	start-stop-daemon --start \
+		-c jabber:jabber \
+		-x /usr/bin/jabberd -- -B -c /etc/jabber/jabberd.xml
+	eend $?
+
+}
+
+stop() {
+
+	ebegin "Stopping Jabber Server"
+	start-stop-daemon --stop -x /usr/bin/jabberd
+	eend $?
+
+}
diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
new file mode 100644
index 000000000000..e6cfd63032aa
--- /dev/null
+++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.1 2006/09/27 22:31:36 nelchael Exp $
+
+inherit eutils
+
+S="${WORKDIR}/jabberd-${PV}"
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://download.jabberd.org/jabberd14/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="ssl ipv6 mysql postgres"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/pth-1.4.0
+	dev-libs/expat
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )
+	ssl? ( >=dev-libs/openssl-0.9.6i )
+	!=net-im/jabberd-2*"
+
+# Block against jabberd-2* is needed - both packages install the same files - collisions!
+# jabberd-2* needs to be back at SLOT="0"
+
+pkg_setup() {
+
+	if use postgres && use mysql; then
+		eerror "Please select mysql or postgres"
+		die "Please select mysql or postgres"
+	fi
+
+	if use ipv6; then
+		ewarn "You are about to build with ipv6 support, if your system is not using ipv6"
+		ewarn "hit Control-C now and emerge with \"USE=-ipv6\" or add it to /etc/portage/package.use "
+	fi
+
+}
+
+src_unpack() {
+
+	unpack "${A}"
+
+	# Resolves bug #147342
+	epatch "${FILESDIR}/${P}-openssl-0.9.8.patch"
+
+}
+
+src_compile() {
+
+	unset LC_ALL LC_CTYPE
+
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(use_enable ssl) \
+		$(use_enable ipv6) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql )\
+		|| die "econf failed"
+
+	# Broken parallel build
+	emake -j 1 || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	newinitd ${FILESDIR}/${P}.init jabber
+
+	# net-im/jabber-base provides needed directories
+	rm -rf "${D}/var"
+	mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml"
+	mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist"
+	sed -i \
+		-e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \
+		-e 's,/var/lib/log/jabberd,/var/log/jabber,g' \
+		-e 's,/var/lib/run/jabberd,/var/run/jabber,g' \
+		-e 's,jabber.pid,jabberd14.pid,g' \
+		"${D}/etc/jabber/jabberd.xml" \
+		"${D}/etc/jabber/jabberd.xml.dist"
+
+}
+
+pkg_postinst() {
+
+	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"
+	einfo "net-im/pymsn-t - MSN transport"
+	einfo "net-im/jud - Jabber User Directory"
+	einfo "net-im/yahoo-transport - Yahoo IM system"
+	einfo "net-im/mu-conference - Jabber multi user conference"
+	einfo
+	ewarn "If upgrading from older version please stop jabberd BEFORE updating the init.d"
+	ewarn "script, or you will end with a \"dead\" server."
+	ewarn
+	ewarn "Configuration file name has changed:"
+	ewarn "    configure your server in /etc/jabber/jabberd.xml!"
+	ebeep
+
+}