diff options
Diffstat (limited to 'net-im')
21 files changed, 9 insertions, 1375 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz Binary files differindex de9fe7fc606c..d52a0437f42d 100644 --- a/net-im/Manifest.gz +++ b/net-im/Manifest.gz diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index c3d51ad3df3a..987052797b6a 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,6 +1,3 @@ -AUX ejabberd-16.09-ejabberdctl.patch 2154 BLAKE2B b5050f77bfaf84a4ec5f366d6ca3241d39eab3603b54d3a19c17d3581d37fe5e55b348d3a523ea6004468817d580a066fda2a2b1578e321b3ee06f3bff5935ae SHA512 8f715dee3570dc5ea44499bde94d6a137ef2a7c28d0535173b88cef0ceeadd94950e42b29d23f689b1de7be7670dd307694524b75102c668ad88f10250ae6166 -AUX ejabberd-17.01-0001-Dont-overwrite-service-file.patch 470 BLAKE2B fb1574a2c64e3fb56dca3d6eecb6f24d2cfd59bb16b04afb89cd807fc95c14cead2927173fccb9736d518f19d5ca5a7953e0c81482b46a9b8d609b291290a949 SHA512 f3c708a65c4eaeaf95aef9d98c683984f8d897d69a1d361f73a2b6cde30ee8248ddc2b1e1e56bba4718302f3141788aa69c0a1b5846a13b3e10d8304bf9ab70d -AUX ejabberd-17.01-ejabberdctl.patch 2154 BLAKE2B b5050f77bfaf84a4ec5f366d6ca3241d39eab3603b54d3a19c17d3581d37fe5e55b348d3a523ea6004468817d580a066fda2a2b1578e321b3ee06f3bff5935ae SHA512 8f715dee3570dc5ea44499bde94d6a137ef2a7c28d0535173b88cef0ceeadd94950e42b29d23f689b1de7be7670dd307694524b75102c668ad88f10250ae6166 AUX ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch 1642 BLAKE2B ffba29eb4f46e35cf957d2fa023ae28d56148bdd20a0d7a4f594a745ab46e9dfa371796fd58105e30acfdc6b0834eec993ce266723ffd359b7953f2ccad6ea76 SHA512 ab2b3fe4f3cca579a174cd77876f6c485fd806454b07d7e8d2a13c710b3f9115aa901f22dd71dfd3ab60a78f819e0c8dfdbcca38ca9c87d65fe5b5a0f105cad6 AUX ejabberd-17.04-0002-Dont-overwrite-service-file.patch 470 BLAKE2B 0dd597eaa63ccedafbb5c2903f948cc078c4951c551f76827f66198b4a25ac71f81dfaa36a0e0f443a8567c5d4309d00bc7ed59732a945dd0696d08edea5189f SHA512 a6b38ae82a0fe5d5d643eb2a122921aff3a9701381f6162213cee11b4950bdb9f16add78465a01eb6df5824dfa4ba2adae6dc0451749f76eefd224f5f97b8b01 AUX ejabberd-17.04-ejabberdctl.patch 2154 BLAKE2B b5050f77bfaf84a4ec5f366d6ca3241d39eab3603b54d3a19c17d3581d37fe5e55b348d3a523ea6004468817d580a066fda2a2b1578e321b3ee06f3bff5935ae SHA512 8f715dee3570dc5ea44499bde94d6a137ef2a7c28d0535173b88cef0ceeadd94950e42b29d23f689b1de7be7670dd307694524b75102c668ad88f10250ae6166 @@ -9,11 +6,6 @@ AUX ejabberd.initd 1071 BLAKE2B 226a0d4593df3504e30fbf40e9daffed6d903cf797b4ce0c AUX ejabberd.logrotate 203 BLAKE2B f523a30cf927d403523f618a6ab28fe4281a95ce6a1e639b4075b0ce98a8a985deec5446655c41288258a286a1ceb46cb64422be554d1de754fd97fc86e67555 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2 AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309de4d25a38c93bfa82ac216211341d047078eed1346a39f327d856e8e9021e87d4c63ea9b26c0d581a0e2a0 SHA512 21953448f1695cf6b45d2eccf2eca7611d45c8407759fcc62b347afd22a4f25b79514275e18c473debc8070345b25bb49e1457e10bc37766f0590cb70f7f0230 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449 -DIST ejabberd-16.09.tar.gz 1687485 BLAKE2B 01bdfc0ebfc54bf94f5ce645fdb7e4c86070249fe9c5bd6ae40fb355bb0cce8707b285b8e4519a38148a75d8a14719b2815dd0a987de74fe69099bce1401f9da SHA512 506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f -DIST ejabberd-17.01.tar.gz 1638418 BLAKE2B 016224277c45f753018a4e82783be1924acc1e747f1674ce1c902b06644908762750770debe5c06e8e4befcb4246b65efed4592d948188c30dcbf158bb049688 SHA512 d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566 DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B 2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066 SHA512 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7 -EBUILD ejabberd-16.09.ebuild 10410 BLAKE2B 5f0e00b9c106afd09dad578411c0e7ff7ec982db5184ec539ae532293c84db06a4b73ce382a3c633bcf0041c7a613b9e1403e9ecfa3196f18b2b9a5c2d372021 SHA512 474c1effa517a9a21866d78362bf915f8377d7e331190a0e2ef6408c5fa9f758b2e0a8917de9106ac56a06ea6953c3786e225164e154197aaaa976cb46686491 -EBUILD ejabberd-17.01-r2.ebuild 10610 BLAKE2B b8488e6546001b91deb8ded9ae3b7cdbf81303153f467c8ca1beb17bdbb56178324349c0f6f484c9dbc3307c8a238a1da874638361ce5043d5097e5eef932309 SHA512 9309a91a1a4103c54d81574b4aebcda7c5174e36833154f31698e86d1ce178a13c803cadf55d3ccaaeb6ab32194d228798ec655e2de183d916baef1213306f8a -EBUILD ejabberd-17.04-r1.ebuild 10679 BLAKE2B 4243dfc06ef33e41eb77ec529cc98bbe86003cf7bf2e383624c279678dc71351b6a2d34d46ccb91004e324b805100cc180233552a98637af611f2ce9bfa78f7d SHA512 b21e8022f7ee1024c3bae79af80c8a683db4b40974230b194e19910944d74b9dec9b74e020967dfe960b7c27b2fdd2e7e70e9ff86d2052133e1d241954c23798 EBUILD ejabberd-17.04-r2.ebuild 10910 BLAKE2B 8a5d34ca8fd943b604d07b9e6ca9aa092a40064b67a03ed58fc1fd4a74b626e3073cbb22d3ed4effb9e594f2e3c1a36ac63078dfe8b9b066bd7b7d9a5d1c7b2d SHA512 0b6d08ef700f1d721d436858f24505e8304733346a49dbe84252f4b69fe359aa505f2f888d4538c035c15704c477fe884904c64ef414648f18811f3e2de8dfc1 MISC metadata.xml 1722 BLAKE2B b88f8d75b4e5ce0a61e7fbc2402d8c7f8e7976965fb0cd7f933d2a4136e378ad79bfef107b8e557c383ef84d4fee38ff3d670c3aae6815a457c649083e1590a3 SHA512 943a50b2d49defcb82428ec1470bf05e890a4c753463da857fca4cb01fdb032aade634c69f9ebf4c3b7cf1023ed9bc2c11e7aa94e8cfed57af1a5dc328bb5d78 diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild b/net-im/ejabberd/ejabberd-16.09.ebuild deleted file mode 100644 index 8c86270fcf8b..000000000000 --- a/net-im/ejabberd/ejabberd-16.09.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SSL_CERT_MANDATORY=1 - -inherit eutils pam rebar ssl-cert systemd - -DESCRIPTION="Robust, scalable and extensible XMPP server" -HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" -SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz - -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis - riak roster-gw sqlite zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/meck-0.8.4 -# TODO: >=dev-erlang/moka-1.0.5b -# TODO: ) -CDEPEND=" - >=dev-erlang/cache_tab-1.0.4 - >=dev-erlang/esip-1.0.8 - >=dev-erlang/fast_tls-1.0.7 - >=dev-erlang/fast_xml-1.1.15 - >=dev-erlang/fast_yaml-1.0.6 - >=dev-erlang/jiffy-0.14.7 - >=dev-erlang/lager-3.2.1 - >=dev-erlang/luerl-0.2 - >=dev-erlang/p1_oauth2-0.6.1 - >=dev-erlang/p1_utils-1.0.5 - >=dev-erlang/stringprep-1.0.6 - >=dev-erlang/stun-1.0.7 - >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] - !>=dev-lang/erlang-20.0 - >=net-im/jabber-base-0.01 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) - nls? ( >=dev-erlang/iconv-1.0.2 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.0 - <dev-erlang/epam-1.0.1 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - riak? ( - >=dev-erlang/hamcrest-0.1.0_p20150103 - >=dev-erlang/riakc-2.1.1_p20151111 - ) - sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) - zlib? ( >=dev-erlang/ezlib-1.0.1 )" -DEPEND="${CDEPEND} - >=sys-apps/gawk-4.1" -RDEPEND="${CDEPEND} - captcha? ( media-gfx/imagemagick[truetype,png] )" - -DOCS=( README ) -PATCHES=( "${FILESDIR}/${P}-ejabberdctl.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 certificates. -# - Correct PAM service name. -adjust_config() { - sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \ - -e "s|\"pamservicename\"|\"xmpp\"|" \ - -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' - sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to correct path to captcha.sh in example config' -} - -# 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' -} - -# Disable mod_irc in example configuration file. -disable_mod_irc() { - local needs_iconv='needs dev-erlang/iconv (+nls USE flag)' - sed -r \ - -e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to modify example config' -} - -# Check if there already exists a certificate. -ejabberd_cert_exists() { - local cert - - for cert in $(gawk -- \ - 'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \ - "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do - [[ -f ${cert} ]] && return 0 - done - - 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}" -} - -# Check whether mod_irc is enabled in ejabberd configuration on target system. -is_mod_irc_enabled() { - egrep '^(\s*)(mod_irc\s*:.*$)' \ - "${EROOT%/}${JABBER_ETC}/ejabberd.yml" -} - -# Make ejabberd.service for systemd from upstream provided template. -make_ejabberd_service() { - sed -r \ - -e 's!@ctlscriptpath@!/usr/sbin!' \ - -e 's!(User|Group)=(.*)!\1=jabber!' \ - "${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 - use nls || disable_mod_irc - customize_epam_wrapper "${FILESDIR}/epam-wrapper" - - # 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 hipe) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable nls iconv) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable riak) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable zlib) -} - -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 || die "cannot create pam.d file" - into "$(get_ejabberd_path)/priv" - newbin epam-wrapper epam - # PAM helper module permissions - # https://www.process-one.net/docs/ejabberd/guide_en.html#pam - fowners root:jabber "${epam_path}" - fperms 4750 "${epam_path}" - fi - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - systemd_dounit "${PN}.service" - systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" -} - -pkg_postinst() { - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then - ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after" - ewarn "migration to ${PV}. pubsub data may not be migrated automatically and" - ewarn "you may need to run migration script manually, see:" - ewarn - ewarn " https://github.com/processone/ejabberd/issues/479#issuecomment-124497456" - ewarn - ewarn "In case you don't care about all stored moods, activities, geoinfo and you" - ewarn "know you don't store in pubsub anything important, you can just remove" - ewarn "pubsub tables:" - ewarn - ewarn " rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*" - ewarn - ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244" - echo - fi - elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then - elog "Ejabberd now defaults to using a YAML format for its config file." - elog "The old ejabberd.cfg file can be converted using the following instructions:" - echo - elog "1. Make sure all processes related to the previous version of ejabberd aren't" - elog " running. Usually this just means the ejabberd and epmd daemons and possibly" - elog " the pam-related process (epam) if pam support is enabled." - elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can" - elog " fail to start ejabberd properly for various reasons. Check ejabberd's main" - elog " log file at /var/log/jabber/ejabberd.log to confirm it started successfully." - elog "3. Run" - elog " \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`" - elog " with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to" - elog " /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config" - elog " file." - echo - fi - - if ! ejabberd_cert_exists; then - ejabberd_cert_install - fi - - if use pam; then - # sfperms drops read bit from files with suid. Reapply it. - # Fix bug #592218. - local epam_path="$(get_ejabberd_path)/priv/bin/epam" - chmod g+r "${EROOT%/}${epam_path}" \ - || die "failed to correct ${epam_path} permissions" - fi - - if ! use nls && is_mod_irc_enabled; then - ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd" - ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml." - fi -} diff --git a/net-im/ejabberd/ejabberd-17.01-r2.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild deleted file mode 100644 index d20acca57feb..000000000000 --- a/net-im/ejabberd/ejabberd-17.01-r2.ebuild +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SSL_CERT_MANDATORY=1 - -inherit eutils pam rebar ssl-cert systemd - -DESCRIPTION="Robust, scalable and extensible XMPP server" -HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" -SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz - -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis - riak roster-gw sqlite zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/meck-0.8.4 -# TODO: >=dev-erlang/moka-1.0.5b -# TODO: ) -CDEPEND=" - >=dev-erlang/cache_tab-1.0.6 - >=dev-erlang/esip-1.0.10 - >=dev-erlang/fast_tls-1.0.10 - >=dev-erlang/fast_xml-1.1.19 - >=dev-erlang/fast_yaml-1.0.8 - >=dev-erlang/jiffy-0.14.8 - >=dev-erlang/lager-3.2.1 - >=dev-erlang/luerl-0.2 - >=dev-erlang/p1_oauth2-0.6.1 - >=dev-erlang/p1_utils-1.0.6 - >=dev-erlang/stringprep-1.0.7 - >=dev-erlang/stun-1.0.9 - >=dev-erlang/xmpp-1.1.6 - <dev-erlang/xmpp-1.2.0 - >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] - !>=dev-lang/erlang-20.0 - >=net-im/jabber-base-0.01 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) - nls? ( >=dev-erlang/iconv-1.0.3 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.0-r1 - <dev-erlang/epam-1.0.1 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - riak? ( - >=dev-erlang/hamcrest-0.1.0_p20150103 - >=dev-erlang/riakc-2.4.1 - ) - sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) - zlib? ( >=dev-erlang/ezlib-1.0.2 )" -DEPEND="${CDEPEND} - >=sys-apps/gawk-4.1" -RDEPEND="${CDEPEND} - captcha? ( media-gfx/imagemagick[truetype,png] )" - -DOCS=( README ) -PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" - "${FILESDIR}/${P}-0001-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 certificates. -# - Correct PAM service name. -adjust_config() { - sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \ - -e "s|\"pamservicename\"|\"xmpp\"|" \ - -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' - sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to correct path to captcha.sh in example config' -} - -# 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' -} - -# Disable mod_irc in example configuration file. -disable_mod_irc() { - local needs_iconv='needs dev-erlang/iconv (+nls USE flag)' - sed -r \ - -e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to modify example config' -} - -# Check if there already exists a certificate. -ejabberd_cert_exists() { - local cert - - for cert in $(gawk -- \ - 'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \ - "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do - [[ -f ${cert} ]] && return 0 - done - - 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}" -} - -# Check whether mod_irc is enabled in ejabberd configuration on target system. -is_mod_irc_enabled() { - egrep '^(\s*)(mod_irc\s*:.*$)' \ - "${EROOT%/}${JABBER_ETC}/ejabberd.yml" -} - -# 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!' \ - "${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' -} - -pkg_setup() { - 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 -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - set_jabberbase_paths - make_ejabberd_service - skip_docs - adjust_config - use nls || disable_mod_irc - customize_epam_wrapper "${FILESDIR}/epam-wrapper" - - rebar_fix_include_path fast_xml - 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 hipe) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable nls iconv) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable riak) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable zlib) -} - -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 || 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" - systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" -} - -pkg_postinst() { - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then - ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after" - ewarn "migration to ${PV}. pubsub data may not be migrated automatically and" - ewarn "you may need to run migration script manually, see:" - ewarn - ewarn " https://github.com/processone/ejabberd/issues/479#issuecomment-124497456" - ewarn - ewarn "In case you don't care about all stored moods, activities, geoinfo and you" - ewarn "know you don't store in pubsub anything important, you can just remove" - ewarn "pubsub tables:" - ewarn - ewarn " rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*" - ewarn - ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244" - echo - fi - elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then - elog "Ejabberd now defaults to using a YAML format for its config file." - elog "The old ejabberd.cfg file can be converted using the following instructions:" - echo - elog "1. Make sure all processes related to the previous version of ejabberd aren't" - elog " running. Usually this just means the ejabberd and epmd daemons and possibly" - elog " the pam-related process (epam) if pam support is enabled." - elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can" - elog " fail to start ejabberd properly for various reasons. Check ejabberd's main" - elog " log file at /var/log/jabber/ejabberd.log to confirm it started successfully." - elog "3. Run" - elog " \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`" - elog " with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to" - elog " /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config" - elog " file." - echo - fi - - if ! ejabberd_cert_exists; then - ejabberd_cert_install - fi - - if ! use nls && is_mod_irc_enabled; then - ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd" - ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml." - fi -} diff --git a/net-im/ejabberd/ejabberd-17.04-r1.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild deleted file mode 100644 index 02947b6b7391..000000000000 --- a/net-im/ejabberd/ejabberd-17.04-r1.ebuild +++ /dev/null @@ -1,327 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SSL_CERT_MANDATORY=1 - -inherit eutils pam rebar ssl-cert systemd - -DESCRIPTION="Robust, scalable and extensible XMPP server" -HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" -SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz - -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis - riak roster-gw sqlite zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/meck-0.8.4 -# TODO: >=dev-erlang/moka-1.0.5b -# TODO: ) -CDEPEND=" - >=dev-erlang/cache_tab-1.0.7 - >=dev-erlang/esip-1.0.11 - >=dev-erlang/fast_tls-1.0.11 - >=dev-erlang/fast_xml-1.1.21 - >=dev-erlang/fast_yaml-1.0.9 - >=dev-erlang/jiffy-0.14.8 - >=dev-erlang/lager-3.2.1 - >=dev-erlang/luerl-0.2 - >=dev-erlang/p1_oauth2-0.6.1 - >=dev-erlang/p1_utils-1.0.8 - >=dev-erlang/stringprep-1.0.8 - >=dev-erlang/stun-1.0.10 - >=dev-erlang/xmpp-1.1.9 - <dev-erlang/xmpp-1.2.0 - >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] - !>=dev-lang/erlang-20.0 - >=net-im/jabber-base-0.01 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) - nls? ( >=dev-erlang/iconv-1.0.4 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.2 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - riak? ( - >=dev-erlang/hamcrest-0.1.0_p20150103 - >=dev-erlang/riakc-2.4.1 - ) - sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) - zlib? ( >=dev-erlang/ezlib-1.0.2 )" -DEPEND="${CDEPEND} - >=sys-apps/gawk-4.1" -RDEPEND="${CDEPEND} - captcha? ( media-gfx/imagemagick[truetype,png] )" - -DOCS=( README ) -PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" - "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" - "${FILESDIR}/${P}-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 certificates. -# - Correct PAM service name. -adjust_config() { - sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \ - -e "s|\"pamservicename\"|\"xmpp\"|" \ - -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' - sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to correct path to captcha.sh in example config' -} - -# 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' -} - -# Disable mod_irc in example configuration file. -disable_mod_irc() { - local needs_iconv='needs dev-erlang/iconv (+nls USE flag)' - sed -r \ - -e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to modify example config' -} - -# Check if there already exists a certificate. -ejabberd_cert_exists() { - local cert - - for cert in $(gawk -- \ - 'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \ - "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do - [[ -f ${cert} ]] && return 0 - done - - 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}" -} - -# Check whether mod_irc is enabled in ejabberd configuration on target system. -is_mod_irc_enabled() { - egrep '^(\s*)(mod_irc\s*:.*$)' \ - "${EROOT%/}${JABBER_ETC}/ejabberd.yml" -} - -# 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!' \ - "${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' -} - -pkg_setup() { - 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 -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - set_jabberbase_paths - make_ejabberd_service - skip_docs - adjust_config - use nls || disable_mod_irc - 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 hipe) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable nls iconv) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable riak) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable zlib) -} - -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 || 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" - systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" -} - -pkg_postinst() { - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then - ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after" - ewarn "migration to ${PV}. pubsub data may not be migrated automatically and" - ewarn "you may need to run migration script manually, see:" - ewarn - ewarn " https://github.com/processone/ejabberd/issues/479#issuecomment-124497456" - ewarn - ewarn "In case you don't care about all stored moods, activities, geoinfo and you" - ewarn "know you don't store in pubsub anything important, you can just remove" - ewarn "pubsub tables:" - ewarn - ewarn " rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*" - ewarn - ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244" - echo - fi - elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then - elog "Ejabberd now defaults to using a YAML format for its config file." - elog "The old ejabberd.cfg file can be converted using the following instructions:" - echo - elog "1. Make sure all processes related to the previous version of ejabberd aren't" - elog " running. Usually this just means the ejabberd and epmd daemons and possibly" - elog " the pam-related process (epam) if pam support is enabled." - elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can" - elog " fail to start ejabberd properly for various reasons. Check ejabberd's main" - elog " log file at /var/log/jabber/ejabberd.log to confirm it started successfully." - elog "3. Run" - elog " \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`" - elog " with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to" - elog " /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config" - elog " file." - echo - fi - - if ! ejabberd_cert_exists; then - ejabberd_cert_install - fi - - if ! use nls && is_mod_irc_enabled; then - ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd" - ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml." - fi -} diff --git a/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch deleted file mode 100644 index 6001c651f5d6..000000000000 --- a/net-im/ejabberd/files/ejabberd-16.09-ejabberdctl.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Mon, 29 Aug 2016 22:29:41 +0100 -Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup - -Set SHELL since the generic jabber user used on Gentoo for jabber -servers doesn't have a valid shell set by default and fix EXEC_CMD -otherwise it fails with "This account is currently not available" again -due to jabber not having a valid shell. - -Also, workaround the assumption that jabber's $HOME is a directory when -instead it defaults to /dev/null on Gentoo. ---- - ejabberdctl.template | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/ejabberdctl.template b/ejabberdctl.template -index 5b34ebe..3c080fd 100755 ---- a/ejabberdctl.template -+++ b/ejabberdctl.template -@@ -16,6 +16,7 @@ IEX={{bindir}}/iex - EPMD={{epmd}} - INSTALLUSER={{installuser}} - ERL_LIBS={{libdir}} -+SHELL=/bin/sh - - # check the proper system user is used if defined - if [ "$INSTALLUSER" != "" ] ; then -@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then - for GID in `id -G`; do - if [ $GID -eq 0 ] ; then - INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6) -- if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then -+ if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then - mkdir -p "$INSTALLUSER_HOME" - chown "$INSTALLUSER" "$INSTALLUSER_HOME" - fi -- EXEC_CMD="su $INSTALLUSER -c" -+ EXEC_CMD="su $INSTALLUSER -p -c" - fi - done - if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then -@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log - DATETIME=`date "+%Y%m%d-%H%M%S"` - ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump - ERL_INETRC=$ETC_DIR/inetrc -+HOME=$SPOOL_DIR - - # define mnesia options - MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS" -@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES - export CONTRIB_MODULES_PATH - export CONTRIB_MODULES_CONF_DIR - export ERL_LIBS -+export HOME -+export SHELL - - shell_escape_str() - { --- -2.9.2 - diff --git a/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch deleted file mode 100644 index 92b7b023309e..000000000000 --- a/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 5ff3efe0..644ed713 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-17.01-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-17.01-ejabberdctl.patch deleted file mode 100644 index 6001c651f5d6..000000000000 --- a/net-im/ejabberd/files/ejabberd-17.01-ejabberdctl.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Mon, 29 Aug 2016 22:29:41 +0100 -Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup - -Set SHELL since the generic jabber user used on Gentoo for jabber -servers doesn't have a valid shell set by default and fix EXEC_CMD -otherwise it fails with "This account is currently not available" again -due to jabber not having a valid shell. - -Also, workaround the assumption that jabber's $HOME is a directory when -instead it defaults to /dev/null on Gentoo. ---- - ejabberdctl.template | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/ejabberdctl.template b/ejabberdctl.template -index 5b34ebe..3c080fd 100755 ---- a/ejabberdctl.template -+++ b/ejabberdctl.template -@@ -16,6 +16,7 @@ IEX={{bindir}}/iex - EPMD={{epmd}} - INSTALLUSER={{installuser}} - ERL_LIBS={{libdir}} -+SHELL=/bin/sh - - # check the proper system user is used if defined - if [ "$INSTALLUSER" != "" ] ; then -@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then - for GID in `id -G`; do - if [ $GID -eq 0 ] ; then - INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6) -- if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then -+ if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then - mkdir -p "$INSTALLUSER_HOME" - chown "$INSTALLUSER" "$INSTALLUSER_HOME" - fi -- EXEC_CMD="su $INSTALLUSER -c" -+ EXEC_CMD="su $INSTALLUSER -p -c" - fi - done - if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then -@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log - DATETIME=`date "+%Y%m%d-%H%M%S"` - ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump - ERL_INETRC=$ETC_DIR/inetrc -+HOME=$SPOOL_DIR - - # define mnesia options - MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS" -@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES - export CONTRIB_MODULES_PATH - export CONTRIB_MODULES_CONF_DIR - export ERL_LIBS -+export HOME -+export SHELL - - shell_escape_str() - { --- -2.9.2 - diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest index 1307552542dc..0f8d93356a3d 100644 --- a/net-im/mcabber/Manifest +++ b/net-im/mcabber/Manifest @@ -1,5 +1,5 @@ AUX README.gentoo 692 BLAKE2B ff09452aa3712dcdcd575bdf12b6bffd32f142e1b75a392c394af9131d029bedb66193dc767b5d0a3fbcc0e14852e7c63951a6189f43a68986e9f6d8f524d07d SHA512 e55fe538eb677f638ce343cb3e54314c50c923b9b0e5077e5a82bbe9d8c68dcfe3ae6975821147fd3322d2d6a74669fa58435a772e55d3b27601a80a964e3e31 DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f EBUILD mcabber-1.1.0-r1.ebuild 2363 BLAKE2B d1a02f8692b144511f7d72dfc70ff82a35c216512563ecd1658470c9dc5b1c649dfe2fef639e3b8f22c8df921bd27a930dc28704673ae251e75287e2d6aa122e SHA512 c885f5d856848c0ff3ac49d296572c692da00a9c722a4dc917cab2f3fd257bb32539f86edc1f916fd1f6d63fa87009379be61f3b5a1aa9ace1698c53b6e7c4ed -EBUILD mcabber-9999.ebuild 2368 BLAKE2B 9939ed9e6917c345fd2d8381eb25e657d782769496b6fd45ff3ff033d32af451d3883ad12d56fd4c654518d5de3d52fa03ac5cb20dbe3b69134b75767a3a8079 SHA512 a6cf985eaed60adb87dd2b76b15cc989a20a223873458bc7a254cf5195b416e10615b7a6a71dd2c64320d3de2611bc904ba73cb17cbe0ee2a8e26427039b0f29 +EBUILD mcabber-9999.ebuild 2352 BLAKE2B 12746296524a0e90717722047e49c7d6b21f1da88a9fea69562644c89066d6502f66c4d6ba00d1b3f0821f9c89efb8933576f2b92913b0ac625e41a90bf1b9cd SHA512 185722d98fe44c10c059de27a96434e18a224fcd064b00dd9737fac5197ab11f35ce9eae33035adc25a5ece91aaa89b370521efc99eabdc981822f5a45ee70e7 MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6 diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild index 2f8476b1c214..75d371a188d9 100644 --- a/net-im/mcabber/mcabber-9999.ebuild +++ b/net-im/mcabber/mcabber-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic readme.gentoo-r1 +inherit readme.gentoo-r1 DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP" HOMEPAGE="http://mcabber.com/" diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index df36e2ee67e2..6bccf6966839 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -1,4 +1,3 @@ -AUX prosody-0.10.0-cfg.lua.patch 1558 BLAKE2B 5c9426fb53f954843309c333db915a1392d7e7704e6f7755de88029e64714afd9e8290c1a697f3a9f9a80944ecad1e71c6ce4131cf36770c60e3f34d79ef0b28 SHA512 39df578b0dc205ed6142fbf23b049e0c1d26d53e6ee0926d3f61965ced2935c18eca4d0b576e47bb58a44484212199c7f788dc7d15bc9e65ad69fdfa6888496f AUX prosody-0.9.2-cfg.lua.patch 2173 BLAKE2B 7b2fbfb1fa6c57b34e96f54cc6c50449057f802b8a0c6d8094d2613642ffa750a59b54ba1d4687e3153f030ff9282445e9cce58b43e73a624a97e1a024bea8da SHA512 73531ac9c3667fc8c95e572643de760c6da378f73824fb04e4d3d3e4bf0b12b56c6854a61b9340ddbca8ff8fea1bc49927928b7b07016d4aeadad4d52630f1b1 AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfeee09c939a2c9449a7f5994d984ed68ffbd015344db8f99fc9e5f5a16c4196d767c1768140d4880becc SHA512 6e16462a39fb72bbf7b312b5e02ea1ca766576b18ab0304e48fc8e123c4241fad1d784266d00b63a25ac7d36524cedbf5eb0cafe3a7e745082b50b87a2a9a9da AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c diff --git a/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch b/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch deleted file mode 100644 index d0600ac6d67a..000000000000 --- a/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- prosody-0.10.0/prosody.cfg.lua.dist 2017-10-05 11:27:20.852452270 +0200 -+++ prosody-0.10.0-gentoo/prosody.cfg.lua.dist 2017-10-05 11:29:07.151997654 +0200 -@@ -1,5 +1,3 @@ ---- Prosody Example Configuration File ---- - -- Information on configuring Prosody can be found on our - -- website at https://prosody.im/doc/configure - -- -@@ -9,8 +7,6 @@ - -- If there are any errors, it will let you know what and where - -- they are, otherwise it will keep quiet. - -- ---- The only thing left to do is rename this file to remove the .dist ending, and fill in the ---- blanks. Good luck, and happy Jabbering! - - - ---------- Server-wide settings ---------- -@@ -80,6 +76,12 @@ - --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use - } - -+-- Settings for Gentoo init script and net-im/jabber-base permissions system: -+daemonize = true; -+prosody_user = "jabber"; -+prosody_group = "jabber"; -+pidfile = "/var/run/jabber/prosody.pid"; -+ - -- These modules are auto-loaded, but should you want - -- to disable them then uncomment them here: - modules_disabled = { -@@ -161,8 +163,8 @@ - -- Logging configuration - -- For advanced logging see https://prosody.im/doc/logging - log = { -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging -- error = "prosody.err"; -+ info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging -+ error = "/var/log/jabber/prosody.err"; - -- "*syslog"; -- Uncomment this for logging to syslog - -- "*console"; -- Log to the console, useful for debugging with daemonize=false - } diff --git a/net-im/sendxmpp/Manifest b/net-im/sendxmpp/Manifest index 093b29e2217f..0d443e0d6994 100644 --- a/net-im/sendxmpp/Manifest +++ b/net-im/sendxmpp/Manifest @@ -1,5 +1,3 @@ DIST sendxmpp-1.24.tar.gz 9657 BLAKE2B c1dbf65c031d7178b996b4309cab149038774c40aa903185d99f1cf26c9a803b623d5a72e3991e30c929b9f236d7cfe2e2828e92b1f135e7e791e001d58142e1 SHA512 349aac46ad4e13836f797f953d1acb33014d66de2bebed4961bcd981b765b5f0014bd2291a7355f0f8e80db522e3e843088fe08c0a21d4dda360dc2834db4842 -DIST sendxmpp_1.23.orig.tar.gz 9196 BLAKE2B 16ec292478610d58c92ea50a46e24ac86656102966dfda3eb917b65af7c6cb13fb254b257fbf78d1f8040e2237d378450774c72f090c22cbd2bd3aed77da1367 SHA512 65cbda52450a3537982d0c8f94265a1f8c336379ea4e4bc56c772bb613ea03fe25feb85fb4c8e3b26a48ad03d0c5e07188268e07c1da9981cb1dab87b17d9ba8 -EBUILD sendxmpp-1.23.ebuild 520 BLAKE2B fe783206d54370c55309b77de5c894e90f7880247d9b359951bc68d3f08e2d6f0fb8741a9b106db6416fe4f6902e7dc2f77600ee35d991f8ecd251dbbffa8ca0 SHA512 e33d5b689932055d70a1ffcb0f199733c1236d0b0a1f901946efc9a54b02346de2a6fb9f0febadfb5fbe825ee53f0d402a42268cb476c5b18aa17e2b8b74da22 -EBUILD sendxmpp-1.24.ebuild 489 BLAKE2B 34e72adf1b231a6e1895ae0336810dc99935e1f80eaccfc758ce09aacb865c8e225336ac26bb8bbbae7d8011919a47454c9b2781e783468d838452e6f4a7ac01 SHA512 838f6849e415b711c7466c19e496a08809c751a9f57a966fa70b645b13e8bfee2afd1eefce759860aa14edd255482c739d28eacc5262877c89b8f82c2252a97c +EBUILD sendxmpp-1.24.ebuild 488 BLAKE2B f8aaaf3c921ff0a07cfe698d3549bb833666d4226df077bffd1d909c14f8d81bdec0d22065e99b176f900cdb68bbf41c689958120c060abe0f2dc6d2d0c858a1 SHA512 ddb864346011fa5814c23fabb432aa467ec450d1114a099dd06259665e929cbd91658d4755e8f331064ba326d3099a594f369a0c4825b547ffbcb0ff4fd237ab MISC metadata.xml 246 BLAKE2B 113c4d0217bba0bce6df81f39bc20882e47ed9dded43fb367e2c6c545fe1092ddea56d00d6e8d4f80cd751804f0206bb486795ee4ab592a85bc8937a879e7650 SHA512 b64c7aae46e2d47987372d30818221d17e5635606a61a1f87737bd3820e9db37d6ad91a470fdeac55fe42c85d3e86f3c28e81d45bc7a0d5440f8c6d5f52bd28d diff --git a/net-im/sendxmpp/sendxmpp-1.23.ebuild b/net-im/sendxmpp/sendxmpp-1.23.ebuild deleted file mode 100644 index 85910cbbd41a..000000000000 --- a/net-im/sendxmpp/sendxmpp-1.23.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit perl-module - -DESCRIPTION="A perl-script to send xmpp (jabber), similar to what mail(1) does for mail" -HOMEPAGE="http://sendxmpp.hostname.sk/" -SRC_URI="mirror://debian/pool/main/s/sendxmpp/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ppc sparc x86" -IUSE="" - -RDEPEND="dev-perl/Net-XMPP - dev-perl/Authen-SASL - virtual/perl-Getopt-Long" - -S="${WORKDIR}"/lhost-${PN}-610082b diff --git a/net-im/sendxmpp/sendxmpp-1.24.ebuild b/net-im/sendxmpp/sendxmpp-1.24.ebuild index a47a2f89cdc3..bdd1e66033ab 100644 --- a/net-im/sendxmpp/sendxmpp-1.24.ebuild +++ b/net-im/sendxmpp/sendxmpp-1.24.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/lhost/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 hppa ppc sparc x86" +KEYWORDS="amd64 hppa ppc sparc x86" IUSE="" RDEPEND="dev-perl/Net-XMPP diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index e87504eddf01..77a6ff2ea1df 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1,3 +1,3 @@ -DIST signal-desktop_1.21.2_amd64.deb 74745050 BLAKE2B 6000b23876abe54ba863dc5db021ab336497b211eb3d77c7addc3c183f2ac2f8918a00e61d813cbed8c23f8408323161b5b4a9762a84362ffc8d7a445f950e8e SHA512 e678dd1d006cfdbb0fb09c1803dbe958502f53ff3c57a52bb6e3079b0e6d99171512b019888d70a0222072f9da53d94c5a33f781a0fd4b0c9c9c515573eebea3 -EBUILD signal-desktop-bin-1.21.2.ebuild 1357 BLAKE2B 509b1674cbd0bb0bc6cab228c839b3b33d380c00c378a832fc0966cfd7a5051095a1ac5908b3796fa3d261f14d44ab8da1e256d98f57de0630dbd420b2e35b00 SHA512 9938eb393fbbedb8568159cf252aa7c8f0073d373e4f092840c874774f8a660fd76e955e5db59d0b9f25aefa047512f522200d2cf3f8e8bbb4729d5c470af7c3 +DIST signal-desktop_1.22.0_amd64.deb 74411844 BLAKE2B 1a0d8c10066e860142de85315c09a86b819975b5825eb1200af2a0d9e8af250b97d7b3746408ba721b6de44941464bc68262156b3052d61cf20d272c24fa3899 SHA512 ea471877991f8a85b47f72f5c8e790f230a18a9e107f8beea9b1ba9375291ed33fa07d09a07da0dad74942618a2c8d2fb51b8b5d7fe7c18ad36f305249d8f68a +EBUILD signal-desktop-bin-1.22.0.ebuild 1357 BLAKE2B 509b1674cbd0bb0bc6cab228c839b3b33d380c00c378a832fc0966cfd7a5051095a1ac5908b3796fa3d261f14d44ab8da1e256d98f57de0630dbd420b2e35b00 SHA512 9938eb393fbbedb8568159cf252aa7c8f0073d373e4f092840c874774f8a660fd76e955e5db59d0b9f25aefa047512f522200d2cf3f8e8bbb4729d5c470af7c3 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.21.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.22.0.ebuild index e4a362f0ca50..e4a362f0ca50 100644 --- a/net-im/signal-desktop-bin/signal-desktop-bin-1.21.2.ebuild +++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.22.0.ebuild diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index 583c57c3f560..90eccd14c241 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1,10 +1,7 @@ AUX spectrum2-2.0.9-remove_debug_cflags.patch 376 BLAKE2B 21a4c230d57398d8ce5ff39cd1ad103fa1f7df332b88cf0024e2a505ecf9be7378da99eb83941122d5cf6a835bff9dfa7b9a10a2583299c91d8506dccc548c85 SHA512 3ec75a4ae915b7d2e2aa594fafcc559aa8b09b5cb8948931797088340d722bfb074ac8e0f77fea1258a7b2c3f0816d001aee63b4fd7cc334927a8431fb6a5611 -AUX spectrum2-2.0.9-use_qt5_libcommuni.patch 2428 BLAKE2B d6f377f9ac1d99d5af51a60d5b837bca6acd3d88c4b6cef9716f1f74198c3b5f2e3c4e153be9094c0af1b315f03b3e50c49fc9c93f262a76a0d137636e142b33 SHA512 fc08e37256782db97f7e067d6a3a51f1244c9f0610f69900711d706e6fa50591e200451432ee99691d899a2e6e95c987baa56d3708f2fd172524865dd07a51e5 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2 AUX spectrum2.tmpfiles 44 BLAKE2B c0cef689f5b483d16461bf50edbe8a17c8269440a43a3ccf04c45e028704ad4861e7bd340b85b0daf11b5e41a51e19fd04f2dcd1f2446e00b9a6a3b1e08d2206 SHA512 b995bf8c97a98dc6c887d6d4bb4b53cfee85461cfe65770013d2a412729d164894201ad0e3b69868b94c159ecd524d7bd0eccfedbc27c81969c3ed640ae32785 DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c -DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B 32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939 SHA512 f111133d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982 -EBUILD spectrum2-2.0.10.ebuild 2862 BLAKE2B 10a32320909ffcacd099979062f557f6e5b9bc9f9c0a4fb1c698d2ce2845741b6f6b89d7370b61b93263440f07dbde67dd2561b6b12afc25a12740df81c0b8c4 SHA512 3a37a2fa257f54b422cc4a3f60bf3ee725dbce7fd311b55159a52ea70511c4094f305066234083714411652b384853af0aade34ca3ec12647ff4ff3c48598c7a -EBUILD spectrum2-2.0.9.ebuild 2901 BLAKE2B c0dedfd2f7693469ce936daf90ce512546239343a387a453798e5c48e964b886df8355d0716c6e447a8bf378098994ca403f35b271a7e3a742b81ab15a44a844 SHA512 2f9c427748e3ccbeac88986e82b83ed785b6f950a04ba18fc6049309e494b9f4f9bd0d72df2eb7757eba80a07e6f3431479a3bce86bd00537f3ae734ef172f07 +EBUILD spectrum2-2.0.10.ebuild 2867 BLAKE2B 726cb2fe344b54c715bfc103cbf8710328d51a55be7106155d3fb63e40acf2bad682ea4a0283ab5ebc3f8244d6fe05f36b7dcbb1c328f7daf208ef8cf9c99ad6 SHA512 752a1d934d04c9b61a18bd71f9e278db15ecfbea50aa0a20fa4a78627cc8415b9f8770850a2326e27a9a01155af7f5855fed46c864333c2710aa73a114b9e621 MISC metadata.xml 1259 BLAKE2B e885a8348122a70994d3b04387d64fa88d2e02075554849d427f18b2b39b6ae1eeab543066cd587031f8eae9842f0d727f297d7b6cbe744c8d1424d9fb3640ce SHA512 be2129a4b76017ce3d84aa48589d54ac3863e1d9b7a1aa2a5d98341f962bda3f2e9507497056add0b4f280545ed0c511c8f50eff35d46cf9cadd2c6fba7b5ed6 diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch deleted file mode 100644 index 27e23db44848..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200 -+++ b/CMakeLists.txt 2018-09-20 20:57:35.000000000 +0200 -@@ -182,8 +182,7 @@ - if(ENABLE_IRC) - find_package(Communi) - -- INCLUDE(FindQt4) -- FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork) -+ FIND_PACKAGE(Qt5 COMPONENTS Core Network) - # ADD_DEFINITIONS(${SWIFTEN_CFLAGS}) - ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS) - # ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2) -@@ -321,7 +320,6 @@ - message("IRC plugin : yes") - include_directories(${QT_QTNETWORK_INCLUDE_DIR}) - include_directories(${IRC_INCLUDE_DIR}) -- include(${QT_USE_FILE}) - else() - if(ENABLE_IRC) - message("IRC plugin : no (install libCommuni and libprotobuf-dev)") ---- a/backends/libcommuni/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200 -+++ b/backends/libcommuni/CMakeLists.txt 2018-09-20 20:59:31.000000000 +0200 -@@ -1,14 +1,14 @@ - cmake_minimum_required(VERSION 2.6) - FILE(GLOB SRC *.cpp) - FILE(GLOB HEADERS *.h) --QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) --add_definitions(-DQT_NO_KEYWORDS) -+QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC}) -+include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) - - if (NOT WIN32) -- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport pthread) -+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport pthread) - else () -- target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport) -+ target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport) - endif() - INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin) - ---- a/cmake_modules/FindCommuni.cmake 2018-09-17 09:46:40.000000000 +0200 -+++ b/cmake_modules/FindCommuni.cmake 2018-09-20 21:00:04.000000000 +0200 -@@ -1,8 +1,7 @@ --find_package(Qt4) --include( ${QT_USE_FILE} ) -+find_package(Qt5Network) - - FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS ${QT_LIBRARY_DIR}) --FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${QT_INCLUDE_DIR} PATH_SUFFIXES Communi) -+FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${Qt5Core_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}"/.." PATH_SUFFIXES Communi) - - # message( STATUS ${IRC_LIBRARY}) - if( IRC_LIBRARY AND IRC_INCLUDE_DIR ) diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild index 285dd6d49820..ddc335eca687 100644 --- a/net-im/spectrum2/spectrum2-2.0.10.ebuild +++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild @@ -18,7 +18,7 @@ IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsap REQUIRED_USE="|| ( mysql postgres sqlite )" RDEPEND=" - dev-libs/boost:= + dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx diff --git a/net-im/spectrum2/spectrum2-2.0.9.ebuild b/net-im/spectrum2/spectrum2-2.0.9.ebuild deleted file mode 100644 index 5533572a03cf..000000000000 --- a/net-im/spectrum2/spectrum2-2.0.9.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils python-single-r1 systemd user - -DESCRIPTION="An open source instant messaging transport" -HOMEPAGE="https://www.spectrum.im" -SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -RDEPEND=" - dev-libs/boost:= - dev-libs/expat - dev-libs/libev:= - dev-libs/log4cxx - dev-libs/jsoncpp:= - dev-libs/openssl:0= - dev-libs/popt - dev-libs/protobuf:= - net-dns/libidn:0= - net-im/swift:= - net-misc/curl - sys-libs/zlib:= - frotz? ( !games-engines/frotz ) - irc? ( net-im/libcommuni ) - mysql? ( - || ( - dev-db/mariadb-connector-c - dev-db/mysql-connector-c - ) - ) - postgres? ( dev-libs/libpqxx:= ) - purple? ( - dev-libs/glib - net-im/pidgin:= - ) - sms? ( app-mobilephone/smstools ) - sqlite? ( dev-db/sqlite:3 ) - twitter? ( net-misc/curl ) - whatsapp? ( net-im/transwhat )" - -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-python/sleekxmpp[${PYTHON_USEDEP}] - dev-util/cppunit - net-irc/ngircd - ) -" - -PATCHES=( - "${FILESDIR}/${P}-remove_debug_cflags.patch" - "${FILESDIR}/${P}-use_qt5_libcommuni.patch" -) - -# Tests are currently restricted, as they do completly fail -RESTRICT="test" - -pkg_setup() { - enewgroup spectrum - enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum - - use test && python-single-r1_pkg_setup -} - -src_prepare() { - # Respect users LDFLAGS - sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die - - # Respect users CFLAGS, when compiling for debug mode - # Since Spectrum2 searches for a qt4 compiled libcommuni, - # it must be patched, to find the qt5 compiled libcommuni, - # See: https://github.com/SpectrumIM/spectrum2/pull/253 - cmake-utils_src_prepare -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - local mycmakeargs=( - -DENABLE_DOCS="$(usex doc)" - -DENABLE_FROTZ="$(usex frotz)" - -DENABLE_IRC="$(usex irc)" - -DENABLE_MYSQL="$(usex mysql)" - -DENABLE_PQXX="$(usex postgres)" - -DENABLE_PURPLE="$(usex purple)" - -DENABLE_SMSTOOLS3="$(usex sms)" - -DENABLE_SQLITE3="$(usex sqlite)" - -DENABLE_TESTS="$(usex test)" - -DENABLE_TWITTER="$(usex twitter)" - -DENABLE_XMPP="$(usex xmpp)" - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - cmake-utils_src_configure -} - -src_test() { - cd tests/libtransport && "${EPYTHON}" ../start.py || die -} - -src_install() { - cmake-utils_src_install - - diropts -o spectrum -g spectrum - keepdir /var/log/spectrum2 /var/lib/spectrum2 - diropts - - newinitd "${FILESDIR}"/spectrum2.initd spectrum2 - systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service - systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf - - einstalldocs -} |