Bump adding a new debug shell patch to the wrapper, from bug #250861

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 211 insertions, 12 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index d01e38e4ee5b..7cda9860af07 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.58 2009/04/22 20:56:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.59 2009/04/27 13:33:32 caleb Exp $
+
+*ejabberd-2.0.5-r2 (27 Apr 2009)
+
+  27 Apr 2009; Caleb Tennis <caleb@gentoo.org>
+  +files/ejabberdctl-wrapper-3.template, +ejabberd-2.0.5-r2.ebuild:
+  Bump adding a new debug shell patch to the wrapper, from bug #250861
 
   22 Apr 2009; Markus Meier <maekke@gentoo.org> ejabberd-2.0.5-r1:
   amd64 stable, bug #265341
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 6aa316bde30b..f9a0032b5635 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1.4-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c39d2fa9 SHA1 687066247c9ad74c4e9ec869a9f4f0d9e80bae6d SHA256 1c32a57f4f187d55b28b240820875fcd3e731f6d91cd9429d14c318222f07e7b
 AUX 2.0.0-ejab-542-mod_proxy65.patch 598 RMD160 bfe11518b5dbfcfb64c7bb04be965d2e383c2d90 SHA1 9161450bf883209f4c2ff2c061f94ef401e4fa51 SHA256 80ce546763de423430efcb60376ff2fda1fcd15ab7b80003ef5d7380a1a4caa3
 AUX 2.0.0-erlang12-s2s-in.patch 1164 RMD160 5bcb04354c02749cdec302dc30354a49872ef2f5 SHA1 c27402b062b58ecf74c9e8c0cf2e879dbe600656 SHA256 ebc66c2a507e39f7f794b32f91148ea5e8c34e46ad41b4b876983da4aa9c1342
@@ -16,6 +13,7 @@ AUX ejabberd-2.initd 1126 RMD160 8c696768e686efdc9865446ce5a3fbb2ae7302f6 SHA1 2
 AUX ejabberd-wrapper-2.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
 AUX ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0
 AUX ejabberdctl-wrapper-2.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
+AUX ejabberdctl-wrapper-3.template 908 RMD160 c5378d8e089ae1c180b7be76639a99d5cad16f11 SHA1 4ee6996c492360c4e44a05e011fb228eecff56b9 SHA256 c3c377ae8b00143e21ab4ccff7cffe539f6a6b95336aa5636cb8d6bba49c9592
 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
@@ -33,13 +31,7 @@ EBUILD ejabberd-2.0.2.ebuild 4796 RMD160 21b06d748fdce3254de01ea4534283b773a1f57
 EBUILD ejabberd-2.0.4-r1.ebuild 4880 RMD160 1afa8baedd614d60a94d2127b97cf731aa821a0f SHA1 87821e4fa57ba76558e50db23a74496aaef292b9 SHA256 e2ee596c6ceda950b378f85b59e8dcde5f80d1bf54f3960de2abb79d479f06fd
 EBUILD ejabberd-2.0.4.ebuild 4814 RMD160 3d3f65505877405ca7cbf008f900636146520f55 SHA1 ec3c64f8a4f55f98dc963b55ea7da5cd76f9f908 SHA256 62b65d0e2d4210437541a56d77388737ba26597b04233580c1bfc942177a3478
 EBUILD ejabberd-2.0.5-r1.ebuild 4770 RMD160 7b279e3aff8d06575c80ef0b97fd5d53d520f366 SHA1 cffb43b818e00cf96c016c60e4d2ab92fb0a285c SHA256 b249f548aa17ad8237fc269117331c776fef8feda24414a1b189ee277da270dc
+EBUILD ejabberd-2.0.5-r2.ebuild 4770 RMD160 031464734ffc6d2b1763adf94b3554cf9aee51a3 SHA1 5a475746f2b6c54de4b2ed3585afa284d945d877 SHA256 b5c7f1884df8867b324a56fafcbcf1b4abedf242adccdbdbf271861bf10fc05d
 EBUILD ejabberd-2.0.5.ebuild 4748 RMD160 a9a593a515366f3c2021f4c4319b8f74b2f4338f SHA1 48c44b6356bafcfe7de34d0732feebcb80a1f46e SHA256 7edda3b2aeb9d9202cf8018b57c67dfbbb7fac95cbb40a3f55108b0f6d00409e
-MISC ChangeLog 12564 RMD160 2cb20904d5202241cbdfcc1baecab15492054f31 SHA1 d574dcf19227bfbbade23b32d842387213ac643c SHA256 326ba9ef69ccfe8fb906892eae066053b2d6b3e5916b78309c5eeb8c84d510ca
+MISC ChangeLog 12784 RMD160 4c22e746748a014e9944cb76b1422ea7c9343e0b SHA1 b157debbfe5e68cd773854155e6acd3cd8d0a94f SHA256 37599cd8f83120037110ada5884c0f5fc0e30228732e08e51f0e16188f6e07bf
 MISC metadata.xml 619 RMD160 ca6e7f018d370ce36a3b93eb960254537260949c SHA1 404f3d0d31036ed1cfeb8aeee2264559c1d1c8d9 SHA256 843e1bbd5fdc082763e71322094170cde5b90d0f5d9320011c4b9872cd6589f4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAknvhLQACgkQkKaRLQcq0GLpaQCfXND5tPR+/fdRImyPI0JOOSTH
-93MAoKhHp2aam3yo8MZS6WR9kjXs6DWl
-=nGkk
------END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-2.0.5-r2.ebuild b/net-im/ejabberd/ejabberd-2.0.5-r2.ebuild
new file mode 100644
index 000000000000..64c133e4b9a8
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.0.5-r2.ebuild
@@ -0,0 +1,155 @@
+# 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.5-r2.ebuild,v 1.1 2009/04/27 13:33:32 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}"
+
+	# 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}
+
+	fowners -R jabber:jabber ${JABBER_ETC}
+	fowners -R jabber:jabber ${JABBER_LOG}
+	fowners -R jabber:jabber /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
+		fowners root:jabber /usr/$(get_libdir)/erlang/lib/${P}/priv/bin/epam
+		fperms 4750 /usr/$(get_libdir)/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-2.template" \
+		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+		> "${T}/ejabberd"
+	exeinto /usr/sbin
+	doexe "${T}/ejabberd" || die
+
+	# set up /usr/sbin/ejabberdctl wrapper
+	cat "${FILESDIR}/ejabberdctl-wrapper-3.template" \
+		| sed -e "s:\@libdir\@:$(get_libdir):g" -e "s:\@version\@:${PV}:g" \
+		> "${T}/ejabberdctl"
+	doexe "${T}/ejabberdctl"
+
+	dodir /var/lib/ejabberd
+	newinitd "${FILESDIR}/${PN}-2.initd" ${PN} || die
+	newconfd "${FILESDIR}/${PN}-2.confd" ${PN} || die
+
+	# 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/ejabberdctl-wrapper-3.template b/net-im/ejabberd/files/ejabberdctl-wrapper-3.template
new file mode 100644
index 000000000000..05b67d8bca4b
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberdctl-wrapper-3.template
@@ -0,0 +1,46 @@
+#!/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
+
+case $1 in
+    debug)
+    shift
+
+    if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%@*}" ] ; then
+        EJABBERD_NODE=$EJABBERD_NODE@$(hostname -s)
+    fi
+
+    echo "Attaching Erlang shell to node $EJABBERD_NODE."
+    echo "To detach it, press: Ctrl+G, q, Return"
+    echo ""
+    exec $ERL $SNAME ejabberddebug \
+        -remsh $EJABBERD_NODE \
+        "$@"
+    ;;
+    *)
+exec $ERL $SNAME ejabberdctl \
+    -pa /usr/@libdir@/erlang/lib/ejabberd-@version@/ebin \
+    -s ejabberd_ctl \
+    -noinput \
+    -extra $EJABBERD_NODE "$@"
+    ;;
+esac