gentoo auto-resync : 12:02:2023 - 09:56:54

8 files changed, 229 insertions, 9 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index cac1effa9e3b..a278f9ca342b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 47c85400d19a..6aaec560d5fc 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -7,6 +7,8 @@ AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aa
 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
 EBUILD ejabberd-22.05-r2.ebuild 7136 BLAKE2B 35e34dede32c4067dd35b54d7a98cd864ddbeb4fa50d14b812dbda642d7d44be5f54a79edd446917975f349dc6680f5bafaf03af9aa11eb722fef38cd3ea04a8 SHA512 6da99fe902f7ba9a62ea1f60d018e3ef7a1fb9eac48d7b3dc9c3503fab388b631e8cbb3b328bc5277ae2ece1cbb0fc5310c034d407c413a2bbb57f3e648b90fd
-EBUILD ejabberd-22.10.ebuild 6926 BLAKE2B f1d03d20bc0d672ff076d76b433dfff8a4dac566cc237d91f39af9af0f6cba419e9a0414d2e4fad8047c670f5a640af24e393d3fefde86bbc5adfbeb1d869f47 SHA512 18ae55e2d445db5d23b38425384ac7ebab772aa88229ef5c1e97f5bd7e9c6b520c382f482ae7f6f94818fd7fc7f4e530eddf0d54c3443081a445898e8cf3d5ba
+EBUILD ejabberd-22.10.ebuild 6925 BLAKE2B acf99298e11c8bb573be35d3cfda71d2789b884027bc2366a432b6d3a9df78c82868fe075d8f99b0b62a11be332fa728910c7677a05e1cc5a28fbaa4820658dc SHA512 f93095f1d16a3a85d9c2b44c12f04656f3222614826bf5b6d8808cecfe9a1aad1904a0a56fe5874a7f96f549a74738587e13088ee6759b7678fa7fd2593a87d3
+EBUILD ejabberd-23.01.ebuild 6926 BLAKE2B e55efacf9c537cd45384270772b1111782a53335a5ff1d15358c7c30f6dd38d40e03a7bd6ae1305c3ba4c08a73e8649aa6e76d29c7ed3c70d67919b11055541e SHA512 9f2c36ab8009ea058f4b8beb1429ba1ddf000698a52cf5784d6d9df4c844ff9d04af85478a2d8654329621939a353c012fb1e4b3166aee9c4e9a30e153059f94
 MISC metadata.xml 1484 BLAKE2B 74f0ec404b37dfe72d8751dd8bc8f0ba0b56f334939a5311af70df4616f19e536209b9be7361b35c8e5d316fbce623afdbf7e3ce53a139eb0d2e0d895275ae3c SHA512 793584e1e44c3a651b15eed84a91a801cd809392ccf7623f1a1b222e65641f8dca18515fb90e42e4a51178f4686d3c61778e14834be23feb23b269b4f07c91fb
diff --git a/net-im/ejabberd/ejabberd-22.10.ebuild b/net-im/ejabberd/ejabberd-22.10.ebuild
index d872abcb6285..e7e5988884bb 100644
--- a/net-im/ejabberd/ejabberd-22.10.ebuild
+++ b/net-im/ejabberd/ejabberd-22.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+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
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
+}
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 6e23db7fcb9e..ab79a623ba49 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.11.8_amd64.deb 81824720 BLAKE2B a359d51bf946bbca2ee76f961533d02bcfbadab90c50d849f50897bb495cfe8199bf55964e9dcae6913d854800ec161638c8255203e4e0e5935a6e319e492b4b SHA512 6a5d7386e84a1c4d35baa3e1cc711f4fbecc9815b2f8afac5bb347054d16fb396dc1d480ca3f4bdabf0754eaf61ff9ed18cc92c548c029b69c01ae325af424b2
-EBUILD element-desktop-bin-1.11.8-r1.ebuild 1963 BLAKE2B 389cd26dc8f729bc622698739c2bb3e1a6f0ce9514654ba511eef08e776914e7e4df6b71e245795fc220f33aaedb6ea51af9cc72763605178a6d3c00bc99cea5 SHA512 351ccadc0330c3febb8ac09e2791730462179ccfc6f3e857f583d0c430ebd26958f04ab163352c6be2ca8e9273f6a1dcc57530d7935c385e0febcbeca62e66ff
+DIST element-desktop_1.11.22_amd64.deb 86439264 BLAKE2B 560232a4c4ba33f3ebab1aadca823d25183c9a6f2f6ecbbf530059e677a95b2e74b0c9320073d5a6158c527bc6af36d27a891fccb5cce8db5a3b0fce1425d641 SHA512 a05bb0c17bdcca5a75ef92577f53711787bf53035f44addaaede0c3ab122a65518ccae9bd872c41926f18ac6812aae0f64b74db8224e4555a52855b89f633d99
+EBUILD element-desktop-bin-1.11.22.ebuild 1963 BLAKE2B e843aa50d0998da1414493ad816142d88a5576a18bdf81e57cd0ad876b92ed96f9095d0775db3f582b7486d3258f3e5f375d76d28cc6236a7be3eaf889b53460 SHA512 4ca00093b9d031d33965fc661e09fcd075b48e3b1cfe2bd523d5ba733837cd5e5a57b7c8edfcebe19161caf51f9e0d335d91d3a7463ba7979dc84b8d09c5b4aa
 MISC metadata.xml 248 BLAKE2B 88afa54e3134b10ecc3f3f7e19fb6b209f3908a517788151cfe6c6ced2b21d368f19a6de982c28575b14a8769069c02b70f639ab73618a9b949c0e9eaf4f17a0 SHA512 3ec152d35cfd434c4ba49a51afd5f2eeaed478983f49f5e61e0713af7da791faee69713a3740182302d8129fb538e8296d0b40152e23e7d5e6d1a996322e7122
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.11.8-r1.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.22.ebuild
index b06fc2ffab40..a265fd85b2b5 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.11.8-r1.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 1b1cd18700c9..e08ee76f8a75 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_6.3.0_amd64.deb 121658652 BLAKE2B 52af99052b9e9489ca87516522c2b532f8511fcaac2fb660209e2e1b8cb4c83388f3e1b727e5d103980a7a135c3a31473265ff2283dbf77b43919fb4353fb6cf SHA512 f682950d69ea4f89a893d6e8538e134015ad84b1ccdb5d0d889adef80bd07c117a6d90375cd887c1fa398fe4a0c1c91079fe2895dc0d712304131545c2a6e8de
-EBUILD signal-desktop-bin-6.3.0.ebuild 2382 BLAKE2B 5297d40757941c7bda818a0587d92a4f224df25d839d407a91c9e1e021e60893025857ed7d2414d9ff64ca588460d4620a21258b05b8d1b25cf7608bd9742244 SHA512 eba57d117428e26abf91eed64ee56e8b767c6ce293cafcc8caa15fea2daa3bdc7d10c0b0435dfe652d795dc14842fdf500f15c26b8980a2a53c5b85945856cba
+DIST signal-desktop_6.5.1_amd64.deb 122802760 BLAKE2B 1592660b760b32e9c4552a023c4ff730cc9530f152078987836e811e15da3fa020be55de97a75536660ecc81a86f16968725e1a473d2337a3a3252efd9d96e0e SHA512 339aa597a444dd2b9763c2fd89e6ab3cc6314d5a83751e50bcb8e85bf1337ab9768a0400ed34db6f66d19102b7ec5f27c61fcb93a06fedd288596b6854582ffc
+EBUILD signal-desktop-bin-6.5.1.ebuild 2364 BLAKE2B 7c84ce1504022bf755df2ac3d76a700d2151875db3b2ce94acd1a17f30c9f3adb8bfd98c194b713e5e0fe72746eb462228c5f4f48d246e3b6d6c0f28b2935c8f SHA512 916240972bdc6c6d005bbc7073e837a78a672dbfafac12ee8567262cc91158e81a50f4e01b22a85743bfa1f0ec10bd1f844abc3b98b742bc2c7a594e3f92442c
 MISC metadata.xml 486 BLAKE2B cfc118c5488c5c50b4de72443e6b836992a4ba7a6fb94358552c814006a49b00580b5ab0a57141b17809e1d2a898b9e23e6fee0837778edfa7f6de53ccc09d01 SHA512 4ab7dc5fd6fb03e7296164d0d924ab4eb11c6fd31c2fc651706892eda53b29be5db65cd94da8e6aa743e9b7ed10ee3e5f25f14dd2d1be99459daa11f529dbb95
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-6.3.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-6.5.1.ebuild
index 74fbeee29f5d..1b6e912201c3 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-6.3.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-6.5.1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
-	dev-libs/wayland
 	media-libs/alsa-lib
 	media-libs/mesa[X(+)]
 	net-print/cups