Security cleanup, bug #488636

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 13 insertions, 233 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index a0c0a7f03341..571c770f1ad4 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.122 2013/11/01 13:48:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.123 2013/12/04 07:38:22 pinkbyte Exp $
+
+  04 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> -ejabberd-2.1.11.ebuild:
+  Security cleanup, bug #488636
 
   01 Nov 2013; Agostino Sarubbo <ago@gentoo.org> ejabberd-2.1.13-r1.ebuild:
   Stable for x86, wrt bug #486292
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 7076c9d376e0..169d342b79ec 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,36 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ejabberd-3.confd 161 SHA256 0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb WHIRLPOOL 657c44991244d58c10590093a7f58f654cb45cf7e22244b474459c63a449c17d0cf1d6f2d62008ddb34f0022f8fc9e31f22d2010cb3d1070a462bcb22a9a81fc
 AUX ejabberd-3.initd 1025 SHA256 2810ca25fbe9d41a175b15c82d9ea1254fc4c934fd6ec02d9ee10bc34079e168 SHA512 5705074bd564568295d6d098394937ea44f5ea38ebc386fbcc3f8a239734acb77784500e8761e5fb3864fb56f7d136c9ef1f65603810d31b1f9a0ee4005d389a WHIRLPOOL 13718736e2ff08380c8a2df38099f11a0c5257188731fe9830e1ccdbe304b7c9984956ec7b1f9db11f677293a939604db79ac0870c1a74116d1eb70c1c373391
 AUX ejabberd.logrotate 203 SHA256 42f28222c6a5b7c691eb371085cccdef3fcba059a1e89f18744aa9bfc25e6294 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2 WHIRLPOOL ffbdfc1b22e855666aedbf816ec44439addcae21d82509399de046fa6a7c0182c1df756377a9d08d3b1f1d73e1e09ecd85da145357850d8a11d8ddb4b3b29d2a
 AUX ejabberd.service 422 SHA256 a699466dd95b8fb98aca078ca7e57a2d9f0fed13ecdc70d10b96e96df61b64af SHA512 91ba2ca5b0104a7628a63a80efd0ec4aa016f9100b631701e18ab7b524c2e2e9471a6ece4adcc90bbea16af05479dfa5a2414d2f50bdd4b0cd06a1e40539c5e3 WHIRLPOOL eb3b5af56eaf4292cdb67854e46ccc9d0c4f3f8674ad7992fdbfb037c3a441b27c922ac80f2fd8819c84411f045c689e67eeca4e331d088c7749fa4fc74437a3
 AUX ejabberd.tmpfiles.conf 43 SHA256 2ee7fb4fb9c9c931ffa8c1dfa273e6658f3bbd37bb6ae25765b9e4f2a7459506 SHA512 8bdc297d5cb405e82c33627b36730992584d7f8b92d15c47933edd01ba6575983009c1f6607a21eee0280abdf7b51639d99d7836712a8d3629ec1e960b8a02c4 WHIRLPOOL f27e3a9bff1ab941c4a80fc5573d8541e40804f24b2f2e40e0f77c2ea2016e5c0b323e59674ed880df95037d0d82a956bc9ea984b5b371dd16e50858faa7e0d0
-DIST ejabberd-2.1.11.tgz 2014232 SHA256 91d5c10e64f9faa60c345c68304746f493d71f82723302955d40d6619e3d87de SHA512 6f09c80b03a84595294c679d49b5991985707f6c9e8c2f9fad94618224666e05b4325a5bef840d2ccf0c803038fc11b49b168716a3e258312216e201bdd4bb88 WHIRLPOOL 2ab09c84619173090acabf19cde10f14e3240fa6b89fb7d963bd79aca960b11a6f869f691d219c55b1b0a664c676afc800599671dfc923a0302d2075eec0e224
 DIST ejabberd-2.1.12.tgz 1999224 SHA256 38f0825346773c00c85a66b33586c75f2d191d1eb0ed8ae09fa17368d6ddfd19 SHA512 725ab9563a6c73e85b5115f66bac157cf9b1170913c1bfed7cf066408c6b3ac5b4bdba22c6c3ed1505391a7048a86ce3b59484f78264ab023612c539422278db WHIRLPOOL 3de3b103f69b8ead3d68cb70f3073808c40cd9541f0fd97aff7173f3ecabf6755295e1c30de83e67c844dc6886a5c2cb55a26980f4275cb32008e922591ae35a
 DIST ejabberd-2.1.13.tgz 1999853 SHA256 a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512 9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b WHIRLPOOL 2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
-DIST ejabberd-mod_statsdx-1080.patch.gz 14024 SHA256 0f3a3a991c14d797e795ef4fffcf19aa9a54608f5053b759187ec7d3696b9edb SHA512 cdec93504501f60d01defe8634d2fe1ee900d78bd8d4568313b581d0e306144df50d3a8d2b724091bdb7c4a7f65c6bb4ebc4bd053ffdda7acb6512b92d1249cf WHIRLPOOL 881b776b6476319c81ae9bfea286baff1020f0b1acdc8437cf38105678f141eb5bd1cbb615326886cc0937db8039901c6ab5747b63b7934fca8356e96454a290
 DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256 5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512 99399323150990cda15e707385f0f26fa790d4ba188a97ac46daaaab9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d WHIRLPOOL 05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702
-EBUILD ejabberd-2.1.11.ebuild 7940 SHA256 343b0ff68bcf8d6d4379628b3dfee5ed5bf4565caf981e4113edcb87d260f2fa SHA512 9782f0993dc5734b3b57e50020f7952c706b97f518040934737364edfcca78597cf39152cd8c9f4e86063168abf4975cf6f3d78f9f4e6426db59adf04ec9f04d WHIRLPOOL b375b28cafdfb6ba7e5f46ec0dd844a80477bf82c37a690a5e2a7d27dcfb54f60abdee1922d2098313cf9b701ecef46638341792a0ef2b98d97bda7c1ed1e0a3
 EBUILD ejabberd-2.1.12.ebuild 7967 SHA256 fe4879395e71b4fe9d913d7e6e480042b25d517cb696c8b4d5fc09755cedb213 SHA512 e09721742102fe83abc9f934c576bf70295edf738c6f9a1bb949e3745c999bb241220b5618d18e65f67510c67ab140284fa1b4ed089be255ccd8c1222431f637 WHIRLPOOL 311a65cc5ccec4983518e104b6c25473c492a250843531be817fa09f84805f3c9539a5b416e16392d2e58082df6da2ff546182ac9845df6af30f500f7f241397
 EBUILD ejabberd-2.1.13-r1.ebuild 8273 SHA256 bb7c732d090f0e3919e06d55f5404a0c04bf75e5daca6848f9596498b9811e3a SHA512 b8b576303101eb7d62a3d076af51908491ef32c74005957c4c114a7b846a78c869a85aad9ce4785bd5bceb942ff35babb58de44ddd80de794b38e43c95567604 WHIRLPOOL 6d518f8e251f18e9f92bb0bb66c8a345d1e2a5d0f1f725686cf8c8d93c492461229962e49327e269a4a9ac6e29d12c9d6aabc44948fdb9501bab13bc6f8a9d36
 EBUILD ejabberd-2.1.13.ebuild 8106 SHA256 a562cb248c59a47fe7fc9b57c674fbcdc14bd382defed32461d274a1e605a0b9 SHA512 313a4fd981c3066e0d5de86de9ff7f706e571e26a3b2624177c2b5f312b8700cda7f90d0fa9cab62228b821e3a5f7c736f0a5846a27d97d94c17b9473e6d375b WHIRLPOOL fa5619ae5ef03e17a004bcd4fc5c72f06c4b6ecafa14399e1777715cccb2317e596e1c3a4848ebec8a6f4577481ee731a951307f31998bdcb49ac37c3ba1e07f
-MISC ChangeLog 23492 SHA256 de35165129033dfad15c6790022af8b04ffd3e8474892a566651b92117200141 SHA512 48b927aa01261cfc8202e7d2cc32769e309c610830f44af13d815727bf7507bac0ab2a6011f56be961e0633863e70963bdf40df4539b3bb9537c140e7c4c41db WHIRLPOOL e27a0d171d3abab24992090c7ba82a85f597e7b878908a55fe36af6ae8e80fe73e7aba0d52c354d6923bff27524a8b999a749f7d1ffa7f2edd81d2e4c4212489
+MISC ChangeLog 23605 SHA256 98c581b327095bf3329a68fea60cdae835af61513bbd6a7657a451bed93d99a8 SHA512 fde23ea97084f162b6b18c79cedf500cb8c43f126503c6247d3589f0bcc9bece8a64c115459fe8a45f8b8d1c6a22e094ed4dad971314a163031bb13e6cd141ce WHIRLPOOL 0db00fe0fa33d40c54f129981a11898d074ecdcc0dac5fdd4fad5ba19932f9bf2b1c3e6fd9ede9b960a24795504445e16734d91f29d572b02e87d96d5c8d6d79
 MISC metadata.xml 915 SHA256 9c1956a6be7e957bf41c3ac9b5b176a9edd963fc5c8055609461689e09e0cbc6 SHA512 7ce2467693ba5db6397e28fe71a5add944c005aadfe83d21ced82a830c26971a4e94b1273239e1c0a729f2bf8b2e46a603a65109b93d7f2695e764dddbb114b8 WHIRLPOOL 19ef3e6c81ccfe6aa11b8e796956a19cdc80e56645dea70b28e1a67db211b88f36893e196f243a839d40613c6ff8b421c73f0d72ffea925fe13dbdf484b59804
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSc7E2AAoJELp701BxlEWfFF8P/ivgJR5SKGefjXf+hg2plYe0
-9LcTZGDUeQu3mFgphO3Wk2Z+tyLViE2yAsuEmNs78bhA7Oi60IaHUnUUki6ogEQK
-rNPVrZPmNZIfnQaurAePnHZMb2gS41gwfTZhU+QoR6b7M8ZWGzHv0ZwEemFZHGOo
-m4nKKi5VOTj+j48WXgCePAWuGmU3LUzBg20lwFAe9RgkJC/010c2OLqP8rYSX33x
-ccCQhzO39TQWSjsghcLieLB6qeHRON3Iv5NsyUnOf45KCK7rdAQX0YAA1DsPHPk8
-SlI+Yz6tad0mkDl+++Tw+LRKdUa1lHDZZJ1qwkgg8LHJKTDXUqLZjKKTK3BiMCTl
-dMa9nxM2RITaj37Mwz4bUhVXLoJxlFGkGMIytJlEZz2Vjg2mBuxVH20mBfONzRj+
-3yeWBgi1zk0JiPQTBUiJFMAJsCsDY/YtXPpQm9a6L5YahynD0wdJStm0T70myFha
-5cAZ2LWsRBm1IReysqsDQvbscvRMgiU70SFEqxiAoJ3lzkML2BgkZRdef7L5Diul
-Jo1UKeaKW/cMEINydc8KiYfFfiuvInr3ec/L9CG+GcqTuaUNSyKazugnLGHtipKt
-QzqG8GKEXzoiPwxQhyg56cBTngL/VbJVQTJSWcDCuLggOadqwiQNx2k5RGYodmND
-cY+p3Xjowr420KlFy3iS
-=2j77
+iQEcBAEBCAAGBQJSntuqAAoJECo/aRed9267AygIAJgebSny1xRO9IyefZmGyhWc
+wkb0aPwx4afoou5zf2eSsjvlZxMwGphGqVy1+f6gvFevOHG95k9wSt1uxuuKOkAE
+I0gbg8GGkY7Iww0kA+mRA2OOym1hIiodhRBD/NPcNAurNW7UqNlYpJ62HG1a76dv
+9rs58AtMslsMPGkSPUvIQhJx2r08lYbuu4XNwlctUnuik+xtA2btXYzn8/vC7gtl
+eVrDxEwMRfsJUSxw7yDLj+GkXxRzjNN+22SR75qaqJR/jz01xIdTc+r6uUYLs6XP
+tGXVRDaLEevps7ZOmVstmkmFKN6mIXIoTp2QDoSBIde9JC3EShVKI+U9E3hYN9c=
+=QMOV
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-2.1.11.ebuild b/net-im/ejabberd/ejabberd-2.1.11.ebuild
deleted file mode 100644
index a261239b4c4e..000000000000
--- a/net-im/ejabberd/ejabberd-2.1.11.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.11.ebuild,v 1.4 2012/09/23 08:22:11 phajdan.jr Exp $
-
-EAPI=4
-
-inherit eutils multilib pam ssl-cert
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://www.ejabberd.im/"
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-	mod_statsdx? ( mirror://gentoo/ejabberd-mod_statsdx-1080.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]
-	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() {
-	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}/ejabberd-mod_statsdx-1080.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() {
-	emake DESTDIR="${ED}" install
-
-	# 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"
-
-	#dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}-3.confd" ${PN}
-}
-
-pkg_postinst() {
-	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'
-	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'
-
-	# 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
-}