From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86A55158020 for ; Fri, 28 Oct 2022 20:58:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 802EEE0924; Fri, 28 Oct 2022 20:58:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 683A3E0924 for ; Fri, 28 Oct 2022 20:58:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0FC1E341244 for ; Fri, 28 Oct 2022 20:58:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F35B6DC for ; Fri, 28 Oct 2022 20:58:00 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1666990659.e0ed0500560d9f796c8a197e10ecfd6f2d993e5c.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/ejabberd/Manifest net-im/ejabberd/ejabberd-22.10.ebuild net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch X-VCS-Directories: net-im/ejabberd/files/ net-im/ejabberd/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: e0ed0500560d9f796c8a197e10ecfd6f2d993e5c X-VCS-Branch: master Date: Fri, 28 Oct 2022 20:58:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cf905002-7c74-47d9-b4b8-319e36e61eab X-Archives-Hash: bc65d8e15ee7f62c019d3c9f9c010b7a commit: e0ed0500560d9f796c8a197e10ecfd6f2d993e5c Author: Florian Schmaus gentoo org> AuthorDate: Fri Oct 28 19:10:54 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Oct 28 20:57:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0ed0500 net-im/ejabberd: add 22.10 Closes: https://github.com/gentoo/gentoo/pull/28011 Signed-off-by: Florian Schmaus gentoo.org> net-im/ejabberd/Manifest | 1 + net-im/ejabberd/ejabberd-22.10.ebuild | 219 +++++++++++++++++++++ ...djust-ejabberd.service.template-to-Gentoo.patch | 16 ++ 3 files changed, 236 insertions(+) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index df8cc1d38ab8..308fe35abac5 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,2 +1,3 @@ DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865 DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da +DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B 670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3 SHA512 3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942 diff --git a/net-im/ejabberd/ejabberd-22.10.ebuild b/net-im/ejabberd/ejabberd-22.10.ebuild new file mode 100644 index 000000000000..d872abcb6285 --- /dev/null +++ b/net-im/ejabberd/ejabberd-22.10.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools pam rebar systemd + +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 +" + +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.16 + >=dev-erlang/fast_xml-1.1.49 + >=dev-erlang/fast_yaml-1.0.34 + >=dev-erlang/yconf-1.0.14 + >=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.29 + >=dev-erlang/xmpp-1.6.0 + >=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.20 + >=dev-erlang/base64url-1.0.1 + ldap? ( =net-nds/openldap-2* ) + mysql? ( >=dev-erlang/p1_mysql-1.0.20 ) + odbc? ( dev-db/unixODBC ) + pam? ( >=dev-erlang/epam-1.0.12 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.19 ) + redis? ( >=dev-erlang/eredis-1.2.0 ) + sip? ( >=dev-erlang/esip-1.0.48 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) + stun? ( >=dev-erlang/stun-1.2.6 ) + zlib? ( >=dev-erlang/ezlib-1.0.12 ) +" +RDEPEND=" + ${DEPEND} + >=acct-user/ejabberd-2[pam?] + captcha? ( media-gfx/imagemagick[truetype,png] ) + selinux? ( sec-policy/selinux-jabber ) +" + +DOCS=( CHANGELOG.md README.md ) +PATCHES=( + "${FILESDIR}/ejabberd-22.10-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 ejabberd.service +} + +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" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}" + + keepdir /var/{lib,log}/ejabberd +} + +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.10-adjust-ejabberd.service.template-to-Gentoo.patch b/net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch new file mode 100644 index 000000000000..f607f48037ae --- /dev/null +++ b/net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch @@ -0,0 +1,16 @@ +From c0af543fc3b6047f66bfe820e7ce75abd3ed2049 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Fri, 10 Dec 2021 12:36:45 +0100 +Subject: [PATCH] Adjust ejabberd.service.template to Gentoo + +--- a/ejabberd.service.template ++++ b/ejabberd.service.template +@@ -1,6 +1,7 @@ + [Unit] + Description=XMPP Server +-After=network.target ++After=epmd.service network.target ++Requires=epmd.service + + [Service] + Type=notify