From c4d4d544a37efc45bd5482e62e1fcdbe7d5993d3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 1 Jan 2025 06:30:58 +0000 Subject: gentoo auto-resync : 01:01:2025 - 06:30:57 --- net-im/Manifest.gz | Bin 8928 -> 8935 bytes net-im/prosody-modules/Manifest | 4 +- .../prosody-modules-0_pre20230221.ebuild | 56 ------- .../prosody-modules-0_pre20241231.ebuild | 56 +++++++ net-im/prosody/Manifest | 2 + net-im/prosody/prosody-0.12.5.ebuild | 164 +++++++++++++++++++++ 6 files changed, 224 insertions(+), 58 deletions(-) delete mode 100644 net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild create mode 100644 net-im/prosody-modules/prosody-modules-0_pre20241231.ebuild create mode 100644 net-im/prosody/prosody-0.12.5.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index a735deea3c3e..2849786e310e 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 5eaefbc1a3bd..6f49bee8ca80 100644 --- a/net-im/prosody-modules/Manifest +++ b/net-im/prosody-modules/Manifest @@ -1,4 +1,4 @@ -DIST prosody-modules-0_pre20230221.tar.xz 1243536 BLAKE2B d9bf42acf22f94ab0e3a530ca09e3cdac066c46f8b3e443b1c6e0768e6e0a516175452f673edf85832e527e0533c7ab65f51f328af4f01883d02d91e45880c84 SHA512 b49f4e05ed7b2dbac319380a929240366b2da559bd612838ab447b2b705a962b5d006f1a087d3bbd9df0b6ab307030811747fb2cc78fa2d2e1ab6c8020767c84 -EBUILD prosody-modules-0_pre20230221.ebuild 1646 BLAKE2B 49d1a60ed4d024052047f7b55fa47ccd32bc37346765978011a01c39c5e8bc2a98d1132762ebdd38a54cb948d620b28de2befbeaa8be51867ccfba8e00c59561 SHA512 d87e1f4858d946b33afd69e70eb834a65b86bd30c5fbdd0091c42132f0cc26793982454afd3e46af17a43407a6cea28723fb33aababa36ba0fc55ddbd668381c +DIST prosody-modules-0_pre20241231.tar.xz 1308320 BLAKE2B a93287838840bb58b03733d0dab4f261f0a7232b3a2355650d739c517d08454dee1df13f1e064f56d4ee3710628fccca2aa16ef8b3bec180a60cce2c1a5457b4 SHA512 1d3fef0f8f5816d713bffb07be1f5e673de70f9fc3196957da47a8a4c3e184724abbe7b4023a425daa25ed21d1ea7aabffd8cfdc181572b0ca1315b8b9e57f0d +EBUILD prosody-modules-0_pre20241231.ebuild 1646 BLAKE2B d8e4798360a1555837929fd2b086ba8c32c8a96b2fc7b53835c88301e0a3e61968adce393b05063a240d42bac91c6d64a724b9cdbffd7be520c55f09b6bd8ba8 SHA512 6d4262fc3808f8091abada48820ab33b8dc537084a8ca82f4eca978779590aae18f196b7f3e578ec9fc286240aca5b1f3adea106180f829c60cb80a575fcf8bb EBUILD prosody-modules-9999.ebuild 1592 BLAKE2B 5bd5d1ab8eabdf2a34830c5205f111c33b8e904e99b843e991635be2c3cc1d73777758b52a025950cb5f529274d7af53af53ec9b54682f86d97e7e78e2bbb599 SHA512 b09cb39f7b781ebf761e1c92bcea0a3b984cdd8137783c11594e1d6f80d38b4b3dd606d9c87a7a62caae946d158714dcd7a981d8574705ee1583e9dc68cce791 MISC metadata.xml 702 BLAKE2B 1a27a1b550de974f6f28fe5afa1c070c0591efe67b8cddfaeca4307693698592e21e9f8eff2de2776cc37a6d07d9a8944815983928c0dcbd2a7e5ac61c5db6df SHA512 18fc3251c4cc97f6e429fd0ed2e653ba28771a67f7d791154bb22e6532508c528b6a64cdf35a425f978f866fe3abbb803de1d4d3b4ab2083e52a2adb7e6b8827 diff --git a/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild deleted file mode 100644 index 2950cf906871..000000000000 --- a/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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 || 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 =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