From: Stefan Cornelius Date: Tue, 27 Feb 2007 20:26:12 +0000 (+0000) Subject: Bumping to version 1.1.3 due to security bug #159580 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c448088c886f5eb5190f9ee2812572a47d86882f;p=gentoo.git Bumping to version 1.1.3 due to security bug #159580 Package-Manager: portage-2.1.2-r9 --- diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index 4881816a9106..1d21a9b17106 100644 --- a/net-im/ejabberd/ChangeLog +++ b/net-im/ejabberd/ChangeLog @@ -1,11 +1,16 @@ # 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.12 2007/02/27 17:47:38 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.13 2007/02/27 20:26:12 dercorny Exp $ + +*ejabberd-1.1.3 (27 Feb 2007) + + 27 Feb 2007; Stefan Cornelius +ejabberd-1.1.3.ebuild: + Bumping to version 1.1.3 wrt security bug #159580 27 Feb 2007; Gustavo Felisberto ; metadata.xml: Corrected maintainer in metadata. - 22 Feb 2007; Piotr Jaroszyński ChangeLog: + 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. *ejabberd-1.1.2-r1 (16 Oct 2006) @@ -42,7 +47,7 @@ +files/ejabberd-1.1.1.initd, +ejabberd-1.1.1.ebuild: Version bump, thanks to all contributors in bug #101708. - 05 May 2006; Diego Pettenò ejabberd-0.7.5.ebuild: + 05 May 2006; Diego Pettenò ejabberd-0.7.5.ebuild: Fix enewuser/enewgroup location, bug #130849. 23 Aug 2005; Gustavo Felisberto ; diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 5211ea5e5520..89225b1d4a97 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b MD5 e34f266ad55b2db038375cb6962721cd files/ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b files/ejabberd 355 @@ -48,6 +45,7 @@ SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635 files/ss DIST ejabberd-0.7.5.tar.gz 410451 RMD160 fa7c558a568ec7fb88c1a8fab20bde61404dca3c SHA1 7b268c8fec00e4307fc6efb49eef026278d6d721 SHA256 9ac3080f6e3284b1f26b8eb5aff60c3e5fd7877895a2bc1511be91ac3323acfa DIST ejabberd-1.1.1.tar.gz 803278 RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 SHA1 4f23d787afe75c7c866decdff6f539195449776e SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082 DIST ejabberd-1.1.2.tar.gz 836240 RMD160 e763752e6c5fb46c51b71e265ab2ceda6d043a0d SHA1 9e94bdbc10fee5b781405daf43a0b4abc4dee6c1 SHA256 029129a6bcb5d15dbccc5aa756f61c52692eb6882ec7aad0193aa940b6a20bb6 +DIST ejabberd-1.1.3.tar.gz 826057 RMD160 99b4c73ae29ef9814f5c572f8e3b3a82d960f5ee SHA1 66b00ca52fa4f4f4e097b0e897c3b5a2e4526603 SHA256 3b8ac67673fa6c08bc25382d3e99171ebc71d4759899eb5a730e65117256e703 DIST ejabberd-patchball-1.1.1-r1.tar.bz2 11826 RMD160 8bee1764940073c807644438914bbbad4548a9a5 SHA1 e3238179c55b77d99b0bbec25787bbc47239feee SHA256 4bf89e6858e455444bc5a29113f19462e856d1399179cb51bb8e404176eee3de EBUILD ejabberd-0.7.5.ebuild 2873 RMD160 c472f73e3fc5b8793ae7846605cbe9b1b7c17d88 SHA1 eb6632ef55de2350987d33a5c255431753dcd4a2 SHA256 fb7ddb32a459431fa03701edc546448c189c0c87c4c3bdb2b2404759a10f7cd2 MD5 0299ef0b946b6cbac7a91bbcd186ee9d ejabberd-0.7.5.ebuild 2873 @@ -65,10 +63,14 @@ EBUILD ejabberd-1.1.2-r1.ebuild 3607 RMD160 b65ba6e38aa8ead16a507deb8bbae861bc8c MD5 34e53f55eb9d23fcae23e55a451780b4 ejabberd-1.1.2-r1.ebuild 3607 RMD160 b65ba6e38aa8ead16a507deb8bbae861bc8ce0b6 ejabberd-1.1.2-r1.ebuild 3607 SHA256 3fda0f1112490c63683a7d44c5cd215dd10abdb8aa2fbcac27d717fcaaf324cd ejabberd-1.1.2-r1.ebuild 3607 -MISC ChangeLog 2694 RMD160 8f9d326f8af4c9a600d0da0dee38061099fc00bb SHA1 6d5c6d9410234f8c74beb544aee88ea0138f64ef SHA256 923bd007bef87f7382d71341d2118ffa36495398a127bc4d3bbecb35bc059a32 -MD5 551de7c3e8e9719c38d8a72681c4b971 ChangeLog 2694 -RMD160 8f9d326f8af4c9a600d0da0dee38061099fc00bb ChangeLog 2694 -SHA256 923bd007bef87f7382d71341d2118ffa36495398a127bc4d3bbecb35bc059a32 ChangeLog 2694 +EBUILD ejabberd-1.1.3.ebuild 3604 RMD160 efbbf20610c1aa376df32ac4d21e12c7a7623df2 SHA1 e4e363dec6cf8f82722848c912dc6ab1ebadc5fd SHA256 b324a81445afaa53089260a42338b2f743f48acd36e7b1818102cfbca04e556b +MD5 2e68cf40ea32567b7c154df0b8b4152e ejabberd-1.1.3.ebuild 3604 +RMD160 efbbf20610c1aa376df32ac4d21e12c7a7623df2 ejabberd-1.1.3.ebuild 3604 +SHA256 b324a81445afaa53089260a42338b2f743f48acd36e7b1818102cfbca04e556b ejabberd-1.1.3.ebuild 3604 +MISC ChangeLog 2860 RMD160 3701306ba0735deb627747bfd6ebd8108fe67e11 SHA1 d9ff862ddb2f044f2bfa27d1aa7f6eac7f47f01d SHA256 ea9b55dfd6b512056c6a258058efffec6899c7b64a409ff1118edcea86326a67 +MD5 24f9c1e537b20c3f0e2980933f807ba9 ChangeLog 2860 +RMD160 3701306ba0735deb627747bfd6ebd8108fe67e11 ChangeLog 2860 +SHA256 ea9b55dfd6b512056c6a258058efffec6899c7b64a409ff1118edcea86326a67 ChangeLog 2860 MISC metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee SHA1 2e1a9e8406a47ceb62f0d9edcabd27668b412634 SHA256 c1afbca95c1be1d2095a4dcd6ba39c8d1dd1974993b0f800264add3c18428a55 MD5 2a43b0fd5e7b6404b98548ac55046b3f metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee metadata.xml 383 @@ -85,10 +87,6 @@ SHA256 f7efa501bd505164f6945a73792014a2af61646e9be44683a46eff6de743e0a9 files/di MD5 a38033cd51c7bb84bc09310952063222 files/digest-ejabberd-1.1.2-r1 244 RMD160 d8117ebc19953eb40137b4ebca37d7577ff9e5b6 files/digest-ejabberd-1.1.2-r1 244 SHA256 e1ff34ed81425e1b009e60d29d7f6b9bdeff7cdba4407372cfdb8e40ca00efcb files/digest-ejabberd-1.1.2-r1 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF5G7H8zY1VwezZiERAlCVAJ98BNRjeSOJCIpM7TdBG86nnvVi8gCeJGyE -I2DHdIl7rZzg4PWytuu+zpc= -=L8o7 ------END PGP SIGNATURE----- +MD5 9b247a2a345b5d2c9cdf1a1678f4edf9 files/digest-ejabberd-1.1.3 244 +RMD160 59a1985b119be6cf343af1ea13929c233e59f0b4 files/digest-ejabberd-1.1.3 244 +SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/digest-ejabberd-1.1.3 244 diff --git a/net-im/ejabberd/ejabberd-1.1.3.ebuild b/net-im/ejabberd/ejabberd-1.1.3.ebuild new file mode 100644 index 000000000000..590054e897e5 --- /dev/null +++ b/net-im/ejabberd/ejabberd-1.1.3.ebuild @@ -0,0 +1,125 @@ +# 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 $ + +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="~x86" +IUSE="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-10.2.0 + odbc? ( dev-db/unixODBC ) + ldap? ( =net-nds/openldap-2* )" + +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) \ + || 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 < ${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 < ${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 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.3 b/net-im/ejabberd/files/digest-ejabberd-1.1.3 new file mode 100644 index 000000000000..72f1fd1a1f21 --- /dev/null +++ b/net-im/ejabberd/files/digest-ejabberd-1.1.3 @@ -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