gentoo auto-resync : 05:04:2025 - 01:34:33HEADmaster

5 files changed, 157 insertions, 2 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8a6a7d046866..16043dcc9686 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 6d7edceb647e..ac4f8e3bf591 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -4,6 +4,8 @@ AUX prosody.service-r3 439 BLAKE2B abd128f236f2c28f54542388a38aaa3d0e5030510dddc
 AUX prosody.tmpfilesd-r2 39 BLAKE2B 1e004bf2bf1495d219c12bea1973206fae135fb4a5b453c6692f0143413626ec83889bb84b5086a6e507d3b8af14877b3820f3d9560df17e1ca49e2cbee85e0b SHA512 81b855c6bf496f0e6f20c41b8be5538c4edd1fbc6e4f2ca6e9a2d0a06bd5237223a4d42bcbdb75746cb01e46ff0eb36dac6952d9c076c6a72d1bbd733aca07eb
 DIST prosody-0.12.5.tar.gz 617833 BLAKE2B 71f8681e9a976919281be2afe47aa59e8ebd3b7a6e947e85757e18db3110749fa64ae75e3db2a5e55b2116cb213f0caa404fecade2d817623d36ae497f6ed1f6 SHA512 05b15204849ec285c465784ae43e3b748c4a3cda434b53f700121b518af59e14faea22af4b6bbc0d45f3633ddcaf762f00072fd713744a60d2e9ea8b3b10a7ed
 DIST prosody-13.0.0.tar.gz 731936 BLAKE2B d54edb90c76c3ec97efe8d8cdd25a2151fc8e2cb0ffa36a9eb43420e5ef88ac2ccb7dd68bd29c8004f9a3ebc93e51894054b56822e87e87ed4be9f64883ed090 SHA512 5e1ae2e3b4a772ce561f85c2de2467a19547b1f5bda3ad2a07fbf25f0e73559f663e3e16afbef6ab8240109add14d37973c2bbc5e2b431090eec1f87898808ff
+DIST prosody-13.0.1.tar.gz 735228 BLAKE2B 0f6afc24732ee00daacc9982aa72c68d2cd96c1dbb887bff62c159efcfa32965628e468504c951706e851e472c016415b3f9d9fcc030ab9c054e4e5b0eedc114 SHA512 374630fd75e1f0dedabd8ff8dd14794703b785132f10dfe73fa08b415b74742e140c8f085ece6cac75fa7fc3de77b1f5d527aed256aeac8e2c61355abd399551
 EBUILD prosody-0.12.5.ebuild 4922 BLAKE2B 057e67574d3c7a95341f83f3b280c1044c28061994795525c2b4351c42e6a3732afd87a326bb24e4ee06567d8f65a8d87223336586d38f14aa5ac455638beaef SHA512 60925d97929fad81b24a228262ca84852f9313921b112143f696d33069061352b684f0364d4feb9416eabdba81ed6f4175b872302e0822152ffb2c4a37f59f32
 EBUILD prosody-13.0.0.ebuild 4784 BLAKE2B 071a821098ba8a2a4598344068e151cc009dd68c0fe6499de89075adade44891d046c524a50e8c71a42417411407600c948cccf4b3ea8cca82bd319fecf32e01 SHA512 fc503162b15fb45779a7f005afefc0887b9b04e802e6bfdc6815941653e7da40eedd22b513c1bd72991bd98bdb6537b70e4651e8fec5764c99bd74bdb55e29d8
+EBUILD prosody-13.0.1.ebuild 4784 BLAKE2B 071a821098ba8a2a4598344068e151cc009dd68c0fe6499de89075adade44891d046c524a50e8c71a42417411407600c948cccf4b3ea8cca82bd319fecf32e01 SHA512 fc503162b15fb45779a7f005afefc0887b9b04e802e6bfdc6815941653e7da40eedd22b513c1bd72991bd98bdb6537b70e4651e8fec5764c99bd74bdb55e29d8
 MISC metadata.xml 670 BLAKE2B 448bf5ede2b6f09940c51fdff4642e18be22d9c3dac637271c7c8bcfde1b4af0853e2623c55c00efcd8757ef863ac37fdb895606e572911a62a1c9d5f32cc693 SHA512 6177b8e3d2ed1aeeae2f369dc693283a3f811953f71be0e004eea402aa421d89973dbefe79c8fd198e9f9f82e4b345552dc3a2c3597c05927dc1a518cacbaf1d
diff --git a/net-im/prosody/prosody-13.0.1.ebuild b/net-im/prosody/prosody-13.0.1.ebuild
new file mode 100644
index 000000000000..e6904739d987
--- /dev/null
+++ b/net-im/prosody/prosody-13.0.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3..4} )
+LUA_REQ_USE="deprecated(+)"
+
+inherit eapi9-ver lua-single systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib"
+REQUIRED_USE="
+	^^ ( icu idn )
+	${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/prosody
+	acct-user/prosody
+	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
+	dev-lua/luarocks[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/lua-unbound[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/readline[${LUA_USEDEP}]')
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	ldap? ( $(lua_gen_cond_dep 'dev-lua/lualdap[${LUA_USEDEP}]') )
+	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
+	dev-libs/openssl:0=
+	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
+	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
+	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
+	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
+	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
+	${LUA_DEPS}
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.12.0-gentoo.patch" )
+
+src_prepare() {
+	default
+
+	# Set correct plugin path for optional net-im/prosody-modules package
+	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--add-cflags="${CFLAGS}"
+		--add-ldflags="${LDFLAGS}"
+		--c-compiler="$(tc-getCC)"
+		--datadir="${EPREFIX}/var/lib/prosody"
+		--idn-library="$(usex idn 'idn' 'icu')"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--linker="$(tc-getCC)"
+		--lua-version="$(ver_cut 1-2 $(lua_get_version))"
+		--no-example-certs
+		--ostype="linux"
+		--prefix="${EPREFIX}/usr"
+		--runwith="${ELUA}"
+		--sysconfdir="${EPREFIX}/etc/prosody"
+		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
+		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+
+	rm makefile || die
+	mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/prosody
+
+	newinitd "${FILESDIR}"/prosody.initd-r6 prosody
+	systemd_newunit "${FILESDIR}"/prosody.service-r3 prosody.service
+
+	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r2 prosody.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process prosody.conf
+
+	# Starting with >=0.12.0, the prosody configuration is now in
+	# /etc/prosody and no longer in /etc/jabber.
+	# See if we need to migrate the configuration. Furthermore,
+	# prosody 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 0.12.0; then
+		local -A dirs_to_migrate=(
+			[/etc/jabber]=/etc/prosody
+			[/var/log/jabber]=/var/log/prosody
+			[/var/spool/jabber]=/var/lib/prosody
+		)
+
+		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 prosody:prosody "${eroot_dst_dir}" || die
+			fi
+		done
+
+		# Update configuration file to match new pathes and permissions
+		local mysedargs=(
+			-e "'s#/etc/jabber#/etc/prosody#g'"
+			-e "'s#/run/jabber#/run/prosody#g'"
+			-e "'s#/var/log/jabber#/var/log/prosody#g'"
+			-e "'s/prosody_user.*/prosody_user = \"prosody\";/g'"
+			-e "'s/prosody_group.*/prosody_group = \"prosody\";/g'"
+			-i /etc/prosody/prosody.cfg.lua
+		)
+
+		eval sed "${mysedargs[@]}" || die
+
+		ewarn "Newer versions of the prosody (Gentoo) package use ${EROOT}/etc/prosody"
+		ewarn "(just as upstream) and *not* anymore ${EROOT}/etc/jabber."
+		ewarn "The files from ${EROOT}/etc/jabber where copied to ${EROOT}/etc/prosody."
+		ewarn "Also prosody's spool directory became ${EROOT}/var/lib/prosody (was ${EROOT}/var/spool/jabbber)."
+		ewarn "Please check your configuration."
+	fi
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 2b52c7964365..b099bcb43da6 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_7.47.0_amd64.deb 121967582 BLAKE2B 6503e0548f2186b1a74e9a60a14844aff217a5579c0b94dac3f088659b0a46597e906d57e56a4d98d47c52c21f63fdec7c481d17c12989361952b0bd5dd57a18 SHA512 aedb0fd6ae366e22c186d492c3f2227320283fa9b7025e1f32f12f75b238dd8d13c1b20058c131de9c3510513a62ac3e7c8d3e39a8be63753876652d639f1488
-EBUILD signal-desktop-bin-7.47.0.ebuild 2397 BLAKE2B cc4545309c5fb1aea9b077ab7c3586ac19f350a247c6a9cac8b1bbd103d58172b4d7c2255e278560d5d1bc6ef67abaee0cc630ad3c13823ad2edc32ad98c8480 SHA512 d9cdd78088960e235d659a4632d260f77009d09f5727bc3164041b1b12e53846bb6b25555f6329031948b49a581440659e0a2bd031235e300e4964932de4052c
+DIST signal-desktop_7.48.0_amd64.deb 124769480 BLAKE2B 168056fc7912bf56a3e46f5385cdb37612f316421ce5dd8856120feda99bebee5ce166c9c69d1e2a45fef80bc21ddb246a3e030cf52f43fe0f91631e42d2e6a9 SHA512 cb717d02b2d0914e4c31ecd2b039b52becc178cc653dee6340923e189aea5ed057ac1b641b0fad9f71dfc809b8accb4cc6e9cf1e0ccaab722632c1a9266d504b
+EBUILD signal-desktop-bin-7.48.0.ebuild 2397 BLAKE2B cc4545309c5fb1aea9b077ab7c3586ac19f350a247c6a9cac8b1bbd103d58172b4d7c2255e278560d5d1bc6ef67abaee0cc630ad3c13823ad2edc32ad98c8480 SHA512 d9cdd78088960e235d659a4632d260f77009d09f5727bc3164041b1b12e53846bb6b25555f6329031948b49a581440659e0a2bd031235e300e4964932de4052c
 MISC metadata.xml 486 BLAKE2B cfc118c5488c5c50b4de72443e6b836992a4ba7a6fb94358552c814006a49b00580b5ab0a57141b17809e1d2a898b9e23e6fee0837778edfa7f6de53ccc09d01 SHA512 4ab7dc5fd6fb03e7296164d0d924ab4eb11c6fd31c2fc651706892eda53b29be5db65cd94da8e6aa743e9b7ed10ee3e5f25f14dd2d1be99459daa11f529dbb95
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-7.47.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-7.48.0.ebuild
index 276cc243a0c4..276cc243a0c4 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-7.47.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-7.48.0.ebuild