From d5c63eb25c941a54fd3d08c4045a10242d400436 Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Fri, 13 Jul 2007 14:32:01 +0000 Subject: Debugging support by Justin , closes bug #174734. Do not attempt to automatically generate a key, this ends up being interactive on some systems. Closes bug #178615 by Robin Johnson . Revert defective change from bug #161252, without sname the daemon can not be stopped. Thanks to Conrad Kostecki , closes bug #181745. Restrict erlang dep to <11.2.5 to avoid EOF during handshake, as reported by Santiago Gala , closes bug #184419. Restrict openssl dep to >=0.9.8e so a messy die on USE="zlib" in openssl is no longer required. Also a report by Conrad Kostecki , this closes bug #185009. (Portage version: 2.1.3_rc8) --- net-im/ejabberd/ChangeLog | 16 ++- net-im/ejabberd/ejabberd-1.1.3-r2.ebuild | 135 +++++++++++++++++++++++++ net-im/ejabberd/files/digest-ejabberd-1.1.3-r2 | 3 + 3 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 net-im/ejabberd/ejabberd-1.1.3-r2.ebuild create mode 100644 net-im/ejabberd/files/digest-ejabberd-1.1.3-r2 (limited to 'net-im') diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index a3ba527d13f1..72083bffdf2e 100644 --- a/net-im/ejabberd/ChangeLog +++ b/net-im/ejabberd/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for net-im/ejabberd # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.20 2007/04/28 17:35:13 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.21 2007/07/13 14:32:01 chainsaw Exp $ + +*ejabberd-1.1.3-r2 (13 Jul 2007) + + 13 Jul 2007; Tony Vroon +ejabberd-1.1.3-r2.ebuild: + Debugging support by Justin , closes bug + #174734. Do not attempt to automatically generate a key, this ends up being + interactive on some systems. Closes bug #178615 by Robin Johnson + . Revert defective change from bug #161252, without + sname the daemon can not be stopped. Thanks to Conrad Kostecki + , closes bug #181745. Restrict erlang dep to <11.2.5 to + avoid EOF during handshake, as reported by Santiago Gala , + closes bug #184419. Restrict openssl dep to >=0.9.8e so a messy die on + USE="zlib" in openssl is no longer required. Also a report by Conrad + Kostecki , this closes bug #185009. 28 Apr 2007; Sven Wegener ejabberd-0.7.5.ebuild: Fix *initd, *confd and *envd calls (#173884, #174266) diff --git a/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild b/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild new file mode 100644 index 000000000000..522b8b4cefec --- /dev/null +++ b/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild,v 1.1 2007/07/13 14:32:01 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" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc ssl web" + +DEPEND=">=net-im/jabber-base-0.01 + >=dev-libs/expat-1.95 + =dev-libs/openssl-0.9.8e )" + +PROVIDE="virtual/jabber-server" +S=${WORKDIR}/${P}/src + +src_unpack() { + unpack ${A} + cd ${S} + + # Bug #171427 + epatch ${FILESDIR}/${PV}-missing-declaration.patch +} + +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" + + 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" + + 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} + dohtml doc/*.{html,png} + + # + # Create /usr/bin/ejabberd + # + cat < ${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 < ${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}/ejabberd-1.1.1-r1.initd ${PN} + newconfd ${FILESDIR}/${P}.confd ${PN} + + insinto ${JABBER_ETC} + doins ${FILESDIR}/inetrc + if useq ssl ; then + doins ${FILESDIR}/ssl.cnf + newins ${FILESDIR}/self-cert-v2.sh self-cert.sh + fi +} + +pkg_postinst() { + elog "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html" + elog "or the online version at http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html" + echo + 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 + if useq odbc ; then + elog "Please add a column askmessage to the rosterusers table if migrating from 1.1.1" + fi +} diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.3-r2 b/net-im/ejabberd/files/digest-ejabberd-1.1.3-r2 new file mode 100644 index 000000000000..72f1fd1a1f21 --- /dev/null +++ b/net-im/ejabberd/files/digest-ejabberd-1.1.3-r2 @@ -0,0 +1,3 @@ +MD5 bdb39965a147506fc194d5a28117172a ejabberd-1.1.3.tar.gz 826057 +RMD160 99b4c73ae29ef9814f5c572f8e3b3a82d960f5ee ejabberd-1.1.3.tar.gz 826057 +SHA256 3b8ac67673fa6c08bc25382d3e99171ebc71d4759899eb5a730e65117256e703 ejabberd-1.1.3.tar.gz 826057 -- cgit v1.2.3-65-gdbad