Version bump. Fix security bug 546678.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x93491BB8

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 4bc7e70bbb9d9e8b5f4e6676b7f99a53019c8f5c..611f781a8e9482b64379ed218131730d90a58713 100644 (file)
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.81 2015/04/15 22:24:19 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.82 2015/04/17 14:37:57 monsieurp Exp $
+
+*oracle-jre-bin-1.7.0.80 (17 Apr 2015)
+
+  17 Apr 2015; Patrice Clement <monsieurp@gentoo.org>
+  +oracle-jre-bin-1.7.0.80.ebuild:
+  Version bump. Fix security bug 546678.
 
 *oracle-jre-bin-1.8.0.45 (15 Apr 2015)
 

diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index bbbe8bc9f63ec351fcbdcff7f754ace3ab032056..8a326e58c30ccf4399279f670b1b7ad24b086eef 100644 (file)
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jre-bin-1.7.env 1035 SHA256 fc49633539a944a9d684b2d33b8c4a25f2d6d68e82fe644adbf2a499c178617b SHA512 a075562804594b6a3187e0c0e58f93883ead699470dd0ff8a37e717b3af52e3d6cf0757df43d507e149e1bcb2814e53eef14388ce8d513c174d0a813524e3815 WHIRLPOOL 7d08a3bc883cc2d3de3d37d46366b24b2bed4ce35233ab2f1ac4179adfa30787cb3bc948bf074d2ba59151352ab453a08efa2436281079623066e6f8303a00bf
 AUX oracle-jre-bin-1.8.env 1035 SHA256 4ad3d79687682b76df29e4d1f5e6a1bec87fca4149b817da09f9398bc25f793b SHA512 8ebdc1100214c2707332beedd10bc665e386a0d994fe8b154b33a053f555d3064192bbcb4e664ca841d2d7d381d07d0baca3d586c66bc5317e9b99c23d4d09e6 WHIRLPOOL 16367932a4a6b484d1cdf0394511c5a47cb1c04baf44fba179dfbe471f1261345ead58af85497afc7b5d2e4f86fcb55f1514dde0b1658619e863b109d206dd41
@@ -8,31 +5,15 @@ DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
 DIST jre-7u76-linux-i586.tar.gz 48501515 SHA256 38aecf5f6c8706f293b40db0133fca0aca5e6ab520c1b9b0a3fc38ef2988b3cf SHA512 084752d9f41352df061be8327d6eecdd07d4065de8c0a7201f36cbc1fbd62c1ca45b21dc882601c34a09bca29317ebe952ac589904d4893545544134ed619cce WHIRLPOOL c6f90d86a5b1e06385996354a8aa450b83e0516345a014a2f55a41e436e2e00121d200d5d83ff96691237330945589de97d8e6e5895ef5dae0aa352c4b476768
 DIST jre-7u76-linux-x64.tar.gz 47058747 SHA256 22808ec8c747409858e952c124bbc05734feff057ead402be2b2a7fa5852e4d9 SHA512 b4101ade8c0f9a7891f01b62740e53873db410637663fda02f4a6ecddc8ade0db2650162654eb9514811fafc640925ff780b5b7a9e3f2a58df207ff97d954aef WHIRLPOOL 21aac95873276ed0cec72ec80ccad226e47c5894324c925e1d1bd9b7c0d15f03e41e50a6bca5fd36d0d4c5caa079a11774b756e8ccffacffb5ea99ae49ee334a
+DIST jre-7u80-linux-i586.tar.gz 48558751 SHA256 b773aef1458a4adde03af62f8163c7e4614b485e1f01699ff8f5f60919251575 SHA512 d85b8700248a4ad0a0873d0c84b2175fb0a66773c43899ab47ac531be089794c17eb0e8b7503d46efd78833da17c9fa8a83ad1cb9c062e191acfb77155639474 WHIRLPOOL 766c88748bc758a1b35bd6008750cc8f2678801b1cc5629bcb7a756e4a32973a5f5ad927348b3ce3ad9ecb3e7aca5d1af2b613fba35d4f53f9601b1ff42312b2
+DIST jre-7u80-linux-x64.tar.gz 47110223 SHA256 4c01efd0d8e80bb6e2f324ec3408ce64f066d4506c7ec93a491f615a4523f4f3 SHA512 e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d WHIRLPOOL 1af7417b327402abaf4074445f051924de8b19810668890e089b66a488dddfc7f50cdd96a012130a591940338177164f66c83caf54c5d6d370be27d119a907fe
 DIST jre-8u40-linux-i586.tar.gz 65652483 SHA256 1a5c90e36bfa8117aa4764f8d1ef7b61607d694af2b6ab4ceb27cdeb65c46d01 SHA512 614bd56bbe94cc08c182d36c1bb0846fda08c7834b9d063e941cd7043137aa68ec2458a6c804226332dbf0bdb5acaaa30fb2e2d96985d24f4264b7075317f990 WHIRLPOOL a1ace57317f3023d4b0ad2c7d475a0f2de5e561db0497a6d574ba3080d3553313fe61f6d4fc3ca009cace23e1dae47659d66e0be2311195ecb31c7585ddde515
 DIST jre-8u40-linux-x64.tar.gz 63777545 SHA256 17f4e8df5082b0df63dfb962e2e3da0f98e45850aebf5e4a91f0471d2cde7d4a SHA512 01c0b40f538282eb232970fe70e244680725522c73d81226f872f066db435db7756f1d9256bf8f22f29edd78aef5a88a51957ba8143a01e32bcf40e3b5c0ae77 WHIRLPOOL 25b869e385887b311e99b9de525c16295a24f4dd2c56500a7775a02dd81241f80b80766992d65b74a5bb6074510e6195b28919d5712f8c8da019e26b1325577f
 DIST jre-8u45-linux-i586.tar.gz 65672226 SHA256 2f0bfecaae5afe296f42064d9725100698341f87bc46dc2c71cb0a4f03ba1574 SHA512 91b4b959ed7198feb26bb5f38eb9018ec621392c968c5011914295502e417b0af032fd69602d4cf79d5ba20ccb6c1166ae8a7a8ab4cc3aa95d1c678422b894df WHIRLPOOL 327b8c99c1662d29370d9777664862cc3dfac9e07ad98c9a1f0d237efb4b48e1b9c5c89015f52b918f453f10c64099b8e3cac193a1b3f018ea206939790639b6
 DIST jre-8u45-linux-x64.tar.gz 63822322 SHA256 c156128cd92eb91e9320f61a8f36305b3382043afe3467304c6abd044d27da0a SHA512 c70d9ae5d1f2d47aab1943e4123155c10973b26d951fb220978097c676850c37c7ed48c643784989292c766f8afa141740614704ec6901d1f4882096f1c67789 WHIRLPOOL c965868d17307f8454a2acab6bbb3d86c19c059b89c72dc9b823844d0a4e2acad7674fa7297979d9e056663e31a83ac32409deca97125117632f8d20171a14cc
 EBUILD oracle-jre-bin-1.7.0.76.ebuild 5513 SHA256 5f148e84104bbda33340b8cb43f9759e819336b80859e155fee7301c2ab61f7e SHA512 8487980da92d283f2963eefec9027452e0f930f7a52fcdcb732ae22aca9698855e27a8a1a9aee52a925e29bb393d0b5a4b638602028c031f99dc8e4be703c138 WHIRLPOOL e9f41da039717a17b5b406eedf2607294935c940cdccb5c3ddbb54068a366f5b76141f75f5be845d21a0b154e81b8c1b54247483dfabbd3f59623f57cb270bbd
+EBUILD oracle-jre-bin-1.7.0.80.ebuild 5521 SHA256 aa6b0a9de5eb60bc5b560b50f7110fb13ca2a3809c5f60efde692e1ca54c2f52 SHA512 28f7c57a3f8fa1ba5e742a67f1c103348f13beb59bc7540bf0aa670f68ef25bc01493d443e5ae4e074211c7ea98c9f8297d54cd669ac0914574f4b5b18133b82 WHIRLPOOL 40b0b1a8d6de0c239191d712f93938c744e39ede6d5ec919f864be6b245290f68d6c275c7a1e0d29e17e439c6108cec78618cc8dcea6c47ce1c5197b5b92ec1d
 EBUILD oracle-jre-bin-1.8.0.40.ebuild 5907 SHA256 e5f831ba908628fcb66bf2bfe014cd3b5e801e98b8918b1311634a4dda8b2a79 SHA512 2ca2cb8048bf5ef3d9aa70bb91b92cf618ad344381135041f2e5d390ffebe5e3939ba17beb682efab7a0a42f894b9f988ae130b6d886fc4a4ef3cbf94bdce326 WHIRLPOOL 628e201b5d10ac71ef86bbf507a2c0c07e9ab34d92c7b5156a1463c3708e307ed02b840ad7100c5f5b3920fa6e8f490a084ad845b6fbafb3cc3998695e622103
 EBUILD oracle-jre-bin-1.8.0.45.ebuild 5911 SHA256 bba480fd96fe53c32af13f2bd23ee0f00c4e9b7177553bdd3d23ed0b2f2a9386 SHA512 0931a033ff741b6cd447e392a6c5e6af3cb8cb45965dce5ad8510098f84658096cba5a2538fe48224e66bbe060880595018875361ea79b9800d5d6b3423bcc3b WHIRLPOOL 9ecf1873218371a7997c14c916f9c8dcd60821b4e1189124cd7edaa255bbff61dbcc87b7db0ff93f7dad79e7b37c5463de3f60683012e812c6ec6143b1e8184c
-MISC ChangeLog 13598 SHA256 e890c5fbd63c09a21ace1f99c0815d2dcb2f881e3d971eb5541fca680af5064b SHA512 117063defd11ab123b922d9d075a34fa213f098e0940e458c40a70783fbf0ece30a439057f340e265229e739c32dcd74e6181685209b1b19714ce8e29cef3681 WHIRLPOOL 7323cedd43c5dcba21fe641e9350a2436dd5434ad77a6dc0f1ad8f5efe21a08f2f0eee356e61c5e4f366a8b5abfac80d73c9b099c7953724c6a8da5276d6f2e1
+MISC ChangeLog 13773 SHA256 8a8b6d92a05023d5b46a49dd4a6790b459a85fb3b11c7a5ca75b2a46874c6ec8 SHA512 3c28d731f312d1bf327e28c44287af03001db4986dd0678c6715ef396cc634758b9c1f70baf96026a02f34dba94115fd4b2ad01ae60c3a40f77ee1dd53131175 WHIRLPOOL f523801c3dde66f222c7700bd00a298cfe1d63fffa8abc632f755305694f14fb030fe298121936fdd5e1b5984c3c35e4f83dfc7ff09606d95f361da64c09ac5b
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJVLuUUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kmxcP/36EZ2UKAE1D+KP/e72U5tH7
-woWGmOI7rnDyeFTuQpNgl1UHtYjH5VqrHx+KBmjP3hIqA1/Xdl+0ad3zhKpDMgNH
-0LfUJ6PyXswjFru/As1ilPWZEejotFx2I9g6LM9fEJZJ5tT2eR2oK4zcAN4Bta06
-ZPC+XUbw9BUub02NGh8gG6c3uuZkTkMiRSTw7LfBw5UFrn+jZHimJ2LPmxJvbq4s
-dbD8GcwZ5hg+hHFnppRl7F0VBMXtm2piKhQY1M6kzUnSEeoaGd/3Rwerlm2z+b6K
-h0K/O6buGmhQvWpvp56zVA9Fffk6pXD+61CPMCjObuo0Eit5dgx3FyYgp5t0mCE+
-TXw6k/PDDsOwUjaX8hv/XFBEDW5zBSNXeJ1rmHN9WcoXVsSFOACIWLjg8ogo4590
-Jnwfm1m1mIg3f8w/8Ddian4orKRGYH3fNRbxMJp/ipT0FbtZibJJphtWgoa3NYEX
-QIrHXoEHRpOIj73RzE6dMSZLQeVyawq2DOdMTRQke4L3+/h4Zg1jjUXOCBdQy71r
-E/5DkqHCF922LH8Mnx/PD53cGzoa5frYOdVsWMooRjV5ZDm6hPmxhTGGkQUe4jQB
-+MGAU5DVR0uXPGmpoXiqGwYSKXwqlmlZDjv7cAcJjKeT3LJay+72dLnOSgj8moxe
-NabI3GVnQthtyipmq+2p
-=uR5e
------END PGP SIGNATURE-----

diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.80.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.80.ebuild
new file mode 100644 (file)
index 0000000..55bbead
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.80.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.80.ebuild,v 1.1 2015/04/17 14:37:57 monsieurp Exp $
+
+EAPI="5"
+
+inherit java-vm-2 eutils prefix versionator
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html#jre-${MY_PV}-oth-JPR"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+       x86? ( ${X86_AT} )
+       amd64? ( ${AMD64_AT} )
+       jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+COMMON_DEP=""
+RDEPEND="${COMMON_DEP}
+       X? (
+               x11-libs/libXext
+               x11-libs/libXi
+               x11-libs/libXrender
+               x11-libs/libXtst
+               x11-libs/libX11
+       )
+       alsa? ( media-libs/alsa-lib )
+       fontconfig? ( media-libs/fontconfig )
+       !prefix? ( sys-libs/glibc )
+       selinux? ( sec-policy/selinux-java )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="${COMMON_DEP}
+       jce? ( app-arch/unzip )
+       pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+       if use x86; then
+               AT=${X86_AT}
+       elif use amd64; then
+               AT=${AMD64_AT}
+       fi
+
+       einfo "Please download '${AT}' from:"
+       einfo "'${JRE_URI}'"
+       einfo "and move it to '${DISTDIR}'"
+
+       if use jce; then
+               einfo "Also download '${JCE_FILE}' from:"
+               einfo "'${JCE_URI}'"
+               einfo "and move it to '${DISTDIR}'"
+       fi
+
+       einfo
+       einfo "If the above mentioned urls do not point to the correct version anymore,"
+       einfo "please download the files from Oracle's java download archive:"
+       einfo
+       einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jre-${MY_PV}-oth-JPR"
+       einfo
+}
+
+src_prepare() {
+       if use jce; then
+               mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+       fi
+}
+
+src_install() {
+       local dest="/opt/${P}"
+       local ddest="${ED}${dest}"
+
+       # Create files used as storage for system preferences.
+       mkdir .systemPrefs || die
+       touch .systemPrefs/.system.lock || die
+       touch .systemPrefs/.systemRootModFile || die
+
+       # We should not need the ancient plugin for Firefox 2 anymore, plus it has
+       # writable executable segments
+       if use x86; then
+               rm -vf lib/i386/libjavaplugin_oji.so \
+                       lib/i386/libjavaplugin_nscp*.so
+               rm -vrf plugin/i386
+       fi
+       # Without nsplugin flag, also remove the new plugin
+       local arch=${ARCH};
+       use x86 && arch=i386;
+       if ! use nsplugin; then
+               rm -vf lib/${arch}/libnpjp2.so \
+                       lib/${arch}/libjavaplugin_jni.so
+       fi
+
+       dodir "${dest}"
+       cp -pPR bin lib man "${ddest}" || die
+
+       # This needs to be done before CDS - #215225
+       java-vm_set-pax-markings "${ddest}"
+
+       # see bug #207282
+       einfo "Creating the Class Data Sharing archives"
+       case ${ARCH} in
+               arm|ia64)
+                       ${ddest}/bin/java -client -Xshare:dump || die
+                       ;;
+               x86)
+                       ${ddest}/bin/java -client -Xshare:dump || die
+                       # limit heap size for large memory on x86 #467518
+                       # this is a workaround and shouldn't be needed.
+                       ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+                       ;;
+               *)
+                       ${ddest}/bin/java -server -Xshare:dump || die
+                       ;;
+       esac
+
+       # Remove empty dirs we might have copied
+       find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+       dodoc COPYRIGHT README
+
+       if use jce; then
+               dodir ${dest}/lib/security/strong-jce
+               mv "${ddest}"/lib/security/US_export_policy.jar \
+                       "${ddest}"/lib/security/strong-jce || die
+               mv "${ddest}"/lib/security/local_policy.jar \
+                       "${ddest}"/lib/security/strong-jce || die
+               dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
+                       "${dest}"/lib/security/US_export_policy.jar
+               dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
+                       "${dest}"/lib/security/local_policy.jar
+       fi
+
+       if use nsplugin; then
+               install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
+       fi
+
+       # Install desktop file for the Java Control Panel.
+       # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+       # make_desktop_entry can't be used as ${P} would end up in filename.
+       newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+               sun-jcontrol-${PN}-${SLOT}.png || die
+       sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
+               -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+               -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+               -e "s#Application;##" \
+               -e "/Encoding/d" \
+               lib/desktop/applications/sun_java.desktop > \
+               "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+       domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+       # Prune all fontconfig files so libfontconfig will be used and only install
+       # a Gentoo specific one if fontconfig is disabled.
+       # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
+       rm "${ddest}"/lib/fontconfig.* || die
+       if ! use fontconfig; then
+               cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+               eprefixify "${T}"/fontconfig.properties
+               insinto "${dest}"/lib/
+               doins "${T}"/fontconfig.properties
+       fi
+
+       set_java_env
+       java-vm_revdep-mask
+       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}