Version bump, bug #547552 by Agostino Sarubbo: CVE-2014-3451, CVE-2015-2080

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

3 files changed, 120 insertions, 5 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index e7624a2c4b44..db257d1c89b6 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.64 2015/04/01 20:13:31 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.65 2015/04/24 21:03:48 slyfox Exp $
+
+*openfire-3.10.0 (24 Apr 2015)
+
+  24 Apr 2015; Sergei Trofimovich <slyfox@gentoo.org> +openfire-3.10.0.ebuild:
+  Version bump, bug #547552 by Agostino Sarubbo: CVE-2014-3451, CVE-2015-2080
 
 *openfire-3.9.3-r1 (01 Apr 2015)
 
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index b54c27f3cd9a..bb7d17a85a6c 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -6,17 +6,19 @@ AUX openfire-3.8.0-buildxml.patch 792 SHA256 36ba7815a3fd8e6d7626d275268c5f74310
 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_9_2.tar.gz 80845988 SHA256 7ca3194a32fd0061ac5bc30f1d59b483bb945d7be4d3e032c7493f8e0070c742 SHA512 b877daba05763721dface374aa6e4184cc20be7a62583d656fb8fb11fb9cba3300490f4b78378ad3f37ab0c9190a3659530ae838610c155dee585c78ec4f6f34 WHIRLPOOL caad551c969ce1a08437dcf8f5704e79956b02c9189ba7d595dc28f6574ad5dee2a8365e1553bf6b3b096fef6b01f754368e703b190528377599b5b18d70f83e
 DIST openfire_src_3_9_3.tar.gz 80785973 SHA256 37001835a3007f115214aa83f2a48f8c33bbf3576937f4d964d9eb3de3933ad2 SHA512 9a00431a36c7d5539bad2409ca7b3091652d567c6e09a1b3f34e9dc3c79a74b53b5a4d14dad81af212e0a3b69cb0f3c4552fb2f8d58caa5cd44c32dd0b50913e WHIRLPOOL 0aa8c548af6ddb16fd28f71b7c2e7f0c22fdcfa0abdde3f09ee21b5d2f2b55512b57ab59083ac7e9c2b4b9011b85a0e0027ae9a91b6f5f200d838c2401f3a26e
+EBUILD openfire-3.10.0.ebuild 2990 SHA256 5f694683473e9fb8e65efe779ea0fe7e128c0686e812aafa76a5c773319d933f SHA512 7e55ac0a4ea66a301fa0c1b66a27807744c49a2479e382cd4764f8dc50b4218d5f28b5678f45190c27d90feda984ce9e9488e0a92e6e84cb267f81a2c76b25b2 WHIRLPOOL b88454b3f6b414d3104c3e86b7f9872e15b843cef8b0807c7e01d98005cddd7e23cb337d8b3e9dd0e2f9314bf822ffff91e60d8e7709db29fe256a5f5ce914c3
 EBUILD openfire-3.9.2-r1.ebuild 3083 SHA256 bc8a6fc45f812557f079bc2b7ab2939182e7f9bc6fffb62597bdb03609a3708c SHA512 fa48f7eef644f4c19389f14fa79887939a897f6f134f1e43164376761c8da01071a20b5c5cf1cd3d5b8919933592cab0fb6e44e07ba4d362fa1dfdf46026d75f WHIRLPOOL 31352984ca5280152372764b766b7a210b3789d653ff52a82e000daa84bef80c8d7c6e66d76bca6539fde0ff25758970f7b9184ee85b75e82de9d65494289582
 EBUILD openfire-3.9.3-r1.ebuild 3189 SHA256 8cd467e29fdb6ad2e2dbffefc0e50bba1f1259c0e1e833ca9433c40126a00f43 SHA512 fe836964b3bd4c25a99cb1bcac18a560a1921d8a710c6ccc99e7d39cad7e306e7d0cecefc4f0c11a1c5e78d3956dc4322bcd7888b782862d06a9aa3bc321a7fd WHIRLPOOL ed1405639d85e24db4472244fdc01bb364ebb105a09c711c10ddbc2f4b4b03ee549c52d4dc028d8751b4219bae165e760a6912d4b1c4ed155781427c380dc94a
 EBUILD openfire-3.9.3.ebuild 3085 SHA256 3f9e16478d4493320eb5ddf76f080968401d8cd475d9778fb6bfa8fd0f770a47 SHA512 bbcaadb957f44e3385841873780bf596152a28a298737754ba89aba01367c164632e22d79f3741361ba2727451dd2a66392adcab6f6fc32b3e500f63d9d1235d WHIRLPOOL 406b139d43127bde7a10c5b8a012a5769342518038674d9b8dbf76e580c9826a653ad5a134acf7f402103e8c95fc46980f05cee3ca73d3fc4d22b98217ce9f14
-MISC ChangeLog 15434 SHA256 2eaea154943b513b267487e1f18546eef0b91b7afacac3ee2ec7878ded03be7b SHA512 e9d152e7b3b3579717d9065224ba42a2a759be1a67b8501a8eeb9e84762794e7627170428269eb92438daafd3c8a8ec571c810b1e48be3d637c127977fe2c8b7 WHIRLPOOL 096e3b2a532175fb6dbb94dcaabf88ee94f7e5c6d00e9f684e07f7f2417b4e6f78aa0b0def859e9c3b8de5de92037373752f5b89bbe90d335114e9670535e736
+MISC ChangeLog 15624 SHA256 87fa54ad0adc347c0a5317ea43b59285497573a29db0c74f89e3cf27e000c64b SHA512 a945f1b4cb2f41f4a35c83dd359a6648c86f34d9607cfc7d1fdee20dcce1c578137636ee410d73d157d17c0b2dc370bf77305240cf78e7e76ed5330266c7db5c WHIRLPOOL 5d0ffc532d1395d85f29fda5fa101c20d9345eed49950ef4c89d5d1b052e08c62ea08c1913058a8efa6c4edff7f85d2244788d311dc097c0f29cc11844884649
 MISC metadata.xml 469 SHA256 54c8a314944640dade8e23fe264bdd928732ef9f47e20bedf943ea990b437bfe SHA512 50370daa407e3f46462bb5a2774bb723bf908a44f96ba470a0635a82f0eb4f24e1c19e94e369dcb72199fd93d970c3ee8c6643f3926a6005b8d679d422a6c00b WHIRLPOOL 096ee6f7f78c6bb5ebbee871975afff24d63de0c054f864998517b7478c7e37b89e4f561722b5f0f9ea9210f6bfeb2807a62f700cfb14d29c6c80e119f14732e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUcUSAACgkQcaHudmEf86rw5gCdFZ3hXVB45ZVTIA0FhCN/4I7J
-RwkAn0JO35Hh9UMhbPePybwfCjm8fBgX
-=7eY2
+iEYEAREIAAYFAlU6r0QACgkQcaHudmEf86qEjACdGqhpOk1nvi/s0dFjFy4dmi/d
+2wIAn0Z0LtBi/oODO3f9qQAjuqqOZvgx
+=uT5R
 -----END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.10.0.ebuild b/net-im/openfire/openfire-3.10.0.ebuild
new file mode 100644
index 000000000000..5fad336e38d2
--- /dev/null
+++ b/net-im/openfire/openfire-3.10.0.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.0.ebuild,v 1.1 2015/04/24 21:03:48 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
+}