Version bump to add ipv6 support.

4 files changed, 167 insertions, 6 deletions

diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 0bb5b8bf7c86..ee280caa9bae 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,7 +1,7 @@
-MD5 f0b233cbf1fcb1417cbf11da9c5e928a metadata.xml 422
+MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
 MD5 e51ababb4ba89899058126801b63211a jabberd-1.4.3.ebuild 4545
 MD5 041a01a328991b9a675327713d2fe07f ChangeLog 613
-MD5 72d3296a20f8d95333a8054c09cda4de jabberd-1.4.3-r1.ebuild 4499
+MD5 e31f0041a17870944b6334bfddfe935a jabberd-1.4.3-r1.ebuild 4602
 MD5 7a981c4b2e87705a17c9f1061027d988 files/jabber.rc6-r5 860
 MD5 f337375df716c6aa70d2f696efbfe21d files/multiple.xml 4919
 MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
diff --git a/net-im/jabberd/files/digest-jabberd-1.4.3-r1 b/net-im/jabberd/files/digest-jabberd-1.4.3-r1
new file mode 100644
index 000000000000..09bdcd16d472
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-1.4.3-r1
@@ -0,0 +1,2 @@
+MD5 a3e964d6fa07b5d850302ae0512f94c6 jabberd-1.4.3.tar.gz 258016
+MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204
diff --git a/net-im/jabberd/jabberd-1.4.3-r1.ebuild b/net-im/jabberd/jabberd-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..3c74a971769c
--- /dev/null
+++ b/net-im/jabberd/jabberd-1.4.3-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r1.ebuild,v 1.1 2004/01/23 15:41:34 humpback Exp $
+
+S="${WORKDIR}/jabberd-${PV}"
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
+	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="ssl ldap ipv6"
+
+DEPEND="!net-im/jabber-server
+	=dev-libs/pth-1.4.0
+	ssl? ( >=dev-libs/openssl-0.9.6i )
+	ldap? ( =net-nds/openldap-2* )"
+
+src_unpack() {
+	unpack jabberd-${PV}.tar.gz
+	cd ${S}
+	use ldap	&& unpack xdb_ldap-1.0.tar.gz
+
+}
+
+src_compile() {
+	# These can cause problems with certain configure scripts used...
+	unset LC_ALL LC_CTYPE
+
+
+	local myconf
+	cd ${S}
+	use ssl && myconf="--enable-ssl"
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+
+	mv jabberd/jabberd.c jabberd/jabberd.c.orig
+	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
+	rm -f jabberd/jabberd.c.orig
+	./configure ${myconf} || die
+	make || die
+
+	if use ldap; then
+		cd ${S}/xdb_ldap/src
+		make all || die
+	fi
+}
+
+src_install() {
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r5 jabber
+	dodir /usr/sbin /etc/jabber /usr/lib/jabberd /var/log/jabber /usr/include/jabberd
+	touch ${D}/var/log/jabber/error.log
+	touch ${D}/var/log/jabber/record.log
+	dodir /var/spool/jabber
+	touch ${D}/var/spool/jabber/.keep
+	dodir /var/run
+
+	exeinto /usr/sbin
+	doexe jabberd/jabberd
+	insinto /usr/lib/jabberd
+	doins platform-settings
+	doins jsm/jsm.so
+	doins xdb_file/xdb_file.so
+	doins pthsock/pthsock_client.so
+	doins dnsrv/dnsrv.so
+	doins dialback/dialback.so
+	if [ `use ldap` ]; then
+		insinto /etc/jabber
+		doins xdb_ldap/jabber.schema
+		doins xdb_ldap/slapd.conf
+		doins config/xdb-ldap.xml
+		insinto /usr/lib/jabberd
+		doins xdb_ldap/src/xdb_ldap.so
+	fi
+	insinto /etc/jabber
+	doins ${FILESDIR}/multiple.xml
+	exeinto /etc/jabber
+	doexe ${FILESDIR}/self-cert.sh
+
+	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
+	if [ -z $test_group ]
+	then
+		groupadd jabber
+	fi
+
+	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
+	if [ -z $test_user ]
+	then
+		useradd jabber -s /bin/false -d /var/spool/jabber -g jabber -m
+	fi
+
+	dodoc README UPGRADE ${FILESDIR}/README.Gentoo
+
+	fowners jabber:jabber /etc/jabber
+	fowners jabber:jabber /usr/sbin/jabberd
+	fowners jabber:jabber /var/log/jabber
+	fowners jabber:jabber /var/log/jabber/error.log
+	fowners jabber:jabber /var/log/jabber/record.log
+	fowners jabber:jabber /var/spool/jabber
+	fowners jabber:jabber /var/spool/jabber/.keep
+
+	fperms o-rwx /etc/jabber
+	fperms o-rwx /usr/sbin/jabberd
+	fperms o-rwx /var/log/jabber
+	fperms o-rwx /var/log/jabber/error.log
+	fperms o-rwx /var/log/jabber/record.log
+	fperms o-rwx /var/spool/jabber
+	fperms o-rwx /var/spool/jabber/.keep
+	fperms u+rwx /usr/sbin/jabberd
+
+	fperms g-x /etc/jabber
+	fperms g-x /usr/sbin/jabberd
+	fperms g-x /var/log/jabber
+	fperms g-x /var/log/jabber/error.log
+	fperms g-x /var/log/jabber/record.log
+	fperms g-x /var/spool/jabber
+	fperms g-x /var/spool/jabber/.keep
+
+	fperms g+rw /etc/jabber
+	fperms g+rw /usr/sbin/jabberd
+	fperms g+rw /var/spool/jabber
+	fperms g+rw /var/spool/jabber/error.log
+	fperms g+rw /var/spool/jabber/record.log
+	fperms g+rw /var/log/jabber
+	fperms g+rw /var/log/jabber/.keep
+	fperms u+xs /usr/sbin/jabberd
+
+	#Install header files for transports to use
+	cd ${S}/jabberd
+	tar cf - `find . -name \*.h` | (cd ${D}/usr/include/jabberd ; tar xvf -)
+	assert "Failed to install header files to /usr/include/jabberd"
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "Change 'localhost' to your server's domainname in the"
+	einfo "/etc/jabber/*.xml configs first"
+	einfo "Server admins should be added to the "jabber" group"
+	if [ `use ssl` ]; then
+		einfo
+		einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
+		einfo "(Only if compiled with SSL support (ssl in USE)"
+	fi
+	if [ `use ldap` ]; then
+		einfo
+		einfo "In order to use the ldap backend, you need to copy"
+		einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
+		einfo "directory on your ldap server. You will also need to"
+		einfo "include the schema in your slapd.conf file and retsart openldap."
+		einfo "An example slapd.conf file is included in /etc/jabber."
+		einfo "The xdb_ldap backend expects your ldap server to handle"
+		einfo "StartTLS or run in ldaps mode."
+	fi
+	einfo
+	einfo "Please read /usr/share/doc/${P}/README.Gentoo"
+	einfo
+}
diff --git a/net-im/jabberd/metadata.xml b/net-im/jabberd/metadata.xml
index fa4290d8cdea..54ca97977a52 100644
--- a/net-im/jabberd/metadata.xml
+++ b/net-im/jabberd/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>net-im</herd>
 <maintainer>
-  <email>rizzo@gentoo.org</email>
-  <name>Don Seiler</name>
-  <description>Holding this until Humpback (Gustavo Felisberto) graduates from Dev U.</description>
+  <email>humpback@gentoo.org</email>
+  <name>Gustavo Felisberto</name>
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
+<longdescription>This is the original implementation of jabberd server.
+This serves as the basis for running a jabber server in Gentoo.</longdescription>
 </pkgmetadata>