[gentoo-commits] dev/graaff:master commit in: net-im/ejabberd/, net-im/ejabberd/files/

[Hans de Graaff]

commit:     aefe790e7ac7d9b464975776de9727db65ea2fa3
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sun Oct  2 05:17:28 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 05:17:28 2016 +0000
URL:        https://gitweb.gentoo.org/dev/graaff.git/commit/?id=aefe790e

Obsolete version

 net-im/ejabberd/ChangeLog                          |  31 ---
 net-im/ejabberd/Manifest                           |   2 -
 net-im/ejabberd/ejabberd-2.1.13-r2.ebuild          | 224 ---------------------
 .../ejabberd/files/ejabberd-2.1.11-ldap-ipv6.patch |  15 --
 net-im/ejabberd/files/ejabberd-3.confd             |   5 -
 net-im/ejabberd/files/ejabberd-3.initd             |  47 -----
 net-im/ejabberd/files/ejabberd.logrotate           |  13 --
 net-im/ejabberd/files/ejabberd.service             |  17 --
 net-im/ejabberd/files/ejabberd.tmpfiles.conf       |   1 -
 net-im/ejabberd/metadata.xml                       |  16 --
 10 files changed, 371 deletions(-)

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
deleted file mode 100644
index d2f9f52..0000000
--- a/net-im/ejabberd/ChangeLog
+++ /dev/null
@@ -1,31 +0,0 @@
-# ChangeLog for net-im/ejabberd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*ejabberd-2.1.13-r2 (15 Jul 2014)
-
-  15 Jul 2014; Hans de Graaff <graaff@g.o> +ejabberd-2.1.13-r2.ebuild,
-  files/ejabberd-3.initd, +files/ejabberd.logrotate, +files/ejabberd.service,
-  +files/ejabberd.tmpfiles.conf:
-  Version bump with LDAP IPv6 patch.
-
-  26 May 2013; Hans de Graaff <graaff@g.o> +ejabberd-2.1.12-r1.ebuild:
-  Version bump with my LDAP-IPv6 patch.
-
-*ejabberd-2.1.12-r1 (19 May 2013)
-
-  19 May 2013; Hans de Graaff <graaff@g.o> +ejabberd-2.1.12-r1.ebuild:
-  Version bump of my local version since LDAP IPv6 is not fixed upstream yet.
-
-  30 Jul 2012; Hans de Graaff <graaff@g.o> +ejabberd-2.1.11-r1.ebuild,
-  +files/ejabberd-2.1.11-ldap-ipv6.patch, +files/ejabberd-3.confd,
-  +files/ejabberd-3.initd, +metadata.xml:
-  Fix metadata.
-
-*ejabberd-2.1.11-r1 (30 Jul 2012)
-
-  30 Jul 2012; Hans de Graaff <graaff@g.o> +ejabberd-2.1.11-r1.ebuild,
-  +files/ejabberd-2.1.11-ldap-ipv6.patch, +files/ejabberd-3.confd,
-  +files/ejabberd-3.initd, +metadata.xml:
-  Fix LDAP on IPv6.
-

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
deleted file mode 100644
index 269bc2d..0000000
--- a/net-im/ejabberd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ejabberd-2.1.13.tgz 1999853 SHA256 a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512 9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b WHIRLPOOL 2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
-DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256 5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512 99399323150990cda15e707385f0f26fa790d4ba188a97ac46daaaab9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d WHIRLPOOL 05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702

diff --git a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
deleted file mode 100644
index 251a210..0000000
--- a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild,v 1.4 2013/12/21 17:17:15 ago Exp $
-
-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="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-	mod_statsdx? ( http://dev.gentoo.org/~radhermit/dist/${PN}-mod_statsdx-1118.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
-IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
-
-DEPEND=">=net-im/jabber-base-0.01
-	>=dev-libs/expat-1.95
-	>=dev-lang/erlang-12.2.5[ssl]
-	<dev-lang/erlang-16
-	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 )"
-#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
-RDEPEND="${DEPEND}
-	>=sys-apps/shadow-4.1.4.2-r3
-	pam? ( virtual/pam )"
-
-S=${WORKDIR}/${P}/src
-
-# 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}/${PN}-2.1.11-ldap-ipv6.patch"
-
-	if use mod_statsdx; then
-		ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
-		ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/${PN}-mod_statsdx-1118.patch
-	fi
-
-	# 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|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \
-		-e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \
-		-e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \
-			-i ejabberdctl.template || die
-
-	# Set shell, so it'll work even in case jabber user have no shell
-	# This is gentoo specific I guess since other distributions may have
-	# ejabberd user with reall shell, while we share this user among different
-	# jabberd implementations.
-	sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die
-	sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die
-
-	#sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl
-
-	# fix up the ssl cert paths in ejabberd.cfg to use our cert
-	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
-		-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# correct path to captcha script in default ejabberd.cfg
-	sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
-			-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# disable mod_irc in ejabberd.cfg
-	if ! use mod_irc; then
-		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
-			-i ejabberd.cfg.example || die "Failed to disable mod_irc"
-	fi
-
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
-		$(use_enable mod_irc) \
-		$(use_enable ldap eldap) \
-		$(use_enable mod_muc) \
-		$(use_enable mod_proxy65) \
-		$(use_enable mod_pubsub) \
-		$(use_enable web) \
-		$(use_enable odbc) \
-		$(use_enable zlib ejabberd_zlib) \
-		$(use_enable pam) \
-		--enable-user=jabber
-}
-
-src_compile() {
-	emake $(use debug && echo debug=true ejabberd_debug=true)
-}
-
-src_install() {
-	default
-
-	# Pam helper module permissions
-	# http://www.process-one.net/docs/ejabberd/guide_en.html
-	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
-
-	cd "${WORKDIR}"/${P}/doc
-	dodoc release_notes_${PV%%_rc*}.txt
-
-	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/"
-
-		if ! use web ; then
-			ewarn
-			ewarn "The web USE flag is off, this has disabled the web admin interface."
-			ewarn
-		fi
-
-		elog
-		elog '===================================================================='
-		elog 'Quick Start Guide:'
-		elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91'
-		elog '   {hosts, ["localhost", "thehost"]}.'
-		elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360'
-		elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
-		elog '3) Start the server'
-		elog '   # /etc/init.d/ejabberd start (for openRC)'
-		elog '	 # systemctl start ejabberd (for Systemd)'
-		elog '4) Register the admin user'
-		elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
-		elog '5) Log in with your favourite jabber client or using the web admin'
-	fi
-
-	# Upgrading from ejabberd-2.0.x:
-	if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then
-		source "${EROOT}/etc/conf.d/ejabberd"
-		ewarn
-		ewarn "!!! WARNING !!!  WARNING !!!  WARNING !!!  WARNING !!!"
-		ewarn "Starting with 2.1.x some paths and configuration files were"
-		ewarn "changed to reflect upstream intentions better. Notable changes are:"
-		ewarn
-		ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
-		ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
-		ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
-		ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."
-		ewarn
-		ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides"
-		ewarn "at standard location: /etc/ssl/ejabberd/server.pem."
-		ewarn
-		ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie"
-		ewarn
-		ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log"
-		ewarn
-		ewarn "5. Crash dumps (if any) will be located at /var/log/jabber"
-
-		local i ctlcfg new_ctlcfg
-		i=0
-		ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg
-		while :; do
-			new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i})
-			[[ ! -e ${new_ctlcfg} ]] && break
-			ctlcfg=${new_ctlcfg}
-			((i++))
-		done
-
-		ewarn
-		ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
-		sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
-
-		if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
-			ewarn "Moving .erlang.cookie..."
-			if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then
-				mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak}
-			fi
-			mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie
-		fi
-		ewarn
-		ewarn "We'll try to handle upgrade automagically but, please, do your"
-		ewarn "own checks and do not forget to run 'etc-update'!"
-		ewarn "PLEASE! Run 'etc-update' now!"
-	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"
-	if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
-		ewarn
-		ewarn "The location of SSL certificates has changed. If you are"
-		ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
-		ewarn "want to move your old certificates from /etc/jabber into"
-		ewarn "/etc/ssl/ejabberd/, update config files and"
-		ewarn "rm /etc/jabber/ssl.pem to avoid this message."
-		ewarn
-	fi
-}

diff --git a/net-im/ejabberd/files/ejabberd-2.1.11-ldap-ipv6.patch b/net-im/ejabberd/files/ejabberd-2.1.11-ldap-ipv6.patch
deleted file mode 100644
index 7fae64f..0000000
--- a/net-im/ejabberd/files/ejabberd-2.1.11-ldap-ipv6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/eldap/eldap.erl.~1~	2012-04-26 16:04:16.000000000 +0200
-+++ src/eldap/eldap.erl	2012-07-30 19:28:33.182004486 +0200
-@@ -984,10 +984,10 @@
-     ?INFO_MSG("LDAP connection on ~s:~p", [Host, S#eldap.port]),
-     Opts = if S#eldap.tls == tls ->
-                    [{packet, asn1}, {active, true}, {keepalive, true},
--                    binary | S#eldap.tls_options];
-+                    inet6, binary | S#eldap.tls_options];
-               true ->
-                    [{packet, asn1}, {active, true}, {keepalive, true},
--                    {send_timeout, ?SEND_TIMEOUT}, binary]
-+                    {send_timeout, ?SEND_TIMEOUT}, inet6, binary]
-            end,
-     SocketData = case S#eldap.tls of
- 		     tls ->

diff --git a/net-im/ejabberd/files/ejabberd-3.confd b/net-im/ejabberd/files/ejabberd-3.confd
deleted file mode 100644
index b1e984e..0000000
--- a/net-im/ejabberd/files/ejabberd-3.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Please configure everything at /etc/jabber/ejabberdctl.cfg
-# Put here only command line arguments for ejabberdctl (if any are required)
-
-#EJABBERDCTL_OPTS=""
-

diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd-3.initd
deleted file mode 100644
index a8519d4..0000000
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.4 2013/04/05 09:03:34 radhermit Exp $
-
-depend() {
-	use dns
-	need net
-	provide jabber-server
-}
-
-start() {
-	if ejabberdctl status >/dev/null 2>&1; then
-		ewarn "ejabberd is already started (manually?)."
-		return 0
-	fi
-	ebegin "Starting ejabberd"
-	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
-	eend $?
-}
-
-stop() {
-	ejabberdctl status >/dev/null 2>&1
-	if test $? = 3; then
-		ewarn "ejabberd is already stopped (manually?)."
-		return 0
-	fi
-	ebegin "Stopping ejabberd"
-	if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
-		cnt=0
-		sleep 1
-		while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
-			echo -n .
-			cnt=`expr $cnt + 1`
-			if [ $cnt -ge 60 ] ; then
-				eend 1
-				break
-			fi
-			sleep 1
-		done
-		eend 0
-	else
-		eend 1
-		einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
-	fi
-	eend 0
-}

diff --git a/net-im/ejabberd/files/ejabberd.logrotate b/net-im/ejabberd/files/ejabberd.logrotate
deleted file mode 100644
index 4f32472..0000000
--- a/net-im/ejabberd/files/ejabberd.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/jabber/*.log {
-	su jabber jabber
-	weekly
-	rotate 4
-	missingok
-	nocreate
-	sharedscripts
-	notifempty
-	compress
-	postrotate
-		/usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true
-	endscript
-}

diff --git a/net-im/ejabberd/files/ejabberd.service b/net-im/ejabberd/files/ejabberd.service
deleted file mode 100644
index 0b79256..0000000
--- a/net-im/ejabberd/files/ejabberd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=oneshot
-User=jabber
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/sbin/ejabberdctl \
-	--config /etc/jabber/ejabberd.cfg --ctl-config /etc/jabber/ejabberdctl.cfg \
-	--logs "/var/log/jabber" --spool "/var/spool/jabber" start
-ExecStop=/usr/sbin/ejabberdctl stop
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-im/ejabberd/files/ejabberd.tmpfiles.conf b/net-im/ejabberd/files/ejabberd.tmpfiles.conf
deleted file mode 100644
index cf17b73..0000000
--- a/net-im/ejabberd/files/ejabberd.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lock/ejabberdctl 0750 jabber jabber

diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
deleted file mode 100644
index 1242ab6..0000000
--- a/net-im/ejabberd/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-<maintainer><email>graaff@g.o</email></maintainer>
-<longdescription> Free and Open Source distributed fault-tolerant Jabber server. It's mostly written in Erlang, and works on many platforms.</longdescription>
-    <use>
-	<flag name='mod_irc'>Build irc gateway </flag>
-	<flag name='mod_muc'>Build Multi User Chat module</flag>
-	<flag name='mod_pubsub'>Build Pubsub module</flag>
-	<flag name='web'>Enable web admin interface</flag>
-	<flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>
-	<flag name="mod_proxy65">Support for SOCKS5 Bytestreams (XEP-0065)</flag>
-	<flag name="mod_statsdx">Measures several statistics, and provides a new section in ejabberd Web Admin to view them.</flag>
-    </use>
-</pkgmetadata>