Remove nativeAuth plugin support (bug #net-im/openfire by Berthold Humkamp).

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

3 files changed, 134 insertions, 3 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 2ab6a34b96ea..e7624a2c4b44 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.63 2014/08/05 18:34:04 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.64 2015/04/01 20:13:31 slyfox Exp $
+
+*openfire-3.9.3-r1 (01 Apr 2015)
+
+  01 Apr 2015; Sergei Trofimovich <slyfox@gentoo.org> +openfire-3.9.3-r1.ebuild:
+  Remove nativeAuth plugin support (bug #net-im/openfire by Berthold Humkamp).
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> openfire-3.9.2-r1.ebuild,
   openfire-3.9.3.ebuild:
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index 34414f02f11b..b54c27f3cd9a 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX buildxml-ant.patch 398 SHA256 d00f33a091377e554ce05c38b51db4c7936d956c333d212d65be105d402213fa SHA512 91d1da8b86709e1a2cefd06c8e093249958f74d0af6726a8abe532ea661f3d9406fbe867a53a892dc3f8b62de66e31ccc4f42c928adec4e8effe16a15258eda6 WHIRLPOOL 6444cb9d1384ca09e5bea47aaba88aa6ed85c26a704557ae41fd1cdf141e37b1c96746c90f164a44a08d20ed60581ae6b9be0beaa6e4f2be60e2fa33576bc2dc
 AUX openfire-3.8.0-buildxml.patch 792 SHA256 36ba7815a3fd8e6d7626d275268c5f7431053f1a589284b006354982873b229b SHA512 2e2d08393fa8e4d7a676e6c1272202f0c83083c2df481f7ed2d47e919c64eb9331fadb9bc6319d2a165e23047d57ee99866e47bbf83520b54be9fe87af606fb0 WHIRLPOOL de817a1bbc73f9b75c1c0a4ee136b0fb4c1c99cf7830f79a5680c97dff52f2871bb3cb70c4ea677ae245253cece329668db3227ec0b705274c3230f04b0762a6
 AUX openfire-confd 491 SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5 SHA512 c35e00f7e6b4136c1e8ab71b9221a91f3821a536be54681567cd5948243b9b1575056324c104cf038df8191777361b5eed8a1917185aead431a8f5343f1ed698 WHIRLPOOL c4a82a28363cca33fd8184010616122b85f4842bf10606cb0f71e8c6a027f29ae11e67d3483c99bfbadb385cff91726b3cc4e9b05ff0bed299a9c46568bd219b
@@ -6,6 +9,14 @@ AUX openfire.service 364 SHA256 543c83c5e3b2fd4dea7763d681c16989c0431ef3e4a7043e
 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.9.2-r1.ebuild 3083 SHA256 bc8a6fc45f812557f079bc2b7ab2939182e7f9bc6fffb62597bdb03609a3708c SHA512 fa48f7eef644f4c19389f14fa79887939a897f6f134f1e43164376761c8da01071a20b5c5cf1cd3d5b8919933592cab0fb6e44e07ba4d362fa1dfdf46026d75f WHIRLPOOL 31352984ca5280152372764b766b7a210b3789d653ff52a82e000daa84bef80c8d7c6e66d76bca6539fde0ff25758970f7b9184ee85b75e82de9d65494289582
+EBUILD openfire-3.9.3-r1.ebuild 3189 SHA256 8cd467e29fdb6ad2e2dbffefc0e50bba1f1259c0e1e833ca9433c40126a00f43 SHA512 fe836964b3bd4c25a99cb1bcac18a560a1921d8a710c6ccc99e7d39cad7e306e7d0cecefc4f0c11a1c5e78d3956dc4322bcd7888b782862d06a9aa3bc321a7fd WHIRLPOOL ed1405639d85e24db4472244fdc01bb364ebb105a09c711c10ddbc2f4b4b03ee549c52d4dc028d8751b4219bae165e760a6912d4b1c4ed155781427c380dc94a
 EBUILD openfire-3.9.3.ebuild 3085 SHA256 3f9e16478d4493320eb5ddf76f080968401d8cd475d9778fb6bfa8fd0f770a47 SHA512 bbcaadb957f44e3385841873780bf596152a28a298737754ba89aba01367c164632e22d79f3741361ba2727451dd2a66392adcab6f6fc32b3e500f63d9d1235d WHIRLPOOL 406b139d43127bde7a10c5b8a012a5769342518038674d9b8dbf76e580c9826a653ad5a134acf7f402103e8c95fc46980f05cee3ca73d3fc4d22b98217ce9f14
-MISC ChangeLog 15238 SHA256 f47568579c876c4d0358eff7cf46101d575e9c872578dbaff5af294682d64f94 SHA512 d7ffbd044f435ed5d0b88064f545e8ccd824108c43572a4dd3b57032ad8dcc6beeb6ef63c2ee696a89e7c3578e739c6c228f0f63af635b00c14b3b12f814d24a WHIRLPOOL 2a0bcfcc65e77257450e9b4343055afcc24fe73d96dd7346eef874909bbef7ce0691624dae9f35f7376b8b63b57941c0c91e120c94da7281fd44e7783f26f555
+MISC ChangeLog 15434 SHA256 2eaea154943b513b267487e1f18546eef0b91b7afacac3ee2ec7878ded03be7b SHA512 e9d152e7b3b3579717d9065224ba42a2a759be1a67b8501a8eeb9e84762794e7627170428269eb92438daafd3c8a8ec571c810b1e48be3d637c127977fe2c8b7 WHIRLPOOL 096e3b2a532175fb6dbb94dcaabf88ee94f7e5c6d00e9f684e07f7f2417b4e6f78aa0b0def859e9c3b8de5de92037373752f5b89bbe90d335114e9670535e736
 MISC metadata.xml 469 SHA256 54c8a314944640dade8e23fe264bdd928732ef9f47e20bedf943ea990b437bfe SHA512 50370daa407e3f46462bb5a2774bb723bf908a44f96ba470a0635a82f0eb4f24e1c19e94e369dcb72199fd93d970c3ee8c6643f3926a6005b8d679d422a6c00b WHIRLPOOL 096ee6f7f78c6bb5ebbee871975afff24d63de0c054f864998517b7478c7e37b89e4f561722b5f0f9ea9210f6bfeb2807a62f700cfb14d29c6c80e119f14732e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlUcUSAACgkQcaHudmEf86rw5gCdFZ3hXVB45ZVTIA0FhCN/4I7J
+RwkAn0JO35Hh9UMhbPePybwfCjm8fBgX
+=7eY2
+-----END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.9.3-r1.ebuild b/net-im/openfire/openfire-3.9.3-r1.ebuild
new file mode 100644
index 000000000000..e2a423b8ca37
--- /dev/null
+++ b/net-im/openfire/openfire-3.9.3-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 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-r1.ebuild,v 1.1 2015/04/01 20:13:31 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
+
+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)
+
+	# delete nativeAuth prebuilt libs:
+	#    uses outdated unmaintained libshaj, does not support amd64
+	rm -rfv target/openfire/resources/nativeAuth || dir
+}
+
+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
+}