From 1b013d9d13c304bf66a4a6c16d272d25bc480b83 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 22 Feb 2023 02:26:51 +0000
Subject: gentoo auto-resync : 22:02:2023 - 02:26:50

---
 net-im/Manifest.gz                                 | Bin 10057 -> 10064 bytes
 net-im/prosody-modules/Manifest                    |   4 +-
 .../prosody-modules-0_pre20220319.ebuild           |  55 -------
 .../prosody-modules-0_pre20230221.ebuild           |  55 +++++++
 net-im/prosody/Manifest                            |   2 +
 net-im/prosody/prosody-0.12.3.ebuild               | 164 +++++++++++++++++++++
 6 files changed, 223 insertions(+), 57 deletions(-)
 delete mode 100644 net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild
 create mode 100644 net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild
 create mode 100644 net-im/prosody/prosody-0.12.3.ebuild

(limited to 'net-im')

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ef3e066491a1..3ca49b4840fe 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/prosody-modules/Manifest b/net-im/prosody-modules/Manifest
index 204cd2a87c26..8561bccb7be5 100644
--- a/net-im/prosody-modules/Manifest
+++ b/net-im/prosody-modules/Manifest
@@ -1,4 +1,4 @@
-DIST prosody-modules-0_pre20220319.tar.xz 1221828 BLAKE2B bb9482a60b15fd456125b512017ee93223bd139ed5b664236db4313b65985729ad4f5b8adb5d76bb9099ff4de816457fffd1277b7d36c556d00ce789d8ecf15f SHA512 a288d082e3bc2f9450c0b09e4f02816322d0db073134b315b2fa19be4d176037b399d763854c6c9a006eef85153c7bbbabddf5da85225d599082bfc7c0101450
-EBUILD prosody-modules-0_pre20220319.ebuild 1637 BLAKE2B d621e4f6c59a96ebf24c413ee683d7cae3c9eb516e956e9f13447d0b21a6d29c41b6afa81a858b459245d2b8a2e1c5655bc87d516b3b98833587612f87f8a68e SHA512 06b51230f675de6a155e1489cc6b6fa6ab2fd13051df76bcf832ccfc4686b2ac85129ec9bd580af15f9d73ea69d0291bd3408388f81038c73d735d33678939af
+DIST prosody-modules-0_pre20230221.tar.xz 1243536 BLAKE2B d9bf42acf22f94ab0e3a530ca09e3cdac066c46f8b3e443b1c6e0768e6e0a516175452f673edf85832e527e0533c7ab65f51f328af4f01883d02d91e45880c84 SHA512 b49f4e05ed7b2dbac319380a929240366b2da559bd612838ab447b2b705a962b5d006f1a087d3bbd9df0b6ab307030811747fb2cc78fa2d2e1ab6c8020767c84
+EBUILD prosody-modules-0_pre20230221.ebuild 1637 BLAKE2B 28c562fb9596ff5648c1ab3450f224a0e53fd2566ad1aedf723006f234ee3f37d48b69135088cf7df651061f2c81ef16bb4c36eeff5ac01e4cfa046cf6ae2e90 SHA512 605b8101174fb4c4bb436cec44d52159468158daa061d85953386b1ced8ecbde653b7f6f84d4f8b51377ae81b4d74b0c5ee76cf39eea00d8a58e948d27bb1c32
 EBUILD prosody-modules-9999.ebuild 1583 BLAKE2B 5c6e8d6fc573f956529324ce9fb85466276a3648677785872e50a39df5879ca9b0e72c270d7e7652973ee007df1933784e6a94a023df10165991cf1ad8cde1ed SHA512 64d7ef5126a6797b6d12f069c46777468bdf1553b4aaa0905eb6782310d27b91cf2f8c195d359b561664ca0b681baba1fee6a7731af4a35309b473d922c3ddb6
 MISC metadata.xml 702 BLAKE2B 1a27a1b550de974f6f28fe5afa1c070c0591efe67b8cddfaeca4307693698592e21e9f8eff2de2776cc37a6d07d9a8944815983928c0dcbd2a7e5ac61c5db6df SHA512 18fc3251c4cc97f6e429fd0ed2e653ba28771a67f7d791154bb22e6532508c528b6a64cdf35a425f978f866fe3abbb803de1d4d3b4ab2083e52a2adb7e6b8827
diff --git a/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild
deleted file mode 100644
index a120ace96588..000000000000
--- a/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit savedconfig
-
-DESCRIPTION="A collection of community-maintained modules for Prosody"
-HOMEPAGE="https://modules.prosody.im"
-SRC_URI="https://dev.gentoo.org/~conikost/distfiles/${P}.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="net-im/prosody"
-
-src_prepare() {
-	default
-
-	# Exclude 'misc' folder from install, since it does not provide any modules.
-	echo "# Remove all modules from this list, which you don't want to install." > prosody-modules.conf || die
-	find * -maxdepth 0 -type d ! -name misc >> prosody-modules.conf || die
-
-	use savedconfig && restore_config prosody-modules.conf
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/prosody/community-modules"
-	while read prosody_module; do
-		if ! [[ "${prosody_module}" = \#* ]]; then
-			if [[ -f "${prosody_module}/README.markdown" ]]; then
-				newdoc "${prosody_module}/README.markdown" "README.${prosody_module}"
-				rm "${prosody_module}/README.markdown" || die
-			fi
-
-			doins -r "${prosody_module}"
-		fi
-	done <prosody-modules.conf
-
-	save_config prosody-modules.conf
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	einfo "In order to use the community modules on an existing instance, you have to add"
-	einfo "'/usr/$(get_libdir)/prosody/community-modules' into 'plugin_paths'"
-	einfo "into your prosody configuration file '/etc/jabber/prosody.cfg.lua.'"
-	einfo ""
-	einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\", \"/usr/$(get_libdir)/prosody/community-modules\" };"
-}
diff --git a/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild
new file mode 100644
index 000000000000..9b0ba076aa2b
--- /dev/null
+++ b/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit savedconfig
+
+DESCRIPTION="A collection of community-maintained modules for Prosody"
+HOMEPAGE="https://modules.prosody.im"
+SRC_URI="https://dev.gentoo.org/~conikost/distfiles/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="net-im/prosody"
+
+src_prepare() {
+	default
+
+	# Exclude 'misc' folder from install, since it does not provide any modules.
+	echo "# Remove all modules from this list, which you don't want to install." > prosody-modules.conf || die
+	find * -maxdepth 0 -type d ! -name misc >> prosody-modules.conf || die
+
+	use savedconfig && restore_config prosody-modules.conf
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/prosody/community-modules"
+	while read prosody_module; do
+		if ! [[ "${prosody_module}" = \#* ]]; then
+			if [[ -f "${prosody_module}/README.markdown" ]]; then
+				newdoc "${prosody_module}/README.markdown" "README.${prosody_module}"
+				rm "${prosody_module}/README.markdown" || die
+			fi
+
+			doins -r "${prosody_module}"
+		fi
+	done <prosody-modules.conf
+
+	save_config prosody-modules.conf
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	einfo "In order to use the community modules on an existing instance, you have to add"
+	einfo "'/usr/$(get_libdir)/prosody/community-modules' into 'plugin_paths'"
+	einfo "into your prosody configuration file '/etc/jabber/prosody.cfg.lua.'"
+	einfo ""
+	einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\", \"/usr/$(get_libdir)/prosody/community-modules\" };"
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index f0a98bfa4556..44e5674f0462 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,5 +3,7 @@ AUX prosody.initd-r6 1114 BLAKE2B a988b584eb49d21261776fa0a651dc01d3943a5a75c9bf
 AUX prosody.service-r3 439 BLAKE2B abd128f236f2c28f54542388a38aaa3d0e5030510dddc16240273de90c13ddee62d01d26d7c9e1be0635dc59ad9ca5e93a30f2b5fa42106489a95d26a037314a SHA512 b540e5d4389439cdd2886f9ccaf189d20ffcaf29a982a26e4ed296b0c529df95aade88751d22919cb36b27db94530dade754044d50cee2e5244d37983b933517
 AUX prosody.tmpfilesd-r2 39 BLAKE2B 1e004bf2bf1495d219c12bea1973206fae135fb4a5b453c6692f0143413626ec83889bb84b5086a6e507d3b8af14877b3820f3d9560df17e1ca49e2cbee85e0b SHA512 81b855c6bf496f0e6f20c41b8be5538c4edd1fbc6e4f2ca6e9a2d0a06bd5237223a4d42bcbdb75746cb01e46ff0eb36dac6952d9c076c6a72d1bbd733aca07eb
 DIST prosody-0.12.2.tar.gz 614303 BLAKE2B f44f2106e3064b6ecb5d75718997ed980309e9debbd9f0b17eaeb3261d27421774097ba16bfd8d86d4bf1dd8f427c653b494b199676738d8781ffa37f9b73c5f SHA512 dd14d2740b67127e7edcf79db7d1fd81b4566d4a285430edb9dd7263ad109fdd6e581a1d93fcbf971f73fa5ba051ae7935a121d31e3e7448cacfcd8ecbd802bb
+DIST prosody-0.12.3.tar.gz 615302 BLAKE2B 07dc16950449086b5d1643efc29a13cde8e55f38b3402e6355665eed9dd4f7fbf38db237f511cb4f0e8cf08be536ce47a8aec502eff1961556dc47d8ec4b2b88 SHA512 5654aabd83561bea8a10387a242800e92df8db183b6273579d710599ffc458c5b545758ee742fb929a19a2fad9c33700787bc7aa348a8527caef03e80bc2edc4
 EBUILD prosody-0.12.2.ebuild 5129 BLAKE2B 8a754c72fc2e94af39ca165d78f7e7761129304a6d5eacd947a6586399e9394cfed51128df79a956a9b6566bc603554d1a2b4306c7d2db9b19ac22654bc4e13f SHA512 f49c9737f09b1ecd254aad907d467903ae4a70879a528bfd883b5f0c975d50843ea7f77b31929b6301f0c8c8ed1fcbb25da5e1b193277432a8e0f8ffed74cbc3
+EBUILD prosody-0.12.3.ebuild 5131 BLAKE2B b0491da54886ddd69e05ed8466ba371935b18a76e8e7a36d2ce5596d8b2c8813cb719d61c0f131849f779e4d7f72c6278b36888430b3a16963ab8bfe7c246137 SHA512 a3375b41059f4731d84a67cd26ed7bb7ecbc306c56deea71276bea4b2b3046193e1e520561a151caafbeba7c2a2f18d430436b3ae4f7a331aa9090db5006dcaa
 MISC metadata.xml 670 BLAKE2B 448bf5ede2b6f09940c51fdff4642e18be22d9c3dac637271c7c8bcfde1b4af0853e2623c55c00efcd8757ef863ac37fdb895606e572911a62a1c9d5f32cc693 SHA512 6177b8e3d2ed1aeeae2f369dc693283a3f811953f71be0e004eea402aa421d89973dbefe79c8fd198e9f9f82e4b345552dc3a2c3597c05927dc1a518cacbaf1d
diff --git a/net-im/prosody/prosody-0.12.3.ebuild b/net-im/prosody/prosody-0.12.3.ebuild
new file mode 100644
index 000000000000..8ec80145aecc
--- /dev/null
+++ b/net-im/prosody/prosody-0.12.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+LUA_REQ_USE="deprecated(+)"
+
+inherit 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=
+	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
+	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="$(usex lua_single_target_luajit '5.1' $(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() {
+	local migrate_to_prosody_user="false"
+	tmpfiles_process prosody.conf
+
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 0.12.0; then
+				migrate_to_prosody_user="true"
+				break
+			fi
+		done
+	fi
+
+	# Sarting 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 ${migrate_to_prosody_user}; 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
+}
-- 
cgit v1.2.3