diff options
author | 2009-04-20 19:39:41 +0000 | |
---|---|---|
committer | 2009-04-20 19:39:41 +0000 | |
commit | 0bfdf963388375777b417460b6754d155f1e9f9a (patch) | |
tree | 65c538ba0a807093a0aff7cedfdf8f530ea4a0ca | |
parent | fix building with gcc-4.4 by Daniel J. in bug #265041 (diff) | |
download | historical-0bfdf963388375777b417460b6754d155f1e9f9a.tar.gz historical-0bfdf963388375777b417460b6754d155f1e9f9a.tar.bz2 historical-0bfdf963388375777b417460b6754d155f1e9f9a.zip |
Fixed permissions handling on amd64, thank Markus Meier for report in bug #265341.
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64
-rw-r--r-- | net-im/ejabberd/ChangeLog | 8 | ||||
-rw-r--r-- | net-im/ejabberd/Manifest | 13 | ||||
-rw-r--r-- | net-im/ejabberd/ejabberd-2.0.5-r1.ebuild | 155 |
3 files changed, 164 insertions, 12 deletions
diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index 4934b9050249..4fa58f073c2c 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.56 2009/04/19 13:49:52 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.57 2009/04/20 19:39:41 pva Exp $ + +*ejabberd-2.0.5-r1 (20 Apr 2009) + + 20 Apr 2009; Peter Volkov <pva@gentoo.org> +ejabberd-2.0.5-r1.ebuild: + Fixed permissions handling on amd64, thank Markus Meier for report in bug + #265341. 19 Apr 2009; Markus Meier <maekke@gentoo.org> ejabberd-2.0.5: x86 stable, bug #265341 diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index f6e860684d9f..9b7a7cb72136 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 @@ -32,13 +29,7 @@ EBUILD ejabberd-2.0.2-r1.ebuild 4799 RMD160 aa56c896ec0fb7300c30d0b651589144794a EBUILD ejabberd-2.0.2.ebuild 4796 RMD160 21b06d748fdce3254de01ea4534283b773a1f576 SHA1 b1314459af0720306c0354771cc52df390ca6a28 SHA256 8311eeceae62f8387c62c05343c82cc1d1985aa661084cedad03ae457b704e87 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 4768 RMD160 830b15d1a629a4543bc832777b014ffb0905202a SHA1 b7630fb78b12487b2b1f53c867fe479b735b6e29 SHA256 def6e71fe003baa2f112ef747cec5575ac6f1e9fe5eed6c495a014b4e6335b5f EBUILD ejabberd-2.0.5.ebuild 4748 RMD160 a9a593a515366f3c2021f4c4319b8f74b2f4338f SHA1 48c44b6356bafcfe7de34d0732feebcb80a1f46e SHA256 7edda3b2aeb9d9202cf8018b57c67dfbbb7fac95cbb40a3f55108b0f6d00409e -MISC ChangeLog 12274 RMD160 96fb5ea1ee317d01c9fff8ae8eda513b0ee7d3d8 SHA1 27058d9dc4a9971f543da8dcca949245c29365be SHA256 6b5c39e406099640dacdd4a9b4e76b98efd9ee4a4aafbfec4f7d2aeb0fe6c32b +MISC ChangeLog 12465 RMD160 53169f8e725c9c565608848b7797414d8edd4e93 SHA1 1e75ff57132bdf0df6642738907ab8b37bcffdec SHA256 2e60c5bcdb009bf51e6187fe54016b3f0199d76a8ec9dec0bd1405d9d7a5ef62 MISC metadata.xml 619 RMD160 ca6e7f018d370ce36a3b93eb960254537260949c SHA1 404f3d0d31036ed1cfeb8aeee2264559c1d1c8d9 SHA256 843e1bbd5fdc082763e71322094170cde5b90d0f5d9320011c4b9872cd6589f4 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) - -iEYEARECAAYFAknrLCcACgkQkKaRLQcq0GLNcwCfdbUbuNvl9YNxPt9ahG4bhFGV -bhIAnitQqoh6nV6oUDjDFR1A4c/LW5rl -=7DsV ------END PGP SIGNATURE----- diff --git a/net-im/ejabberd/ejabberd-2.0.5-r1.ebuild b/net-im/ejabberd/ejabberd-2.0.5-r1.ebuild new file mode 100644 index 000000000000..d682bc4b4bee --- /dev/null +++ b/net-im/ejabberd/ejabberd-2.0.5-r1.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-r1.ebuild,v 1.1 2009/04/20 19:39:41 pva 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-2.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' +} |