Version bump (bug #396037).

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 230 insertions, 9 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 4feb9dbde390..e42e225fed23 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.103 2012/03/06 11:40:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.104 2012/03/06 11:44:48 radhermit Exp $
+
+*ejabberd-2.1.10 (06 Mar 2012)
+
+  06 Mar 2012; Tim Harder <radhermit@gentoo.org> +ejabberd-2.1.10.ebuild:
+  Version bump (bug #396037).
 
   06 Mar 2012; Tim Harder <radhermit@gentoo.org> ejabberd-2.1.8.ebuild,
   ejabberd-2.1.9.ebuild:
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index ebd0380ccdbc..5b7c170494de 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -3,21 +3,23 @@ Hash: SHA512
 
 AUX ejabberd-3.confd 161 RMD160 3b2c2b2a871c42c75e854a3c592c0d399a5dd387 SHA1 01e72bda178e7bf26a66321c4330bbcc1607e540 SHA256 0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386
 AUX ejabberd-3.initd 1018 RMD160 1d52bc9c664a6477d10b1396aba4a2c626da910a SHA1 fd0bb049df3d8a04410b3ccf59b9d78b40ee9d49 SHA256 1c07fa02152b42bee44a8d1cd3f031596aeee37276ec4a36d765e3c54aa23075
+DIST ejabberd-2.1.10.tar.gz 1942456 RMD160 7069aeeb87fd074988bc62cb4e898f7b920ab3c0 SHA1 c1164aa00f4445cc464cc57a986cf2607315635b SHA256 9dc2e5889e919a7d51f2b95b83da835116631db81550a115c02e71909ad932be
 DIST ejabberd-2.1.8.tar.gz 3382833 RMD160 24d3042565a8631447bbf56f998f3a2377c23822 SHA1 3f8ecc944e0719577bfc45a68e974b1945ffa296 SHA256 dedf7684f9e96efbbc12f08f175096ef50b3f75b284bd27d172eaf75cecded7f
 DIST ejabberd-2.1.9.tar.gz 1872544 RMD160 6a6431a54999f5ca40273fef289ae7fd9b289476 SHA1 7faff4252eb2a10c046f1e6a2fcb11fd4f500ea8 SHA256 f97f2daad497d9d9979455b67ce31e2ddbd3a3cd638a97b2e1d76a6ac8758781
 DIST ejabberd-mod_statsdx-1080.patch.gz 14024 RMD160 eb40aa4c3b7b4529a317c8b521a883d156f90ce9 SHA1 ba669e917393b4400878613464ff83a84ff414da SHA256 0f3a3a991c14d797e795ef4fffcf19aa9a54608f5053b759187ec7d3696b9edb
+EBUILD ejabberd-2.1.10.ebuild 7945 RMD160 269d8f937bb7690f4b2ecf477e983b11413711e3 SHA1 5387fc5dca5b27a74ef9ead87a1de11fae613856 SHA256 11a193414547b47ac43c3e3b45aa6a5c9b80ba9363146b7e421f4b40697ebb6c
 EBUILD ejabberd-2.1.8.ebuild 7942 RMD160 399994361836a1a54d9b493a8b60e75b4201c613 SHA1 5da4ee93a0550ebe5a9e081d7e9d5e8b77dcea04 SHA256 d18ee051d4188c3fa67bdc9be2cfa6e62da5aacd67962d41ded2b040e5ea6196
 EBUILD ejabberd-2.1.9.ebuild 7942 RMD160 f269839fd027ca058fba7473e7b972ce06acb4ed SHA1 b0e80ba5c27b9a3dcfda9c8804176320518ada42 SHA256 87048ccaa71ecfa56bb44eeb5479e75fbf351968f8e1b8ada73e1ea1c397e5f7
-MISC ChangeLog 21077 RMD160 9c4baafe90e461cd55fc6ee60b9820cb6948151a SHA1 b2079c44324dc3d629a61f175c59458273254cf6 SHA256 ae3f1d12215dfd483fe5705f03a672f4a07daf2401f7edd253b5918d4146cfca
+MISC ChangeLog 21214 RMD160 a99116547c521f534d917e9ee74bd3832b120531 SHA1 04bafa178c86700e4fadf372ee0956bbced1b59a SHA256 9d7d8425032298b3e6b072659312c96b28874b0010ffd122ce9eb8da80c1e34d
 MISC metadata.xml 815 RMD160 99adec0da4b277273f0866daa434f0f24bfaeadb SHA1 ece19bb746b31d2004d4644cb800fb6e4d077ff1 SHA256 687ad563d41f2ab628da5c0ce09e8fe8c92c703005dbca370f76a2cd0e080265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPVffJAAoJEEqz6FtPBkyjxAAH/3ihrVMIRCyQZFzKIi9GnEV6
-dTAd/AlyRfRhgfwpgQ0sVZcw61/pQ7+jrKLkAhPQIJbLfToMHNP5SLFbW1TpzUbf
-IidTAnw+NrAr9V2Wm2OTPVtqiCQwCQ+UDwC2RRfKlnJeUsTDTla01NaAn+TO/pXT
-8Qs7C3xTi1NazpwjmQgJ8FjcF9wAeSCh/VB+1pxkfkGY1kFvr0wUNMLIgIo/+MWZ
-gcmTHu1p9bqOhaCxCEmL4KTghKDZLLvIOGxuzKXSyR1s6EcX2Q7Tkq19WPlW4mR2
-PE9las2Ngn83gLgn7kGAzl+jx61ELduUN+hv8YwSo8TlARDLAWjyCJ5Z4Mr0KT8=
-=/Aau
+iQEcBAEBCgAGBQJPVfi2AAoJEEqz6FtPBkyjYGQH+wWEAR21aDig/9gvSCIBTv2m
+XaUkTX+uUrvuc/YQbXZHxY311GSy/yHbv8UVoBuruztYswUaeFxgBwHZZY+ti0B1
+HnlwQMFEDZaYqTB2JanlV/Z/54GSJUusNkAIDEuJQ2G8Snt3r0Vv6eLJFLPkBShZ
+HwOHx3PDuoH0Al3N88lRDg9MuWSUM/gPkO8I3j01nbsdJr74gy8WDopcY3KkqUjr
+4ti+Fxf4h/mA7uZNMH4pPpR8P6lwdMgN9tzSiuuYfux4IIokpEbzN1+WtXOge4Qf
+0vkNG6C1aNkoJnsI65Q+xgV0pVmTlfJGhj27XwpYXa9mnvWN/GRD+pyeNpr93ug=
+=PGVa
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-2.1.10.ebuild b/net-im/ejabberd/ejabberd-2.1.10.ebuild
new file mode 100644
index 000000000000..5745af5b55d7
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.1.10.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.10.ebuild,v 1.1 2012/03/06 11:44:48 radhermit Exp $
+
+EAPI=4
+
+inherit eutils multilib pam ssl-cert
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz
+	mod_statsdx? ( mirror://gentoo/ejabberd-mod_statsdx-1080.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
+IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/expat-1.95
+	>=dev-lang/erlang-12.2.5[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 )"
+#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
+RDEPEND="${DEPEND}
+	>=sys-apps/shadow-4.1.4.2-r3
+	pam? ( virtual/pam )"
+
+S=${WORKDIR}/${P}/src
+
+# 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() {
+	if use mod_statsdx; then
+		ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
+		ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
+		EPATCH_OPTS="-p2" epatch "${WORKDIR}/ejabberd-mod_statsdx-1080.patch"
+	fi
+
+	# 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|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \
+			-i ejabberdctl.template || die
+
+	# Set shell, so it'll work even in case jabber user have no shell
+	# This is gentoo specific I guess since other distributions may have
+	# ejabberd user with reall shell, while we share this user among different
+	# jabberd implementations.
+	sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die
+	sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die
+
+	#sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl
+
+	# fix up the ssl cert paths in ejabberd.cfg to use our cert
+	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
+		-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
+
+	# correct path to captcha script in default ejabberd.cfg
+	sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
+			-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
+
+	# disable mod_irc in ejabberd.cfg
+	if ! use mod_irc; then
+		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
+			-i ejabberd.cfg.example || die "Failed to disable mod_irc"
+	fi
+
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
+		$(use_enable mod_irc) \
+		$(use_enable ldap eldap) \
+		$(use_enable mod_muc) \
+		$(use_enable mod_proxy65) \
+		$(use_enable mod_pubsub) \
+		$(use_enable web) \
+		$(use_enable odbc) \
+		$(use_enable zlib ejabberd_zlib) \
+		$(use_enable pam) \
+		--enable-user=jabber
+}
+
+src_compile() {
+	emake $(use debug && echo debug=true ejabberd_debug=true)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# Pam helper module permissions
+	# http://www.process-one.net/docs/ejabberd/guide_en.html
+	if use pam; then
+		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
+		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+	fi
+
+	cd "${WORKDIR}/${P}/doc"
+	dodoc "release_notes_${PV%%_rc*}.txt"
+
+	#dodir /var/lib/ejabberd
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}-3.confd" ${PN}
+}
+
+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/ejabberd/docs/guide_en/"
+
+	if ! use web ; then
+		ewarn
+		ewarn "The web USE flag is off, this has disabled the web admin interface."
+		ewarn
+	fi
+
+	elog
+	elog '===================================================================='
+	elog 'Quick Start Guide:'
+	elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91'
+	elog '   {hosts, ["localhost", "thehost"]}.'
+	elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360'
+	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'
+
+	# Upgrading from ejabberd-2.0.x:
+	if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then
+		source "${EROOT}/etc/conf.d/ejabberd"
+		ewarn
+		ewarn "!!! WARNING !!!  WARNING !!!  WARNING !!!  WARNING !!!"
+		ewarn "Starting with 2.1.x some paths and configuration files were"
+		ewarn "changed to reflect upstream intentions better. Notable changes are:"
+		ewarn
+		ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
+		ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
+		ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
+		ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."
+		ewarn
+		ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides"
+		ewarn "at standard location: /etc/ssl/ejabberd/server.pem."
+		ewarn
+		ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie"
+		ewarn
+		ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log"
+		ewarn
+		ewarn "5. Crash dumps (if any) will be located at /var/log/jabber"
+
+		local i ctlcfg new_ctlcfg
+		i=0
+		ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg
+		while :; do
+			new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i})
+			[[ ! -e ${new_ctlcfg} ]] && break
+			ctlcfg=${new_ctlcfg}
+			((i++))
+		done
+
+		ewarn
+		ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
+		sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
+
+		if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
+			ewarn "Moving .erlang.cookie..."
+			if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then
+				mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak}
+			fi
+			mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie
+		fi
+		ewarn
+		ewarn "We'll try to handle upgrade automagically but, please, do your"
+		ewarn "own checks and do not forget to run 'etc-update'!"
+		ewarn "PLEASE! Run 'etc-update' now!"
+	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"
+	if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
+		ewarn
+		ewarn "The location of SSL certificates has changed. If you are"
+		ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
+		ewarn "want to move your old certificates from /etc/jabber into"
+		ewarn "/etc/ssl/ejabberd/, update config files and"
+		ewarn "rm /etc/jabber/ssl.pem to avoid this message."
+		ewarn
+	fi
+}