public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
Date: Fri, 10 Feb 2023 12:40:45 +0000 (UTC)	[thread overview]
Message-ID: <1676032787.7ea044932b2baf0c070bcd65d7d32eb8ab528147.flow@gentoo> (raw)

commit:     7ea044932b2baf0c070bcd65d7d32eb8ab528147
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 12:23:45 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 12:39:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea04493

net-im/ejabberd: add 23.01

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-im/ejabberd/Manifest              |   1 +
 net-im/ejabberd/ejabberd-23.01.ebuild | 219 ++++++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 308fe35abac5..e8affd8a2f51 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,4 @@
 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
+DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4 SHA512 3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b

diff --git a/net-im/ejabberd/ejabberd-23.01.ebuild b/net-im/ejabberd/ejabberd-23.01.ebuild
new file mode 100644
index 000000000000..99ac7b8d7df3
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-23.01.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2023 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.36
+	>=dev-erlang/yconf-1.0.15
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/jose-1.11.5
+	>=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.1
+	>=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.22
+	>=dev-erlang/base64url-1.0.1
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.21 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.14 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.20 )
+	redis? ( >=dev-erlang/eredis-1.2.0 )
+	sip? ( >=dev-erlang/esip-1.0.49 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.14 )
+	stun? ( >=dev-erlang/stun-1.2.7 )
+	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
+}


             reply	other threads:[~2023-02-10 12:40 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-10 12:40 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-06  0:04 [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/ Sam James
2025-04-05 18:25 Florian Schmaus
2025-04-05 18:25 Florian Schmaus
2025-02-14 15:18 Florian Schmaus
2024-11-08 20:21 Florian Schmaus
2024-10-18  8:36 Florian Schmaus
2024-10-18  8:27 Florian Schmaus
2024-08-05 20:42 Sam James
2024-06-10 20:05 Arthur Zamarin
2024-04-16 14:55 Florian Schmaus
2024-04-16 14:50 Florian Schmaus
2024-03-12 19:31 Florian Schmaus
2024-03-10 20:10 Florian Schmaus
2023-12-11 15:44 Florian Schmaus
2023-12-10 10:53 Florian Schmaus
2023-12-06 21:20 Arthur Zamarin
2023-07-30 17:22 Florian Schmaus
2023-07-29 20:20 Florian Schmaus
2023-07-28 18:56 Sam James
2023-07-28 14:28 Florian Schmaus
2023-02-10 20:36 Sam James
2022-09-21 19:56 Florian Schmaus
2022-07-16 14:46 Florian Schmaus
2022-07-05  8:52 Agostino Sarubbo
2022-05-17 20:02 Florian Schmaus
2022-03-23  8:33 Florian Schmaus
2022-03-23  8:33 Florian Schmaus
2022-03-23  8:33 Florian Schmaus
2022-02-01  7:22 Hanno Böck
2022-01-20 20:10 Florian Schmaus
2021-12-12 18:56 Florian Schmaus
2021-12-10  9:26 Florian Schmaus
2021-12-07 10:42 Florian Schmaus
2021-07-30 23:31 Sam James
2021-07-08 18:37 Florian Schmaus
2021-07-08 15:37 Florian Schmaus
2021-06-02  1:13 Sam James
2021-06-01  9:35 Sam James
2021-06-01  9:35 Sam James
2021-05-16 13:49 Sergei Trofimovich
2021-03-07 11:58 David Seifert
2020-10-14 16:20 Hanno Böck
2020-08-23  8:24 Sergei Trofimovich
2020-08-23  8:12 Hanno Böck
2020-08-06 11:52 Agostino Sarubbo
2020-08-06 11:47 Agostino Sarubbo
2020-07-20 11:52 Sam James
2020-07-19 13:33 Sergei Trofimovich
2020-07-17 11:01 Sam James
2020-07-12  8:08 Sergei Trofimovich
2020-07-12  2:41 Sam James
2020-05-04 18:54 Hanno Böck
2020-05-04 11:55 Hanno Böck
2019-07-13 10:10 Amadeusz Piotr Żołnowski
2018-12-04 22:01 Amadeusz Piotr Żołnowski
2018-05-27 15:33 Mikle Kolyada
2018-05-27 14:14 Thomas Deutschmann
2018-04-18 18:11 Pacho Ramos
2018-03-28 19:01 Pacho Ramos
2018-03-26 18:40 Aaron Bauman
2017-12-06 22:18 Amadeusz Piotr Żołnowski
2017-07-09 20:17 Amadeusz Piotr Żołnowski
2017-07-09 20:14 Amadeusz Piotr Żołnowski
2017-05-28 18:06 Amadeusz Piotr Żołnowski
2017-05-27 20:55 Amadeusz Piotr Żołnowski
2017-05-27 20:55 Amadeusz Piotr Żołnowski
2017-05-17 20:34 Amadeusz Piotr Żołnowski
2017-04-19 20:10 Amadeusz Piotr Żołnowski
2017-01-02  9:35 Amadeusz Piotr Żołnowski
2017-01-01 21:49 Agostino Sarubbo
2016-12-23  7:48 Aaron Bauman
2016-08-27 13:27 Amadeusz Piotr Żołnowski
2016-08-27 13:27 Amadeusz Piotr Żołnowski
2016-08-27 13:27 Amadeusz Piotr Żołnowski
2016-08-27 13:27 Amadeusz Piotr Żołnowski
2016-08-27 13:12 Amadeusz Piotr Żołnowski
2016-08-27 13:12 Amadeusz Piotr Żołnowski
2016-08-27  7:05 Amadeusz Piotr Żołnowski
2016-08-21 10:49 Amadeusz Piotr Żołnowski
2016-08-20 22:22 Anthony G. Basile
2016-08-20  3:18 Matthias Maier
2016-08-19 20:23 Amadeusz Piotr Żołnowski
2016-07-13 20:36 Amadeusz Piotr Żołnowski
2016-07-09  9:33 Amadeusz Piotr Żołnowski
2016-07-03 17:39 Amadeusz Piotr Żołnowski
2016-07-03  7:44 Amadeusz Piotr Żołnowski
2016-06-14 19:21 Amadeusz Piotr Żołnowski
2016-06-13 21:36 Amadeusz Piotr Żołnowski
2016-06-07 21:35 Amadeusz Piotr Żołnowski
2016-05-05  9:53 Anthony G. Basile
2016-01-24 10:47 Amadeusz Piotr Żołnowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1676032787.7ea044932b2baf0c070bcd65d7d32eb8ab528147.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox