diff options
Diffstat (limited to 'net-im/ejabberd')
| -rw-r--r-- | net-im/ejabberd/Manifest | 2 | ||||
| -rw-r--r-- | net-im/ejabberd/ejabberd-24.10.ebuild | 19 |
2 files changed, 5 insertions, 16 deletions
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index fe7fb2340c24..7caa4e5f22ef 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -15,5 +15,5 @@ DIST ejabberd-24.10-set-ejabberd-opts.patch 1508 BLAKE2B 1692fb54b3aeb9838f057d3 DIST ejabberd-24.10.tar.gz 2532726 BLAKE2B bc59958150f0a3f4bf495ac42d8362c87d9979a57c9ac372826582203b6b3b00bee63897da1f436ab1833bbaa5c49f7da973d07009fb1f27ca5e2f314e955c9c SHA512 dc32e341d5a5cf0c02574b14059ed95feaa8d840080a7c9367186b9a076ab0124df5b54b522732cd9541ed53140cff4024abe8353e91af18abd3c76d69fe9e19 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 7052 BLAKE2B 407c0fc757cfc86589fd1bc57975f1402d2e599a8338bfeeb5ddcfcf7c8809abd46b3dbfe5829f3e82db194de17d5ceb34c96042fd625022a370c2db969b4fe3 SHA512 a268855da4a4f2a96854f9be741033502c8f4c8016daea729099df0101af68faa643399306d0cfc077b81c0ae0f090097a9e859c0f18fec9c9af3d4cd145f781 +EBUILD ejabberd-24.10.ebuild 6847 BLAKE2B 13f8da502d3dd0c5aeb57fb19c4c786c54281060d27e3a244aff497cfa6ec153d65e1f6f769ef44424b54587d23aa7408567153db89b9bac00f804ddfb332894 SHA512 f4336c201a2253609c55fc939bd92f3a8adea04d6dfa6bdd8955d3dddc1c52c4320eedbe4aa5720114b0e57d842775c4269da3f60e9f3c3b6f7fa5d7ec829d7b 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 1f410818dca7..fd1ef9305509 100644 --- a/net-im/ejabberd/ejabberd-24.10.ebuild +++ b/net-im/ejabberd/ejabberd-24.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools pam rebar systemd +inherit autotools eapi9-ver pam rebar systemd DESCRIPTION="Robust, scalable and extensible XMPP server" HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" @@ -174,24 +174,13 @@ src_install() { } 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 + # 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 $migrate_to_ejabberd_user; then + 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." |