From 360468f13add58583c7780bcacafb5452a07851d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 13 Mar 2024 00:46:32 +0000 Subject: gentoo auto-resync : 13:03:2024 - 00:46:32 --- net-im/ejabberd/Manifest | 2 +- net-im/ejabberd/ejabberd-24.02-r1.ebuild | 221 +++++++++++++++++++++++++++++++ net-im/ejabberd/ejabberd-24.02.ebuild | 220 ------------------------------ 3 files changed, 222 insertions(+), 221 deletions(-) create mode 100644 net-im/ejabberd/ejabberd-24.02-r1.ebuild delete mode 100644 net-im/ejabberd/ejabberd-24.02.ebuild (limited to 'net-im/ejabberd') diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index d041b166b1f1..4e5304f372a4 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -17,5 +17,5 @@ EBUILD ejabberd-22.10.ebuild 6925 BLAKE2B acf99298e11c8bb573be35d3cfda71d2789b88 EBUILD ejabberd-23.01.ebuild 6925 BLAKE2B 6253509421453e88062317a7c6f28a9c7ad3c76d637392e3d5ee65920f9ffeea3e4f39c2da3c1ed25d5e5f7cd324ab473517dda89c64cf6bfbe7cc52604e27a6 SHA512 6227a9c5826f106b03878c6bdb6a91bf13ace70a21afb40c598d84a1db69f0f5a6d6dcd2f88067fee8694678e713efd703ed00c8fd1bf886383e7129a649d7de EBUILD ejabberd-23.04.ebuild 6776 BLAKE2B c7f404b51df06d7c28212f2fb2f22ed54c8289ae07fcf75bfb6ca4bb43b6493d589a4e291e3f836d7945ab045f66fd88babd29427366dd34a5bbdff39d8c05df SHA512 51a7a89f0b6c0f7560566ef474e362902a54b22471e10af59c90aaec5739178742e00bffedd090d0cc9d932f3d00f21eb3b1a93ff459c933c68c07151facf33d EBUILD ejabberd-23.10-r1.ebuild 7165 BLAKE2B 55cc3aa2820eebb73aa67e81c15965e6e0139d41787063e7121c3231d9be4d31dc6d33e947ffc81ace964620cc2fd1d18a55892f8fe7c0c0f150521225985c3c SHA512 d33787538c827b08f7e3e4a9b468dce3d72a86d749db242420d965246516316a916017706d6723baf70fcf89572c717ec0fdb775aaae939d2db17bf0e7c25c4e -EBUILD ejabberd-24.02.ebuild 7030 BLAKE2B 887ec0627892bf69e66629816b3776496d8c8f26fd324b9168cb7ffe723efe646e5a8ce879b10677c83d3b95aed9f6c93b5a3dbe77a0494c1e1af5fe1b419d4e SHA512 4a7d753a3fa8c863f169de9fd7f3797cd66271fb6b59f2b3948d0101065f21d0088f50e2fd53cd1703c0ea1030731acf96dddda5e128dbd22f00a3605a98279d +EBUILD ejabberd-24.02-r1.ebuild 7053 BLAKE2B 709ce1c30842e4826fdb9f85c829d5d39f1ec50e039d2b540ef4a24ee71a483faee3174e069a53cdca83556c84855d3c0b936570825f125632d440e04b01f421 SHA512 34675c7e482f1edac8bf1ff8fe3bda38b21558196db7d8c2d3bb5ed58bcdd94dfe7dfabc0420c9298a394138e7250fdd4266c3be328cf0b43a54bee68e8ada0c MISC metadata.xml 1484 BLAKE2B 74f0ec404b37dfe72d8751dd8bc8f0ba0b56f334939a5311af70df4616f19e536209b9be7361b35c8e5d316fbce623afdbf7e3ce53a139eb0d2e0d895275ae3c SHA512 793584e1e44c3a651b15eed84a91a801cd809392ccf7623f1a1b222e65641f8dca18515fb90e42e4a51178f4686d3c61778e14834be23feb23b269b4f07c91fb diff --git a/net-im/ejabberd/ejabberd-24.02-r1.ebuild b/net-im/ejabberd/ejabberd-24.02-r1.ebuild new file mode 100644 index 000000000000..c6595ebb5cd8 --- /dev/null +++ b/net-im/ejabberd/ejabberd-24.02-r1.ebuild @@ -0,0 +1,221 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools pam rebar systemd + +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 + https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch -> + ${P}-fix-ejabberdctl.patch + https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch -> + ${P}-set-ejabberd-opts.patch +" + +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-20[odbc?,ssl] + >=dev-erlang/cache_tab-1.0.30 + >=dev-erlang/eimp-1.0.22 + >=dev-erlang/fast_tls-1.1.19 + >=dev-erlang/fast_xml-1.1.51 + >=dev-erlang/fast_yaml-1.0.36 + >=dev-erlang/yconf-1.0.15 + >=dev-erlang/jiffy-1.0.5 + >=dev-erlang/jose-1.11.5 + >=dev-erlang/lager-3.9.1 + >=dev-erlang/p1_oauth2-0.6.14 + >=dev-erlang/p1_utils-1.0.25 + >=dev-erlang/stringprep-1.0.29 + >=dev-erlang/xmpp-1.8.1 + >=dev-erlang/pkix-1.0.9 + >=dev-erlang/mqtree-1.0.16 + >=dev-erlang/idna-6.0.0-r1 + >=dev-erlang/p1_acme-1.0.22 + >=dev-erlang/base64url-1.0.1 + ldap? ( =net-nds/openldap-2* ) + mysql? ( >=dev-erlang/p1_mysql-1.0.23 ) + odbc? ( dev-db/unixODBC ) + pam? ( >=dev-erlang/epam-1.0.14 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.25 ) + redis? ( >=dev-erlang/eredis-1.2.0 ) + sip? ( >=dev-erlang/esip-1.0.52 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.14 ) + stun? ( >=dev-erlang/stun-1.2.12 ) + 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 ) +" + +DOCS=( CHANGELOG.md README.md ) +PATCHES=( + "${FILESDIR}/ejabberd-22.10-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' + + # 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} \ + --with-rebar=rebar \ + $(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 ejabberd.service +} + +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 +} diff --git a/net-im/ejabberd/ejabberd-24.02.ebuild b/net-im/ejabberd/ejabberd-24.02.ebuild deleted file mode 100644 index 1a918b3c7001..000000000000 --- a/net-im/ejabberd/ejabberd-24.02.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools pam rebar systemd - -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 - https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch -> - ${P}-fix-ejabberdctl.patch - https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch -> - ${P}-set-ejabberd-opts.patch -" - -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-20[odbc?,ssl] - >=dev-erlang/cache_tab-1.0.30 - >=dev-erlang/eimp-1.0.22 - >=dev-erlang/fast_tls-1.1.19 - >=dev-erlang/fast_xml-1.1.51 - >=dev-erlang/fast_yaml-1.0.36 - >=dev-erlang/yconf-1.0.15 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.11.5 - >=dev-erlang/lager-3.9.1 - >=dev-erlang/p1_oauth2-0.6.14 - >=dev-erlang/p1_utils-1.0.25 - >=dev-erlang/stringprep-1.0.29 - >=dev-erlang/xmpp-1.8.1 - >=dev-erlang/pkix-1.0.9 - >=dev-erlang/mqtree-1.0.16 - >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.22 - >=dev-erlang/base64url-1.0.1 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.23 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.14 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.25 ) - redis? ( >=dev-erlang/eredis-1.2.0 ) - sip? ( >=dev-erlang/esip-1.0.52 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.14 ) - stun? ( >=dev-erlang/stun-1.2.12 ) - 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 ) -" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( - "${FILESDIR}/ejabberd-22.10-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' - - # 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 ejabberd.service -} - -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