* [gentoo-commits] gentoo-x86 commit in net-im/ejabberd: metadata.xml ChangeLog ejabberd-15.03.ebuild
@ 2015-04-12 5:27 Tim Harder (radhermit)
0 siblings, 0 replies; only message in thread
From: Tim Harder (radhermit) @ 2015-04-12 5:27 UTC (permalink / raw
To: gentoo-commits
radhermit 15/04/12 05:27:09
Modified: metadata.xml ChangeLog
Added: ejabberd-15.03.ebuild
Log:
Version bump (bug #487994).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)
Revision Changes Path
1.13 net-im/ejabberd/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/metadata.xml?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/metadata.xml?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/metadata.xml?r1=1.12&r2=1.13
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml 20 Mar 2015 21:40:41 -0000 1.12
+++ metadata.xml 12 Apr 2015 05:27:09 -0000 1.13
@@ -7,12 +7,17 @@
mostly written in Erlang, and works on many platforms.
</longdescription>
<use>
+ <flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>
+ <flag name="mod_proxy65">Support for SOCKS5 Bytestreams (XEP-0065)</flag>
+ <flag name="mod_statsdx">Measures several statistics, and provides a new section in ejabberd Web Admin to view them.</flag>
+ <flag name='elixir'>Enable Elixir language support (http://elixir-lang.org/)</flag>
+ <flag name='mod_bosh'>Enable support for XMPP over BOSH (XEP-0206)</flag>
<flag name='mod_irc'>Build irc gateway</flag>
<flag name='mod_muc'>Build Multi User Chat module</flag>
<flag name='mod_pubsub'>Build Pubsub module</flag>
+ <flag name='redis'>Enable Redis support</flag>
+ <flag name='riak'>Enable Riak support</flag>
+ <flag name='tools'>Build development tools</flag>
<flag name='web'>Enable web admin interface</flag>
- <flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>
- <flag name="mod_proxy65">Support for SOCKS5 Bytestreams (XEP-0065)</flag>
- <flag name="mod_statsdx">Measures several statistics, and provides a new section in ejabberd Web Admin to view them.</flag>
</use>
</pkgmetadata>
1.128 net-im/ejabberd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.128&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.128&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?r1=1.127&r2=1.128
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- ChangeLog 20 Mar 2015 21:40:41 -0000 1.127
+++ ChangeLog 12 Apr 2015 05:27:09 -0000 1.128
@@ -1,6 +1,12 @@
# ChangeLog for net-im/ejabberd
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.127 2015/03/20 21:40:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.128 2015/04/12 05:27:09 radhermit Exp $
+
+*ejabberd-15.03 (12 Apr 2015)
+
+ 12 Apr 2015; Tim Harder <radhermit@gentoo.org> +ejabberd-15.03.ebuild,
+ +files/ejabberd-15.03-ejabberdctl.patch, metadata.xml:
+ Version bump (bug #487994).
20 Mar 2015; Tim Harder <radhermit@gentoo.org> metadata.xml:
Drop myself as maintainer.
1.1 net-im/ejabberd/ejabberd-15.03.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ejabberd-15.03.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ejabberd-15.03.ebuild?rev=1.1&content-type=text/plain
Index: ejabberd-15.03.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-15.03.ebuild,v 1.1 2015/04/12 05:27:09 radhermit Exp $
EAPI=5
inherit eutils multilib pam ssl-cert
DESCRIPTION="The Erlang Jabber Daemon"
HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
# upstream tarball missing bundled erlang libs that are fetched via git
#SRC_URI="https://www.process-one.net/downloads/downloads-action.php?file=/${PN}/${PV}/${P}.tgz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
EJABBERD_MODULES="mod_bosh mod_irc mod_muc mod_proxy65 mod_pubsub"
IUSE="captcha debug elixir ldap mysql odbc pam postgres riak redis tools zlib ${EJABBERD_MODULES}"
DEPEND=">=net-im/jabber-base-0.01
>=dev-libs/expat-1.95
>=dev-libs/libyaml-0.1.4
>=dev-lang/erlang-15.2[ssl]
odbc? ( dev-db/unixODBC )
ldap? ( =net-nds/openldap-2* )
>=dev-libs/openssl-0.9.8e
captcha? ( media-gfx/imagemagick[truetype,png] )
zlib? ( >=sys-libs/zlib-1.2.3 )"
RDEPEND="${DEPEND}
>=sys-apps/shadow-4.1.4.2-r3
pam? ( virtual/pam )"
# paths in net-im/jabber-base
JABBER_ETC="${EPREFIX}/etc/jabber"
#JABBER_RUN="/var/run/jabber"
JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
JABBER_LOG="${EPREFIX}/var/log/jabber"
JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
src_prepare() {
epatch "${FILESDIR}"/${P}-ejabberdctl.patch
# don't install release notes (we'll do this manually)
sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
# Set correct paths
sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
-i Makefile.in || die
sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
-e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
-i ejabberdctl.template || die
# fix up the ssl cert paths in ejabberd.yml to use our cert
sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
-i ejabberd.yml.example || die
# correct path to captcha script in default ejabberd.yml
sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
-i ejabberd.yml.example || die
# disable mod_irc in ejabberd.yml
if ! use mod_irc; then
sed -e "s/{mod_irc,/%{mod_irc,/" \
-i ejabberd.yml.example || die
fi
epatch_user
}
src_configure() {
# run configure scripts for all prefetched deps
./rebar get-deps
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
$(use_enable tools) \
$(use_enable odbc) \
$(use_enable mysql) \
$(use_enable postgres pgsql) \
$(use_enable pam) \
$(use_enable zlib) \
$(use_enable riak) \
$(use_enable redis) \
$(use_enable mod_bosh json) \
$(use_enable elixir) \
$(use_enable mod_irc iconv) \
$(use_enable debug) \
--enable-lager \
--enable-user=jabber
}
src_compile() {
emake $(use debug && echo debug=true ejabberd_debug=true)
}
src_install() {
default
# Pam helper module permissions
if use pam; then
pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
fi
newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
}
pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]] ; then
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/ejabberd/docs/guide_en/"
else
elog "Ejabberd now defaults to using a YAML format for its config file."
elog "To convert your old Erlang term file run the following as root:"
elog "ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml"
echo
fi
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
install_cert /etc/ssl/ejabberd/server
# Fix ssl cert permissions bug #369809
chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-12 5:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-12 5:27 [gentoo-commits] gentoo-x86 commit in net-im/ejabberd: metadata.xml ChangeLog ejabberd-15.03.ebuild Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox