commit: ac7fd9583afe227c0efa9ff882617574e8f41592 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Wed Mar 23 08:20:51 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Mar 23 08:33:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7fd958
net-im/ejabberd: drop 20.04, 21.04, 21.04-r2 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-im/ejabberd/Manifest | 2 - net-im/ejabberd/ejabberd-20.04.ebuild | 294 --------------------- net-im/ejabberd/ejabberd-21.04-r2.ebuild | 245 ----------------- net-im/ejabberd/ejabberd-21.04.ebuild | 275 ------------------- ...rd-17.04-0002-Dont-overwrite-service-file.patch | 15 -- net-im/ejabberd/files/ejabberd.tmpfiles.conf | 2 - net-im/ejabberd/metadata.xml | 1 - 7 files changed, 834 deletions(-) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 9ed7f914b758..4507c95a647f 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,4 +1,2 @@ -DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca -DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579 DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1 diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild deleted file mode 100644 index 90c657f64b01..000000000000 --- a/net-im/ejabberd/ejabberd-20.04.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SSL_CERT_MANDATORY=1 - -inherit eutils pam rebar ssl-cert systemd tmpfiles - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis - roster-gw 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[hipe(-)?,odbc?,ssl] - >=dev-erlang/cache_tab-1.0.22 - >=dev-erlang/eimp-1.0.14 - >=dev-erlang/fast_tls-1.1.5 - >=dev-erlang/fast_xml-1.1.40 - >=dev-erlang/fast_yaml-1.0.24 - >=dev-erlang/yconf-1.0.4 - >=dev-erlang/jiffy-1.0.1 - >=dev-erlang/jose-1.9.0 - >=dev-erlang/lager-3.6.10 - >=dev-erlang/p1_oauth2-0.6.6 - >=dev-erlang/p1_utils-1.0.18 - >=dev-erlang/stringprep-1.0.19 - >=dev-erlang/xmpp-1.4.6 - >=dev-erlang/pkix-1.0.5 - >=dev-erlang/mqtree-1.0.7 - >=dev-erlang/idna-6.0.0 - >=dev-erlang/p1_acme-1.0.5 - >=dev-erlang/base64url-1.0 - >=net-im/jabber-base-0.01 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.14 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.7 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.9 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - sip? ( >=dev-erlang/esip-1.0.32 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.6 ) - stun? ( >=dev-erlang/stun-1.0.32 ) - zlib? ( >=dev-erlang/ezlib-1.0.7 )" -RDEPEND="${DEPEND} - captcha? ( media-gfx/imagemagick[truetype,png] )" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch") - -EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" -# Paths in net-im/jabber-base -JABBER_ETC="${EPREFIX}/etc/jabber" -JABBER_LOG="${EPREFIX}/var/log/jabber" -JABBER_SPOOL="${EPREFIX}/var/spool/jabber" - -# Adjust example configuration file to Gentoo. -# - Use our sample certificate. -adjust_config() { - sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to adjust example config' - sed -re 's/^#\s+(certfiles)/\1/' \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to adjust example config' -} - -# 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' -} - -# Check if we are missing a default certificate. -ejabberd_cert_missing() { - if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then - if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then - # default certificate is present in config and exists - not installing - return 1 - else - # default certificate is present in config - # but doesn't exist - need to install one - return 0 - fi - fi - # no default certificate in config - not installing - return 1 -} - -# Generate and install sample ejabberd certificate. It's installed into -# EJABBERD_CERT path. -ejabberd_cert_install() { - SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}" - install_cert "${EJABBERD_CERT%.*}" - chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die - chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die -} - -# 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}" -} - -# Make ejabberd.service for systemd from upstream provided template. -make_ejabberd_service() { - sed -r \ - -e 's!@ctlscriptpath@!/usr/sbin!g' \ - -e 's!^(User|Group)=(.*)!\1=jabber!' \ - -e 's!^(After)=(.*)!\1=epmd.service network.target!' \ - -e '/^After=/ a Requires=epmd.service' \ - "${PN}.service.template" >"${PN}.service" \ - || die 'failed to make ejabberd.service' -} - -# Set paths to defined by net-im/jabber-base. -set_jabberbase_paths() { - sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ - -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ - -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set paths in Makefile.in' - sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \ - -e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \ - -e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set paths ejabberdctl.template' -} - -# Skip installing docs because it's only COPYING that's installed by Makefile. -skip_docs() { - gawk -i inplace ' -/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ { - if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) { - print $0; - } else { - next; - } -} -1 -' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in' -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - set_jabberbase_paths - make_ejabberd_service - skip_docs - adjust_config - 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' - - sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \ - -i configure.ac || die "Failed to write correct version to configure" - # eautoreconf # required in case of download from github -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-user=jabber \ - --disable-system-deps \ - $(use_enable debug) \ - $(use_enable full-xml) \ - $(use_enable hipe) \ - $(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 - - keepdir /var/lib/lock/ejabberdctl - rm -rf "${ED%/}/var/log" || die - rm -rf "${ED%/}/var/spool" || die - - if use pam; then - local epam_path="$(get_ejabberd_path)/priv/bin/epam" - - pamd_mimic_system xmpp auth account || die "cannot create pam.d file" - into "$(get_ejabberd_path)/priv" - newbin epam-wrapper epam - fi - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - systemd_dounit "${PN}.service" - dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" -} - -pkg_preinst() { - if use pam; then - einfo "Adding jabber 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 jabber || die - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.tmpfiles.conf - - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/"; - echo - fi - if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then - ewarn If you are updating from an older version like 17.x - ewarn you may need to add an access_rules section to your - ewarn ejabberd.yml config file. - ewarn Otherwise authentication will be broken and users - ewarn will not be able to log in. - echo - fi - - if ejabberd_cert_missing; then - ejabberd_cert_install - fi -} diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild b/net-im/ejabberd/ejabberd-21.04-r2.ebuild deleted file mode 100644 index d8911b3b288c..000000000000 --- a/net-im/ejabberd/ejabberd-21.04-r2.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam rebar systemd - -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" - -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.28 - >=dev-erlang/eimp-1.0.20 - >=dev-erlang/fast_tls-1.1.12 - >=dev-erlang/fast_xml-1.1.46 - >=dev-erlang/fast_yaml-1.0.31 - >=dev-erlang/yconf-1.0.11 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.9.0 - >=dev-erlang/lager-3.6.10 - >=dev-erlang/p1_oauth2-0.6.9 - >=dev-erlang/p1_utils-1.0.22 - >=dev-erlang/stringprep-1.0.25 - >=dev-erlang/xmpp-1.5.3 - >=dev-erlang/pkix-1.0.7 - >=dev-erlang/mqtree-1.0.13 - >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.12 - >=dev-erlang/base64url-1.0.1 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.18 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.10 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.11 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - sip? ( >=dev-erlang/esip-1.0.42 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.12 ) - stun? ( >=dev-erlang/stun-1.0.43 ) - zlib? ( >=dev-erlang/ezlib-1.0.9 )" -RDEPEND="${DEPEND} - acct-user/ejabberd - captcha? ( media-gfx/imagemagick[truetype,png] ) - selinux? ( sec-policy/selinux-jabber ) -" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.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}" -} - -# Make ejabberd.service for systemd from upstream provided template. -make_ejabberd_service() { - sed -r \ - -e 's!@ctlscriptpath@!/usr/sbin!g' \ - -e 's!^(After)=(.*)!\1=epmd.service network.target!' \ - -e '/^After=/ a Requires=epmd.service' \ - "${PN}.service.template" >"${PN}.service" \ - || die 'failed to make ejabberd.service' -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - make_ejabberd_service - 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}" - - # /var/lock/ejabberdctl is unused, see - # https://github.com/processone/ejabberd/pull/3724 - rmdir "${ED}/var/lock/ejabberdctl" || die - rmdir "${ED}/var/lock" || die - - 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 - - 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 - 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 - - 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 where copied to /etc/ejabberd." - ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." - ewarn "Please check your configuration." - fi -} diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild b/net-im/ejabberd/ejabberd-21.04.ebuild deleted file mode 100644 index 245c006f1141..000000000000 --- a/net-im/ejabberd/ejabberd-21.04.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SSL_CERT_MANDATORY=1 - -inherit pam rebar ssl-cert systemd tmpfiles - -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" - -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.28 - >=dev-erlang/eimp-1.0.20 - >=dev-erlang/fast_tls-1.1.12 - >=dev-erlang/fast_xml-1.1.46 - >=dev-erlang/fast_yaml-1.0.31 - >=dev-erlang/yconf-1.0.11 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.9.0 - >=dev-erlang/lager-3.6.10 - >=dev-erlang/p1_oauth2-0.6.9 - >=dev-erlang/p1_utils-1.0.22 - >=dev-erlang/stringprep-1.0.25 - >=dev-erlang/xmpp-1.5.3 - >=dev-erlang/pkix-1.0.7 - >=dev-erlang/mqtree-1.0.13 - >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.12 - >=dev-erlang/base64url-1.0.1 - >=net-im/jabber-base-0.01 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.18 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.10 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.11 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - sip? ( >=dev-erlang/esip-1.0.42 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.12 ) - stun? ( >=dev-erlang/stun-1.0.43 ) - zlib? ( >=dev-erlang/ezlib-1.0.9 )" -RDEPEND="${DEPEND} - captcha? ( media-gfx/imagemagick[truetype,png] ) - selinux? ( sec-policy/selinux-jabber ) -" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch") - -EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" -# Paths in net-im/jabber-base -JABBER_ETC="${EPREFIX}/etc/jabber" -JABBER_LOG="${EPREFIX}/var/log/jabber" -JABBER_SPOOL="${EPREFIX}/var/spool/jabber" - -# Adjust example configuration file to Gentoo. -# - Use our sample certificate. -adjust_config() { - sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to adjust example config' - sed -re 's/^#\s+(certfiles)/\1/' \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to adjust example config' -} - -# 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' -} - -# Check if we are missing a default certificate. -ejabberd_cert_missing() { - if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then - if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then - # default certificate is present in config and exists - not installing - return 1 - else - # default certificate is present in config - # but doesn't exist - need to install one - return 0 - fi - fi - # no default certificate in config - not installing - return 1 -} - -# Generate and install sample ejabberd certificate. It's installed into -# EJABBERD_CERT path. -ejabberd_cert_install() { - SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}" - install_cert "${EJABBERD_CERT%.*}" - chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die - chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die -} - -# 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}" -} - -# Make ejabberd.service for systemd from upstream provided template. -make_ejabberd_service() { - sed -r \ - -e 's!@ctlscriptpath@!/usr/sbin!g' \ - -e 's!^(User|Group)=(.*)!\1=jabber!' \ - -e 's!^(After)=(.*)!\1=epmd.service network.target!' \ - -e '/^After=/ a Requires=epmd.service' \ - "${PN}.service.template" >"${PN}.service" \ - || die 'failed to make ejabberd.service' -} - -# Set paths to defined by net-im/jabber-base. -set_jabberbase_paths() { - sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ - -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ - -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set paths in Makefile.in' - sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \ - -e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \ - -e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set paths ejabberdctl.template' -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - set_jabberbase_paths - make_ejabberd_service - adjust_config - 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" \ - --enable-user=jabber \ - $(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 - - keepdir /var/lib/lock/ejabberdctl - rm -rf "${ED%/}/var/log" || die - rm -rf "${ED%/}/var/spool" || die - - 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" - dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" -} - -pkg_preinst() { - if use pam; then - einfo "Adding jabber 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 jabber || die - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.tmpfiles.conf - - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/"; - echo - fi - if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then - ewarn If you are updating from an older version like 17.x - ewarn you may need to add an access_rules section to your - ewarn ejabberd.yml config file. - ewarn Otherwise authentication will be broken and users - ewarn will not be able to log in. - echo - fi - - if ejabberd_cert_missing; then - ejabberd_cert_install - fi -} diff --git a/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch deleted file mode 100644 index 2bea750ef04e..000000000000 --- a/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index a0b4553d..4675b88a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -204,8 +204,8 @@ install: all copy-files - chmod 755 ejabberd.init - # - # Service script -- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \ -- > ejabberd.service -+ [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \ -+ ejabberd.service.template > ejabberd.service - chmod 644 ejabberd.service - # - # Spool directory diff --git a/net-im/ejabberd/files/ejabberd.tmpfiles.conf b/net-im/ejabberd/files/ejabberd.tmpfiles.conf deleted file mode 100644 index 6a9cc9e61b7a..000000000000 --- a/net-im/ejabberd/files/ejabberd.tmpfiles.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /run/lock/ejabberdctl 0750 jabber jabber -d /run/ejabberd 0750 jabber jabber diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml index 787de61bb992..df085f63589b 100644 --- a/net-im/ejabberd/metadata.xml +++ b/net-im/ejabberd/metadata.xml @@ -12,7 +12,6 @@ <flag name="captcha">Support for CAPTCHA Forms (XEP-158) on registration</flag> <flag name="full-xml">Use XML features in XMPP stream (ex: CDATA), requires XML compliant clients</flag> - <flag name="hipe">Compile natively with HiPE, not recommended</flag> <flag name="mssql">Enable Microsoft SQL Server support (via ODBC) for data storage</flag> <flag name="mysql">Enable MySQL support for data storage</flag>
