* [gentoo-commits] gentoo-x86 commit in net-im/ejabberd: ChangeLog ejabberd-2.0.2.ebuild ejabberd-2.0.2-r1.ebuild
@ 2009-02-01 9:47 Patrick Lauer (patrick)
0 siblings, 0 replies; only message in thread
From: Patrick Lauer (patrick) @ 2009-02-01 9:47 UTC (permalink / raw
To: gentoo-commits
patrick 09/02/01 09:47:35
Modified: ChangeLog ejabberd-2.0.2.ebuild
Added: ejabberd-2.0.2-r1.ebuild
Log:
Small fix so that docs are actually installed
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Revision Changes Path
1.49 net-im/ejabberd/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?r1=1.48&r2=1.49
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog 9 Sep 2008 23:36:50 -0000 1.48
+++ ChangeLog 1 Feb 2009 09:47:34 -0000 1.49
@@ -1,6 +1,12 @@
# ChangeLog for net-im/ejabberd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.48 2008/09/09 23:36:50 caleb Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.49 2009/02/01 09:47:34 patrick Exp $
+
+*ejabberd-2.0.2-r1 (01 Feb 2009)
+
+ 01 Feb 2009; Patrick Lauer <patrick@gentoo.org> ejabberd-2.0.2.ebuild,
+ +ejabberd-2.0.2-r1.ebuild:
+ Small doc fix, docs are actually installed now
*ejabberd-2.0.2 (09 Sep 2008)
1.3 net-im/ejabberd/ejabberd-2.0.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild?r1=1.2&r2=1.3
Index: ejabberd-2.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ejabberd-2.0.2.ebuild 10 Sep 2008 14:05:35 -0000 1.2
+++ ejabberd-2.0.2.ebuild 1 Feb 2009 09:47:34 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2.ebuild,v 1.2 2008/09/10 14:05:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild,v 1.3 2009/02/01 09:47:34 patrick Exp $
inherit eutils multilib
@@ -96,7 +96,7 @@
chmod 4750 "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam
fi
- cd "${WORKDIR}/${MY_P}-beta1/doc"
+ cd "${WORKDIR}/${MY_P}/doc"
dodoc "release_notes_${MY_PV}.txt"
dohtml *.{html,png}
1.1 net-im/ejabberd/ejabberd-2.0.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: ejabberd-2.0.2-r1.ebuild
===================================================================
# 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.2-r1.ebuild,v 1.1 2009/02/01 09:47:34 patrick 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 )"
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 -s` 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'
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-02-01 9:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-01 9:47 [gentoo-commits] gentoo-x86 commit in net-im/ejabberd: ChangeLog ejabberd-2.0.2.ebuild ejabberd-2.0.2-r1.ebuild Patrick Lauer (patrick)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox