summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2009-03-21 12:29:53 +0000
committerCaleb Tennis <caleb@gentoo.org>2009-03-21 12:29:53 +0000
commit77f842adfa3098b49f052c36f3b5f57e617c3fc0 (patch)
tree9117caee541f6f6161c3f82f5d2fbaaa034e09ea /net-im
parentReview dependencies and clean up old revisions. (diff)
downloadhistorical-77f842adfa3098b49f052c36f3b5f57e617c3fc0.tar.gz
historical-77f842adfa3098b49f052c36f3b5f57e617c3fc0.tar.bz2
historical-77f842adfa3098b49f052c36f3b5f57e617c3fc0.zip
Version bump
Package-Manager: portage-2.1.6.7/cvs/Linux i686
Diffstat (limited to 'net-im')
-rw-r--r--net-im/ejabberd/ChangeLog9
-rw-r--r--net-im/ejabberd/Manifest8
-rw-r--r--net-im/ejabberd/ejabberd-2.0.4.ebuild158
-rw-r--r--net-im/ejabberd/files/ejabberd-2.0.4.confd23
-rw-r--r--net-im/ejabberd/files/ejabberd-2.0.4.initd54
-rw-r--r--net-im/ejabberd/files/ejabberd-wrapper-2.0.4.template49
-rw-r--r--net-im/ejabberd/files/ejabberdctl-wrapper-2.0.4.template30
7 files changed, 329 insertions, 2 deletions
diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 4fe79ffc8d37..90531dda5b89 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-im/ejabberd
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.50 2009/02/01 10:01:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.51 2009/03/21 12:29:52 caleb Exp $
+
+*ejabberd-2.0.4 (21 Mar 2009)
+
+ 21 Mar 2009; Caleb Tennis <caleb@gentoo.org> +files/ejabberd-2.0.4.confd,
+ +files/ejabberd-2.0.4.initd, +files/ejabberd-wrapper-2.0.4.template,
+ +files/ejabberdctl-wrapper-2.0.4.template, +ejabberd-2.0.4.ebuild:
+ Version bump
*ejabberd-1.1.4-r2 (01 Feb 2009)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index a50b7cb3606f..2fc4ecd47103 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -11,11 +11,15 @@ AUX ejabberd-2.0.1.confd 840 RMD160 c013ebfe1e471916561ba23a0ac83618501ce8cc SHA
AUX ejabberd-2.0.1.initd 1134 RMD160 21d775aeb8671996ee9dcfb371d1122cad81a063 SHA1 143b0f9d4c8eba20164d9915aa48a736add828be SHA256 9f65bbd0e3e7e0fc8df379a0cac6d03414ab793ce83abcbc55468c16e529ad82
AUX ejabberd-2.0.2.confd 840 RMD160 5227a3fbb0d0c8bffd8a5537003f965f1fb73582 SHA1 d3a51fa0923a571d30f3f0840834c651726ad206 SHA256 d6b0c44a450c4191e450b8e3ab281dc2e3bc668a97ddd1652d2e6c555675a2c6
AUX ejabberd-2.0.2.initd 1134 RMD160 b5d3a5a50069be713511ebd37f9eab07dab33371 SHA1 0cd2c3bd44c1923014c1cdd84edfb56ddb11bdc2 SHA256 8b2c50bc80b5b0700195c79a4eaa6f68549fd63310b584c2e86d951c116e14de
+AUX ejabberd-2.0.4.confd 840 RMD160 0d6761c629964febf390249304d9b2a4e10f85b4 SHA1 0afedf459a4a8bf6c24798800c1f83149003f44f SHA256 5f86c82752f5cbdc77556a134d3d0d07e682f7255a25d91873677f9e2f43cda0
+AUX ejabberd-2.0.4.initd 1134 RMD160 bea74f99c56b7205213ef5d967bbf51c9d27b2e5 SHA1 00b6f7c6797cb644dc914e7794b332d304f29917 SHA256 06b02be1757fdeabc5386b4c524585bda1f6869b6bf90cf92ffbf83632b23945
AUX ejabberd-wrapper-2.0.1.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
AUX ejabberd-wrapper-2.0.2.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
+AUX ejabberd-wrapper-2.0.4.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
AUX ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0
AUX ejabberdctl-wrapper-2.0.1.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
AUX ejabberdctl-wrapper-2.0.2.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
+AUX ejabberdctl-wrapper-2.0.4.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
AUX inetrc 36 RMD160 4b79020864689ede547969610fde18fe490f5810 SHA1 1e0bae0f7251e2ae3b62ba9d3e5cc86bb5dd271e SHA256 0f383befc4c46134d88ce14d3bd06c404ef6575391f4ac0b5e8c28ba383b28fc
AUX self-cert-v2.sh 1017 RMD160 3beb0f05e8cc3041abd2f689d31d410bc7d5088d SHA1 1f07299b2e49541dcbf5c2b81b26280bbf0b6aeb SHA256 34b2c9cb36c424ffd1117bd20b67d0f4a05168b0bc6237e287c2dcabd0e27972
AUX self-cert.sh 491 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b SHA1 61a4c8b79141ec1bc846e8ede6fa19a07210c619 SHA256 6a0c53a8573411c18ed6f5dd79ce4807b72fb10bc5eb3a3a7f4641c57e4ddceb
@@ -23,10 +27,12 @@ AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a1
DIST ejabberd-1.1.4.tar.gz 846059 RMD160 4c72548129b0196ff0096bd85936e0750fc4d7be SHA1 db6f521d45dece200de4eb6fc967c64728e8f6a3 SHA256 dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6
DIST ejabberd-2.0.1_2.tar.gz 1054739 RMD160 a5561a6c508bbb9846a351189ed5aad2f5fb65ee SHA1 7fbb21eb87206c1b40e5234927e2d6a20de66149 SHA256 a5335517a443e80dae4698a33423858201d699af18d2b53b279a2ad171916ad4
DIST ejabberd-2.0.2.tar.gz 1040817 RMD160 b24c1c2d6ce8c56fd26f28a98b89d99890dbad72 SHA1 7c82082b941277fe18aac25ca9b2016f25dc8472 SHA256 23136f2d215e82836d84322011914e1c9a846ab056b80cd26ff3e70b300b345a
+DIST ejabberd-2.0.4.tar.gz 1827181 RMD160 05b8d1fd42724335af588bf6fa7a14e5605bf6e3 SHA1 16516c7f9723e1ca781970d54afbf580a72c9eeb SHA256 6ddbd1501bd2824673522e2a3c119195acc177ce198800a116f90d5b0e3d2172
EBUILD ejabberd-1.1.4-r1.ebuild 3456 RMD160 2f1ad83dd3d4773dd10de489f71939bb3b35fed5 SHA1 a191993a20e11ef84a6097029190360d5a1ce731 SHA256 db2686cc2ce063421843b048091af363fe8f18b88ebbeebe20f419a50dc38792
EBUILD ejabberd-1.1.4-r2.ebuild 3479 RMD160 d6bfed9a9127bc8246d315b16c184bf7a94bccde SHA1 b2815db38d8d76d7697d82505f8bdf9cb7401195 SHA256 9898cff52c3d8948bddb16dcb5392c2a7cd8eafb48c69e9b5e6d74884023575d
EBUILD ejabberd-2.0.1_p2-r1.ebuild 4888 RMD160 d3155ae40d18d431f047e4dc7d29dbc7a57b9bbc SHA1 bef8cc2ed73edd70ba01490b062ac5247afcfcef SHA256 5cfd96195106459e4d5f1675d7b8837b060e91b2d69163c778f7f18954bcad55
EBUILD ejabberd-2.0.2-r1.ebuild 4817 RMD160 f5a48c390ad0ea3760b2667c623374c1bc2a5ca4 SHA1 cc56db2924b713b7edff88ad304bd11c0c2377d2 SHA256 19b2b7dcfa1930068bbe1d2a79ab1d845823fce0ce962d1f8f42ee32a6d9fe30
EBUILD ejabberd-2.0.2.ebuild 4814 RMD160 78fdc1c569c0961efda5aa9c53be5c363d5a4b13 SHA1 e6590f5fa39628aad821c0aaa75a93bfc1610998 SHA256 785f47b09ba14a32673a5a231d57b549aa61cb341f86e624f2630b941b4a302b
-MISC ChangeLog 10433 RMD160 9f436e38c95b30d8ffc8be5735a752947fc5e5f6 SHA1 c0b2197b76e9c8aca83296cb4afd46b65165a180 SHA256 4ab940aa94e0030e21c19c29d03f4abdb5448ce7913c0929ceddeaf76eb08875
+EBUILD ejabberd-2.0.4.ebuild 4832 RMD160 35add58a5e9a9cfd2fd2c58aad80d91553b495ef SHA1 44da55cc4378a89843f0250913fc101f21db789a SHA256 b93b9e55e9e3e0ddead560ba31d153a5b410c0d1a90e5d9c4e4b69d5be322731
+MISC ChangeLog 10694 RMD160 f6d84456900b56e154722d42b631ca83993652ce SHA1 90c351a7e742b1906063ba999505934708f944c1 SHA256 0afd26726d06d0ec77d5de386b1b4100fc746f73d8e9212c0d5eb36cea3302b9
MISC metadata.xml 619 RMD160 ca6e7f018d370ce36a3b93eb960254537260949c SHA1 404f3d0d31036ed1cfeb8aeee2264559c1d1c8d9 SHA256 843e1bbd5fdc082763e71322094170cde5b90d0f5d9320011c4b9872cd6589f4
diff --git a/net-im/ejabberd/ejabberd-2.0.4.ebuild b/net-im/ejabberd/ejabberd-2.0.4.ebuild
new file mode 100644
index 000000000000..3b1d9144e73a
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.0.4.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.4.ebuild,v 1.1 2009/03/21 12:29:52 caleb Exp $
+
+inherit eutils multilib
+
+JABBER_ETC="/etc/jabber"
+JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+JABBER_LOG="/var/log/jabber"
+
+MY_PV=${PV}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/"
+SRC_URI="http://www.process-one.net/downloads/ejabberd/${PV}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc pam ssl web zlib"
+
+DEPEND=">=net-im/jabber-base-0.01
+ >=dev-libs/expat-1.95
+ >=dev-lang/erlang-11.2.5
+ odbc? ( dev-db/unixODBC )
+ ldap? ( =net-nds/openldap-2* )
+ ssl? ( >=dev-libs/openssl-0.9.8e )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+PROVIDE="virtual/jabber-server"
+
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # Bug #171427
+ epatch "${FILESDIR}/2.0.0-missing-declaration.patch"
+
+ # get rid of the prefix
+ sed -i -e "s/\\@prefix\\@//" "${S}/Makefile.in" \
+ || die "cannot sed Makefile.in"
+ # we want ejabberdctl in /usr/sbin not /sbin !!!
+ sed -i -e "s/\\/sbin/\\/usr\\/sbin/" "${S}/Makefile.in" \
+ || die "cannot sed Makefile.in"
+}
+
+src_compile() {
+ econf --prefix=/ \
+ $(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) \
+ $(use_enable zlib ejabberd_zlib) \
+ $(use_enable pam) \
+ || die "econf failed"
+
+ if useq debug; then
+ emake ejabberd_debug=true || die "compiling ejabberd core failed"
+ else
+ emake || die "compiling ejabberd core failed"
+ fi
+}
+
+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"
+
+ # remove the default ejabberdctl as we use our own
+ rm "${D}/sbin/ejabberdctl"
+
+ insinto ${JABBER_ETC}
+
+ 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}"
+
+ if useq ssl ; then
+ doins "${FILESDIR}/ssl.cnf"
+ newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh
+ fi
+
+ # Pam helper module permissions
+ # http://www.process-one.net/docs/ejabberd/guide_en.html
+ if useq pam; then
+ chown root:jabber "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam
+ chmod 4750 "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam
+ fi
+
+ cd "${WORKDIR}/${MY_P}/doc"
+ dodoc "release_notes_${MY_PV}.txt"
+ dohtml *.{html,png}
+
+ # set up /usr/sbin/ejabberd wrapper
+ cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \
+ | sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+ > "${T}/ejabberd"
+ exeinto /usr/sbin
+ doexe "${T}/ejabberd"
+
+ # set up /usr/sbin/ejabberdctl wrapper
+ cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \
+ | sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+ > "${T}/ejabberdctl"
+ doexe "${T}/ejabberdctl"
+
+ dodir /var/lib/ejabberd
+ newinitd "${FILESDIR}/${MY_P}.initd" ${PN}
+ newconfd "${FILESDIR}/${MY_P}.confd" ${PN}
+
+ # fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
+ # that would be generated by /etc/jabber/self-cert.sh
+ sed -i -e "s/\/path\/to\/ssl.pem/\/etc\/jabber\/ssl.pem/g" \
+ "${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg"
+
+ # if mod_irc is not enabled, comment out the mod_irc in the default
+ # ejabberd.cfg
+ if ! use mod_irc; then
+ sed -i -e "s/{mod_irc,/%{mod_irc,/" \
+ "${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg"
+ fi
+}
+
+pkg_postinst() {
+ elog "For configuration instructions, please see"
+ elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+ elog "http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html"
+ if useq ssl ; then
+ if [ ! -e /etc/jabber/ssl.pem ]; then
+ elog "Please edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh"
+ elog "Ejabberd may refuse to start without an SSL certificate"
+ fi
+ fi
+ if ! useq web ; then
+ elog "The web USE flag is off, this has disabled the web admin interface."
+ fi
+ elog "===================================================================="
+ elog 'Quick Start Guide:'
+ elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 89'
+ elog ' {hosts, ["localhost", "thehost"]}.'
+ elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 324'
+ elog ' {acl, admin, {user, "theadmin", "thehost"}}.'
+ elog '3) Start the server'
+ elog ' # /etc/init.d/ejabberd start'
+ elog '4) Register the admin user'
+ elog ' # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
+ elog '5) Log in with your favourite jabber client or using the web admin'
+}
diff --git a/net-im/ejabberd/files/ejabberd-2.0.4.confd b/net-im/ejabberd/files/ejabberd-2.0.4.confd
new file mode 100644
index 000000000000..8638792423cd
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-2.0.4.confd
@@ -0,0 +1,23 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.4.confd,v 1.1 2009/03/21 12:29:53 caleb Exp $
+
+# Name of your ejabberd node. Used by ejabberdctl to determine which
+# node to communicate with.
+EJABBERD_NODE="ejabberd@`hostname -s`"
+
+# Max number of open network connections. Default is 1024. Increasing
+# this will slightly increase memory usage.
+#ERL_MAX_PORTS=1024
+
+# Return memory to the system after using it, instead of keeping it
+# allocated for future use. Decreases the memory required by ejabberd,
+# but makes it run slower. Default is unset, set to any value to
+# activate.
+#ERL_FULLSWEEP_AFTER=0
+
+# set to 1, "true" or "yes" if you have a symmetric-multi-processor
+# default is non smp
+#HAVE_SMP=0
+
+
diff --git a/net-im/ejabberd/files/ejabberd-2.0.4.initd b/net-im/ejabberd/files/ejabberd-2.0.4.initd
new file mode 100644
index 000000000000..c6fe9febf18a
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-2.0.4.initd
@@ -0,0 +1,54 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.4.initd,v 1.1 2009/03/21 12:29:53 caleb Exp $
+
+opts="${opts} reload"
+
+depend() {
+ use dns
+ need net
+ provide jabber-server
+}
+
+checkconfig() {
+ if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
+ eerror "You need a /etc/jabber/ejabberd.cfg file to run ejabberd"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting ejabberd"
+ # the process name of beam is different depending whether smp is used.
+ # set it explicitly so start-stop-daemon works
+ case "$HAVE_SMP" in
+ "1"|"true"|"yes")
+ BEAMNAME="beam.smp"
+ SMPOPT="enable"
+ ;;
+ *)
+ BEAMNAME="beam"
+ SMPOPT="disable"
+ ;;
+ esac
+ cd /var/lib/ejabberd
+ start-stop-daemon --start --quiet --chuid jabber:jabber \
+ --name $BEAMNAME \
+ --exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ejabberd"
+ /usr/sbin/ejabberdctl stop
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading ejabberd"
+ /usr/sbin/ejabberdctl reopen-log
+ eend $?
+}
+
diff --git a/net-im/ejabberd/files/ejabberd-wrapper-2.0.4.template b/net-im/ejabberd/files/ejabberd-wrapper-2.0.4.template
new file mode 100644
index 000000000000..89f3ff4824e3
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-wrapper-2.0.4.template
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd
+
+# provide some default configuration
+ERL=/usr/bin/erl
+CONFIG=/etc/jabber/ejabberd.cfg
+INETRC=/etc/jabber/inetrc
+LOG_PATH=/var/log/jabber/ejabberd.log
+SASL_LOG=/var/log/jabber/sasl.log
+SPOOL=/var/spool/jabber
+
+ARGS=
+while [ $# -ne 0 ] ; do
+ PARAM=$1
+ shift
+ case $PARAM in
+ --) break ;;
+ --node) EJABBERD_NODE=$1; shift ;;
+ --config) CONFIG=$1 ; shift ;;
+ --log) LOG_PATH=$1 ; shift ;;
+ --sasl-log) SASL_LOG=$1 ; shift ;;
+ --spool) SPOOL=$1 ; shift ;;
+ *) ARGS="$ARGS $PARAM" ;;
+ esac
+done
+
+if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
+ SNAME=-sname
+else
+ SNAME=-name
+fi
+
+# export ejabberd configuration environment variables
+export HOME=/var/run/jabber
+export EJABBERD_EBIN=/usr/@libdir@/erlang/lib/ejabberd-@version@/ebin
+export EJABBERD_MSGS_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/msgs
+export EJABBERD_SO_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/lib
+export EJABBERD_LOG_PATH=$LOG_PATH
+export EJABBERD_CONFIG_PATH=$CONFIG
+
+exec $ERL $SNAME $EJABBERD_NODE \
+ -s ejabberd \
+ -kernel inetrc \"$INETRC\" \
+ -sasl sasl_error_logger \{file,\"$SASL_LOG\"\} \
+ -mnesia dir \"$SPOOL\" \
+ $ERL_OPTIONS $ARGS "$@"
+
+
diff --git a/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.4.template b/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.4.template
new file mode 100644
index 000000000000..6443678cf9b2
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.4.template
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd
+
+if [ -r /var/run/jabber/.erlang.cookie ] ; then
+ HOME=/var/run/jabber
+ export HOME
+fi
+
+ERL=/usr/bin/erl
+
+if [ $# -ne 0 ] ; then
+ case $1 in
+ --node) shift ; EJABBERD_NODE=$1 ; shift ;;
+ esac
+fi
+
+if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
+ SNAME=-sname
+else
+ SNAME=-name
+fi
+
+exec $ERL $SNAME ejabberdctl \
+ -pa /usr/@libdir@/erlang/lib/ejabberd-@version@/ebin \
+ -s ejabberd_ctl \
+ -noinput \
+ -extra $EJABBERD_NODE "$@"
+
+