diff options
Diffstat (limited to 'net-im/ejabberd')
| -rw-r--r-- | net-im/ejabberd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/ejabberd/Manifest | 24 | ||||
| -rw-r--r-- | net-im/ejabberd/ejabberd-1.1.2.ebuild | 149 | ||||
| -rw-r--r-- | net-im/ejabberd/files/digest-ejabberd-1.1.2 | 9 |
4 files changed, 182 insertions, 8 deletions
diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index c312d3a0431f..0f7325fa8191 100644 --- a/net-im/ejabberd/ChangeLog +++ b/net-im/ejabberd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/ejabberd # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.8 2006/10/12 16:26:07 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.9 2006/10/13 15:54:02 chainsaw Exp $ + +*ejabberd-1.1.2 (13 Oct 2006) + + 13 Oct 2006; Tony Vroon <chainsaw@gentoo.org> +ejabberd-1.1.2.ebuild: + New upstream version. Patchball updated with mod_presence, all thanks to + Nikolaus Polak <nik@linuxlovers.at> in bug #137724. *ejabberd-1.1.1-r1 (12 Oct 2006) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 1b2cfcf407c6..2d7f020da43d 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -47,7 +47,10 @@ RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 files/ssl.cnf 1042 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635 files/ssl.cnf 1042 DIST ejabberd-0.7.5.tar.gz 410451 DIST ejabberd-1.1.1.tar.gz 803278 RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 SHA1 4f23d787afe75c7c866decdff6f539195449776e SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082 +DIST ejabberd-1.1.2-presence-pixmaps.tar.gz 38879 RMD160 25334895360ef570d0569fb8b7528d9848bd9297 SHA1 5f15a3082975e09f9cc8fe8172bca0d502d82dee SHA256 2be1df08f6b5ea51e41974ff9c7d7688546a794840074036a283e7b46c2f8756 +DIST ejabberd-1.1.2.tar.gz 836240 RMD160 e763752e6c5fb46c51b71e265ab2ceda6d043a0d SHA1 9e94bdbc10fee5b781405daf43a0b4abc4dee6c1 SHA256 029129a6bcb5d15dbccc5aa756f61c52692eb6882ec7aad0193aa940b6a20bb6 DIST ejabberd-patchball-1.1.1-r1.tar.bz2 11826 RMD160 8bee1764940073c807644438914bbbad4548a9a5 SHA1 e3238179c55b77d99b0bbec25787bbc47239feee SHA256 4bf89e6858e455444bc5a29113f19462e856d1399179cb51bb8e404176eee3de +DIST ejabberd-patchball-1.1.2.tar.bz2 16264 RMD160 dec64faaf6b1b3028e8c154fd8a56600b62bc3e9 SHA1 eff98176721671c9f63fb428d060cf5d8cc4ae02 SHA256 36b0d3d5bc2259b4304f8dd3003b509eae0d0308a0d9e97599a77f058fa34866 EBUILD ejabberd-0.7.5.ebuild 2873 RMD160 c472f73e3fc5b8793ae7846605cbe9b1b7c17d88 SHA1 eb6632ef55de2350987d33a5c255431753dcd4a2 SHA256 fb7ddb32a459431fa03701edc546448c189c0c87c4c3bdb2b2404759a10f7cd2 MD5 0299ef0b946b6cbac7a91bbcd186ee9d ejabberd-0.7.5.ebuild 2873 RMD160 c472f73e3fc5b8793ae7846605cbe9b1b7c17d88 ejabberd-0.7.5.ebuild 2873 @@ -60,10 +63,14 @@ EBUILD ejabberd-1.1.1.ebuild 3327 RMD160 00650229571c5362dcf9732c3fc06d36e3bffa0 MD5 889d9fd6080d69234175d19f05d8624e ejabberd-1.1.1.ebuild 3327 RMD160 00650229571c5362dcf9732c3fc06d36e3bffa06 ejabberd-1.1.1.ebuild 3327 SHA256 3826cb497719692826c7e6ab8c992b3259c67c907aa1f0950681fc0648e5be26 ejabberd-1.1.1.ebuild 3327 -MISC ChangeLog 2014 RMD160 c9170044b84ea44f1437ff3e49bec63419c1406e SHA1 02c29f28eb40e00de2e8a8b03f98fc75702a5afd SHA256 d218657d2a5ae12087cbd8d7d31712ecc8ce137f278bebbe391c800297fb2943 -MD5 f2a13291dc40768f83518c180b50f84a ChangeLog 2014 -RMD160 c9170044b84ea44f1437ff3e49bec63419c1406e ChangeLog 2014 -SHA256 d218657d2a5ae12087cbd8d7d31712ecc8ce137f278bebbe391c800297fb2943 ChangeLog 2014 +EBUILD ejabberd-1.1.2.ebuild 4378 RMD160 50de2092fea335a99eff1bda3ab2271d66ad9af8 SHA1 57607990d48524eaad8563ddd01c2d9f0f395d55 SHA256 350b2b9a33a36e8edb187b319db6c874d18f178532d77436b0c49db3c99929c9 +MD5 53e85f855065492aa2ea0378e446845d ejabberd-1.1.2.ebuild 4378 +RMD160 50de2092fea335a99eff1bda3ab2271d66ad9af8 ejabberd-1.1.2.ebuild 4378 +SHA256 350b2b9a33a36e8edb187b319db6c874d18f178532d77436b0c49db3c99929c9 ejabberd-1.1.2.ebuild 4378 +MISC ChangeLog 2247 RMD160 8e097b0304fab71e242f15f52d96cdcf1640c13a SHA1 67a3aaee2757475979813e60c7f132befbdf94b8 SHA256 25acd8fe5836026e18a8401c37d04d2b857ecfe120985445ee6b4c9c17809526 +MD5 e96f20e5a9541f7de92cc0a6456e7063 ChangeLog 2247 +RMD160 8e097b0304fab71e242f15f52d96cdcf1640c13a ChangeLog 2247 +SHA256 25acd8fe5836026e18a8401c37d04d2b857ecfe120985445ee6b4c9c17809526 ChangeLog 2247 MISC metadata.xml 383 RMD160 aceb05ede401881022e8465895f6f9c33c332eeb SHA1 619e611cec685394a089bfc5f9af061e8f33b2b2 SHA256 b200df29d7cec9556f72f2915e771251dff35c4d69c30eb15bf187865df51d7a MD5 4d142ea790d97a89bdcc4325d5e3b301 metadata.xml 383 RMD160 aceb05ede401881022e8465895f6f9c33c332eeb metadata.xml 383 @@ -77,10 +84,13 @@ SHA256 d3659c3dbc43cf807fb7309da84ba62393e9257a7a16a3305621ee60f97378a6 files/di MD5 271f80b598fac50393ae42ee64385b5b files/digest-ejabberd-1.1.1-r1 527 RMD160 83ce012051e482806e65add1163d82bbf0b5a228 files/digest-ejabberd-1.1.1-r1 527 SHA256 f7efa501bd505164f6945a73792014a2af61646e9be44683a46eff6de743e0a9 files/digest-ejabberd-1.1.1-r1 527 +MD5 aef532ac1111c2de58a4a702916896ba files/digest-ejabberd-1.1.2 810 +RMD160 fd56915752b1a42bb624d2e96f888cf4875e5ecf files/digest-ejabberd-1.1.2 810 +SHA256 717f0676d94c40bb617bae17f62d08fb6bf9ab276c042728457add7a1aa5a104 files/digest-ejabberd-1.1.2 810 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) -iD8DBQFFLmyzp5vW4rUFj5oRAvesAKC0Z1llWVy7iCKpi9lt4ZG8no1ejgCguKH9 -Z/fdDt6Xf7/psHLOMIivwt0= -=tOoJ +iD8DBQFFL7a0p5vW4rUFj5oRAutiAKC6QDkbBQ3ma8UaP7rCSg4g1oJVfgCgh6sj +wTimsKvm+B1qZDBHQt7M9pQ= +=UTxx -----END PGP SIGNATURE----- diff --git a/net-im/ejabberd/ejabberd-1.1.2.ebuild b/net-im/ejabberd/ejabberd-1.1.2.ebuild new file mode 100644 index 000000000000..7179046485f1 --- /dev/null +++ b/net-im/ejabberd/ejabberd-1.1.2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.2.ebuild,v 1.1 2006/10/13 15:54:02 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 mirror://gentoo/ejabberd-patchball-${PV}.tar.bz2 + mod_presence? ( http://linuxlovers.at/site/files/${P}-presence-pixmaps.tar.gz )" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="mod_irc mod_muc mod_pubsub mod_presence ldap odbc socks5 statsdx 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* )" + +PROVIDE="virtual/jabber-server" +S=${WORKDIR}/${P}/src + +src_unpack() { + unpack ${A} + cd ${S} + if useq socks5 ; then + epatch ${WORKDIR}/patchball/${P}-mod-proxy.patch + fi + if useq statsdx; then + epatch ${WORKDIR}/patchball/${P}-statsdx.patch + if useq web; then + epatch ${WORKDIR}/patchball/${P}-statsdx-web.patch + fi + fi + if useq mod_presence; then + epatch ${WORKDIR}/patchball/${P}-mod-presence.patch + fi +} + +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} + dodoc doc/release_notes_${PV}.txt + dohtml doc/*.{html,png} + + # + # Create /usr/bin/ejabberd + # + cat <<EOF > ${T}/ejabberd +#!/bin/bash + +erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ + ${pa} \\ + -sname ejabberd \\ + -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 + +exec env HOME=${JABBER_RUN} \\ + erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ + ${pa} \\ + -noinput \\ + -sname ejabberdctl \\ + -s ejabberd_ctl \\ + -extra \$@ +EOF + + dobin ${T}/ejabberdctl + dobin ${T}/ejabberd + + newinitd ${FILESDIR}/ejabberd-1.1.1-r1.initd ${PN} + newconfd ${FILESDIR}/ejabberd-1.1.1.confd ${PN} + + insinto ${JABBER_ETC} + doins ${FILESDIR}/inetrc + doins ${FILESDIR}/ssl.cnf + newins ${FILESDIR}/self-cert-v2.sh self-cert.sh +} + +pkg_postinst() { + einfo "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html" + einfo "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 + ewarn "Please be sure that your ${JABBER_ETC}/ejabber.cfg points to ${JABBER_ETC}/ssl.pem" + ewarn "You may want to edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh again" + fi + if ! useq web ; then + einfo "The web USE flag is off, this has disabled the web admin interface." + fi + if useq socks5 ; then + einfo "Info about the SOCKS5 proxy support can be found at http://ejabberd.jabber.ru/mod_proxy65" + fi + if useq mod_presence ; then + einfo "Info about the presence module can be found at http://ejabberd.jabber.ru/mod_presence" + fi + if useq odbc ; then + ewarn "Please add a column askmessage to the rosterusers table if migrating from 1.1.1" + fi +} diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.2 b/net-im/ejabberd/files/digest-ejabberd-1.1.2 new file mode 100644 index 000000000000..6734f54abc66 --- /dev/null +++ b/net-im/ejabberd/files/digest-ejabberd-1.1.2 @@ -0,0 +1,9 @@ +MD5 e958383db35c31bd9e32e9ae9d5044b1 ejabberd-1.1.2-presence-pixmaps.tar.gz 38879 +RMD160 25334895360ef570d0569fb8b7528d9848bd9297 ejabberd-1.1.2-presence-pixmaps.tar.gz 38879 +SHA256 2be1df08f6b5ea51e41974ff9c7d7688546a794840074036a283e7b46c2f8756 ejabberd-1.1.2-presence-pixmaps.tar.gz 38879 +MD5 5b947e19e18a6b554bf31d1c95176eb6 ejabberd-1.1.2.tar.gz 836240 +RMD160 e763752e6c5fb46c51b71e265ab2ceda6d043a0d ejabberd-1.1.2.tar.gz 836240 +SHA256 029129a6bcb5d15dbccc5aa756f61c52692eb6882ec7aad0193aa940b6a20bb6 ejabberd-1.1.2.tar.gz 836240 +MD5 06a339391d525a9e053368c7c66ab67d ejabberd-patchball-1.1.2.tar.bz2 16264 +RMD160 dec64faaf6b1b3028e8c154fd8a56600b62bc3e9 ejabberd-patchball-1.1.2.tar.bz2 16264 +SHA256 36b0d3d5bc2259b4304f8dd3003b509eae0d0308a0d9e97599a77f058fa34866 ejabberd-patchball-1.1.2.tar.bz2 16264 |