commit: 0c9fa61cdf21f280c4be90c3be1b0a510731ecf0 Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> AuthorDate: Thu Nov 10 22:41:24 2016 +0000 Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> CommitDate: Sun Nov 13 10:08:13 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9fa61c
net-im/ejabberd: Bump version to 16.09 Package-Manager: portage-2.3.2 net-im/ejabberd/Manifest | 1 + net-im/ejabberd/ejabberd-16.09.ebuild | 297 +++++++++++++++++++++ .../files/ejabberd-16.09-ejabberdctl.patch | 62 +++++ 3 files changed, 360 insertions(+) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 8bcc74c..786180d 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,2 +1,3 @@ DIST ejabberd-16.04.tar.gz 1715963 SHA256 3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2 WHIRLPOOL d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4 DIST ejabberd-16.08.tar.gz 1739542 SHA256 b45598a6f2f1b398a19f23e3280b45eccc833d3339b1aeb6ec08ded7c19b1137 SHA512 661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55 WHIRLPOOL 41f5ae825997818671d6db94ac62108a0b02f8eb6eed07ebaa04287ee2d7955dc4d15c3ce18cbf20240e4b2a14d48ccb8bf383b510851be12326131c4c829788 +DIST ejabberd-16.09.tar.gz 1687485 SHA256 7b44ab3af3310ca73624c47b65cf30a651d5a1398413e8af51c610d788fb8f14 SHA512 506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f WHIRLPOOL 6c56ad58b4e247cedf29cf247fdadddf727270311a0ba21eef88f84ee6b997ad8be75448e3bfdaa67d978ea167e2feb21bc9ce0839741a62fb60fa045e45edf2 diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild b/net-im/ejabberd/ejabberd-16.09.ebuild new file mode 100644 index 00000000..cb5c9fe --- /dev/null +++ b/net-im/ejabberd/ejabberd-16.09.ebuild @@ -0,0 +1,297 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +SSL_CERT_MANDATORY=1 + +inherit eutils pam rebar ssl-cert systemd + +DESCRIPTION="Robust, scalable and extensible XMPP server" +HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"; +SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz + -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +REQUIRED_USE="mssql? ( odbc )" +# TODO: Add 'tools' flag. +IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis + riak roster-gw sqlite zlib" + +RESTRICT="test" + +# TODO: Add dependencies for 'tools' flag enabled. +# TODO: tools? ( +# TODO: >=dev-erlang/meck-0.8.4 +# TODO: >=dev-erlang/moka-1.0.5b +# TODO: ) +CDEPEND=" + >=dev-erlang/cache_tab-1.0.4 + >=dev-erlang/esip-1.0.8 + >=dev-erlang/fast_tls-1.0.7 + >=dev-erlang/fast_xml-1.1.15 + >=dev-erlang/fast_yaml-1.0.6 + >=dev-erlang/jiffy-0.14.7 + >=dev-erlang/lager-3.2.1 + >=dev-erlang/luerl-0.2 + >=dev-erlang/p1_oauth2-0.6.1 + >=dev-erlang/p1_utils-1.0.5 + >=dev-erlang/stringprep-1.0.6 + >=dev-erlang/stun-1.0.7 + >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] + >=net-im/jabber-base-0.01 + ldap? ( =net-nds/openldap-2* ) + mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) + nls? ( >=dev-erlang/iconv-1.0.2 ) + odbc? ( dev-db/unixODBC ) + pam? ( >=dev-erlang/p1_pam-1.0.0 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) + redis? ( >=dev-erlang/eredis-1.0.8 ) + riak? ( + >=dev-erlang/hamcrest-0.1.0_p20150103 + >=dev-erlang/riakc-2.1.1_p20151111 + ) + sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) + zlib? ( >=dev-erlang/ezlib-1.0.1 )" +DEPEND="${CDEPEND} + >=sys-apps/gawk-4.1" +RDEPEND="${CDEPEND} + captcha? ( media-gfx/imagemagick[truetype,png] )" + +DOCS=( README ) +PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" ) + +EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" +# Paths in net-im/jabber-base +JABBER_ETC="${EPREFIX}/etc/jabber" +JABBER_LOG="${EPREFIX}/var/log/jabber" +JABBER_SPOOL="${EPREFIX}/var/spool/jabber" + +# Adjust example configuration file to Gentoo. +# - Use our sample certificates. +# - Correct PAM service name. +adjust_config() { + sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \ + -e "s|\"pamservicename\"|\"xmpp\"|" \ + -i "${S}/ejabberd.yml.example" \ + || die 'failed to adjust example config' +} + +# Set paths to ejabberd lib directory consistently to point always to directory +# suffixed with version. +correct_ejabberd_paths() { + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ + -i "${S}/Makefile.in" \ + || die 'failed to set ejabberd path in Makefile.in' + sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ejabberd path in ejabberdctl.template' + sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \ + -i "${S}/ejabberd.yml.example" \ + || die 'failed to correct path to captcha.sh in example config' +} + +# Get epam-wrapper from 'files' directory and correct path to lib directory in +# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper +# file exists there already. +customize_epam_wrapper() { + local epam_wrapper_src="$1" + local epam_wrapper_dst="${S}/epam-wrapper" + + [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' + sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ + "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ + || die 'failed to install epam-wrapper' +} + +# Check if there already exists a certificate. +ejabberd_cert_exists() { + local cert + + for cert in $(gawk -- \ + 'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \ + "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do + [[ -f ${cert} ]] && return 0 + done + + return 1 +} + +# Generate and install sample ejabberd certificate. It's installed into +# EJABBERD_CERT path. +ejabberd_cert_install() { + SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}" + install_cert "${EJABBERD_CERT%.*}" + chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die + chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die +} + +# Get path to ejabberd lib directory. +# +# This is the path ./configure script Base for this path is path set in +# ./configure script which is /usr/lib by default. If libdir is explicitely set +# to something else than this should be adjusted here as well. +get_ejabberd_path() { + echo "/usr/$(get_libdir)/${P}" +} + +# Make ejabberd.service for systemd from upstream provided template. +make_ejabberd_service() { + sed -r \ + -e 's!@ctlscriptpath@!/usr/sbin!' \ + -e 's!(User|Group)=(.*)!\1=jabber!' \ + "${PN}.service.template" >"${PN}.service" \ + || die 'failed to make ejabberd.service' +} + +# Set paths to defined by net-im/jabber-base. +set_jabberbase_paths() { + sed -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 "${S}/Makefile.in" \ + || die 'failed to set paths in Makefile.in' + sed -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 "${S}/ejabberdctl.template" \ + || die 'failed to set paths ejabberdctl.template' +} + +# Skip installing docs because it's only COPYING that's installed by Makefile. +skip_docs() { + gawk -i inplace ' +/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ { + if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) { + print $0; + } else { + next; + } +} +1 +' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in' +} + +src_prepare() { + default + + rebar_remove_deps + correct_ejabberd_paths + set_jabberbase_paths + make_ejabberd_service + skip_docs + adjust_config + customize_epam_wrapper "${FILESDIR}/epam-wrapper" + + # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory + # rather than its parent which is default. That way ejabberd directory + # takes precedence is module lookup. + local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" + sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ERL_LIBS in ejabberdctl.template' +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --enable-user=jabber \ + $(use_enable debug) \ + $(use_enable full-xml) \ + $(use_enable hipe) \ + $(use_enable mssql) \ + $(use_enable mysql) \ + $(use_enable nls iconv) \ + $(use_enable odbc) \ + $(use_enable pam) \ + $(use_enable postgres pgsql) \ + $(use_enable redis) \ + $(use_enable riak) \ + $(use_enable roster-gw roster-gateway-workaround) \ + $(use_enable sqlite) \ + $(use_enable zlib) +} + +src_compile() { + emake REBAR='rebar -v' src +} + +src_install() { + default + + if use pam; then + local epam_path="$(get_ejabberd_path)/priv/bin/epam" + + pamd_mimic_system xmpp auth account || die "cannot create pam.d file" + into "$(get_ejabberd_path)/priv" + newbin epam-wrapper epam + # PAM helper module permissions + # https://www.process-one.net/docs/ejabberd/guide_en.html#pam + fowners root:jabber "${epam_path}" + fperms 4750 "${epam_path}" + fi + + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + systemd_dounit "${PN}.service" + systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" "${PN}" +} + +pkg_postinst() { + if [[ ! ${REPLACING_VERSIONS} ]]; then + echo + elog "For configuration instructions, please see" + elog " http://www.process-one.net/en/ejabberd/docs/"; + echo + if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then + ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after" + ewarn "migration to ${PV}. pubsub data may not be migrated automatically and" + ewarn "you may need to run migration script manually, see:" + ewarn + ewarn " https://github.com/processone/ejabberd/issues/479#issuecomment-124497456"; + ewarn + ewarn "In case you don't care about all stored moods, activities, geoinfo and you" + ewarn "know you don't store in pubsub anything important, you can just remove" + ewarn "pubsub tables:" + ewarn + ewarn " rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*" + ewarn + ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244"; + echo + fi + elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then + elog "Ejabberd now defaults to using a YAML format for its config file." + elog "The old ejabberd.cfg file can be converted using the following instructions:" + echo + elog "1. Make sure all processes related to the previous version of ejabberd aren't" + elog " running. Usually this just means the ejabberd and epmd daemons and possibly" + elog " the pam-related process (epam) if pam support is enabled." + elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can" + elog " fail to start ejabberd properly for various reasons. Check ejabberd's main" + elog " log file at /var/log/jabber/ejabberd.log to confirm it started successfully." + elog "3. Run" + elog " \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`" + elog " with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to" + elog " /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config" + elog " file." + echo + fi + + if ! ejabberd_cert_exists; then + ejabberd_cert_install + fi + + if use pam; then + # sfperms drops read bit from files with suid. Reapply it. + # Fix bug #592218. + local epam_path="$(get_ejabberd_path)/priv/bin/epam" + chmod g+r "${EROOT%/}${epam_path}" \ + || die "failed to correct ${epam_path} permissions" + fi +} diff --git a/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch new file mode 100644 index 00000000..6001c65 --- /dev/null +++ b/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch @@ -0,0 +1,62 @@ +From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <[email protected]> +Date: Mon, 29 Aug 2016 22:29:41 +0100 +Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup + +Set SHELL since the generic jabber user used on Gentoo for jabber +servers doesn't have a valid shell set by default and fix EXEC_CMD +otherwise it fails with "This account is currently not available" again +due to jabber not having a valid shell. + +Also, workaround the assumption that jabber's $HOME is a directory when +instead it defaults to /dev/null on Gentoo. +--- + ejabberdctl.template | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/ejabberdctl.template b/ejabberdctl.template +index 5b34ebe..3c080fd 100755 +--- a/ejabberdctl.template ++++ b/ejabberdctl.template +@@ -16,6 +16,7 @@ IEX={{bindir}}/iex + EPMD={{epmd}} + INSTALLUSER={{installuser}} + ERL_LIBS={{libdir}} ++SHELL=/bin/sh + + # check the proper system user is used if defined + if [ "$INSTALLUSER" != "" ] ; then +@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then + for GID in `id -G`; do + if [ $GID -eq 0 ] ; then + INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6) +- if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then ++ if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then + mkdir -p "$INSTALLUSER_HOME" + chown "$INSTALLUSER" "$INSTALLUSER_HOME" + fi +- EXEC_CMD="su $INSTALLUSER -c" ++ EXEC_CMD="su $INSTALLUSER -p -c" + fi + done + if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then +@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log + DATETIME=`date "+%Y%m%d-%H%M%S"` + ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump + ERL_INETRC=$ETC_DIR/inetrc ++HOME=$SPOOL_DIR + + # define mnesia options + MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS" +@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES + export CONTRIB_MODULES_PATH + export CONTRIB_MODULES_CONF_DIR + export ERL_LIBS ++export HOME ++export SHELL + + shell_escape_str() + { +-- +2.9.2 +
