Add testing version of jabberd-1.4.4.

Package-Manager: portage-2.1.2_pre1-r3

7 files changed, 186 insertions, 16 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/Manifest b/net-im/jabberd/Manifest
index 7d4b63bc56d9..d924e26cf3e8 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -33,6 +33,14 @@ AUX jabber.rc6-r8 800 RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 SHA1 fe427
 MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800
 RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 files/jabber.rc6-r8 800
 SHA256 1ee99a10af00a518cfd74fa0279fcb7937d00f4d24633b67ea6974a19e2a505a files/jabber.rc6-r8 800
+AUX jabberd-1.4.4-openssl-0.9.8.patch 485 RMD160 d320a884f318640521ee5934b92a00440b067eff SHA1 55d7e2fd660931ffe171c2234bce135f8afe55c5 SHA256 ede42894807ca3eece8c5e52a771870233317e5bc6cb3ddfe749a372a08270bc
+MD5 b223acb6e59434654550a7564a0a5762 files/jabberd-1.4.4-openssl-0.9.8.patch 485
+RMD160 d320a884f318640521ee5934b92a00440b067eff files/jabberd-1.4.4-openssl-0.9.8.patch 485
+SHA256 ede42894807ca3eece8c5e52a771870233317e5bc6cb3ddfe749a372a08270bc files/jabberd-1.4.4-openssl-0.9.8.patch 485
+AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1 630cd9c50c20a73992b9891051e02350f6abcba9 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac
+MD5 3b4be327293fb0abc0cdb5dcac80d033 files/jabberd-1.4.4.init 554
+RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e files/jabberd-1.4.4.init 554
+SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac files/jabberd-1.4.4.init 554
 AUX multiple-xml-patch-00 5934 RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d SHA1 27f0aab6b2ec468dd9a1d3b7633555db83ade23f SHA256 43287b8265631498e0e82dfd0b362ec2513ffc4f3ea4daf112a52f3be49795c7
 MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
 RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d files/multiple-xml-patch-00 5934
@@ -67,9 +75,9 @@ RMD160 52bd65c728666be7f6ad48508748d1a4f0b47f3a files/xml-stream-patch-00 726
 SHA256 c6b447658281c5136b63cc2bdcd1d38463dae57a0dc701b7d90fecacc409f0c4 files/xml-stream-patch-00 726
 DIST jabberd-1.4.3-extexpat.diff 309514
 DIST jabberd-1.4.3.tar.gz 258016
-DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
+DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
 DIST jabberd-2.0s10.tar.gz 772817
-DIST jabberd-2.0s11.tar.gz 777466 RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a
+DIST jabberd-2.0s11.tar.gz 98304 RMD160 1120925e6057124f955fdd7c9eb49621c9b1bb4e SHA1 591e89131954e0eb52f063ec04ebed7cee4ced83 SHA256 7e84d38d5032c07c2f7fa32abfebf222d51bfa800caec438ba1c038a514f91d4
 DIST jabberd-2.0s9.tar.gz 769049
 DIST xdb_ldap-1.0.tar.gz 112204
 EBUILD jabberd-1.4.3-r4.ebuild 5623 RMD160 364936935b1351215b3b64a7e9b82ce0e261c513 SHA1 f42b58a8cb94d00a7379b5c15fd76b82c0d2a26b SHA256 5b2d7a93ab3e5b806bbf114437ebee6ad970687fe14cdbebd152c0e49ac491e4
@@ -84,6 +92,10 @@ EBUILD jabberd-1.4.4-r2.ebuild 4516 RMD160 cb4c97271971d011638f2a768729d7c46d17a
 MD5 b3f6c93ad36ef0b1f5d52185e70e8ad3 jabberd-1.4.4-r2.ebuild 4516
 RMD160 cb4c97271971d011638f2a768729d7c46d17abce jabberd-1.4.4-r2.ebuild 4516
 SHA256 53e77bf72d3dec4a8eea0ffb92a5c72435ce6ae1e5833e57b50dae4f52dbf313 jabberd-1.4.4-r2.ebuild 4516
+EBUILD jabberd-1.4.4-r3.ebuild 2804 RMD160 1a6c637fa68440670e50e657e8ca7f2245b08406 SHA1 ee38976f93abc3fed2d716cd8ee88da9b9d7df84 SHA256 b45c7b0c0c3c5b17f702035fb8d0d286d8d610fda9e7867435e605b6a6833a74
+MD5 c20db3b1bf1fdddd6cf12b36c6e10804 jabberd-1.4.4-r3.ebuild 2804
+RMD160 1a6c637fa68440670e50e657e8ca7f2245b08406 jabberd-1.4.4-r3.ebuild 2804
+SHA256 b45c7b0c0c3c5b17f702035fb8d0d286d8d610fda9e7867435e605b6a6833a74 jabberd-1.4.4-r3.ebuild 2804
 EBUILD jabberd-2.0.10.ebuild 3494 RMD160 a43d71c49628084c41d02767775c3dde4898018d SHA1 8c5cad380f1c00395dc4ad7d5b3aa4f0e80f4703 SHA256 1cdeac08668b8d609b335f42d8e6c77f8152398f5b940935d2c64678039e6480
 MD5 fb4eb4f8f7c47229416f97a92b0d99d1 jabberd-2.0.10.ebuild 3494
 RMD160 a43d71c49628084c41d02767775c3dde4898018d jabberd-2.0.10.ebuild 3494
@@ -96,10 +108,10 @@ EBUILD jabberd-2.0.9.ebuild 3622 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b
 MD5 4cfba42324bea977951cd322a4299d77 jabberd-2.0.9.ebuild 3622
 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b jabberd-2.0.9.ebuild 3622
 SHA256 44fad28beb56c42295a9bd4d0b14dafbdab94be0f9114b34b18d235ecb2f0dbe jabberd-2.0.9.ebuild 3622
-MISC ChangeLog 11414 RMD160 af33835dfac45bddf9e30c7904674bdf7f513e0a SHA1 414512532ae9f572a573a56711e6cb153bc65da3 SHA256 93dc365fa216f6ecfa6c20f887fb36f36911d8de8a7a85d66bc10631dd2630fe
-MD5 9edcedbfa42a37732c923dcd3ba1378c ChangeLog 11414
-RMD160 af33835dfac45bddf9e30c7904674bdf7f513e0a ChangeLog 11414
-SHA256 93dc365fa216f6ecfa6c20f887fb36f36911d8de8a7a85d66bc10631dd2630fe ChangeLog 11414
+MISC ChangeLog 11640 RMD160 77a772dffda10a877f758c8d977f91d280265883 SHA1 9e5a6ac88292435e704563db894270fb5378ad9e SHA256 a376cd735833ff78914a6ea805a4eee6638ec4e451d668b812e2ef1ffd09419f
+MD5 b4b3ef79039155407dae6e9ac85e755d ChangeLog 11640
+RMD160 77a772dffda10a877f758c8d977f91d280265883 ChangeLog 11640
+SHA256 a376cd735833ff78914a6ea805a4eee6638ec4e451d668b812e2ef1ffd09419f ChangeLog 11640
 MISC metadata.xml 453 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 SHA1 74ce3349255a107d4ec18bc3e9639a50b8e7cdbe SHA256 b21a9806e3be38cc94ca812e9864c537237905bdb18347461fae9ba26bb1f690
 MD5 e07ef3d6fc255eee85b6dd3480c8f819 metadata.xml 453
 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 metadata.xml 453
@@ -113,19 +125,22 @@ SHA256 33c61cd470b9348e0670e1025620c251a2ace5e9581e6acba6dc4574f8f5586e files/di
 MD5 6608e1126e4f091819d2c41a1a8843a5 files/digest-jabberd-1.4.4-r2 241
 RMD160 0c09cceb4332b70a38db717adb4bd1d244337b72 files/digest-jabberd-1.4.4-r2 241
 SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/digest-jabberd-1.4.4-r2 241
+MD5 6608e1126e4f091819d2c41a1a8843a5 files/digest-jabberd-1.4.4-r3 241
+RMD160 0c09cceb4332b70a38db717adb4bd1d244337b72 files/digest-jabberd-1.4.4-r3 241
+SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/digest-jabberd-1.4.4-r3 241
 MD5 8524e0a5eec488ceb069462f4650cf1b files/digest-jabberd-2.0.10 66
 RMD160 8d772c60a5ef7ed469d9a2e9f33939427d64a4e2 files/digest-jabberd-2.0.10 66
 SHA256 aa25128fea5986576fe926dba3b8b1aaedd757e50d6af3a0fae73511bf4dad08 files/digest-jabberd-2.0.10 66
-MD5 3cbebd7d43212be46daad3e042dce34f files/digest-jabberd-2.0.11 244
-RMD160 4638cd85561494bb4ec40e8af80cc145f8156b23 files/digest-jabberd-2.0.11 244
-SHA256 8d5a3e81789ef9e85b365e2974311b0f46ffb940a2b0bfdbc80457e40014f05b files/digest-jabberd-2.0.11 244
+MD5 605217e89a82b4c95431fd10a112babd files/digest-jabberd-2.0.11 241
+RMD160 3361d2d33017efd68607b5324e0ed9ba79a7c1f3 files/digest-jabberd-2.0.11 241
+SHA256 84d14316b279aadd69d2d5e2a38d5b6684487c7c7b1e118f9332561f3c0fa8e9 files/digest-jabberd-2.0.11 241
 MD5 4817e867644d7d7bd2e1a0724571fbe9 files/digest-jabberd-2.0.9 65
 RMD160 874879ba51467cf292812048ed04f5e71ab66b7a files/digest-jabberd-2.0.9 65
 SHA256 e0558a17b5746d48015656ba100b8c828968a785ad35c728696b79c54cd28922 files/digest-jabberd-2.0.9 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFEQ1Zgo/w9rxVVVERAiz9AKC2A6uzOJyfu9ZYsaneUc68sEMumQCeOgcr
-EfWDh6/Iu6Xd+E2r10tH7BU=
-=wxmU
+iD8DBQFFGvvYgo/w9rxVVVERAgWpAJ9FM4GX0PH2emEJqAyIxzR1NBENAwCgkqJV
+8HdLoEuX8R4v62072XNb00A=
+=UE3X
 -----END PGP SIGNATURE-----
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
+
+}