diff options
| author |   Conrad Kostecki <conikost@gentoo.org> | 2022-07-15 23:20:52 +0200 |
|---|---|---|
| committer |   Florian Schmaus <flow@gentoo.org> | 2022-07-16 16:46:19 +0200 |
| commit | 718e284e6507bba7a7fec3da251b95558e894d10 (patch) | |
| tree | 1ec2f98d64dbe22ecaa38e98dfedeba76a8d12b2 | |
| parent | acct-user/ejabberd: add 2, drop 1 (diff) | |
| download | gentoo-718e284e6507bba7a7fec3da251b95558e894d10.tar.gz gentoo-718e284e6507bba7a7fec3da251b95558e894d10.tar.bz2 gentoo-718e284e6507bba7a7fec3da251b95558e894d10.zip | |
net-im/ejabberd: update usermod handling
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26433
Signed-off-by: Florian Schmaus <flow@gentoo.org>
| -rw-r--r-- | net-im/ejabberd/ejabberd-21.12-r2.ebuild (renamed from net-im/ejabberd/ejabberd-21.12-r1.ebuild) | 15 | ||||
| -rw-r--r-- | net-im/ejabberd/ejabberd-22.05-r2.ebuild (renamed from net-im/ejabberd/ejabberd-22.05-r1.ebuild) | 15 |
2 files changed, 2 insertions, 28 deletions
diff --git a/net-im/ejabberd/ejabberd-21.12-r1.ebuild b/net-im/ejabberd/ejabberd-21.12-r2.ebuild index 51abb0f8f050..51848cda5a6c 100644 --- a/net-im/ejabberd/ejabberd-21.12-r1.ebuild +++ b/net-im/ejabberd/ejabberd-21.12-r2.ebuild @@ -56,7 +56,7 @@ DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] stun? ( >=dev-erlang/stun-1.0.47 ) zlib? ( >=dev-erlang/ezlib-1.0.10 )" RDEPEND="${DEPEND} - acct-user/ejabberd + >=acct-user/ejabberd-2[pam?] captcha? ( media-gfx/imagemagick[truetype,png] ) selinux? ( sec-policy/selinux-jabber ) " @@ -169,19 +169,6 @@ src_install() { keepdir /var/{lib,log}/ejabberd } -pkg_preinst() { - if use pam; then - einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \ - "authentication" - # See - # <https://docs.ejabberd.im/admin/configuration/#pam-authentication>. - # epam binary is installed by dev-erlang/epam package, therefore SUID - # is set by that package. Instead of jabber group it uses epam group, - # therefore we need to add jabber user to epam group. - usermod -a -G epam ejabberd || die - fi -} - pkg_postinst() { local migrate_to_ejabberd_user=false diff --git a/net-im/ejabberd/ejabberd-22.05-r1.ebuild b/net-im/ejabberd/ejabberd-22.05-r2.ebuild index 39a5d3e79270..ebb3a879d1e2 100644 --- a/net-im/ejabberd/ejabberd-22.05-r1.ebuild +++ b/net-im/ejabberd/ejabberd-22.05-r2.ebuild @@ -60,7 +60,7 @@ DEPEND=" " RDEPEND=" ${DEPEND} - >=acct-user/ejabberd-1 + >=acct-user/ejabberd-2[pam?] captcha? ( media-gfx/imagemagick[truetype,png] ) selinux? ( sec-policy/selinux-jabber ) " @@ -174,19 +174,6 @@ src_install() { keepdir /var/{lib,log}/ejabberd } -pkg_preinst() { - if use pam; then - einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \ - "authentication" - # See - # <https://docs.ejabberd.im/admin/configuration/#pam-authentication>. - # epam binary is installed by dev-erlang/epam package, therefore SUID - # is set by that package. Instead of jabber group it uses epam group, - # therefore we need to add jabber user to epam group. - usermod -a -G epam ejabberd || die - fi -} - pkg_postinst() { local migrate_to_ejabberd_user=false |