diff options
| -rw-r--r-- | net-im/ejabberd/ChangeLog | 16 | ||||
| -rw-r--r-- | net-im/ejabberd/Manifest | 23 | ||||
| -rw-r--r-- | net-im/ejabberd/ejabberd-1.1.3-r2.ebuild | 135 | ||||
| -rw-r--r-- | net-im/ejabberd/files/digest-ejabberd-1.1.3-r2 | 3 |
4 files changed, 168 insertions, 9 deletions
diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index a3ba527d13f1..72083bffdf2e 100644 --- a/net-im/ejabberd/ChangeLog +++ b/net-im/ejabberd/ChangeLog @@ -1,6 +1,20 @@ # 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.20 2007/04/28 17:35:13 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.21 2007/07/13 14:32:01 chainsaw Exp $ + +*ejabberd-1.1.3-r2 (13 Jul 2007) + + 13 Jul 2007; Tony Vroon <chainsaw@gentoo.org> +ejabberd-1.1.3-r2.ebuild: + Debugging support by Justin <justin-gentoo@openaether.org>, closes bug + #174734. Do not attempt to automatically generate a key, this ends up being + interactive on some systems. Closes bug #178615 by Robin Johnson + <robbat2@gentoo.org>. Revert defective change from bug #161252, without + sname the daemon can not be stopped. Thanks to Conrad Kostecki + <ConiKost@gmx.de>, closes bug #181745. Restrict erlang dep to <11.2.5 to + avoid EOF during handshake, as reported by Santiago Gala <sgala@apache.org>, + closes bug #184419. Restrict openssl dep to >=0.9.8e so a messy die on + USE="zlib" in openssl is no longer required. Also a report by Conrad + Kostecki <ConiKost@gmx.de>, this closes bug #185009. 28 Apr 2007; Sven Wegener <swegener@gentoo.org> ejabberd-0.7.5.ebuild: Fix *initd, *confd and *envd calls (#173884, #174266) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 7cf26fac8fc1..54bf1dd2bbc7 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -78,14 +78,18 @@ EBUILD ejabberd-1.1.3-r1.ebuild 3945 RMD160 7a513028284e746b61599132a696bef3cdb9 MD5 91a5381f3488c3247505631875be4731 ejabberd-1.1.3-r1.ebuild 3945 RMD160 7a513028284e746b61599132a696bef3cdb9f5cb ejabberd-1.1.3-r1.ebuild 3945 SHA256 21d6c50e18f8251e21714e3f67e6819f33b2c28fa862434332123978baef50c3 ejabberd-1.1.3-r1.ebuild 3945 +EBUILD ejabberd-1.1.3-r2.ebuild 3439 RMD160 3f02d2d42a647b8c05d1167012123f66808bbb89 SHA1 06683cebcfac75db97b8c9a5d67805187079001a SHA256 c5fed7cd9dffae2abf2e63b00fb570f890c82499587eca2d5c8753355dc3d610 +MD5 9df0451594402bd21ac7132fe7b07205 ejabberd-1.1.3-r2.ebuild 3439 +RMD160 3f02d2d42a647b8c05d1167012123f66808bbb89 ejabberd-1.1.3-r2.ebuild 3439 +SHA256 c5fed7cd9dffae2abf2e63b00fb570f890c82499587eca2d5c8753355dc3d610 ejabberd-1.1.3-r2.ebuild 3439 EBUILD ejabberd-1.1.3.ebuild 3367 RMD160 153663a118ebf45fce1cd68e9b3e7497bd7d5960 SHA1 065ff0d1095e5b53f4c7b93e0fca58583249e05c SHA256 cac88de8d3e24bf40c8729a226ff56807a7b8c4b6519761381f0883221b9255e MD5 9a0a9f44b9a2b5f6df72c179ee70feff ejabberd-1.1.3.ebuild 3367 RMD160 153663a118ebf45fce1cd68e9b3e7497bd7d5960 ejabberd-1.1.3.ebuild 3367 SHA256 cac88de8d3e24bf40c8729a226ff56807a7b8c4b6519761381f0883221b9255e ejabberd-1.1.3.ebuild 3367 -MISC ChangeLog 3784 RMD160 2e8972348bc3d8f43e1202f3105355056fd898d0 SHA1 5741253cf3b529b43ee401e031ecdb598204bc02 SHA256 1eb707eaebb5c33e5bb7192d45f9485a3aad784e81ba4c39e78dab7224313f4c -MD5 88cc3af33d670806549a38f2fcb01e37 ChangeLog 3784 -RMD160 2e8972348bc3d8f43e1202f3105355056fd898d0 ChangeLog 3784 -SHA256 1eb707eaebb5c33e5bb7192d45f9485a3aad784e81ba4c39e78dab7224313f4c ChangeLog 3784 +MISC ChangeLog 4604 RMD160 2726ba9126cf2eaf7b48a24a6de76e23596f2d46 SHA1 2fa3384fac9eb93b27a28c3ec653c4a125de1e30 SHA256 df1aa181044f8a4f8117215d0b997bbaf5bd74a8fd6d10e5a124f9bbec5bc369 +MD5 d6dbb854db7d638c37da07a5adbe69e4 ChangeLog 4604 +RMD160 2726ba9126cf2eaf7b48a24a6de76e23596f2d46 ChangeLog 4604 +SHA256 df1aa181044f8a4f8117215d0b997bbaf5bd74a8fd6d10e5a124f9bbec5bc369 ChangeLog 4604 MISC metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee SHA1 2e1a9e8406a47ceb62f0d9edcabd27668b412634 SHA256 c1afbca95c1be1d2095a4dcd6ba39c8d1dd1974993b0f800264add3c18428a55 MD5 2a43b0fd5e7b6404b98548ac55046b3f metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee metadata.xml 383 @@ -108,10 +112,13 @@ SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/di MD5 9b247a2a345b5d2c9cdf1a1678f4edf9 files/digest-ejabberd-1.1.3-r1 244 RMD160 59a1985b119be6cf343af1ea13929c233e59f0b4 files/digest-ejabberd-1.1.3-r1 244 SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/digest-ejabberd-1.1.3-r1 244 +MD5 9b247a2a345b5d2c9cdf1a1678f4edf9 files/digest-ejabberd-1.1.3-r2 244 +RMD160 59a1985b119be6cf343af1ea13929c233e59f0b4 files/digest-ejabberd-1.1.3-r2 244 +SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/digest-ejabberd-1.1.3-r2 244 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) +Version: GnuPG v2.0.5 (GNU/Linux) -iD8DBQFGM4XkI1lqEGTUzyQRArBQAJ9wl1dAhNjDpmdkkRYeJNdJQAv7PACdFOLL -jsqtRRVN14rl9n8gfKhfQcA= -=d3cQ +iD8DBQFGl4yup5vW4rUFj5oRAjuoAKCzCWVi7ZVGAp69iG+/5XnhITmHmwCdFWbi +QLxc3HivhyZpPGV/KW+BOUg= +=IQvl -----END PGP SIGNATURE----- diff --git a/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild b/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild new file mode 100644 index 000000000000..522b8b4cefec --- /dev/null +++ b/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild @@ -0,0 +1,135 @@ +# 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-r2.ebuild,v 1.1 2007/07/13 14:32:01 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" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc ssl web" + +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 )" + +PROVIDE="virtual/jabber-server" +S=${WORKDIR}/${P}/src + +src_unpack() { + unpack ${A} + cd ${S} + + # Bug #171427 + epatch ${FILESDIR}/${PV}-missing-declaration.patch +} + +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" + + 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" + + 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} + 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}/${P}.confd ${PN} + + insinto ${JABBER_ETC} + doins ${FILESDIR}/inetrc + if useq ssl ; then + doins ${FILESDIR}/ssl.cnf + newins ${FILESDIR}/self-cert-v2.sh self-cert.sh + fi +} + +pkg_postinst() { + elog "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html" + elog "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 + 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 + if useq odbc ; then + elog "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.3-r2 b/net-im/ejabberd/files/digest-ejabberd-1.1.3-r2 new file mode 100644 index 000000000000..72f1fd1a1f21 --- /dev/null +++ b/net-im/ejabberd/files/digest-ejabberd-1.1.3-r2 @@ -0,0 +1,3 @@ +MD5 bdb39965a147506fc194d5a28117172a ejabberd-1.1.3.tar.gz 826057 +RMD160 99b4c73ae29ef9814f5c572f8e3b3a82d960f5ee ejabberd-1.1.3.tar.gz 826057 +SHA256 3b8ac67673fa6c08bc25382d3e99171ebc71d4759899eb5a730e65117256e703 ejabberd-1.1.3.tar.gz 826057 |