Revision bump, robust start/stop script thanks to Chris Carlin <ccarlin@physics.tamu.edu> and Dustin J. Mitchell <dustin@v.igoro.us> in bug #145373. Statsdx & SOCKS5 proxy support thanks to Nikolaus Polak <nik@linuxlovers.at> in bug #137724. And finally, thanks to Micha Krause <linux@krausam.de> for pointing out that the SSL eclass did not create certificates usable for S2S connections in bug #150088.

Package-Manager: portage-2.1.2_pre2-r8

8 files changed, 329 insertions, 15 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 2696664e20e3..c312d3a0431f 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.7 2006/08/01 04:26:09 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.8 2006/10/12 16:26:07 chainsaw Exp $
+
+*ejabberd-1.1.1-r1 (12 Oct 2006)
+
+  12 Oct 2006; Tony Vroon <chainsaw@gentoo.org>
+  +files/ejabberd-1.1.1-r1.initd, +files/self-cert-v2.sh, +files/ssl.cnf,
+  ejabberd-1.1.1.ebuild, +ejabberd-1.1.1-r1.ebuild:
+  Revision bump, robust start/stop script thanks to Chris Carlin
+  <ccarlin@physics.tamu.edu> and Dustin J. Mitchell <dustin@v.igoro.us> in bug
+  #145373. Statsdx & SOCKS5 proxy support thanks to Nikolaus Polak
+  <nik@linuxlovers.at> in bug #137724. And finally, thanks to Micha Krause
+  <linux@krausam.de> for pointing out that the SSL eclass did not create
+  certificates usable for S2S connections in bug #150088.
 
   01 Aug 2006; Joshua Jackson <tsunam@gentoo.org> ejabberd-1.1.1.ebuild:
   Stable x86; bug #141302
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 3bbcafef2f0b..1b2cfcf407c6 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -13,6 +13,10 @@ AUX ejabberd-0.7.5.initd 1374 RMD160 83da8ee22eb26505c8266d1f36d8138323a60ebb SH
 MD5 fa69896efdf335059d0545edf83cd359 files/ejabberd-0.7.5.initd 1374
 RMD160 83da8ee22eb26505c8266d1f36d8138323a60ebb files/ejabberd-0.7.5.initd 1374
 SHA256 ab7301036561238dc6d43bc2cd39609d355cbe617a84c860f68bc5cecfafe036 files/ejabberd-0.7.5.initd 1374
+AUX ejabberd-1.1.1-r1.initd 1426 RMD160 024e4e14b74b43176568c3f19577a38ddf4a42a5 SHA1 99f24e3ac3529715c64ba0a46b3bce707d55e51c SHA256 da3ec5de1fabcd58f4dcc709d99ed199cb1f28ed918e54e79310fa4345ff5eda
+MD5 2b335439feff5ddcc26036a4baa67fd1 files/ejabberd-1.1.1-r1.initd 1426
+RMD160 024e4e14b74b43176568c3f19577a38ddf4a42a5 files/ejabberd-1.1.1-r1.initd 1426
+SHA256 da3ec5de1fabcd58f4dcc709d99ed199cb1f28ed918e54e79310fa4345ff5eda files/ejabberd-1.1.1-r1.initd 1426
 AUX ejabberd-1.1.1.confd 777 RMD160 701d81cbc4e4166f94b74557b4e4f463661c7e9c SHA1 6808e2a92673e0a3d524ba958df537b578ef1838 SHA256 e7c521a12c79d38f1a04415dc7205785e81d02d4f4bf7d999fdff22d456d3bd6
 MD5 be6080d28fad9a23512f93986373a64f files/ejabberd-1.1.1.confd 777
 RMD160 701d81cbc4e4166f94b74557b4e4f463661c7e9c files/ejabberd-1.1.1.confd 777
@@ -29,24 +33,37 @@ AUX inetrc 36 RMD160 4b79020864689ede547969610fde18fe490f5810 SHA1 1e0bae0f7251e
 MD5 e088cd52d4316efddc54195dc939cd24 files/inetrc 36
 RMD160 4b79020864689ede547969610fde18fe490f5810 files/inetrc 36
 SHA256 0f383befc4c46134d88ce14d3bd06c404ef6575391f4ac0b5e8c28ba383b28fc files/inetrc 36
+AUX self-cert-v2.sh 1009 RMD160 48b7091243bb30718121bad3e771a9335404d75e SHA1 5fe0516f5001a6580cb977bbce2bf63c117fe26a SHA256 a17d411a138b9130b13d9eb7036984ddca2a47b2f66f55eee738f028e817e327
+MD5 045f44fd5fcc55c69a88b9f76e1fff00 files/self-cert-v2.sh 1009
+RMD160 48b7091243bb30718121bad3e771a9335404d75e files/self-cert-v2.sh 1009
+SHA256 a17d411a138b9130b13d9eb7036984ddca2a47b2f66f55eee738f028e817e327 files/self-cert-v2.sh 1009
 AUX self-cert.sh 491 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b SHA1 61a4c8b79141ec1bc846e8ede6fa19a07210c619 SHA256 6a0c53a8573411c18ed6f5dd79ce4807b72fb10bc5eb3a3a7f4641c57e4ddceb
 MD5 369bff16ecff4a042143b458597bf957 files/self-cert.sh 491
 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b files/self-cert.sh 491
 SHA256 6a0c53a8573411c18ed6f5dd79ce4807b72fb10bc5eb3a3a7f4641c57e4ddceb files/self-cert.sh 491
+AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635
+MD5 4e7eb092bca3a0c2ff1405ff733dc70d files/ssl.cnf 1042
+RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 files/ssl.cnf 1042
+SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635 files/ssl.cnf 1042
 DIST ejabberd-0.7.5.tar.gz 410451
 DIST ejabberd-1.1.1.tar.gz 803278 RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 SHA1 4f23d787afe75c7c866decdff6f539195449776e SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082
+DIST ejabberd-patchball-1.1.1-r1.tar.bz2 11826 RMD160 8bee1764940073c807644438914bbbad4548a9a5 SHA1 e3238179c55b77d99b0bbec25787bbc47239feee SHA256 4bf89e6858e455444bc5a29113f19462e856d1399179cb51bb8e404176eee3de
 EBUILD ejabberd-0.7.5.ebuild 2873 RMD160 c472f73e3fc5b8793ae7846605cbe9b1b7c17d88 SHA1 eb6632ef55de2350987d33a5c255431753dcd4a2 SHA256 fb7ddb32a459431fa03701edc546448c189c0c87c4c3bdb2b2404759a10f7cd2
 MD5 0299ef0b946b6cbac7a91bbcd186ee9d ejabberd-0.7.5.ebuild 2873
 RMD160 c472f73e3fc5b8793ae7846605cbe9b1b7c17d88 ejabberd-0.7.5.ebuild 2873
 SHA256 fb7ddb32a459431fa03701edc546448c189c0c87c4c3bdb2b2404759a10f7cd2 ejabberd-0.7.5.ebuild 2873
-EBUILD ejabberd-1.1.1.ebuild 3321 RMD160 ab711541465d1689ab9238f9a7c292bda596e086 SHA1 803171eaa554b7b35c991fdd56c01a41da69f951 SHA256 08fbf092d9ab2738e0cc61bb8a43a65866fa4d59ba0daefb1ff28682423a7373
-MD5 818e30097e3c402cb775727a6599fa64 ejabberd-1.1.1.ebuild 3321
-RMD160 ab711541465d1689ab9238f9a7c292bda596e086 ejabberd-1.1.1.ebuild 3321
-SHA256 08fbf092d9ab2738e0cc61bb8a43a65866fa4d59ba0daefb1ff28682423a7373 ejabberd-1.1.1.ebuild 3321
-MISC ChangeLog 1386 RMD160 61d9cd20e0c7e25d6d046b978a47e6e575953a34 SHA1 bdb8c8ed4a9471ec732779c9cd8c32d85ef457db SHA256 de0dd21bb2cc6bb9f16ffef13c17396df495eed415c27c03bd82f96164baedeb
-MD5 3193694e73e5717ca41c6e1c4b9613d4 ChangeLog 1386
-RMD160 61d9cd20e0c7e25d6d046b978a47e6e575953a34 ChangeLog 1386
-SHA256 de0dd21bb2cc6bb9f16ffef13c17396df495eed415c27c03bd82f96164baedeb ChangeLog 1386
+EBUILD ejabberd-1.1.1-r1.ebuild 3899 RMD160 6682ab29946c1785575b50de639be808421afe04 SHA1 280c051015c26426c0fae913249c0b6b1770e1b4 SHA256 4f7e70d698f331c7028dbdb5ff6cd09ee2af9659322e7d2d25e51ff340788540
+MD5 1dc9d46b162bdf22a88e7d6a2869b8ea ejabberd-1.1.1-r1.ebuild 3899
+RMD160 6682ab29946c1785575b50de639be808421afe04 ejabberd-1.1.1-r1.ebuild 3899
+SHA256 4f7e70d698f331c7028dbdb5ff6cd09ee2af9659322e7d2d25e51ff340788540 ejabberd-1.1.1-r1.ebuild 3899
+EBUILD ejabberd-1.1.1.ebuild 3327 RMD160 00650229571c5362dcf9732c3fc06d36e3bffa06 SHA1 adaed372c48e5028e2bca0bda655705277f97bd3 SHA256 3826cb497719692826c7e6ab8c992b3259c67c907aa1f0950681fc0648e5be26
+MD5 889d9fd6080d69234175d19f05d8624e ejabberd-1.1.1.ebuild 3327
+RMD160 00650229571c5362dcf9732c3fc06d36e3bffa06 ejabberd-1.1.1.ebuild 3327
+SHA256 3826cb497719692826c7e6ab8c992b3259c67c907aa1f0950681fc0648e5be26 ejabberd-1.1.1.ebuild 3327
+MISC ChangeLog 2014 RMD160 c9170044b84ea44f1437ff3e49bec63419c1406e SHA1 02c29f28eb40e00de2e8a8b03f98fc75702a5afd SHA256 d218657d2a5ae12087cbd8d7d31712ecc8ce137f278bebbe391c800297fb2943
+MD5 f2a13291dc40768f83518c180b50f84a ChangeLog 2014
+RMD160 c9170044b84ea44f1437ff3e49bec63419c1406e ChangeLog 2014
+SHA256 d218657d2a5ae12087cbd8d7d31712ecc8ce137f278bebbe391c800297fb2943 ChangeLog 2014
 MISC metadata.xml 383 RMD160 aceb05ede401881022e8465895f6f9c33c332eeb SHA1 619e611cec685394a089bfc5f9af061e8f33b2b2 SHA256 b200df29d7cec9556f72f2915e771251dff35c4d69c30eb15bf187865df51d7a
 MD5 4d142ea790d97a89bdcc4325d5e3b301 metadata.xml 383
 RMD160 aceb05ede401881022e8465895f6f9c33c332eeb metadata.xml 383
@@ -57,10 +74,13 @@ SHA256 62769c251ad5d7522c7efa0e231f8b22dbd42924cd8491a913fd933951938c92 files/di
 MD5 87c80474a3cbcdf51830a748a411f0f4 files/digest-ejabberd-1.1.1 244
 RMD160 bdb61a1e0dd65fa91775a5f3b7c7516dc65bd8ff files/digest-ejabberd-1.1.1 244
 SHA256 d3659c3dbc43cf807fb7309da84ba62393e9257a7a16a3305621ee60f97378a6 files/digest-ejabberd-1.1.1 244
+MD5 271f80b598fac50393ae42ee64385b5b files/digest-ejabberd-1.1.1-r1 527
+RMD160 83ce012051e482806e65add1163d82bbf0b5a228 files/digest-ejabberd-1.1.1-r1 527
+SHA256 f7efa501bd505164f6945a73792014a2af61646e9be44683a46eff6de743e0a9 files/digest-ejabberd-1.1.1-r1 527
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEztgu2ZWR0Jhg/EsRAgmtAJ9cEbe+6jEbsIc5lmSCWFKRC70/DQCfQAq6
-aXE/bz51xNaqL3msm8IZYtQ=
-=Xhk9
+iD8DBQFFLmyzp5vW4rUFj5oRAvesAKC0Z1llWVy7iCKpi9lt4ZG8no1ejgCguKH9
+Z/fdDt6Xf7/psHLOMIivwt0=
+=tOoJ
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-1.1.1-r1.ebuild b/net-im/ejabberd/ejabberd-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..c63a9bc02eab
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-1.1.1-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.1-r1.ebuild,v 1.1 2006/10/12 16:26:07 chainsaw Exp $
+
+inherit eutils multilib versionator
+
+JABBER_ETC="/etc/jabber"
+JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+JABBER_LOG="/var/log/jabber"
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://ejabberd.jabber.ru/"
+SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz mirror://gentoo/ejabberd-patchball-${PVR}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="mod_irc mod_muc mod_pubsub ldap odbc socks5 statsdx ssl web"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/expat-1.95
+	>=dev-lang/erlang-10.2.0
+	odbc? ( dev-db/unixODBC )
+	ldap? ( =net-nds/openldap-2* )"
+
+PROVIDE="virtual/jabber-server"
+S=${WORKDIR}/${P}/src
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if useq socks5 ; then
+		epatch ${WORKDIR}/patchball/${PVR}-socks5-proxy.patch
+	fi
+	if useq statsdx; then
+		epatch ${WORKDIR}/patchball/${PVR}-statsdx.patch
+		if useq web; then
+			epatch ${WORKDIR}/patchball/${PVR}-statsdx-web.patch
+		fi
+	fi
+}
+
+src_compile() {
+	econf ${myconf}                              \
+		$(use_enable mod_irc)                \
+		$(use_enable ldap eldap)             \
+		$(use_enable mod_muc)                \
+		$(use_enable mod_pubsub)             \
+		$(use_enable ssl tls)                \
+		$(use_enable web)                    \
+		$(use_enable odbc)                   \
+		|| die "econf failed"
+
+	emake || die "compiling ejabberd core failed"
+}
+
+src_install() {
+	make                                                       \
+		DESTDIR=${D}                                       \
+		EJABBERDDIR=${D}/usr/$(get_libdir)/erlang/lib/${P} \
+		ETCDIR=${D}${JABBER_ETC}                           \
+		LOGDIR=${D}${JABBER_LOG}                           \
+	    install \
+	    || die "install failed"
+
+	chown -R jabber:jabber "${D}${JABBER_ETC}"
+	chown -R jabber:jabber "${D}${JABBER_LOG}"
+	chown -R jabber:jabber "${D}/usr/$(get_libdir)/erlang/lib/${P}"
+
+	insinto /usr/share/doc/${PF}
+	cd ${S}/..
+	dodoc doc/release_notes_${PV}.txt
+	dohtml doc/*.{html,png}
+
+	#
+	# Create /usr/bin/ejabberd
+	#
+	cat <<EOF > ${T}/ejabberd
+#!/bin/bash
+
+erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
+	${pa} \\
+	-sname ejabberd \\
+	-s ejabberd \\
+	-ejabberd config \"${JABBER_ETC}/ejabberd.cfg\" \\
+	log_path \"${JABBER_LOG}/ejabberd.log\" \\
+	-kernel inetrc \"${JABBER_ETC}/inetrc\" \\
+	-sasl sasl_error_logger \{file,\"${JABBER_LOG}/sasl.log\"\} \\
+	-mnesia dir \"${JABBER_SPOOL}\" \\
+	\$@
+EOF
+
+	#
+	# Create /usr/bin/ejabberdctl
+	#
+	cat <<EOF > ${T}/ejabberdctl
+#!/bin/sh
+
+exec env HOME=${JABBER_RUN} \\
+	erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
+		${pa} \\
+		-noinput \\
+		-sname ejabberdctl \\
+		-s ejabberd_ctl \\
+		-extra \$@
+EOF
+
+	dobin ${T}/ejabberdctl
+	dobin ${T}/ejabberd
+
+	newinitd ${FILESDIR}/${PF}.initd ${PN}
+	newconfd ${FILESDIR}/${P}.confd ${PN}
+
+	insinto ${JABBER_ETC}
+	doins ${FILESDIR}/inetrc
+	doins ${FILESDIR}/ssl.cnf
+	newins ${FILESDIR}/self-cert-v2.sh self-cert.sh
+}
+
+pkg_postinst() {
+	einfo "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html"
+	einfo "or the online version at http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html"
+	echo
+	if use ssl ; then
+		if [ ! -e /etc/jabber/ssl.pem ]; then
+			ebegin "Creating SSL key"
+			sh ${JABBER_ETC}/self-cert.sh &> /dev/null
+			eend $?
+		fi
+		chown jabber:jabber ${JABBER_ETC}/ssl.pem
+		ewarn "Please be sure that your ${JABBER_ETC}/ejabber.cfg points to ${JABBER_ETC}/ssl.pem"
+		ewarn "You may want to edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh again"
+	fi
+	if ! use web ; then
+		einfo "The web USE flag is off, this will disable the web admin interface,"
+		einfo "if this was not the intention then add web to your USE flags."
+	fi
+}
diff --git a/net-im/ejabberd/ejabberd-1.1.1.ebuild b/net-im/ejabberd/ejabberd-1.1.1.ebuild
index f6e1a4a8633a..dd9c62227dd1 100644
--- a/net-im/ejabberd/ejabberd-1.1.1.ebuild
+++ b/net-im/ejabberd/ejabberd-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.1.ebuild,v 1.2 2006/08/01 04:26:09 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.1.ebuild,v 1.3 2006/10/12 16:26:07 chainsaw Exp $
 
 inherit eutils multilib ssl-cert versionator
 
@@ -15,7 +15,7 @@ SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="mod_irc mod_muc mod_pubsub ldap odbc web"
+IUSE="mod_irc mod_muc mod_pubsub ldap odbc ssl web"
 
 DEPEND=">=net-im/jabber-base-0.01
 	>=dev-libs/expat-1.95
diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.1-r1 b/net-im/ejabberd/files/digest-ejabberd-1.1.1-r1
new file mode 100644
index 000000000000..02e65411ae91
--- /dev/null
+++ b/net-im/ejabberd/files/digest-ejabberd-1.1.1-r1
@@ -0,0 +1,6 @@
+MD5 ef6fae4a3f9c7f807f21e9cd3dae195b ejabberd-1.1.1.tar.gz 803278
+RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 ejabberd-1.1.1.tar.gz 803278
+SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082 ejabberd-1.1.1.tar.gz 803278
+MD5 d93037f28d977f677ca0692ad2f0b741 ejabberd-patchball-1.1.1-r1.tar.bz2 11826
+RMD160 8bee1764940073c807644438914bbbad4548a9a5 ejabberd-patchball-1.1.1-r1.tar.bz2 11826
+SHA256 4bf89e6858e455444bc5a29113f19462e856d1399179cb51bb8e404176eee3de ejabberd-patchball-1.1.1-r1.tar.bz2 11826
diff --git a/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd b/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd
new file mode 100644
index 000000000000..3c4770d301be
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd
@@ -0,0 +1,62 @@
+#!/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/ejabberd/files/ejabberd-1.1.1-r1.initd,v 1.1 2006/10/12 16:26:07 chainsaw Exp $
+
+opts="${opts} reload"
+
+depend() {
+	use dns
+	need net
+	provide jabber-server
+}
+
+checkconfig() {
+	if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
+		eerror "You need an /etc/jabber/ejabberd.cfg file to run ejabberd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting eJabberd"
+	start-stop-daemon --start --quiet --chuid jabber:jabber \
+        --env HOME=/var/run/jabber \
+        --exec /usr/lib/erlang/erts-5.5/bin/beam \
+		--startas /usr/bin/ejabberd -- -noshell -detached
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping eJabberd"
+	if [ -z "$EJABBERD_NODE" ];
+	then
+		EJABBERD_NODE="ejabberd@`hostname -s`"
+	fi
+	/usr/bin/ejabberdctl $EJABBERD_NODE stop
+	eend $?
+}
+
+# Work around a bug in /sbin/runscript.sh - it won't run our custom
+# restart() unless it finds these two strings in the file.
+# svc_start svc_stop
+restart() {
+	ebegin "Restarting eJabberd"
+	if [ -z "$EJABBERD_NODE" ];
+	then
+		EJABBERD_NODE="ejabberd@`hostname -s`"
+	fi
+	/usr/bin/ejabberdctl $EJABBERD_NODE restart
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading eJabberd"
+	if [ -z "$EJABBERD_NODE" ];
+	then
+		EJABBERD_NODE="ejabberd@`hostname -s`"
+	fi
+	/usr/bin/ejabberdctl $EJABBERD_NODE reopen-log
+	eend $?
+}
diff --git a/net-im/ejabberd/files/self-cert-v2.sh b/net-im/ejabberd/files/self-cert-v2.sh
new file mode 100755
index 000000000000..b9bd0aef3c6b
--- /dev/null
+++ b/net-im/ejabberd/files/self-cert-v2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# self-cert.sh for ejabberd, stolen from:
+# mkimapdcert,v 1.1 2001/01/02 03:54:25 drobbins Exp
+#
+# Copyright 2000 Double Precision, Inc.  See COPYING for
+# distribution information.
+#
+# This is a short script to quickly generate a self-signed X.509 key for
+# eJabberd.  Normally this script would get called by an automatic
+# package installation routine.
+
+test -x /usr/bin/openssl || exit 0
+
+prefix="/usr"
+pemfile="/etc/jabber/ssl.pem"
+randfile="/etc/jabber/ssl.rand"
+
+if test -f $pemfile
+then
+	echo "$pemfile already exists."
+	exit 1
+fi
+
+cp /dev/null $pemfile
+chmod 600 $pemfile
+chown root $pemfile
+
+cleanup() {
+	rm -f $pemfile
+	rm -f $randfile
+	exit 1
+}
+
+dd if=/dev/urandom of=$randfile count=1 2>/dev/null
+/usr/bin/openssl req -new -x509 -days 365 -nodes \
+	-config /etc/jabber/ssl.cnf -out $pemfile -keyout $pemfile || cleanup
+/usr/bin/openssl gendh -rand $randfile 512 >> $pemfile || cleanup
+/usr/bin/openssl x509 -subject -dates -fingerprint -noout -in $pemfile || cleanup
+rm -f $randfile
diff --git a/net-im/ejabberd/files/ssl.cnf b/net-im/ejabberd/files/ssl.cnf
new file mode 100644
index 000000000000..7a51d913b85d
--- /dev/null
+++ b/net-im/ejabberd/files/ssl.cnf
@@ -0,0 +1,36 @@
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ssl.cnf,v 1.1 2006/10/12 16:26:07 chainsaw Exp $
+# This is the openssl config file to generate keys for ejabberd
+# It is read by self-cert.sh
+
+[ req ]
+# you can increase this value, but be aware that it will make things much slower
+# this should be a power of 2!
+default_bits = 1024
+# leave the rest of these alone!
+encrypt_key = yes
+distinguished_name = req_dn
+x509_extensions = cert_type
+prompt = no
+
+[ req_dn ]
+# 2-Letter ISO country code
+C=UK
+# FULL name of state/province/district
+# NO abbreviations!
+ST=Cambridgeshire
+# FULL name of city
+# NO abbreviations!
+L=Peterborough
+# Full Name of your organization
+# NO abbreviations!
+O=Bits and Bobs Ltd.
+# Leave this alone unless specifically need to change it!
+OU=Automatically-generated ejabberd SSL key
+# This should be a FQDN that resolves to the IP of your server
+CN=localhost
+# This should be the email address for the administrator of the server
+emailAddress=root@localhost
+
+# Leave this alone!
+[ cert_type ]
+nsCertType = server