+*openfire-3.6.3 (13 Jan 2009)

+
+  13 Jan 2009; Robert Buchholz <rbu@gentoo.org> -openfire-3.5.2.ebuild,
+  -openfire-3.6.0.ebuild, -openfire-3.6.0a.ebuild, +openfire-3.6.3.ebuild:
+  Proxy commit for jokey: Version bump (bug #248857) for security bug (#254309)
+  fixing a Cross-Site Scripting vulnerability that can be exploited to execute
+  arbitrary code on the server.
Package-Manager: portage-2.1.6.5/cvs/Linux 2.6.28 x86_64

5 files changed, 15 insertions, 233 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 6732ce34cd3a..0ef95547ae4c 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/openfire
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.30 2008/11/16 18:00:03 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.31 2009/01/13 12:42:21 rbu Exp $
+
+*openfire-3.6.3 (13 Jan 2009)
+
+  13 Jan 2009; Robert Buchholz <rbu@gentoo.org> -openfire-3.5.2.ebuild,
+  -openfire-3.6.0.ebuild, -openfire-3.6.0a.ebuild, +openfire-3.6.3.ebuild:
+  Proxy commit for jokey: Version bump (bug #248857) for security bug (#254309)
+  fixing a Cross-Site Scripting vulnerability that can be exploited to execute
+  arbitrary code on the server.
 
   16 Nov 2008; Markus Meier <maekke@gentoo.org> openfire-3.6.1.ebuild:
   amd64/x86 stable, bug #246008
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index 87b6aa591ff6..29f57e10cada 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,23 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX buildxml.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6
 AUX openfire-confd 491 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 SHA1 2bee73a734d5e9ef8ba17f3074c9eba01b4cec6b SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5
 AUX openfire-initd 571 RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 SHA1 264ab08172d7559b79a927395ca32926e9da4cf8 SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac
-DIST openfire_src_3_5_2.tar.gz 50817738 RMD160 877c513bad19ec4d086597d45656e0c736a31ca1 SHA1 1f3c021b9991705c7404bbbc8b770a3cd09f3236 SHA256 4c22131cc64fe31b6f93f5e0c24b42b85c4858f07f8f58806802322dd5f0a1db
-DIST openfire_src_3_6_0.tar.gz 51121081 RMD160 cf65fabd2b2c656fe05d717799ebba804d51337c SHA1 94cfb0fa596fadc157c9d01ff9890cea5cfa545e SHA256 ec29461461f2bec40d04f58b7e4b70993b2eca2c813463bb613fd7139b0435fb
-DIST openfire_src_3_6_0a.tar.gz 51125131 RMD160 7aa869cfd910f69fc15ae478ec4be83d9029779e SHA1 1801d2fb75b789a318cc7174ca95c97036a12681 SHA256 423ad325bc922f4045ea6fc2fb2e111cad670ebd3f87a6f5bb4e560e33c01c68
 DIST openfire_src_3_6_1.tar.gz 51130024 RMD160 940fe13d6a2d2da88427eb8a29316aa032d16313 SHA1 b245fb21b59c2ff3185c971f62f50282da12eb8f SHA256 e81a153765e7cb7b67472d4592119dc174008b5c96fca53b4117697ca51c301d
-EBUILD openfire-3.5.2.ebuild 2726 RMD160 56ef9564110b89031c393d21c5dae69d717e100e SHA1 1c730c81ac628a8a2536ff05120eccb1b6e438b8 SHA256 3c86f2a14cc0ac6a92c49379466772c3da0275678a02b9623e29e36e3a6a618d
-EBUILD openfire-3.6.0.ebuild 2956 RMD160 2b6534d942f99ad54769ad7806efd1dbff9e0bf8 SHA1 581fc00d90918bddf093792180f112690410c68c SHA256 db8229bfc4bc199bc0cbf39b7838b893ad1f5ce915aaa9cc903c9cd81ae3b9d3
-EBUILD openfire-3.6.0a.ebuild 3102 RMD160 3621196225d9f42fb3412e550cccf494edac3b2f SHA1 2c3d5fc7372a052ca33238fe5b0a760c90ad19df SHA256 053a7dc8f581b87aedb9fcc1cfcba4fad56300f6e1f49acd20cdbe5fa518c8e5
+DIST openfire_src_3_6_3.tar.gz 51181483 RMD160 1ffe1b4c379cb92faa9ce184d9dfb2edf4f1f978 SHA1 bc45c0bed1463010ac4696972a8fb4dfc775a776 SHA256 44dc336d2ebecf5107124baa07da05a4e7c9a4577d37036365296e663de0b076
 EBUILD openfire-3.6.1.ebuild 3100 RMD160 70f18078c288e2fa6483687ee661edf23005d10e SHA1 22dafa4686f4b441d46a179828cf4d00be9b8525 SHA256 94ad24297f6aab73a08adffd3e3459b5f0536bd302ebbd0da9f6deae51eb6090
-MISC ChangeLog 9555 RMD160 61d238e352e1786133a2a8e816bbbf012f4df534 SHA1 58e57663ab6bddd7c993a136d98fd3c126a92ac8 SHA256 57ff3e9f0c15b6b47ad62ac4d741d01fff06911e5f7afccfad95c9c6149d32eb
+EBUILD openfire-3.6.3.ebuild 3099 RMD160 41931579ab3c32982805e16af38808ee85746515 SHA1 748df57039bd93cb1e83a33070f1bd0623f253bb SHA256 f5e9273bfe9b808adabc46ce77c45412a5700ad35b64d3b9e98e6de2edb05eb1
+MISC ChangeLog 9922 RMD160 90a8af5f182e7b740c184ba098c1c3190e5b0e5a SHA1 63481c817baf771c22b77a23dc9a372bf77ad8a3 SHA256 adafef001c958b6f534ed4e08bbfb5dd1006022ae7963bd08400f39b80868e98
 MISC metadata.xml 451 RMD160 f13ea23502663a93dc747530f24cc39990fdb360 SHA1 9b3f52dad5c84b7fc78dfce5ca3a0611622655cd SHA256 5e1a11856ef90d986ae42faa142bcbfac2054d2cc3565b9daa0ff20a90731893
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkgX7IACgkQkKaRLQcq0GLJMACeJgc13MnWZPTbl3korjoWoGVH
-docAn3KHTVMBPLmemHuB3qyDN3/lz5Cm
-=2WMn
------END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.5.2.ebuild b/net-im/openfire/openfire-3.5.2.ebuild
deleted file mode 100644
index 36cb3214f66e..000000000000
--- a/net-im/openfire/openfire-3.5.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.5.2.ebuild,v 1.1 2008/07/09 14:30:18 humpback Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-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.5"
-DEPEND="net-im/jabber-base
-		dev-java/ant-contrib
-		>=virtual/jdk-1.5"
-
-S=${WORKDIR}/${PN}_src
-
-RESTRICT=""
-
-# For transports
-PROVIDE="virtual/jabber-server"
-
-pkg_setup() {
-	if [ -f /etc/env.d/98openfire ]; then
-		einfo "This is an upgrade"
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/buildxml.patch
-
-	# TODO should replace jars in build/lib with ones packaged by us -nichoj
-}
-
-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)
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.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() {
-	chown -R jabber:jabber /opt/openfire
-
-	ewarn If this is a new install, please edit /opt/openfire/conf/openfire.xml.sample
-	ewarn and save it as /opt/openfire/conf/openfire.xml
-	ewarn
-	ewarn The following must be be owned or writable by the jabber user.
-	ewarn /opt/openfire/conf/openfire.xml
-	ewarn
-	ewarn If you are upgrading please have a look at the Wildfire to Openfire Upgrade Guide:
-	ewarn http://wiki.igniterealtime.org/display/WILDFIRE/Wildfire+to+Openfire+Upgrade+Guide
-	ewarn
-}
diff --git a/net-im/openfire/openfire-3.6.0.ebuild b/net-im/openfire/openfire-3.6.0.ebuild
deleted file mode 100644
index 9da3ae7d422c..000000000000
--- a/net-im/openfire/openfire-3.6.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.6.0.ebuild,v 1.3 2008/08/30 09:13:21 keytoaster Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-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.5"
-DEPEND="net-im/jabber-base
-		~dev-java/ant-contrib-1.0_beta2
-		>=virtual/jdk-1.5"
-
-S=${WORKDIR}/${PN}_src
-
-RESTRICT=""
-
-# For transports
-PROVIDE="virtual/jabber-server"
-
-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 "hey 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/buildxml.patch
-
-	# TODO should replace jars in build/lib with ones packaged by us -nichoj
-}
-
-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)
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.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() {
-	chown -R jabber:jabber /opt/openfire
-
-	ewarn If this is a new install, please edit /opt/openfire/conf/openfire.xml.sample
-	ewarn and save it as /opt/openfire/conf/openfire.xml
-	ewarn
-	ewarn The following must be be owned or writable by the jabber user.
-	ewarn /opt/openfire/conf/openfire.xml
-	ewarn
-	ewarn If you are upgrading please have a look at the Wildfire to Openfire Upgrade Guide:
-	ewarn http://wiki.igniterealtime.org/display/WILDFIRE/Wildfire+to+Openfire+Upgrade+Guide
-	ewarn
-}
diff --git a/net-im/openfire/openfire-3.6.0a.ebuild b/net-im/openfire/openfire-3.6.3.ebuild
index 64971a79a562..b375fd7b8dc3 100644
--- a/net-im/openfire/openfire-3.6.0a.ebuild
+++ b/net-im/openfire/openfire-3.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.6.0a.ebuild,v 1.2 2008/10/27 18:42:11 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.6.3.ebuild,v 1.1 2009/01/13 12:42:21 rbu Exp $
 
 inherit eutils java-pkg-2 java-ant-2