Version bump, still leaving bug #266129 open

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 119 insertions, 12 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 5ed79aceb470..775979e1044c 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/openfire
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.32 2009/01/15 22:02:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.33 2009/05/16 08:09:24 jokey Exp $
+
+*openfire-3.6.4 (16 May 2009)
+
+  16 May 2009; Markus Ullmann <jokey@gentoo.org> +openfire-3.6.4.ebuild:
+  Version bump, still leaving bug #266129 open
 
   15 Jan 2009; Markus Meier <maekke@gentoo.org> openfire-3.6.3.ebuild:
   amd64/x86 stable, bug #254309
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index 20f82e53c386..6be3bb5eb5c5 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,19 +1,11 @@
------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_6_1.tar.gz 51130024 RMD160 940fe13d6a2d2da88427eb8a29316aa032d16313 SHA1 b245fb21b59c2ff3185c971f62f50282da12eb8f SHA256 e81a153765e7cb7b67472d4592119dc174008b5c96fca53b4117697ca51c301d
 DIST openfire_src_3_6_3.tar.gz 51181483 RMD160 1ffe1b4c379cb92faa9ce184d9dfb2edf4f1f978 SHA1 bc45c0bed1463010ac4696972a8fb4dfc775a776 SHA256 44dc336d2ebecf5107124baa07da05a4e7c9a4577d37036365296e663de0b076
+DIST openfire_src_3_6_4.tar.gz 51183844 RMD160 1b83a08db6dc5e4b78dfac5b8f1edad510c33432 SHA1 2578dbde4c9337d687d93575b2e95632bdc2e90b SHA256 8f5c3334da449e2fb1bdabe2bdd46db1fd96a4dc7b3e34a870401fa90819ea99
 EBUILD openfire-3.6.1.ebuild 3100 RMD160 70f18078c288e2fa6483687ee661edf23005d10e SHA1 22dafa4686f4b441d46a179828cf4d00be9b8525 SHA256 94ad24297f6aab73a08adffd3e3459b5f0536bd302ebbd0da9f6deae51eb6090
 EBUILD openfire-3.6.3.ebuild 3100 RMD160 631f842573b0b3535fd3e43ba3f0cae78c925522 SHA1 1ee8042fcfe13b858408cfd40cd296a0d558caaa SHA256 ceb9ae5ef6f866b0dc8068bd2ecb5ab4a44858bc36e80707d5111a184450ad8b
-MISC ChangeLog 10029 RMD160 f354ca8b17bbd3a7d961d969499cc3532041474f SHA1 14512ad1afb16671c61b8b773dd2d82c66e55f0c SHA256 862b2be2be60148652180837728fe933811f06f493bc870739ab72c6e5b83895
+EBUILD openfire-3.6.4.ebuild 3101 RMD160 e1fcab5db4c19e4b26eef219c0659ee02e14484a SHA1 46e57f79b58211c6f8c66d4fe570451a8281d31e SHA256 3fb3a5857c63a645d744f9c5fa1c022646b11600f7d5d0014872ef504a7b855e
+MISC ChangeLog 10180 RMD160 aac8323757fb45fa5f47a3d85747cd47786f8a8e SHA1 30c1a6d82bb6e1358bb961b1247d6751ad68bdaf SHA256 d8fcd4a117120587c4387d2c5b27787e43995e20e41db28c993d4f16733acb4f
 MISC metadata.xml 451 RMD160 f13ea23502663a93dc747530f24cc39990fdb360 SHA1 9b3f52dad5c84b7fc78dfce5ca3a0611622655cd SHA256 5e1a11856ef90d986ae42faa142bcbfac2054d2cc3565b9daa0ff20a90731893
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklvsmsACgkQkKaRLQcq0GLzJQCfdvuL/iwVrVxepfWPUzBu1xqy
-EzYAmQE+8DdKZ+dx6ayNH5BTMrfZSE7p
-=kWvB
------END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.6.4.ebuild b/net-im/openfire/openfire-3.6.4.ebuild
new file mode 100644
index 000000000000..ff2768652d24
--- /dev/null
+++ b/net-im/openfire/openfire-3.6.4.ebuild
@@ -0,0 +1,110 @@
+# 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.4.ebuild,v 1.1 2009/05/16 08:09:24 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
+	ewarn Also there is a known issue about IQ Packets and connection drops
+	ewarn see http://www.igniterealtime.org/issues/browse/JM-1465 for details
+}