From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- net-im/ejabberd/Manifest | 4 +- net-im/ejabberd/ejabberd-20.07.ebuild | 292 ---------------------------------- net-im/ejabberd/ejabberd-21.04.ebuild | 2 +- 3 files changed, 2 insertions(+), 296 deletions(-) delete mode 100644 net-im/ejabberd/ejabberd-20.07.ebuild (limited to 'net-im/ejabberd') diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 3c9795d86cbe..62d9b9ec49ff 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -6,9 +6,7 @@ AUX ejabberd.logrotate 203 BLAKE2B f523a30cf927d403523f618a6ab28fe4281a95ce6a1e6 AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309de4d25a38c93bfa82ac216211341d047078eed1346a39f327d856e8e9021e87d4c63ea9b26c0d581a0e2a0 SHA512 21953448f1695cf6b45d2eccf2eca7611d45c8407759fcc62b347afd22a4f25b79514275e18c473debc8070345b25bb49e1457e10bc37766f0590cb70f7f0230 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449 DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca -DIST ejabberd-20.07.tar.gz 2029485 BLAKE2B c6d9e177b150135595c4670b96386e752d795fab219619edbd5f887975b1edfc79bfe2606b57d2edb34af9fe15c8a545dc70b8d50faa7f667bac5fcef985bb4c SHA512 d31bea2bcf83c2404104a1153664abceda900dca1ef86216970eac32115da521826ee1b80b020d21dafbdff2cfee8b210de6e68ba795068f7fc51545e0e381fc DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579 EBUILD ejabberd-20.04.ebuild 9045 BLAKE2B 446556a5dd96d34c6287f6d7fe212efd6f679753ab9ce98e359dafca6a82ce1b78d1848a6803177dacd7299dd8e54493dfdb3c3fb1ca6e89d2b948e2309b0af5 SHA512 75671043e79bdebbadb53befafe7014806bdf493d88c54eeae8cdd5d34bca1d519aee2d0e852a9b3de6cc160dfbc0a13d61ff9ea0f7d92c321039ff2d857af87 -EBUILD ejabberd-20.07.ebuild 9049 BLAKE2B efc3a2bfccd5e26254af9c73e4db65767c8d64b0c4b752321a446ad76c4306c4efff9089b5fa5b8a917a5a93446ce6d10ddf0db7d02ed80570baafec94cfc9ec SHA512 a56a46e8a1e8423329aa20b90ebecdfec0175c3d7f92fd78a376efa3ab05965c8c12652e2e393b9143bda8548152a07da7ae02103cc560c9db1c9dc1dfb91a2f -EBUILD ejabberd-21.04.ebuild 8476 BLAKE2B 971c64233b7ca9ca346ed2d6f00b6e7eb85ee0d69bba45f2acdcde03b7b5fe180e22631d91d731e87a4932ac6acbfcdaf73130dfd145f0b41fe9a83815c91d44 SHA512 753914dc7e413720d4bb3ce1de356fcf4c418e523e5aa97dce844f47d7dd250bb2f6441ed77f4fd9424afaaa92cf94459e0d96618a5082d297c3b211838c96d9 +EBUILD ejabberd-21.04.ebuild 8474 BLAKE2B 8e9de7e0dc60e26980e69ac949deb37b533260e2c82127c0c20ba854ff0bb1578ccd25b245f8526e633610e8e597ce42537d5260e7f5791c3e925c1d4b3653b5 SHA512 c8f42da30aee30e4c722467fc307cd9c862c101f71e95bcc547357b502097ce4295669adf42a4ceceb704d6a4b6e81683c4a388bb9f8decfd511a941ac12c7a2 MISC metadata.xml 1516 BLAKE2B e156fd8588db78fd863ed478db344d54ed4b401426c602b63b3652a2bdf0db426eac2f46797f40443225abc9fd4f45060701030e7002a31b5162a61712cc8c9b SHA512 091f443f98785ac57d5c9a8c5dfa258029cf5f2b3f6ca90ec4330881b7331c7490cd885f1a477574bc8d6af6a75ec3ea9c8a6d1051194f3cb0636c5672d63671 diff --git a/net-im/ejabberd/ejabberd-20.07.ebuild b/net-im/ejabberd/ejabberd-20.07.ebuild deleted file mode 100644 index a3250c011877..000000000000 --- a/net-im/ejabberd/ejabberd-20.07.ebuild +++ /dev/null @@ -1,292 +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.25 - >=dev-erlang/eimp-1.0.17 - >=dev-erlang/fast_tls-1.1.8 - >=dev-erlang/fast_xml-1.1.43 - >=dev-erlang/fast_yaml-1.0.27 - >=dev-erlang/yconf-1.0.7 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.9.0 - >=dev-erlang/lager-3.6.10 - >=dev-erlang/p1_oauth2-0.6.7 - >=dev-erlang/p1_utils-1.0.20 - >=dev-erlang/stringprep-1.0.22 - >=dev-erlang/xmpp-1.4.9 - >=dev-erlang/pkix-1.0.6 - >=dev-erlang/mqtree-1.0.10 - >=dev-erlang/idna-6.0.0 - >=dev-erlang/p1_acme-1.0.8 - >=dev-erlang/base64url-1.0 - >=net-im/jabber-base-0.01 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.16 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.9 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.10 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - sip? ( >=dev-erlang/esip-1.0.37 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.8 ) - stun? ( >=dev-erlang/stun-1.0.37 ) - zlib? ( >=dev-erlang/ezlib-1.0.8 )" -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 - # . - # 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() { - 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.ebuild b/net-im/ejabberd/ejabberd-21.04.ebuild index b161498bc6ad..3cf528129054 100644 --- a/net-im/ejabberd/ejabberd-21.04.ebuild +++ b/net-im/ejabberd/ejabberd-21.04.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" +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 -- cgit v1.2.3