commit: c8d1e4560d3eff6e034ef1ef2e83ef37f4702510
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 18:46:36 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May 17 20:01:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d1e456
net-im/ejabberd: add 22.05
Fix bashism in OpenRC init script. Drop support for logrotate in favor
of ejabberd's built-in log rotation mechanism.
Also depend on >=acct-user/ejabberd-1, which will create the ejabberd
with HOME set to /var/lib/ejabberd, i.e., ejabberd's spool
directory. This allows us to drop ${PN}-19.08-ejabberdctl.patch.
Closes: https://bugs.gentoo.org/841976
Closes: https://github.com/gentoo/gentoo/pull/25540
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-im/ejabberd/Manifest | 2 +
net-im/ejabberd/ejabberd-22.05.ebuild | 232 +++++++++++++++++++++++++++++
net-im/ejabberd/files/ejabberd-22.05.initd | 54 +++++++
3 files changed, 288 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 4507c95a647f..e8815deaf151 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,4 @@
DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B
847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2
SHA512
4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B
6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093
SHA512
81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
+DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B
d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9
SHA512
33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
+DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B
634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce
SHA512
42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
diff --git a/net-im/ejabberd/ejabberd-22.05.ebuild
b/net-im/ejabberd/ejabberd-22.05.ebuild
new file mode 100644
index 000000000000..029431d351cb
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-22.05.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam rebar systemd verify-sig
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/";
+SRC_URI="
+ https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+ verify-sig? (
https://github.com/processone/${PN}/releases/download/${PV}/${P}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO: >=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+ >=dev-lang/erlang-19.3[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.30
+ >=dev-erlang/eimp-1.0.22
+ >=dev-erlang/fast_tls-1.1.15
+ >=dev-erlang/fast_xml-1.1.49
+ >=dev-erlang/fast_yaml-1.0.33
+ >=dev-erlang/yconf-1.0.13
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.11.2
+ >=dev-erlang/lager-3.9.1
+ >=dev-erlang/p1_oauth2-0.6.11
+ >=dev-erlang/p1_utils-1.0.25
+ >=dev-erlang/stringprep-1.0.28
+ >=dev-erlang/xmpp-1.5.6
+ >=dev-erlang/pkix-1.0.9
+ >=dev-erlang/mqtree-1.0.15
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.19
+ >=dev-erlang/base64url-1.0.1
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.12 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.18 )
+ redis? ( >=dev-erlang/eredis-1.2.0 )
+ sip? ( >=dev-erlang/esip-1.0.45 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
+ stun? ( >=dev-erlang/stun-1.2.2 )
+ zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+ ${DEPEND}
+ >=acct-user/ejabberd-1
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+ "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# 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}"
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ rebar_remove_deps
+
+ # Set paths to ejabberd lib directory consistently to point always to
directory
+ # suffixed with version.
+ 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'
+
+ # 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.
+ local epam_wrapper_src="${FILESDIR}/epam-wrapper"
+ 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'
+
+ rebar_fix_include_path fast_xml
+ rebar_fix_include_path p1_utils
+ rebar_fix_include_path xmpp
+
+ # 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" \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-user=${PN} \
+ $(use_enable debug) \
+ $(use_enable full-xml) \
+ $(use_enable mssql) \
+ $(use_enable mysql) \
+ $(use_enable odbc) \
+ $(use_enable pam) \
+ $(use_enable postgres pgsql) \
+ $(use_enable redis) \
+ $(use_enable roster-gw roster-gateway-workaround) \
+ $(use_enable sqlite) \
+ $(use_enable sip) \
+ $(use_enable stun) \
+ $(use_enable zlib)
+
+ # more options to support
+ # --enable-elixir requires https://github.com/elixir-lang/elixir
+}
+
+src_compile() {
+ # Note that we also add ejabberdctl.example, which will be used by
+ # ejabberd's build system to create /usr/sbin/ejabberdctl, as
+ # target. Otherwise, ejabberdctl.example is due to be created by the
+ # 'install' target (as per upstream's Makefile.in). However when
+ # invoke the 'install' target (in src_install below), DESTDIR is
+ # set, which causes DESTDIR to scope into the ejabberdctl.example
+ # generation.
+ emake REBAR='rebar -v' src ejabberdctl.example
+}
+
+src_install() {
+ default
+
+ if use pam; then
+ local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+ pamd_mimic_system xmpp auth account
+ into "$(get_ejabberd_path)/priv"
+ newbin epam-wrapper epam
+ fi
+
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}"
+ systemd_dounit "${PN}.service"
+
+ keepdir /var/{lib,log}/ejabberd
+}
+
+pkg_preinst() {
+ if use pam; then
+ einfo "Adding ejabberd user to epam group to allow ejabberd to
use PAM" \
+ "authentication"
+ # See
+ #
<https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+ # epam binary is installed by dev-erlang/epam package,
therefore SUID
+ # is set by that package. Instead of jabber group it uses epam
group,
+ # therefore we need to add jabber user to epam group.
+ usermod -a -G epam ejabberd || die
+ fi
+}
+
+pkg_postinst() {
+ local migrate_to_ejabberd_user=false
+
+ if [[ ${REPLACING_VERSIONS} ]]; then
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "${v}" -lt 21.04-r1; then
+ migrate_to_ejabberd_user=true
+ break
+ fi
+ done
+ fi
+
+ # Sarting with >=21.04-r1, the ejabberd configuration is now in
+ # /etc/ejabberd and no longer in /etc/jabber. See if we need to
+ # migrate the configuration. Furthermore, ejabberd no longer runs
+ # under the, shared via net-im/jabber-base, 'jabber' use, but under
+ # its own user. This increase isolation and hence robustness and
+ # security.
+ if $migrate_to_ejabberd_user; then
+ ewarn "Newer versions of the ejabberd Gentoo package use
/etc/ejabberd"
+ ewarn "(just as upstream) and *not* /etc/jabber."
+ ewarn "The files from /etc/jabber will now be copied to
/etc/ejabberd."
+ ewarn "Also ejabberd's spool directory became /var/lib/ejabberd
(was /var/spool/jabber)."
+ ewarn "Please check your configuration, and finish the
migration by stopping ejabberd"
+ ewarn "followed by rsync'ing /var/spool/jabber to
/var/lib/ejabberd."
+
+ local -A dirs_to_migrate=(
+ [/etc/jabber]=/etc/ejabberd
+ [/var/spool/jabber]=/var/lib/ejabberd
+ )
+
+ for src_dir in "${!dirs_to_migrate[@]}"; do
+ local eroot_src_dir="${EROOT}${src_dir}"
+ local
eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
+
+ cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die
"Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+ if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0
]]; then
+ rm
"${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+ fi
+ if ! use prefix; then
+ chown --recursive ejabberd:ejabberd
"${eroot_dst_dir}" || die
+ fi
+ done
+ fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-22.05.initd
b/net-im/ejabberd/files/ejabberd-22.05.initd
new file mode 100644
index 000000000000..57f9cd5aa335
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-22.05.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+ use dns
+ need epmd net
+ provide jabber-server
+}
+
+start() {
+ if ejabberdctl status >/dev/null 2>&1; then
+ ewarn "ejabberd is already started (manually?)."
+ return 0
+ fi
+ ebegin "Starting ejabberd"
+ /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading ejabberd configuration"
+ /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config
+ eend $?
+}
+
+stop() {
+ ejabberdctl status >/dev/null 2>&1
+ if test $? = 3; then
+ ewarn "ejabberd is already stopped (manually?)."
+ return 0
+ fi
+ ebegin "Stopping ejabberd"
+ if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
+ cnt=0
+ sleep 1
+ while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
+ echo .
+ cnt=`expr $cnt + 1`
+ if [ $cnt -ge 60 ] ; then
+ eend 1
+ break
+ fi
+ sleep 1
+ done
+ eend 0
+ else
+ eend 1
+ einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's
going on."
+ fi
+ eend 0
+}
