corrected init file; removed dodoc entry; stable x86; security bug 159580

(Portage version: 2.1.2-r9)

3 files changed, 23 insertions, 20 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 1d21a9b17106..f9ceb0ebfe31 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2007/02/27 20:26:12 dercorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.14 2007/02/28 07:51:35 opfer Exp $
+
+  28 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  files/ejabberd-1.1.1-r1.initd, ejabberd-1.1.3.ebuild:
+  corrected init file; removed dodoc entry; stable x86; security bug 159580
 
 *ejabberd-1.1.3 (27 Feb 2007)
 
diff --git a/net-im/ejabberd/ejabberd-1.1.3.ebuild b/net-im/ejabberd/ejabberd-1.1.3.ebuild
index 590054e897e5..20404fe09e50 100644
--- a/net-im/ejabberd/ejabberd-1.1.3.ebuild
+++ b/net-im/ejabberd/ejabberd-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2007/02/27 20:26:12 dercorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.3.ebuild,v 1.2 2007/02/28 07:51:35 opfer Exp $
 
 inherit eutils multilib versionator
 
@@ -14,7 +14,7 @@ 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="~x86"
+KEYWORDS="x86"
 IUSE="mod_irc mod_muc mod_pubsub ldap odbc ssl web"
 
 DEPEND=">=net-im/jabber-base-0.01
@@ -27,34 +27,33 @@ PROVIDE="virtual/jabber-server"
 S=${WORKDIR}/${P}/src
 
 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)                   \
+	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}                                       \
+	make													   \
+		DESTDIR=${D}									   \
 		EJABBERDDIR=${D}/usr/$(get_libdir)/erlang/lib/${P} \
-		ETCDIR=${D}${JABBER_ETC}                           \
-		LOGDIR=${D}${JABBER_LOG}                           \
-	    install \
-	    || die "install failed"
+		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}
-	dodoc doc/release_notes_${PV}.txt
 	dohtml doc/*.{html,png}
 
 	#
diff --git a/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd b/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd
index 3c4770d301be..24357a60e4ad 100644
--- a/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd
+++ b/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd
@@ -1,7 +1,7 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd,v 1.2 2007/02/28 07:51:35 opfer Exp $
 
 opts="${opts} reload"
 
@@ -23,7 +23,7 @@ start() {
 	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 \
+        --exec /usr/bin/beam \
 		--startas /usr/bin/ejabberd -- -noshell -detached
 	eend $?
 }