Version bump, fixing bugs #345613 and #266129

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 115 insertions, 3 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 9c68169398e7..c5a525eebcf6 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/openfire
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.36 2010/06/27 21:46:33 caster Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.37 2011/03/05 10:46:10 jokey Exp $
+
+*openfire-3.7.0 (05 Mar 2011)
+
+  05 Mar 2011; Markus Ullmann <jokey@gentoo.org> +openfire-3.7.0.ebuild:
+  Version bump, fixing bugs #345613 and #266129
 
   27 Jun 2010; Vlastimil Babka <caster@gentoo.org> openfire-3.6.4.ebuild,
   +files/buildxml-ant.patch:
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index bd769317a82c..9d5eeba94ebb 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -5,8 +5,10 @@ AUX openfire-initd 571 RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 SHA1 264a
 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
+DIST openfire_src_3_7_0.tar.gz 60928248 RMD160 ce0dad48a424cabf96cf9714ce339bf5b094f238 SHA1 0772ef9b2ace74a58a3f756e4fcd0959816583e3 SHA256 838606343b06059cee7d98b9e0d989dc511021b64e0c24a3379192e763b9ef4a
 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
 EBUILD openfire-3.6.4.ebuild 3141 RMD160 242b0cc4e17847e1ada24908b2b1adac31d22861 SHA1 6a87d5310a0936d2b62e904f5ac71fd317292328 SHA256 a775b5d0de1f7597d6210da0492a2676bcd97f93941017ee23b1b7913fe7384d
-MISC ChangeLog 10542 RMD160 5151beb720cd2142b9735a3ccf46b93ed3bd9857 SHA1 dd6efd3c5d7e14f8ef1bd38a101e435229dd93ee SHA256 228321712ec381a68868fd4b1362096ae55a4d47e9c95a0cbdfead7ea8398be0
+EBUILD openfire-3.7.0.ebuild 2800 RMD160 f9cefe0bd8cc1b0248bfb986997956738b0cde34 SHA1 edf75cfaba1c93e969770140a7150b1c0264f464 SHA256 875a99407dbc4870036303ce78639ad89f34fe309052538593c85bddcc387caf
+MISC ChangeLog 10694 RMD160 645a6c9378b55ebf6c40f5a6f832cac9e440e1a9 SHA1 a30a53dc3b6ec5aefcc11d3e7a189fe46df3ea68 SHA256 7f8b402bd51e6f23d672fa3a1dd67ede4c2093528a59ed8a8b550cf07137f61c
 MISC metadata.xml 451 RMD160 f13ea23502663a93dc747530f24cc39990fdb360 SHA1 9b3f52dad5c84b7fc78dfce5ca3a0611622655cd SHA256 5e1a11856ef90d986ae42faa142bcbfac2054d2cc3565b9daa0ff20a90731893
diff --git a/net-im/openfire/openfire-3.7.0.ebuild b/net-im/openfire/openfire-3.7.0.ebuild
new file mode 100644
index 000000000000..e3208591dcf6
--- /dev/null
+++ b/net-im/openfire/openfire-3.7.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.7.0.ebuild,v 1.1 2011/03/05 10:46:10 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
+	epatch "${FILESDIR}"/buildxml-ant.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
+}