diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-16 19:46:11 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-16 19:46:11 +0100 |
| commit | 1fd4e372381e1318aae1b7d3338c04156e5da974 (patch) | |
| tree | d480b13516da01073c455f4a216a5645d4114190 /net-im/ejabberd | |
| parent | 29607d91fb1bf1c4456a0b90601ee172ea769283 (diff) | |
gentoo auto-resync : 16:07:2022 - 19:46:10
Diffstat (limited to 'net-im/ejabberd')
| -rw-r--r-- | net-im/ejabberd/Manifest | 4 | ||||
| -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 |
3 files changed, 4 insertions, 30 deletions
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index baca4486be2f..c0b6c791978a 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -10,6 +10,6 @@ DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf99 DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1 DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865 DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da -EBUILD ejabberd-21.12-r1.ebuild 7369 BLAKE2B 66110d244c7f54eab73be0a34b02be5e3cd6f754e5a19fbe4d4e784973cc3174443f4f390c191f5e42dde24601f553a827def643c00de82e88db56d05f8bc294 SHA512 cdcb08aed7802b5ab13bba4c10671552c6b35290ffcbbd9ba1365d748a1023cdeef1f20c9c8d8e703b5e8042d25f31fedbd20ad8e0d6b772aa382eb36caa01fe -EBUILD ejabberd-22.05-r1.ebuild 7584 BLAKE2B 59718e4e9150c6f991b04d4fb23259e07a99a0df2fa191b9497cfeb6713f46e33de5c4e37b6d122380a7084c72ae42cace0226d8e6b55507fdbcf7e2ec73182f SHA512 7b250c064ff89323fabc7185a8c932432811ef38d9e2ece629e66114eae04959b7c9498089f9de1f398eb85fcc720dd2b1374e1792caef3d547bab2f4fe6b404 +EBUILD ejabberd-21.12-r2.ebuild 6925 BLAKE2B 7ae0332bee5cdfe52a3d924c918059b02df779918dfdb005be6bce29f2bb8b7af24f4231143925de0978ad9b580372743914a6c4b2eda6cd6eb745e9dff730d7 SHA512 c55ae6f0e71e39b95f0fd84bbe175fae5539fe80264eacb4a67d649884c9962594a474ba2c0fb91f87061888ab30c4fd3a8ec5df9a6075732d05aca48dde417f +EBUILD ejabberd-22.05-r2.ebuild 7136 BLAKE2B 35e34dede32c4067dd35b54d7a98cd864ddbeb4fa50d14b812dbda642d7d44be5f54a79edd446917975f349dc6680f5bafaf03af9aa11eb722fef38cd3ea04a8 SHA512 6da99fe902f7ba9a62ea1f60d018e3ef7a1fb9eac48d7b3dc9c3503fab388b631e8cbb3b328bc5277ae2ece1cbb0fc5310c034d407c413a2bbb57f3e648b90fd MISC metadata.xml 1484 BLAKE2B 74f0ec404b37dfe72d8751dd8bc8f0ba0b56f334939a5311af70df4616f19e536209b9be7361b35c8e5d316fbce623afdbf7e3ce53a139eb0d2e0d895275ae3c SHA512 793584e1e44c3a651b15eed84a91a801cd809392ccf7623f1a1b222e65641f8dca18515fb90e42e4a51178f4686d3c61778e14834be23feb23b269b4f07c91fb 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 |