Add version bump to fix security bug #229515, added a note about plugin updates and fixed build dependency bug #233407 thanks to Mike Weissman for testing

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

3 files changed, 129 insertions, 2 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index a5705e3b88c3..d64de9aaaf27 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2008/06/11 06:21:41 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.23 2008/08/27 12:06:20 jokey Exp $
+
+*openfire-3.6.0 (27 Aug 2008)
+
+  27 Aug 2008; Markus Ullmann <jokey@gentoo.org> +openfire-3.6.0.ebuild:
+  Add version bump to fix security bug #229515, added a note about plugin
+  updates and fixed build dependency bug #233407 thanks to Mike Weissman for
+  testing
 
 *openfire-3.5.1 (11 Jun 2008)
 
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index 34641aac071d..ca5a52adbe6e 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -10,6 +13,7 @@ DIST openfire_src_3_4_5.tar.gz 48799040 RMD160 668defe28b8ff4fd990c06df4ccd7eadc
 DIST openfire_src_3_5_0.tar.gz 45664553 RMD160 d0c0d850df5ffee1e04a950b2f0a4354b6a2ecf6 SHA1 1c313a2c12d6ad57cecf3da53e9b745b2a589f19 SHA256 a288f45aeb3006104e3cba69b73da5fb7e1c353f1551d94f97b9d82928d40746
 DIST openfire_src_3_5_1.tar.gz 50631057 RMD160 96eb726df2ea74132733aca03469b626ac88ed9c SHA1 6d1cf11ecd81bf27fb4e0495f7a1c94c7435d9bf SHA256 77a17fff6c8b926b6a1e12ac5866bbc8e6deae3e78e8cb47252bbbd0588b7f1e
 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
 EBUILD openfire-3.3.2.ebuild 2746 RMD160 5ab6acbf5894717ac7aaa3e3dafc7fd55da5e8fa SHA1 b21283a9b109c40311e8bb8fd223050f12ecbfeb SHA256 4f03922958a24115ac3676f0b60a2966b55209d4074a6a848bdf28504f1d578e
 EBUILD openfire-3.3.3.ebuild 2748 RMD160 3ed98dd70eb2ffa40b4c604c40203012c1d27501 SHA1 618bc12ed5788408dc5d7b19ec8652bdc8f2e927 SHA256 2a0560eb20968a06191a9a1e712f368600df1b49d3075d67396f78a07c8b8155
 EBUILD openfire-3.4.1.ebuild 2748 RMD160 cc65c21f52b9ff9652e071646dbf0fe417653307 SHA1 4884228c44ec459e14be4e36c63bace1498b3fc5 SHA256 00b7d84b19725a740c7bb7c49e6e6c5fb4bc192766474a08bba6a7f71c7c26e5
@@ -19,5 +23,13 @@ EBUILD openfire-3.4.5.ebuild 2748 RMD160 e49974f93c9f60268f4bb65ad5150cb59e42e7a
 EBUILD openfire-3.5.0.ebuild 2722 RMD160 02964391194d7def8e0b0fd28983580abf8dd2d4 SHA1 57ea905b5a5e9c8bd2c953baf5944ab73ddb52db SHA256 e869068554adb78fafcd1eea0e5a938d92e2eec264711cf339f03689cb26946f
 EBUILD openfire-3.5.1.ebuild 2725 RMD160 9a33000cd87b4f7539e5230f294df727d6949337 SHA1 6abc4fca37296f47954f02b8f644f0d52158b167 SHA256 652c483589267cadb6bdc44d51cbe129b453e891aa76307ba1cffdf2c0742026
 EBUILD openfire-3.5.2.ebuild 2726 RMD160 56ef9564110b89031c393d21c5dae69d717e100e SHA1 1c730c81ac628a8a2536ff05120eccb1b6e438b8 SHA256 3c86f2a14cc0ac6a92c49379466772c3da0275678a02b9623e29e36e3a6a618d
-MISC ChangeLog 8288 RMD160 934164449a6c97a8de8d5167f3134ec4e21f392a SHA1 047d3f9d682270a2ee977749c06ab483d1ddb4f9 SHA256 d43da7568c3cfe08382419e16a8d32b1fdced72aa10c1973f3550670f0cb30d9
+EBUILD openfire-3.6.0.ebuild 2953 RMD160 36573610969bea26bc22dfe559299d80d9be0dc8 SHA1 3f250d49fb2e371035083e30c4e9e1688a62b04e SHA256 dc00f633b19cbad68f1125b24e2bc97f55e605cb4dab5e6ba273b3014177c23e
+MISC ChangeLog 8552 RMD160 79151f28bf993f489688b134919a65cda596b8a9 SHA1 0f0c59c6c47e0454b917b1c0717dbb14a3159f27 SHA256 a01ecae8b173672495bcc574c740a0a9c61efa6ab5cba7a7997ba9025af67052
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAki1Q0AACgkQz974XjDVpblPDQCbB6C+OM5aETEvarJ51vEKs9BB
+eLsAn2pf73CthjAvqcnHH3kqR1PLCuR+
+=xCZB
+-----END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.6.0.ebuild b/net-im/openfire/openfire-3.6.0.ebuild
new file mode 100644
index 000000000000..8ffdf0ea3f16
--- /dev/null
+++ b/net-im/openfire/openfire-3.6.0.ebuild
@@ -0,0 +1,108 @@
+# 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.1 2008/08/27 12:06:20 jokey 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
+}