Security version bump

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

3 files changed, 122 insertions, 5 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index fd1df7456142..41facd45793b 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,11 @@
 # 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.28 2008/10/27 18:42:11 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.29 2008/11/15 16:02:39 jokey Exp $
+
+*openfire-3.6.1 (15 Nov 2008)
+
+  15 Nov 2008; Markus Ullmann <jokey@gentoo.org> +openfire-3.6.1.ebuild:
+  Security version bump
 
   27 Oct 2008; Markus Ullmann <jokey@gentoo.org> openfire-3.6.0a.ebuild:
   Added note for bug #244647
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index c948f42bcafb..c9e7e30475bf 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -7,15 +7,17 @@ AUX openfire-initd 571 RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 SHA1 264a
 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
-MISC ChangeLog 9321 RMD160 cffc8a18891617d479953263608df55ab3328d8d SHA1 32c1fba52054898169d61ee88be88f90402b94b3 SHA256 51eeca6b52ffc5303bb7c0125b8a1c82b8b5320ce3d710cd5b994bfef1a2e469
+EBUILD openfire-3.6.1.ebuild 3101 RMD160 bb2976f76026bf83f4353d57297eab5e9ad81bde SHA1 74d46e50668dd145803a700f2276ebf90f7c5fd5 SHA256 32d35ef4bf30d8e31ac9de22f69d145941b8360027bf55d0ea6a55fa8dd771f1
+MISC ChangeLog 9450 RMD160 caef7afad0c431bbc840d12ef85e77f94505af15 SHA1 a4f8b8ee99af04bd3a497253906cfb09c153a565 SHA256 752d9e71720577151ee52c3a09fb3d97f0f22fe1a0a732ba3a0b3d424224141a
 MISC metadata.xml 451 RMD160 f13ea23502663a93dc747530f24cc39990fdb360 SHA1 9b3f52dad5c84b7fc78dfce5ca3a0611622655cd SHA256 5e1a11856ef90d986ae42faa142bcbfac2054d2cc3565b9daa0ff20a90731893
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkGC4IACgkQz974XjDVpblzxgCfVGwiUpYRpUzkwaD2GVWyC/RB
-AU8AnjsnC7z2KFMkLWxVNIvCXcYY6iJ3
-=SRk8
+iEYEARECAAYFAkke82QACgkQz974XjDVpbnFggCgmHpJo2vTsYFAx0GXICpsfW+Q
+yZcAnjpqStPo+BjiecQdMJW+Z72dF6j4
+=7LUC
 -----END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.6.1.ebuild b/net-im/openfire/openfire-3.6.1.ebuild
new file mode 100644
index 000000000000..5f24fa8caa2f
--- /dev/null
+++ b/net-im/openfire/openfire-3.6.1.ebuild
@@ -0,0 +1,110 @@
+# 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.1.ebuild,v 1.1 2008/11/15 16:02:39 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
+}