bump

Package-Manager: portage-2.1.2.7

5 files changed, 151 insertions, 5 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 3c89a505b6d5..9e3d766c0635 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/openfire
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.9 2007/06/01 11:05:52 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.10 2007/07/17 10:39:58 humpback Exp $
+
+*openfire-3.3.2 (17 Jul 2007)
+
+  17 Jul 2007; <humpback@gentoo.org> +files/buildxml-3.3.2.patch,
+  +openfire-3.3.2.ebuild:
+  Bumped 3.3.2. Closes bug #183330. Thanks to dev-zero.
 
   01 Jun 2007; Peter Weller <welp@gentoo.org> openfire-3.3.1.ebuild:
   Stable on amd64 wrt security bug 178289
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index c5481ecb3516..bdfe2f15c71a 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -6,6 +6,10 @@ AUX buildxml-3.3.1.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA
 MD5 03fd3398f5d0db0e2ec644c2c2f821de files/buildxml-3.3.1.patch 754
 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 files/buildxml-3.3.1.patch 754
 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 files/buildxml-3.3.1.patch 754
+AUX buildxml-3.3.2.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6
+MD5 03fd3398f5d0db0e2ec644c2c2f821de files/buildxml-3.3.2.patch 754
+RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 files/buildxml-3.3.2.patch 754
+SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 files/buildxml-3.3.2.patch 754
 AUX conf.d/openfire 491 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 SHA1 2bee73a734d5e9ef8ba17f3074c9eba01b4cec6b SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5
 MD5 026fe96118d6451e29e72af8538dd8eb files/conf.d/openfire 491
 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 files/conf.d/openfire 491
@@ -16,6 +20,7 @@ RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 files/init.d/openfire 571
 SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac files/init.d/openfire 571
 DIST openfire_src_3_3_0.tar.gz 18793873 RMD160 cf99135734d069a26df0b88f0b8ef316d434a39c SHA1 10b4ae0983211662b566fc0b7a48aee2b2cd6a05 SHA256 1bfff0c896337d5bf44db30e8c570942202ec16edd5b9d53c8d5e72a035c96a4
 DIST openfire_src_3_3_1.tar.gz 48723953 RMD160 46c80805bdb90f41f2158751b3de1a498f96e2b7 SHA1 ea3ff9fcc5b6fe78b04706fda1b6f700089bee59 SHA256 ace1324862e3906c457b8a20e918d2ac2af3ef328c8259081103de0e1b16ba95
+DIST openfire_src_3_3_2.tar.gz 48712324 RMD160 f1397c0d6f4710e39b0c3d110c70de7834172cb6 SHA1 115e8964dc762f58a308497cc170d6f6355ef137 SHA256 bf8d3a7561d5a569c8fd5e22f384f56c6d6fcabd0a5167240590d873fa0a8377
 EBUILD openfire-3.3.0.ebuild 2776 RMD160 f1fb60a73dbf6a9ce16c99463ccd565df3484ba0 SHA1 0987ce8fed55c5decac1fed1c76a4e2948fbbbc4 SHA256 e21a70c29a89ebe4f1937324121c1009772fbb8e34bf48567b32a02ec19b7893
 MD5 40ca49025a19c8340f19422bb680649b openfire-3.3.0.ebuild 2776
 RMD160 f1fb60a73dbf6a9ce16c99463ccd565df3484ba0 openfire-3.3.0.ebuild 2776
@@ -24,10 +29,14 @@ EBUILD openfire-3.3.1.ebuild 2768 RMD160 d0ac230ce3799b831ce0d47d3ecd6815642250c
 MD5 f42b53d8ef0b50939727982a767f43fb openfire-3.3.1.ebuild 2768
 RMD160 d0ac230ce3799b831ce0d47d3ecd6815642250c5 openfire-3.3.1.ebuild 2768
 SHA256 6e7c65c846f312c0debce9f85734b67ffc84f11f2c07945b4d4a818fc5b854a0 openfire-3.3.1.ebuild 2768
-MISC ChangeLog 5747 RMD160 225fd531d1367314d891300f4b90ef430dc4b8fa SHA1 dbe9e108173e2f70d9c3769de2c0e0e01ccf37cf SHA256 83d41e178bf244221df586bb64806d815f5b6519795eb54407326bf822ab74de
-MD5 bc09085f9b26eeb66e8166a4a6501e88 ChangeLog 5747
-RMD160 225fd531d1367314d891300f4b90ef430dc4b8fa ChangeLog 5747
-SHA256 83d41e178bf244221df586bb64806d815f5b6519795eb54407326bf822ab74de ChangeLog 5747
+EBUILD openfire-3.3.2.ebuild 2772 RMD160 256c7fca8e5db9ac58a61d092edf75e904ca7c20 SHA1 b9896a29be8834234de0e47bb81d2a0c50a4690a SHA256 97e9d0132e4450089e60a5bbf6a31cd906d619e757d5a562ed5086ee5f0400da
+MD5 0c31c586c30b1c81945fe60264bbf51b openfire-3.3.2.ebuild 2772
+RMD160 256c7fca8e5db9ac58a61d092edf75e904ca7c20 openfire-3.3.2.ebuild 2772
+SHA256 97e9d0132e4450089e60a5bbf6a31cd906d619e757d5a562ed5086ee5f0400da openfire-3.3.2.ebuild 2772
+MISC ChangeLog 5932 RMD160 37fd118a1252ed9534c0bff8095c3342d86648fa SHA1 3ffc873466d636ce44a8ebd28294cde0a20c9ba0 SHA256 792ba5d1d333e976b4e68c97a5e2b5618a2d5d33e891ab6c833b1e98dbce75fa
+MD5 64e6f7bdf6e0307c57b9450dc242c99c ChangeLog 5932
+RMD160 37fd118a1252ed9534c0bff8095c3342d86648fa ChangeLog 5932
+SHA256 792ba5d1d333e976b4e68c97a5e2b5618a2d5d33e891ab6c833b1e98dbce75fa ChangeLog 5932
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -38,3 +47,6 @@ SHA256 91aa6f5da22b58cb1bbf6d7d00003ca9831c6610a96a54746a7c4a5c10a70d2e files/di
 MD5 37c144a7ed8231db06ec467372e1288c files/digest-openfire-3.3.1 262
 RMD160 361f6692d4c737a9b2dc2da45035e978e5097fc2 files/digest-openfire-3.3.1 262
 SHA256 e663f15f25b3991813bb98fa26646cca47b23db09cb636020cfec4fd8616d5d2 files/digest-openfire-3.3.1 262
+MD5 8b508b024f2088be4c1577968be7a9f5 files/digest-openfire-3.3.2 262
+RMD160 7fc864d9d5c6741704e382b4b947e7a4261b2c2f files/digest-openfire-3.3.2 262
+SHA256 cbddecf76f0b1258b19aab42571e96258c2aa875b4c165570f6de34f28ff1d32 files/digest-openfire-3.3.2 262
diff --git a/net-im/openfire/files/buildxml-3.3.2.patch b/net-im/openfire/files/buildxml-3.3.2.patch
new file mode 100644
index 000000000000..eb52f286d250
--- /dev/null
+++ b/net-im/openfire/files/buildxml-3.3.2.patch
@@ -0,0 +1,20 @@
+--- build/build.xml	2007-04-13 21:00:32.000000000 +0000
++++ build/build.xml	2007-04-16 23:11:05.000000000 +0000
+@@ -1133,7 +1133,7 @@
+ 
+     </target>
+     <target name="-plugins-impl" if="dirlist">
+-
++	<taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+         <!-- For each plugin in the main src dir, call the 'buildplugin' macro -->
+         <for list="${dirlist}" param="plugin" trim="true">
+             <sequential>
+@@ -1143,7 +1143,7 @@
+ 
+     </target>
+     <target name="-plugins-impl-dev" if="plugin.dev.dir">
+-
++	<taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+         <!-- Get a list of plugins in the optional dev dir -->
+         <subdirinfo dir="${plugin.dev.dir}" property="dirlist2" ifexists="plugin.xml"/>
+ 
diff --git a/net-im/openfire/files/digest-openfire-3.3.2 b/net-im/openfire/files/digest-openfire-3.3.2
new file mode 100644
index 000000000000..5c55bdf29c57
--- /dev/null
+++ b/net-im/openfire/files/digest-openfire-3.3.2
@@ -0,0 +1,3 @@
+MD5 e156e12e098ee9a4f97ba7be84563233 openfire_src_3_3_2.tar.gz 48712324
+RMD160 f1397c0d6f4710e39b0c3d110c70de7834172cb6 openfire_src_3_3_2.tar.gz 48712324
+SHA256 bf8d3a7561d5a569c8fd5e22f384f56c6d6fcabd0a5167240590d873fa0a8377 openfire_src_3_3_2.tar.gz 48712324
diff --git a/net-im/openfire/openfire-3.3.2.ebuild b/net-im/openfire/openfire-3.3.2.ebuild
new file mode 100644
index 000000000000..83ee8f9b617c
--- /dev/null
+++ b/net-im/openfire/openfire-3.3.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.2.ebuild,v 1.1 2007/07/17 10:39:58 humpback Exp $
+
+# because of ant-contrib
+WANT_SPLIT_ANT=true
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz"
+RESTRICT=""
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+# For transports
+PROVIDE="virtual/jabber-server"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND="net-im/jabber-base
+		dev-java/ant-contrib
+		>=virtual/jdk-1.5"
+
+S=${WORKDIR}/${PN//-/_}_src
+
+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 ${PN//-/_}_src_${PV//./_}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/buildxml-${PV}.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
+
+	doinitd ${FILESDIR}/init.d/openfire
+	doconfd ${FILESDIR}/conf.d/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
+}