Version bump, bug #552672 by Thomas Stein. Fixes various server deadlocks.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 127 insertions, 2 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 7d24ffd73088..01efb560977b 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/openfire
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.68 2015/06/01 10:51:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.69 2015/06/21 09:09:26 slyfox Exp $
+
+*openfire-3.10.1 (21 Jun 2015)
+
+  21 Jun 2015; Sergei Trofimovich <slyfox@gentoo.org> +openfire-3.10.1.ebuild:
+  Version bump, bug #552672 by Thomas Stein. Fixes various server deadlocks.
 
   01 Jun 2015; Manuel Rüger <mrueg@gentoo.org> -files/buildxml-ant.patch,
   -files/openfire-3.8.0-buildxml.patch, -openfire-3.9.2-r1.ebuild,
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index badd26c44065..72b5f08c13c1 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX openfire-confd 491 SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5 SHA512 c35e00f7e6b4136c1e8ab71b9221a91f3821a536be54681567cd5948243b9b1575056324c104cf038df8191777361b5eed8a1917185aead431a8f5343f1ed698 WHIRLPOOL c4a82a28363cca33fd8184010616122b85f4842bf10606cb0f71e8c6a027f29ae11e67d3483c99bfbadb385cff91726b3cc4e9b05ff0bed299a9c46568bd219b
 AUX openfire-initd 631 SHA256 601c52c928b92451e64a4a9dd6ccbcc6c55a8c2d5a3c13a2087155e0c6cac2f9 SHA512 9c196492178c306c67e800f52f1d67b826f148d286150ddbe6cee2abf03e89c082812258cd5264bd066813508f93f0528e65bd1d1be3af1b35774154db58fbfe WHIRLPOOL fcfd418fd8751e39cd61ca2821d72fdde70a9866e5b8d1f0cc010f71db18552ce25a478f90e8f67de39b6b0e53c0001a32bad48078ca86a3040abab47aed22e9
 AUX openfire.service 364 SHA256 543c83c5e3b2fd4dea7763d681c16989c0431ef3e4a7043e79e46dff14ebf4f0 SHA512 3dbf25d1566b1d1bdbd9f67deb30456451ffe2fa9d247c66e2bc45b3dc6a0fd91c0fc47d6e4ba5001217225f0a2bd6c2b60eb3056003cc580a10f0560a1fe231 WHIRLPOOL f95f8977777faf9ed8a74ac0d28f600a6838497cdf1cf61bcd230ed7188003f53379728e69127bf28c348d9cd394beabe0cbd3f6ff313718d98bf50a60b0175c
 DIST openfire_src_3_10_0.tar.gz 128475294 SHA256 4911caf5336903e17a752c358c4e506dae76b0f66adfc857537eb6dfe3792f33 SHA512 e3b860711fe9005d58981cd5d037d942cbef2dfb6e59159513916b66dddc5fc4942f1df793e5baf0e71b073e329c1f802884a483a01633c34bfe5143335fb4d7 WHIRLPOOL ad3e6a5f363f6b9bf1fc1c7bcd8c55e514c2ec0fbef3662c2e744cee73ee0d085cda7d96d1a865622e91c96023349fb30e4fe2834eb653b30a169dcdc1b6fea1
+DIST openfire_src_3_10_1.tar.gz 128476328 SHA256 176c53103fe8236be404a3531cf2928c51c8620f1ec75db6e5aa8cccc62c2944 SHA512 24eadd168f31972d19e1fdc2c47ed8515d1407a3741a898264028e1459e37edc08515e9a2a04251f93a423fbce60b07d103d942c42390fbb34720eac9207a6a2 WHIRLPOOL 3f14a2ea1d002222061580283b64bfb503a0d494c5b044998ddfd76244ee0d1f035b9f11a49205508098c038c96392577bbb155f349bd3d8d7b96711af45fb14
 EBUILD openfire-3.10.0.ebuild 2985 SHA256 66ca4a6594b43020748b955592c0c1948648ee7627cbcbd5b303899449d87550 SHA512 d8e42315417b3a8a5f2532b75dacc63a29ac0caf5b9dcc4c6dddbe2a4145a32aec1ba3247c3b35e9a1246dc9b846e3946fcbd304163fd27c9821084cddf60047 WHIRLPOOL acd53925b4a640bab64954acecf22ddbc5deb34b139c63354c99f4f00e9e889e5b0c809664d207041427d41344c03113dc8023e6cb2272e1895efadeef917351
-MISC ChangeLog 16051 SHA256 34879229606b8c1d9954d59b4350a1cb7c86173e07b651e5bb0998f4af30130e SHA512 2a8b72292e6b989fc49b5a1418313f85a5eb82ab8a9e92e9e4181b71a4e17a58bfa2bbf0889e164b07df064d706a56a45f6dd20fc35234e31827b289e88fc9a2 WHIRLPOOL f411942a687dc113f4274ce259bd71d73acd99853b908cb83fa62ab9821097119154a704d8016dffdc75f702888e5060b816a3092e50618b5ee26464ab337de6
+EBUILD openfire-3.10.1.ebuild 2990 SHA256 b8d8cbbe64bc7525a81a12caf15067933c71d9241406db4e0513b83821c9757a SHA512 679cd5ec09cce314a68eaacfd994d5e49a3ef3bdab96fbf5a73e0c07f900e0706754a483c7f26e0fbfc911a8fc56c8c4080c13c940006994093fcbbac5f77451 WHIRLPOOL f31300fc0078f6cf1427695828d1f1f03a6b4c4fe78b4737031374bf0c7ac41c56ad345866f0305fda3231de5bcdb36a78350a639bf5a844e9a445136efc6a2b
+MISC ChangeLog 16241 SHA256 453d26cb34f5e33bf7c2858ebb7a71b8358e510e3609a7e31b12eb964628f808 SHA512 6ddc8d30953f7475b0e16ddc84c046a6cfcb5effe3084bd593382a745380a6e447b8d343458fc425b8597207e0811eff050cc8055b7d4775fcba33041552b678 WHIRLPOOL d9b0edaa74a8ecae0df1c303886f58a2b2a3c0e8aa59cfa1891f128e3423a0a9be727748580347e18db75b702d3f69223d1492beb0366fb54d5ef5e46a71a9a8
 MISC metadata.xml 469 SHA256 54c8a314944640dade8e23fe264bdd928732ef9f47e20bedf943ea990b437bfe SHA512 50370daa407e3f46462bb5a2774bb723bf908a44f96ba470a0635a82f0eb4f24e1c19e94e369dcb72199fd93d970c3ee8c6643f3926a6005b8d679d422a6c00b WHIRLPOOL 096ee6f7f78c6bb5ebbee871975afff24d63de0c054f864998517b7478c7e37b89e4f561722b5f0f9ea9210f6bfeb2807a62f700cfb14d29c6c80e119f14732e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlWGf0oACgkQcaHudmEf86poEgCffWOEsOAUNkcquVkfREi0cYkl
+JdUAn17GSmU0Mxgs32Z6gfWy0SGmPTUu
+=0zWY
+-----END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.10.1.ebuild b/net-im/openfire/openfire-3.10.1.ebuild
new file mode 100644
index 000000000000..4126a0a3f695
--- /dev/null
+++ b/net-im/openfire/openfire-3.10.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.10.1.ebuild,v 1.1 2015/06/21 09:09:26 slyfox Exp $
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+	~dev-java/ant-contrib-1.0_beta2
+	>=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+	if [[ -f /etc/env.d/98openfire ]]; then
+		einfo "This is an upgrade"
+		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+		ewarn "they can be downloaded via Admin Console or at"
+		ewarn "    ${HOMEPAGE}"
+	else
+		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+		ewarn "For more info see bug #139708"
+		sleep 11
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# Jikes doesn't support -source 1.5
+	java-pkg_filter-compiler jikes
+
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
+
+	# delete nativeAuth prebuilt libs:
+	#    uses outdated unmaintained libshaj, does not support amd64
+	rm -rfv target/openfire/resources/nativeAuth || dir
+}
+
+src_install() {
+	dodir /opt/openfire
+
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+	newins target/openfire/conf/security.xml security.xml.sample
+
+	dodir /opt/openfire/logs
+	keepdir /opt/openfire/logs
+
+	dodir /opt/openfire/lib
+	insinto /opt/openfire/lib
+	doins target/openfire/lib/*
+
+	dodir /opt/openfire/plugins
+	insinto /opt/openfire/plugins
+	doins -r target/openfire/plugins/*
+
+	dodir /opt/openfire/resources
+	insinto /opt/openfire/resources
+	doins -r target/openfire/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+	local src
+	local dst
+
+	# http://community.igniterealtime.org/thread/52289
+	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+	do
+		src="${dst}".sample
+		if [[ -f "${dst}" ]]; then
+			einfo "Leaving old '${dst}'"
+		else
+			einfo "Created default '${dst}'. Please edit."
+			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+		fi
+	done
+	chown -R jabber:jabber "${ROOT}"/opt/openfire
+}