gentoo auto-resync : 06:04:2025 - 01:34:40

4 files changed, 213 insertions, 7 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 16043dcc9686..bf4597bd9839 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 7caa4e5f22ef..e1e09c363f99 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -10,10 +10,11 @@ DIST ejabberd-24.02.tar.gz 2531049 BLAKE2B 6d18393dd909ef580fdcc173fb927a1302f7d
 DIST ejabberd-24.07-fix-ejabberdctl.patch 1945 BLAKE2B 3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808 SHA512 0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d
 DIST ejabberd-24.07-set-ejabberd-opts.patch 1508 BLAKE2B 1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa SHA512 aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5
 DIST ejabberd-24.07.tar.gz 2522211 BLAKE2B 32ac7abbbb2acebfc409e93bde097104354664227cac7e1d673f224681900b1dae74aa770141e520c5d4b35a6bc7748f889ab9647cac812f407f7a0ec8da50f9 SHA512 e53c5082c92297ff956b4d811d69ba5b745a1989590e73dc890663cfcdea102e27bafa79452062883a7de8fdf5b5c481d81c68c61a3e888f5e5b668e9ac9bf3c
-DIST ejabberd-24.10-fix-ejabberdctl.patch 1945 BLAKE2B 3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808 SHA512 0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d
-DIST ejabberd-24.10-set-ejabberd-opts.patch 1508 BLAKE2B 1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa SHA512 aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5
 DIST ejabberd-24.10.tar.gz 2532726 BLAKE2B bc59958150f0a3f4bf495ac42d8362c87d9979a57c9ac372826582203b6b3b00bee63897da1f436ab1833bbaa5c49f7da973d07009fb1f27ca5e2f314e955c9c SHA512 dc32e341d5a5cf0c02574b14059ed95feaa8d840080a7c9367186b9a076ab0124df5b54b522732cd9541ed53140cff4024abe8353e91af18abd3c76d69fe9e19
+DIST ejabberd-25.03-fix-sqlite-schema.patch 1952 BLAKE2B 3196c90c2f38093530e0f5a5a86269a886a97a42c45337203dcc8da820660cf71eef41e8dc820e81c0d55a7cf4b28db0c6d0028c3c04ca0e2fcf44f54932c72d SHA512 1189e2ed055d8d650714653e7447126fdc412e7058022d9f00d6156fd37938f568ba634e6e8f78985056031d366a6e4038616c95fb141c1c83196550c9d84f58
+DIST ejabberd-25.03.tar.gz 2593226 BLAKE2B dc7cb28535ad7df2a2a6de5e9ee24da1dc8e6999a25d07427c97b4450d754fe6fbb4e2bc220d42984601e05c61fc4287e96016f409687f1892b84124de4de3a4 SHA512 3bb8ccddc1e89e00dd4dc3974ee02d1077133608a6df4900eca7133abac4bb6712e81595a02052973a6c94ebfa82140d2d009b6d718aeb0fe656dbd1d4a26263
 EBUILD ejabberd-24.02-r1.ebuild 7046 BLAKE2B 81319a0196bbb12e890cdd01cb43847b1b9e9cee90186341800184f8bdf3521f08fe6d56363a28de414ee0de1540a7c97bb1c077293f233e169fc6850e545f6b SHA512 9dbf247f766c1a26ef90195f36d3c6d43e540f7fc6cc314e611484b2e44ac7ad2a958572320ffec51409360128989e1c0a938af47237a7a5380745621c34fc9c
 EBUILD ejabberd-24.07.ebuild 7052 BLAKE2B c6d6457fd5807cd2485da847e5771ad71a729bd8b5fa8109b1980f32f4a3f1e070223ba09f424bc9d46a6e7c1c34c6fece31c9828e073e56824fa05cfa0f11f8 SHA512 f7ee9a6a00e635cc707e0c26d5d5fb8f093a68a5d9c1c7646c0b40d784b60b099c034a28655c2343d536cf4d60c010a285546b6c4fdfa6ed8fa875a56472bf6d
-EBUILD ejabberd-24.10.ebuild 6847 BLAKE2B 13f8da502d3dd0c5aeb57fb19c4c786c54281060d27e3a244aff497cfa6ec153d65e1f6f769ef44424b54587d23aa7408567153db89b9bac00f804ddfb332894 SHA512 f4336c201a2253609c55fc939bd92f3a8adea04d6dfa6bdd8955d3dddc1c52c4320eedbe4aa5720114b0e57d842775c4269da3f60e9f3c3b6f7fa5d7ec829d7b
+EBUILD ejabberd-24.10.ebuild 6593 BLAKE2B 6afdb5ad4eb84032f3b6ad5f50dba62552664b56df8ee962c5912be1c279f0158e33e5003b53ff3857b4d55d278c4ad20e7c39e2bd9106780fa354bc08fa6491 SHA512 890622ae75e35170b43d5c6dd8be8a9cb7584a944b89249ce223c5d2eb7e01810c539dba0088930c5aaec21f3aff13ca9ae8849b53bb5e17b2ab293e57ef4bc4
+EBUILD ejabberd-25.03.ebuild 6776 BLAKE2B 3d016680b4b65df2ae8218a50f446d05314524f51f3a9448be2b1902b8f59ac606a95a3b81cf875053c9be869ced23032928f3de609e5a439b08a4b01dc49187 SHA512 62919532597e6dec24f3a9e245dc2b2bfe2ac0723f0d6112c7a068cb04b734c088619c863bd938ae121ffdc5cffc84c2d1e4d7cc4cd4785f44af353d7f97132d
 MISC metadata.xml 1484 BLAKE2B 74f0ec404b37dfe72d8751dd8bc8f0ba0b56f334939a5311af70df4616f19e536209b9be7361b35c8e5d316fbce623afdbf7e3ce53a139eb0d2e0d895275ae3c SHA512 793584e1e44c3a651b15eed84a91a801cd809392ccf7623f1a1b222e65641f8dca18515fb90e42e4a51178f4686d3c61778e14834be23feb23b269b4f07c91fb
diff --git a/net-im/ejabberd/ejabberd-24.10.ebuild b/net-im/ejabberd/ejabberd-24.10.ebuild
index fd1ef9305509..e099302cec93 100644
--- a/net-im/ejabberd/ejabberd-24.10.ebuild
+++ b/net-im/ejabberd/ejabberd-24.10.ebuild
@@ -9,10 +9,6 @@ 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
-	https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch ->
-		${P}-fix-ejabberdctl.patch
-	https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch ->
-		${P}-set-ejabberd-opts.patch
 "
 
 LICENSE="GPL-2"
diff --git a/net-im/ejabberd/ejabberd-25.03.ebuild b/net-im/ejabberd/ejabberd-25.03.ebuild
new file mode 100644
index 000000000000..532b5f0e3141
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-25.03.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools eapi9-ver 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
+	https://github.com/processone/ejabberd/commit/5008947e326f24fa88f9c06c970630047d6b1020.patch ->
+		${PN}-25.03-fix-sqlite-schema.patch
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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-20[odbc?,ssl]
+	>=dev-erlang/cache_tab-1.0.31
+	>=dev-erlang/eimp-1.0.24
+	>=dev-erlang/fast_tls-1.1.22
+	>=dev-erlang/fast_xml-1.1.55
+	>=dev-erlang/fast_yaml-1.0.37
+	>=dev-erlang/yconf-1.0.18
+	>=dev-erlang/jiffy-1.1.1
+	>=dev-erlang/jose-1.11.10
+	>=dev-erlang/lager-3.9.1
+	>=dev-erlang/p1_oauth2-0.6.14
+	>=dev-erlang/p1_utils-1.0.27
+	>=dev-erlang/stringprep-1.0.31
+	>=dev-erlang/xmpp-1.10.0
+	>=dev-erlang/pkix-1.0.10
+	>=dev-erlang/mqtree-1.0.17
+	>=dev-erlang/idna-6.0.0-r1
+	>=dev-erlang/p1_acme-1.0.25
+	>=dev-erlang/base64url-1.0.1
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.25 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.14 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.32 )
+	redis? ( >=dev-erlang/eredis-1.2.0 )
+	sip? ( >=dev-erlang/esip-1.0.57 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.15 )
+	stun? ( >=dev-erlang/stun-1.2.17 )
+	zlib? ( >=dev-erlang/ezlib-1.0.13 )
+"
+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"
+	"${DISTDIR}"/${PN}-25.03-fix-sqlite-schema.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'
+
+	# 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} \
+		--with-rebar=rebar \
+		$(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() {
+	# Starting 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 ver_replacing -lt 21.04-r1; 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
+}