Version bump.

Package-Manager: portage-2.2.10_p15/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 125 insertions, 15 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 094c07c6016f..ae0739ec4975 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/openfire
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.59 2014/05/04 08:20:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.60 2014/05/06 20:45:30 slyfox Exp $
+
+*openfire-3.9.3 (06 May 2014)
+
+  06 May 2014; Sergei Trofimovich <slyfox@gentoo.org> +openfire-3.9.3.ebuild:
+  Version bump.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org> openfire-3.9.2-r1.ebuild:
   Stable for amd64, wrt bug #507242
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index 0ff7547a496d..24ac6223ebbb 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -17,6 +17,7 @@ DIST openfire_src_3_8_1.tar.gz 69014231 SHA256 554dce3a1b0a0b883ab0fd4a06a0cee13
 DIST openfire_src_3_8_2.tar.gz 69222202 SHA256 2d1bf97523eafe9485a013bbb70ff282d41470f65b842f4d7656c9788ab96c8d SHA512 2a461e6e072d606acbad390fc2e66f5a97eae8c29fb13624a249207ae6cc3ad48020289c3f28cc9fbf49fd25c0cccd559cf040c299de58251ae2c171f13a92cb WHIRLPOOL 1e4f7e5f1dcd5451c96a37db763b866bbfb2d0ff26127297848b0c97e14dfd27b54efb1a29c46c0ea62d63c32b776ce50f3eddf1bd73d7e492ce2c2bc38fbdc9
 DIST openfire_src_3_9_1.tar.gz 123053536 SHA256 682576ea16a111374735cf93bd5e444feee6d0b714b109436aa7e0c775f3020d SHA512 b9fe8180092980cbc3fc8460e36e50167a32cffa312770dee7bf2ab45d1af400de40460e51edef2032a40d97de2093cac42112d5177aef37d784aa00c8fe8b0a WHIRLPOOL e42a5a48b68f35f2715f75e33ce45baaeeacd7e6f22f87c02b6dcba699bce2b00dda9f229ea601aded3b55d45fc5e991278aa79f71547918e8ed5724e1a65b66
 DIST openfire_src_3_9_2.tar.gz 80845988 SHA256 7ca3194a32fd0061ac5bc30f1d59b483bb945d7be4d3e032c7493f8e0070c742 SHA512 b877daba05763721dface374aa6e4184cc20be7a62583d656fb8fb11fb9cba3300490f4b78378ad3f37ab0c9190a3659530ae838610c155dee585c78ec4f6f34 WHIRLPOOL caad551c969ce1a08437dcf8f5704e79956b02c9189ba7d595dc28f6574ad5dee2a8365e1553bf6b3b096fef6b01f754368e703b190528377599b5b18d70f83e
+DIST openfire_src_3_9_3.tar.gz 80785973 SHA256 37001835a3007f115214aa83f2a48f8c33bbf3576937f4d964d9eb3de3933ad2 SHA512 9a00431a36c7d5539bad2409ca7b3091652d567c6e09a1b3f34e9dc3c79a74b53b5a4d14dad81af212e0a3b69cb0f3c4552fb2f8d58caa5cd44c32dd0b50913e WHIRLPOOL 0aa8c548af6ddb16fd28f71b7c2e7f0c22fdcfa0abdde3f09ee21b5d2f2b55512b57ab59083ac7e9c2b4b9011b85a0e0027ae9a91b6f5f200d838c2401f3a26e
 EBUILD openfire-3.6.1.ebuild 3047 SHA256 fb719511dbf6de9a4a3c4802157669cf297963605b03ba2c860cbf05c2a0c32c SHA512 d4999cbe85c01bef94b51227c4bd0de2145dacf1c2f2911c2eccba23277cac958cb3e6653cda68844f6308265040e4be0b4dd6101dc8c448274175869d4d2da8 WHIRLPOOL 20624df94d7b11c15d2d333c68dbe1aac58504540c3c347c39d935faf66d30259f7c026970aaf975afd567e123b020e69a7bc1939f2f1fb357aa39d3ad7f6aa0
 EBUILD openfire-3.6.3.ebuild 3047 SHA256 53ca0a15f5f30b47d9e82141bc123643bdf91dc1fb44f7f1162eedea95f14da9 SHA512 516e0835ac8f8c3023f7edbe0d14db060a5650fc57cdc0fc04eea047a84451c13e3540206a97872049bdc8c8721fae74de08a99b2e69fa53e6745d4f13dc7095 WHIRLPOOL 37022ac9d972a78977fa0aff2c4242763267f8693800332376536650ae01666218aace84c918d3290160359cff0b695d578bdabbfa1cced82ce47de859ce0efc
 EBUILD openfire-3.6.4.ebuild 3088 SHA256 ee1dce47bd40ec60d0ecc9c4cb78abf15474f027b18f7e0e6b075a55e6b80fd9 SHA512 4e35749f157689a0a2cb9670e93f7e79948605fadb81f8c4989f0c5febac80cc15e5e6e47e865f5259c91e5118e9904e7ca80c0eed4824333d78b362cd282476 WHIRLPOOL e6dae2ee243ca393b7d5228428bc04f61cf47aa4c5c7dcd8170ab206774f4c57579e7fbb913addd97eafdfc5811a1178655b4cfd11acff90fa7f58ebeeb04d11
@@ -27,22 +28,13 @@ EBUILD openfire-3.8.2-r1.ebuild 2854 SHA256 0d9679d69c6983e79e3355f7219093902af6
 EBUILD openfire-3.8.2.ebuild 2763 SHA256 a072df299620331ff810ee5fbfa522870a65e3f9c77b4438dfd104a9a8b8c036 SHA512 46f0b09ad8c68c75c4159b52a9847219ce91aeb07b31c857789a2d2bd5a67f0f9670a65c1bdb2a06882ed9ef5974b138266ab05a943d5c1ab96785bf57b6c6eb WHIRLPOOL e4304851abaaed95896c6551df660bdab6925653edf4a3dafc6f51d0f474188b373e927249e8b132dc7e64c347ddc29a765aef437b82e6e30fb844c8bd126d79
 EBUILD openfire-3.9.1.ebuild 2859 SHA256 6919402c58993e42771cfe4ec9a12e263ea51f11d64f5cedb64de6c59dfde2df SHA512 0985e792d7d8c9bd733ea965b29ee9dcfd42ded3d7017dc3867db6dc06c3bff1244d852304ef5acaa86ac77733a437900e98653c1cd6898866491c814b67d18f WHIRLPOOL 673cfc5c1f12027349297c87c54c0b271e31894e65b4f85a6903f635c59b5fbfcf1e23a063819a79345ffe724eaed1693742d686c995c6d7c362aad7eb81c24d
 EBUILD openfire-3.9.2-r1.ebuild 3084 SHA256 28b3d1ab5b379caa129d27d18f2a03975a0dc4f7468f716fbed0f213b3979709 SHA512 4ba183e1de568c8269e82441b9418a61f0fbc6ba36bbe9249ec15a422bbfa304019ef20e9d3d96de9dfbd734d67a6d64b17322ac53e35157a7fd4ba3823638c6 WHIRLPOOL f5badc5584fd7da7fe5efe04c17661b35fc10e4f75ba668f83208eaf9e1992be3fb297bcce4a9a0bbd9f5d94020b8fa4c42a9e5c5aad07cb7dc0b9d9ab597bab
-MISC ChangeLog 14455 SHA256 d57f70f1c8e7a8b93a1e8973fd868c130863efe8ccf8c04f1621c2741db15ffb SHA512 ee94c6788e036a0e9711ab4e773e3621e715d201dcf202c11cb3fff826fb48fe94224a849c8ba0a8de9dc7cc829d87ae09995402ac9980b6cf560ea133f5283c WHIRLPOOL 33209dfdcad5d8f19bbde3b8b58ec504014cfa269b73243125de4f1aaa993440567aac8f19cce1ed0574284d76ca8c8da0e98bbf1a8f3d0e9147dc8902990c6f
+EBUILD openfire-3.9.3.ebuild 3085 SHA256 3f9e16478d4493320eb5ddf76f080968401d8cd475d9778fb6bfa8fd0f770a47 SHA512 bbcaadb957f44e3385841873780bf596152a28a298737754ba89aba01367c164632e22d79f3741361ba2727451dd2a66392adcab6f6fc32b3e500f63d9d1235d WHIRLPOOL 406b139d43127bde7a10c5b8a012a5769342518038674d9b8dbf76e580c9826a653ad5a134acf7f402103e8c95fc46980f05cee3ca73d3fc4d22b98217ce9f14
+MISC ChangeLog 14584 SHA256 6e7bf103cae1ceb211b214bbc3153793c019ea253d970267b1c0236d6dbd0479 SHA512 1912133b24eed30ee0c6b0306943c58cf26101a4711b815dc0a5f7e7ae84478aa91bd8f2e5c38b7d04d37581f86b5ca97e287c366bca8af6067c204087d7c254 WHIRLPOOL c470d9c58d4928847db9ecc1473dda836519802851c9cdea324d9cedeef79ed1ed45c72ec07c9c9b67f1fac42a92052db0f5d4c52a2116a4dbfea64c4b2df313
 MISC metadata.xml 469 SHA256 54c8a314944640dade8e23fe264bdd928732ef9f47e20bedf943ea990b437bfe SHA512 50370daa407e3f46462bb5a2774bb723bf908a44f96ba470a0635a82f0eb4f24e1c19e94e369dcb72199fd93d970c3ee8c6643f3926a6005b8d679d422a6c00b WHIRLPOOL 096ee6f7f78c6bb5ebbee871975afff24d63de0c054f864998517b7478c7e37b89e4f561722b5f0f9ea9210f6bfeb2807a62f700cfb14d29c6c80e119f14732e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZfhSAAoJELp701BxlEWfbtcP/iYwkwP5Abc04XufyzzZZpXf
-1V+idvOdhI7fRT1x6CowJHtRX27/G5uaE2NWxToo3hHKnUPqDqSFU+aSr5cXK1jN
-zMkVfOThUVfY8gSM6Pcrtsz8FZXMuuTwo1v1yZFT/sBhH1tUCZZc1KPOMZ48pX09
-vStFe9H1L+l5BNuWvIpQ+s4HvDQqtKP5HLIGd5o8J+ET84BfWerbRIyYpzU0JUXm
-5Qp8HiH2GLKUjEMsVGIAJOCgFpQBjCpxevX35sXuuWyzAlE5GttcNidtOpVaPMha
-Gv41byH7GrcRB9kBbFHBdQo2U3qA6GI21InwAU/YZYjsNA9ipcvTanMg/RJ1Km+8
-8jpgALz5L9qxfPWrpfQOUM9x/RPfKVYNPu7jYSoLAek0YJfrx+m8MWmXfshjw5UG
-1oMQUE3lRLcFH1rF8K1X//Cr+Gm69LLeb05O7gQZpBgo55oeT6gRU6xjWT6PxLEm
-eUGZS6KXrAQMWKUk/5YZiZv1biC0qcHQNmrC8Qyz55qkwjuJgJPu7QFkWdl4t7vv
-sQwEkqMTwQpXvGXkaf2+lPjrZ7XUlaUYTLM4vVcomIWZsF1bmra0zxqbztip0qUN
-A0WMie0bOiwaJMyZm6nvItbEmSRJj1Y8+DLN9uOnHX0AuQb67VICROnqs+BKk2cc
-u2c1kMvcBU3IKiqfwq1p
-=kvtn
+iEYEAREIAAYFAlNpSc8ACgkQcaHudmEf86oSQQCbB3X6RvJx4NrckIW5wY4W+cBT
+A4IAmgM0KU7tcrCNVHQd1SlrLblCvU4e
+=sfPv
 -----END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.9.3.ebuild b/net-im/openfire/openfire-3.9.3.ebuild
new file mode 100644
index 000000000000..2dfa9ad3f088
--- /dev/null
+++ b/net-im/openfire/openfire-3.9.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.9.3.ebuild,v 1.1 2014/05/06 20:45:30 slyfox Exp $
+
+inherit eutils java-pkg-2 java-ant-2 systemd
+
+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
+
+QA_PREBUILT="opt/openfire/resources/nativeAuth/*.so"
+
+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 "they 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}"/${PN}-3.8.0-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
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+	newins target/openfire/conf/security.xml security.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() {
+	local src
+	local dst
+
+	# http://community.igniterealtime.org/thread/52289
+	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+	do
+		src="${dst}".sample
+		if [[ -f "${dst}" ]]; then
+			einfo "Leaving old '${dst}'"
+		else
+			einfo "Created default '${dst}'. Please edit."
+			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+		fi
+	done
+	chown -R jabber:jabber "${ROOT}"/opt/openfire
+}