summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2016-06-13 22:42:43 +0100
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2016-06-13 22:55:38 +0100
commitb40598486bae8096d554d64aaf1e260625bf6833 (patch)
treea0e190a028320240c0c6333c80a7504c29387129
parentdev-vcs/qgit: drop prefix keywords due to unkeyworded deps (diff)
downloadgentoo-b40598486bae8096d554d64aaf1e260625bf6833.tar.gz
gentoo-b40598486bae8096d554d64aaf1e260625bf6833.tar.bz2
gentoo-b40598486bae8096d554d64aaf1e260625bf6833.zip
net-im/ejabberd: Remove the oldest testing version
Package-Manager: portage-2.3.0_rc1
-rw-r--r--net-im/ejabberd/Manifest1
-rw-r--r--net-im/ejabberd/ejabberd-15.03-r1.ebuild150
-rw-r--r--net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch49
3 files changed, 0 insertions, 200 deletions
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 8d57afa9097..9524ed7c77f 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,6 +1,5 @@
DIST cache_tab-1.0.1.zip 16719 SHA256 149eff4dfb01f633cab643f368e5f96825c26c85ae9e6c22de3f5792e5d3dc28 SHA512 ada72a578359909201d62ad775ca85969aed5cab9be31d38bd505f726434d08bb311f06654f3f26a3b639b9ae2742dd1950ba527489aef84f2ac0dfdb7fba0c8 WHIRLPOOL d026a7452274cb8cfd536da4c5dbabaf0414ddaa5fe835aa80d825d1afae9f952a71e61eaa825d89ee65f6a1d4db9714c3710e7ed36c8fac1be73730e732f362
DIST eiconv-0.9.0.zip 101407 SHA256 fdaa09bcc79b556f2250c4693bc57c89ce474a5ea6ea12429cbb6c2d4ed3619b SHA512 44d0af378b9873dede92657c53557a565050cd4259598a1fe92e1c9bddc8219922ff093bfc20e380f3e39fc0d5648d6d6f72766a5847781cf2101dbd4b922fb6 WHIRLPOOL 97d97f527aaf4d0fb0176723bde464ab003b49b12acca1f657efe83f8c03186e6b4819f4aadedebb8e703e16cc4af23d317b6ebebe96a9a794e6aa78c8e6fc80
-DIST ejabberd-15.03.tar.xz 6274856 SHA256 3a6fd6e94d6f24575dcaff1aa7ca319944eb76970a9d3b6bf5f30819824143fc SHA512 b292b596094aeab576d9d4aadea47042eeda130881de5dd523985dc60cd0644726dae8d525364ec72992c0c45ba9e0673b7a6ffc2bc20613ba0092e2b285e16f WHIRLPOOL 630feba542f5d4bac1e4c17f453b2298a500c0d18159e8f09a4f11e9d372f7ffbf6e2e600c0ee849c689868872644404c03ebfb375d4852f3bbbd966417d951e
DIST ejabberd-16.01.tgz 1651587 SHA256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 SHA512 f0614db0d0eaf6d4f25b75b8eefbcf93260549876535fd5d82498c75779d182b19ec249ffb9b1b168cb5a887e8e6933eb868892b4aa5cd2933b739d263adca8a WHIRLPOOL 65bc13ba5e380a999ed2ae9c816856f90e24393343d16ae52349350687dfdb15857a3358d856de5694c30718cefc5513b9d3c75871bb368cac54547becc1607a
DIST ejabberd-16.04.tar.gz 1715963 SHA256 3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2 WHIRLPOOL d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
DIST ejabberd-2.1.13.tgz 1999853 SHA256 a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512 9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b WHIRLPOOL 2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
diff --git a/net-im/ejabberd/ejabberd-15.03-r1.ebuild b/net-im/ejabberd/ejabberd-15.03-r1.ebuild
deleted file mode 100644
index e8664d8c9f6..00000000000
--- a/net-im/ejabberd/ejabberd-15.03-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib pam ssl-cert systemd
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
-# upstream tarball missing bundled erlang libs that are fetched via git
-#SRC_URI="https://www.process-one.net/downloads/downloads-action.php?file=/${PN}/${PV}/${P}.tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-EJABBERD_MODULES="mod_bosh mod_irc mod_muc mod_proxy65 mod_pubsub"
-IUSE="captcha debug elixir ldap mysql nls odbc pam postgres riak redis tools zlib ${EJABBERD_MODULES}"
-
-DEPEND=">=net-im/jabber-base-0.01
- >=dev-libs/expat-1.95
- >=dev-libs/libyaml-0.1.4
- >=dev-lang/erlang-15.2[ssl]
- odbc? ( dev-db/unixODBC )
- ldap? ( =net-nds/openldap-2* )
- >=dev-libs/openssl-0.9.8e:=
- captcha? ( media-gfx/imagemagick[truetype,png] )
- zlib? ( >=sys-libs/zlib-1.2.3 )"
-RDEPEND="${DEPEND}
- >=sys-apps/shadow-4.1.4.2-r3
- pam? ( virtual/pam )"
-
-# paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-#JABBER_RUN="/var/run/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ejabberdctl.patch
-
- # don't install release notes (we'll do this manually)
- sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
- # Set correct paths
- sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
- -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 Makefile.in || die
- sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
- -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 ejabberdctl.template || die
-
- # fix up the ssl cert paths in ejabberd.yml to use our cert and
- # also use the correct pam service name
- sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
- -e "s:pamservicename:xmpp:" \
- -i ejabberd.yml.example || die
-
- # correct path to captcha script in default ejabberd.yml
- sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
- -i ejabberd.yml.example || die
-
- # disable mod_irc in ejabberd.yml
- if ! use mod_irc; then
- sed -e "s/{mod_irc,/%{mod_irc,/" \
- -i ejabberd.yml.example || die
- fi
-
- epatch_user
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
- $(use_enable tools) \
- $(use_enable odbc) \
- $(use_enable mysql) \
- $(use_enable postgres pgsql) \
- $(use_enable pam) \
- $(use_enable zlib) \
- $(use_enable riak) \
- $(use_enable redis) \
- $(use_enable mod_bosh json) \
- $(use_enable nls iconv) \
- $(use_enable elixir) \
- $(use_enable debug) \
- --enable-lager \
- --enable-user=jabber
-
- # run configure scripts for all prefetched deps
- ./rebar get-deps || die
-}
-
-src_compile() {
- emake $(use debug && echo debug=true ejabberd_debug=true)
-}
-
-src_install() {
- default
-
- # Pam helper module permissions
- # https://www.process-one.net/docs/ejabberd/guide_en.html#pam
- if use pam; then
- pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
- fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
- fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
- fi
-
- newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
- newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "For configuration instructions, please see"
- elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
- elog "http://www.process-one.net/en/ejabberd/docs/guide_en/"
- else
- 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 running."
- elog " Usually this just means the ejabberd daemon and possibly the pam-related processes"
- elog " (epmd and epam) if pam support is enabled."
- elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can fail to"
- elog " start ejabberd properly for various reasons. Check ejabberd's main log file"
- elog " at /var/log/jabber/ejabberd.log to confirm it started successfully."
- elog "3. Run \`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 file."
- echo
- fi
-
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
- install_cert /etc/ssl/ejabberd/server
- # Fix ssl cert permissions bug #369809
- chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
- chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
-}
diff --git a/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch
deleted file mode 100644
index 0d2ccf32485..00000000000
--- a/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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.
-
---- ejabberd-15.03/ejabberdctl.template
-+++ ejabberd-15.03/ejabberdctl.template
-@@ -15,6 +15,7 @@
- IEX={{bindir}}/iex
- EPMD={{bindir}}/epmd
- INSTALLUSER={{installuser}}
-+SHELL=/bin/sh
-
- # Compatibility in ZSH
- #setopt shwordsplit 2>/dev/null
-@@ -25,11 +26,11 @@
- 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
-@@ -111,6 +112,7 @@
- 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 erl parameters
- ERL_OPTIONS=$(echo $ERL_OPTIONS | sed 's/ /\\ /g')
-@@ -167,6 +169,8 @@
- export ERL_INETRC
- export ERL_MAX_PORTS
- export ERL_MAX_ETS_TABLES
-+export HOME
-+export SHELL
-
- # start server
- start()