Revision bump, closes bugs #161252, #171427 and #171551.

(Portage version: 2.1.2.3)

5 files changed, 193 insertions, 1 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 8684e4982382..dc3f0ce6fe5f 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2007/03/11 19:04:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.18 2007/04/11 14:42:45 chainsaw Exp $
+
+*ejabberd-1.1.3-r1 (11 Apr 2007)
+
+  11 Apr 2007; Tony Vroon <chainsaw@gentoo.org> +files/ejabberd-1.1.3.confd,
+  +files/1.1.3-missing-declaration.patch, +ejabberd-1.1.3-r1.ebuild:
+  Revision bump, closes bugs #161252, #171427 and #171551.
 
   11 Mar 2007; Markus Rothe <corsair@gentoo.org> ejabberd-1.1.3.ebuild:
   Adding ~amd64 to 1.1.3, too.
diff --git a/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild b/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..4444d8a726d7
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild
@@ -0,0 +1,155 @@
+# 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-r1.ebuild,v 1.1 2007/04/11 14:42:45 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="mod_irc mod_muc mod_pubsub ldap odbc sname 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* )
+	ssl? ( dev-libs/openssl )"
+
+PROVIDE="virtual/jabber-server"
+S=${WORKDIR}/${P}/src
+
+src_unpack() {
+	# Bug #171551
+	if useq ssl && built_with_use dev-libs/openssl zlib ; then
+		die "Openssl must be built without the zlib USE flag to avoid triggering ejabberd SSL/TLS instability"
+	fi
+
+	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"
+
+	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}
+	dohtml doc/*.{html,png}
+
+	# Bug #161252
+	if useq sname; then
+		CHECK_CONF=""
+		EJD_LINE="-sname ejabberd"
+		EJCTL_LINE="-sname ejabberdctl"
+	else
+		CHECK_CONF=". /etc/conf.d/ejabberd"
+		EJD_LINE="-name \$EJABBERD_NODE"
+		EJCTL_LINE="-name \$EJABBERCTL_NODE"
+	fi
+
+	#
+	# Create /usr/bin/ejabberd
+	#
+	cat <<EOF > ${T}/ejabberd
+#!/bin/bash
+
+${CHECK_CONF}
+
+erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
+	${pa} \\
+	${EJD_LINE} \\
+	-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
+
+${CHECK_CONF}
+
+exec env HOME=${JABBER_RUN} \\
+	erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
+		${pa} \\
+		-noinput \\
+		${EJCTL_LINE} \\
+		-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
+			ebegin "Creating SSL key"
+			sh ${JABBER_ETC}/self-cert.sh &> /dev/null
+			eend $?
+		fi
+		chown jabber:jabber ${JABBER_ETC}/ssl.pem
+		elog "Please be sure that your ${JABBER_ETC}/ejabber.cfg points to ${JABBER_ETC}/ssl.pem"
+		elog "You may want to edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh again"
+	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/1.1.3-missing-declaration.patch b/net-im/ejabberd/files/1.1.3-missing-declaration.patch
new file mode 100644
index 000000000000..a9ece714782a
--- /dev/null
+++ b/net-im/ejabberd/files/1.1.3-missing-declaration.patch
@@ -0,0 +1,11 @@
+--- ejabberd-1.1.3/src/expat_erl.c.orig	2007-04-11 15:24:05.000000000 +0100
++++ ejabberd-1.1.3/src/expat_erl.c	2007-04-11 15:25:25.000000000 +0100
+@@ -14,6 +14,8 @@
+  * Workaround for EI encode_string bug
+  */
+ 
++int x_fix_buff(ei_x_buff* x, int szneeded);
++
+ #define put8(s,n) do { \
+   (s)[0] = (char)((n) & 0xff); \
+   (s) += 1; \
diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.3-r1 b/net-im/ejabberd/files/digest-ejabberd-1.1.3-r1
new file mode 100644
index 000000000000..72f1fd1a1f21
--- /dev/null
+++ b/net-im/ejabberd/files/digest-ejabberd-1.1.3-r1
@@ -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
diff --git a/net-im/ejabberd/files/ejabberd-1.1.3.confd b/net-im/ejabberd/files/ejabberd-1.1.3.confd
new file mode 100644
index 000000000000..2a6dc053c8fc
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-1.1.3.confd
@@ -0,0 +1,17 @@
+# Copyright 1999-2007 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.3.confd,v 1.1 2007/04/11 14:42:45 chainsaw 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