From 1fd4e372381e1318aae1b7d3338c04156e5da974 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Jul 2022 19:46:11 +0100 Subject: gentoo auto-resync : 16:07:2022 - 19:46:10 --- net-im/ejabberd/Manifest | 4 +- net-im/ejabberd/ejabberd-21.12-r1.ebuild | 235 ------------------------------- net-im/ejabberd/ejabberd-21.12-r2.ebuild | 222 +++++++++++++++++++++++++++++ net-im/ejabberd/ejabberd-22.05-r1.ebuild | 235 ------------------------------- net-im/ejabberd/ejabberd-22.05-r2.ebuild | 222 +++++++++++++++++++++++++++++ 5 files changed, 446 insertions(+), 472 deletions(-) delete mode 100644 net-im/ejabberd/ejabberd-21.12-r1.ebuild create mode 100644 net-im/ejabberd/ejabberd-21.12-r2.ebuild delete mode 100644 net-im/ejabberd/ejabberd-22.05-r1.ebuild create mode 100644 net-im/ejabberd/ejabberd-22.05-r2.ebuild (limited to 'net-im/ejabberd') 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-r1.ebuild deleted file mode 100644 index 51abb0f8f050..000000000000 --- a/net-im/ejabberd/ejabberd-21.12-r1.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam rebar systemd verify-sig - -DESCRIPTION="Robust, scalable and extensible XMPP server" -HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" -SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz - -> ${P}.tar.gz - verify-sig? ( https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc -> ${P}.tar.gz.asc )" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis - roster-gw selinux sip sqlite +stun zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/luerl-0.3 -# TODO: ) -DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] - >=dev-erlang/cache_tab-1.0.29 - >=dev-erlang/eimp-1.0.21 - >=dev-erlang/fast_tls-1.1.13 - >=dev-erlang/fast_xml-1.1.48 - >=dev-erlang/fast_yaml-1.0.32 - >=dev-erlang/yconf-1.0.12 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.11.2 - >=dev-erlang/lager-3.9.1 - >=dev-erlang/p1_oauth2-0.6.10 - >=dev-erlang/p1_utils-1.0.23 - >=dev-erlang/stringprep-1.0.27 - >=dev-erlang/xmpp-1.5.6 - >=dev-erlang/pkix-1.0.8 - >=dev-erlang/mqtree-1.0.14 - >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.16 - >=dev-erlang/base64url-1.0.1 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.12 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.16 ) - redis? ( >=dev-erlang/eredis-1.2.0 ) - sip? ( >=dev-erlang/esip-1.0.45 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) - stun? ( >=dev-erlang/stun-1.0.47 ) - zlib? ( >=dev-erlang/ezlib-1.0.10 )" -RDEPEND="${DEPEND} - acct-user/ejabberd - captcha? ( media-gfx/imagemagick[truetype,png] ) - selinux? ( sec-policy/selinux-jabber ) -" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( - "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" -) - -# Set paths to ejabberd lib directory consistently to point always to directory -# suffixed with version. -correct_ejabberd_paths() { - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set ejabberd path in Makefile.in' - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ejabberd path in ejabberdctl.template' -} - -# Get epam-wrapper from 'files' directory and correct path to lib directory in -# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper -# file exists there already. -customize_epam_wrapper() { - local epam_wrapper_src="${1}" - local epam_wrapper_dst="${S}/epam-wrapper" - - [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' - sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ - "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ - || die 'failed to install epam-wrapper' -} - -# Get path to ejabberd lib directory. -# -# This is the path ./configure script Base for this path is path set in -# ./configure script which is /usr/lib by default. If libdir is explicitely set -# to something else than this should be adjusted here as well. -get_ejabberd_path() { - echo "/usr/$(get_libdir)/${P}" -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - customize_epam_wrapper "${FILESDIR}/epam-wrapper" - - rebar_fix_include_path fast_xml - rebar_fix_include_path p1_utils - rebar_fix_include_path xmpp - - # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory - # rather than its parent which is default. That way ejabberd directory - # takes precedence is module lookup. - local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" - sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ERL_LIBS in ejabberdctl.template' -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --localstatedir="${EPREFIX}/var" \ - --enable-user=${PN} \ - $(use_enable debug) \ - $(use_enable full-xml) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable sip) \ - $(use_enable stun) \ - $(use_enable zlib) - - # more options to support - # --enable-elixir requires https://github.com/elixir-lang/elixir -} - -src_compile() { - emake REBAR='rebar -v' src -} - -src_install() { - default - - if use pam; then - local epam_path="$(get_ejabberd_path)/priv/bin/epam" - - pamd_mimic_system xmpp auth account - into "$(get_ejabberd_path)/priv" - newbin epam-wrapper epam - fi - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - systemd_dounit "${PN}.service" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" - - 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 - # . - # 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 - - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - else - 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 - # /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 - 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." - ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." - ewarn "Please check your configuration, and finish the migration by stopping ejabberd" - ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd." - - local -A dirs_to_migrate=( - [/etc/jabber]=/etc/ejabberd - [/var/spool/jabber]=/var/lib/ejabberd - ) - - 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 ejabberd:ejabberd "${eroot_dst_dir}" || die - fi - done - fi -} diff --git a/net-im/ejabberd/ejabberd-21.12-r2.ebuild b/net-im/ejabberd/ejabberd-21.12-r2.ebuild new file mode 100644 index 000000000000..51848cda5a6c --- /dev/null +++ b/net-im/ejabberd/ejabberd-21.12-r2.ebuild @@ -0,0 +1,222 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pam rebar systemd verify-sig + +DESCRIPTION="Robust, scalable and extensible XMPP server" +HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" +SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz + -> ${P}.tar.gz + verify-sig? ( https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc -> ${P}.tar.gz.asc )" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" +REQUIRED_USE="mssql? ( odbc )" +# TODO: Add 'tools' flag. +IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis + roster-gw selinux sip sqlite +stun zlib" + +RESTRICT="test" + +# TODO: Add dependencies for 'tools' flag enabled. +# TODO: tools? ( +# TODO: >=dev-erlang/luerl-0.3 +# TODO: ) +DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] + >=dev-erlang/cache_tab-1.0.29 + >=dev-erlang/eimp-1.0.21 + >=dev-erlang/fast_tls-1.1.13 + >=dev-erlang/fast_xml-1.1.48 + >=dev-erlang/fast_yaml-1.0.32 + >=dev-erlang/yconf-1.0.12 + >=dev-erlang/jiffy-1.0.5 + >=dev-erlang/jose-1.11.2 + >=dev-erlang/lager-3.9.1 + >=dev-erlang/p1_oauth2-0.6.10 + >=dev-erlang/p1_utils-1.0.23 + >=dev-erlang/stringprep-1.0.27 + >=dev-erlang/xmpp-1.5.6 + >=dev-erlang/pkix-1.0.8 + >=dev-erlang/mqtree-1.0.14 + >=dev-erlang/idna-6.0.0-r1 + >=dev-erlang/p1_acme-1.0.16 + >=dev-erlang/base64url-1.0.1 + ldap? ( =net-nds/openldap-2* ) + mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) + odbc? ( dev-db/unixODBC ) + pam? ( >=dev-erlang/epam-1.0.12 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.16 ) + redis? ( >=dev-erlang/eredis-1.2.0 ) + sip? ( >=dev-erlang/esip-1.0.45 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) + stun? ( >=dev-erlang/stun-1.0.47 ) + zlib? ( >=dev-erlang/ezlib-1.0.10 )" +RDEPEND="${DEPEND} + >=acct-user/ejabberd-2[pam?] + captcha? ( media-gfx/imagemagick[truetype,png] ) + selinux? ( sec-policy/selinux-jabber ) +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" + +DOCS=( CHANGELOG.md README.md ) +PATCHES=( + "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" + "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" +) + +# Set paths to ejabberd lib directory consistently to point always to directory +# suffixed with version. +correct_ejabberd_paths() { + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ + -i "${S}/Makefile.in" \ + || die 'failed to set ejabberd path in Makefile.in' + sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ejabberd path in ejabberdctl.template' +} + +# Get epam-wrapper from 'files' directory and correct path to lib directory in +# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper +# file exists there already. +customize_epam_wrapper() { + local epam_wrapper_src="${1}" + local epam_wrapper_dst="${S}/epam-wrapper" + + [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' + sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ + "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ + || die 'failed to install epam-wrapper' +} + +# Get path to ejabberd lib directory. +# +# This is the path ./configure script Base for this path is path set in +# ./configure script which is /usr/lib by default. If libdir is explicitely set +# to something else than this should be adjusted here as well. +get_ejabberd_path() { + echo "/usr/$(get_libdir)/${P}" +} + +src_prepare() { + default + + rebar_remove_deps + correct_ejabberd_paths + customize_epam_wrapper "${FILESDIR}/epam-wrapper" + + rebar_fix_include_path fast_xml + rebar_fix_include_path p1_utils + rebar_fix_include_path xmpp + + # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory + # rather than its parent which is default. That way ejabberd directory + # takes precedence is module lookup. + local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" + sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ERL_LIBS in ejabberdctl.template' +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --localstatedir="${EPREFIX}/var" \ + --enable-user=${PN} \ + $(use_enable debug) \ + $(use_enable full-xml) \ + $(use_enable mssql) \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable pam) \ + $(use_enable postgres pgsql) \ + $(use_enable redis) \ + $(use_enable roster-gw roster-gateway-workaround) \ + $(use_enable sqlite) \ + $(use_enable sip) \ + $(use_enable stun) \ + $(use_enable zlib) + + # more options to support + # --enable-elixir requires https://github.com/elixir-lang/elixir +} + +src_compile() { + emake REBAR='rebar -v' src +} + +src_install() { + default + + if use pam; then + local epam_path="$(get_ejabberd_path)/priv/bin/epam" + + pamd_mimic_system xmpp auth account + into "$(get_ejabberd_path)/priv" + newbin epam-wrapper epam + fi + + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + systemd_dounit "${PN}.service" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" "${PN}" + + keepdir /var/{lib,log}/ejabberd +} + +pkg_postinst() { + local migrate_to_ejabberd_user=false + + if [[ ! ${REPLACING_VERSIONS} ]]; then + echo + elog "For configuration instructions, please see" + elog " https://docs.ejabberd.im/" + echo + else + 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 + # /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 + 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." + ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." + ewarn "Please check your configuration, and finish the migration by stopping ejabberd" + ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd." + + local -A dirs_to_migrate=( + [/etc/jabber]=/etc/ejabberd + [/var/spool/jabber]=/var/lib/ejabberd + ) + + 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 ejabberd:ejabberd "${eroot_dst_dir}" || die + fi + done + fi +} diff --git a/net-im/ejabberd/ejabberd-22.05-r1.ebuild b/net-im/ejabberd/ejabberd-22.05-r1.ebuild deleted file mode 100644 index 39a5d3e79270..000000000000 --- a/net-im/ejabberd/ejabberd-22.05-r1.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools pam rebar systemd verify-sig - -DESCRIPTION="Robust, scalable and extensible XMPP server" -HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" -SRC_URI=" - https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - verify-sig? ( https://github.com/processone/${PN}/releases/download/${PV}/${P}.tar.gz.asc ) -" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis - roster-gw selinux sip sqlite +stun zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/luerl-0.3 -# TODO: ) -DEPEND=" - >=dev-lang/erlang-19.3[odbc?,ssl] - >=dev-erlang/cache_tab-1.0.30 - >=dev-erlang/eimp-1.0.22 - >=dev-erlang/fast_tls-1.1.15 - >=dev-erlang/fast_xml-1.1.49 - >=dev-erlang/fast_yaml-1.0.33 - >=dev-erlang/yconf-1.0.13 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.11.2 - >=dev-erlang/lager-3.9.1 - >=dev-erlang/p1_oauth2-0.6.11 - >=dev-erlang/p1_utils-1.0.25 - >=dev-erlang/stringprep-1.0.28 - >=dev-erlang/xmpp-1.5.6 - >=dev-erlang/pkix-1.0.9 - >=dev-erlang/mqtree-1.0.15 - >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.19 - >=dev-erlang/base64url-1.0.1 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.12 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.18 ) - redis? ( >=dev-erlang/eredis-1.2.0 ) - sip? ( >=dev-erlang/esip-1.0.45 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) - stun? ( >=dev-erlang/stun-1.2.2 ) - zlib? ( >=dev-erlang/ezlib-1.0.12 ) -" -RDEPEND=" - ${DEPEND} - >=acct-user/ejabberd-1 - captcha? ( media-gfx/imagemagick[truetype,png] ) - selinux? ( sec-policy/selinux-jabber ) -" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( - "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" -) - -# Get path to ejabberd lib directory. -# -# This is the path ./configure script Base for this path is path set in -# ./configure script which is /usr/lib by default. If libdir is explicitely set -# to something else than this should be adjusted here as well. -get_ejabberd_path() { - echo "/usr/$(get_libdir)/${P}" -} - -src_prepare() { - default - - eautoreconf - - rebar_remove_deps - - # Set paths to ejabberd lib directory consistently to point always to directory - # suffixed with version. - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set ejabberd path in Makefile.in' - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ejabberd path in ejabberdctl.template' - - # Get epam-wrapper from 'files' directory and correct path to lib directory in - # it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper - # file exists there already. - local epam_wrapper_src="${FILESDIR}/epam-wrapper" - local epam_wrapper_dst="${S}/epam-wrapper" - [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' - sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ - "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ - || die 'failed to install epam-wrapper' - - rebar_fix_include_path fast_xml - rebar_fix_include_path p1_utils - rebar_fix_include_path xmpp - - # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory - # rather than its parent which is default. That way ejabberd directory - # takes precedence is module lookup. - local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" - sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ERL_LIBS in ejabberdctl.template' -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --localstatedir="${EPREFIX}/var" \ - --enable-user=${PN} \ - $(use_enable debug) \ - $(use_enable full-xml) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable sip) \ - $(use_enable stun) \ - $(use_enable zlib) - - # more options to support - # --enable-elixir requires https://github.com/elixir-lang/elixir -} - -src_compile() { - # Note that we also add ejabberdctl.example, which will be used by - # ejabberd's build system to create /usr/sbin/ejabberdctl, as - # target. Otherwise, ejabberdctl.example is due to be created by the - # 'install' target (as per upstream's Makefile.in). However when - # invoke the 'install' target (in src_install below), DESTDIR is - # set, which causes DESTDIR to scope into the ejabberdctl.example - # generation. - emake REBAR='rebar -v' src ejabberdctl.example -} - -src_install() { - default - - if use pam; then - local epam_path="$(get_ejabberd_path)/priv/bin/epam" - - pamd_mimic_system xmpp auth account - into "$(get_ejabberd_path)/priv" - newbin epam-wrapper epam - fi - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}" - systemd_dounit "${PN}.service" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}" - - 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 - # . - # 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 - - 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 - # /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 - 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." - ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." - ewarn "Please check your configuration, and finish the migration by stopping ejabberd" - ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd." - - local -A dirs_to_migrate=( - [/etc/jabber]=/etc/ejabberd - [/var/spool/jabber]=/var/lib/ejabberd - ) - - 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 ejabberd:ejabberd "${eroot_dst_dir}" || die - fi - done - fi -} diff --git a/net-im/ejabberd/ejabberd-22.05-r2.ebuild b/net-im/ejabberd/ejabberd-22.05-r2.ebuild new file mode 100644 index 000000000000..ebb3a879d1e2 --- /dev/null +++ b/net-im/ejabberd/ejabberd-22.05-r2.ebuild @@ -0,0 +1,222 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools pam rebar systemd verify-sig + +DESCRIPTION="Robust, scalable and extensible XMPP server" +HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" +SRC_URI=" + https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + verify-sig? ( https://github.com/processone/${PN}/releases/download/${PV}/${P}.tar.gz.asc ) +" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" +REQUIRED_USE="mssql? ( odbc )" +# TODO: Add 'tools' flag. +IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis + roster-gw selinux sip sqlite +stun zlib" + +RESTRICT="test" + +# TODO: Add dependencies for 'tools' flag enabled. +# TODO: tools? ( +# TODO: >=dev-erlang/luerl-0.3 +# TODO: ) +DEPEND=" + >=dev-lang/erlang-19.3[odbc?,ssl] + >=dev-erlang/cache_tab-1.0.30 + >=dev-erlang/eimp-1.0.22 + >=dev-erlang/fast_tls-1.1.15 + >=dev-erlang/fast_xml-1.1.49 + >=dev-erlang/fast_yaml-1.0.33 + >=dev-erlang/yconf-1.0.13 + >=dev-erlang/jiffy-1.0.5 + >=dev-erlang/jose-1.11.2 + >=dev-erlang/lager-3.9.1 + >=dev-erlang/p1_oauth2-0.6.11 + >=dev-erlang/p1_utils-1.0.25 + >=dev-erlang/stringprep-1.0.28 + >=dev-erlang/xmpp-1.5.6 + >=dev-erlang/pkix-1.0.9 + >=dev-erlang/mqtree-1.0.15 + >=dev-erlang/idna-6.0.0-r1 + >=dev-erlang/p1_acme-1.0.19 + >=dev-erlang/base64url-1.0.1 + ldap? ( =net-nds/openldap-2* ) + mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) + odbc? ( dev-db/unixODBC ) + pam? ( >=dev-erlang/epam-1.0.12 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.18 ) + redis? ( >=dev-erlang/eredis-1.2.0 ) + sip? ( >=dev-erlang/esip-1.0.45 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) + stun? ( >=dev-erlang/stun-1.2.2 ) + zlib? ( >=dev-erlang/ezlib-1.0.12 ) +" +RDEPEND=" + ${DEPEND} + >=acct-user/ejabberd-2[pam?] + captcha? ( media-gfx/imagemagick[truetype,png] ) + selinux? ( sec-policy/selinux-jabber ) +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" + +DOCS=( CHANGELOG.md README.md ) +PATCHES=( + "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" +) + +# Get path to ejabberd lib directory. +# +# This is the path ./configure script Base for this path is path set in +# ./configure script which is /usr/lib by default. If libdir is explicitely set +# to something else than this should be adjusted here as well. +get_ejabberd_path() { + echo "/usr/$(get_libdir)/${P}" +} + +src_prepare() { + default + + eautoreconf + + rebar_remove_deps + + # Set paths to ejabberd lib directory consistently to point always to directory + # suffixed with version. + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ + -i "${S}/Makefile.in" \ + || die 'failed to set ejabberd path in Makefile.in' + sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ejabberd path in ejabberdctl.template' + + # Get epam-wrapper from 'files' directory and correct path to lib directory in + # it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper + # file exists there already. + local epam_wrapper_src="${FILESDIR}/epam-wrapper" + local epam_wrapper_dst="${S}/epam-wrapper" + [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' + sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ + "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ + || die 'failed to install epam-wrapper' + + rebar_fix_include_path fast_xml + rebar_fix_include_path p1_utils + rebar_fix_include_path xmpp + + # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory + # rather than its parent which is default. That way ejabberd directory + # takes precedence is module lookup. + local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" + sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ERL_LIBS in ejabberdctl.template' +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --localstatedir="${EPREFIX}/var" \ + --enable-user=${PN} \ + $(use_enable debug) \ + $(use_enable full-xml) \ + $(use_enable mssql) \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable pam) \ + $(use_enable postgres pgsql) \ + $(use_enable redis) \ + $(use_enable roster-gw roster-gateway-workaround) \ + $(use_enable sqlite) \ + $(use_enable sip) \ + $(use_enable stun) \ + $(use_enable zlib) + + # more options to support + # --enable-elixir requires https://github.com/elixir-lang/elixir +} + +src_compile() { + # Note that we also add ejabberdctl.example, which will be used by + # ejabberd's build system to create /usr/sbin/ejabberdctl, as + # target. Otherwise, ejabberdctl.example is due to be created by the + # 'install' target (as per upstream's Makefile.in). However when + # invoke the 'install' target (in src_install below), DESTDIR is + # set, which causes DESTDIR to scope into the ejabberdctl.example + # generation. + emake REBAR='rebar -v' src ejabberdctl.example +} + +src_install() { + default + + if use pam; then + local epam_path="$(get_ejabberd_path)/priv/bin/epam" + + pamd_mimic_system xmpp auth account + into "$(get_ejabberd_path)/priv" + newbin epam-wrapper epam + fi + + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}" + systemd_dounit "${PN}.service" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}" + + keepdir /var/{lib,log}/ejabberd +} + +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 + # /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 + 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." + ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." + ewarn "Please check your configuration, and finish the migration by stopping ejabberd" + ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd." + + local -A dirs_to_migrate=( + [/etc/jabber]=/etc/ejabberd + [/var/spool/jabber]=/var/lib/ejabberd + ) + + 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 ejabberd:ejabberd "${eroot_dst_dir}" || die + fi + done + fi +} -- cgit v1.2.3