commit: cae6ff63b2ff0d65b3f3ce3409f42a04bb625b3e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 12:41:01 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 12:41:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae6ff63
dev-java/oracle-jre-bin: Remove vulnerable 1.8.0.112 wrt bug #606118
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-java/oracle-jre-bin/Manifest | 2 -
.../oracle-jre-bin/files/oracle-jre-bin-1.8.env | 17 --
dev-java/oracle-jre-bin/metadata.xml | 1 -
.../oracle-jre-bin/oracle-jre-bin-1.8.0.112.ebuild | 249 ---------------------
4 files changed, 269 deletions(-)
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index ec785f6..5715502 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,5 +1,3 @@
DIST jce_policy-8.zip 8409 SHA256
f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512
abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5
WHIRLPOOL
8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jre-8u112-linux-i586.tar.gz 76262744 SHA256
b314d73ddd80e7d0665fb85853d2d69d486bff4a3fd0def090a92be618ba12e9 SHA512
15856f20bf1ad035fa62c615565218780f7f781f77bdb00697e6acdfee946afb34a74dd7a027ab56775c9f82e8f05813fc1bf055e02ab388e2a13c829ac822d9
WHIRLPOOL
1c73896f06e9edf794ff46d18ce2b6aa05016c7d3bcd4dd45c3d4766d4e0a6883f8ce8dc8078c70447df72d20e604af0e32542e7a9a5e38ccc59518f34e0c5b7
-DIST jre-8u112-linux-x64.tar.gz 73653824 SHA256
94053c6aa4d672b728c7788fb7d2676e5c6d7e7fcdbc1c86beaa796a083b4e5b SHA512
01dc42552b58d1560fc7236aa53f94c785b238573305d563c73068f564203560fb1db93e7f40815ebb2ce2bab3ed47517ea16882d976730342bdd8290cef55a5
WHIRLPOOL
6dd53b97dca5df8d79ba9203671158f161c5d40f0f061a26c38946a878fa1eeb51be5f996d0231ea298828d055644615dbfa79dd4621c5db2afa4955f05f921b
DIST jre-8u121-linux-i586.tar.gz 76293286 SHA256
1b28662780c98b3233e8dacaa07c505a70c53463d3b00720baa59f955ab1e1bb SHA512
375003c2fec68deed36cf10a2e225044d6c85035d1d756110cb07ffa526d63bee7573b2db7568fb84c6dfdee101da82bedd7785548da812241e4e0234e99a5bb
WHIRLPOOL
6f4665e448f59a4d1f432bfc974d9d626400b7932ec7f3f8edba29041354386d399306c685240194749d7a6d0364153143704768c4f205fb02ba44de3db92ba7
DIST jre-8u121-linux-x64.tar.gz 73676107 SHA256
30bf5fbac0cfbc9201cac1d6973dbc96e5f55043ab315eda8c7aeb23df4f2644 SHA512
85ed3820b1461bf8c1b83259962f9e7c3f72d694f446d3e5852c416eeeb9905897a9a3b5eaded9a8d617c9c43848635b2ff7b520021b666fd87f39837e4ff54b
WHIRLPOOL
f2bdfe315dc9a7a15bd4e73dd774fd31c1c02bb3d5a24d2829cc51d9aed3b75993c9429e211ee4d204606cf6105015aac30c0e408e3558b24d6d3f4f229b9b7e
diff --git a/dev-java/oracle-jre-bin/files/oracle-jre-bin-1.8.env
b/dev-java/oracle-jre-bin/files/oracle-jre-bin-1.8.env
deleted file mode 100644
index 8350b2d..00000000
--- a/dev-java/oracle-jre-bin/files/oracle-jre-bin-1.8.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="Oracle JRE @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/bin"
-LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/java/packages/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib64:@GENTOO_PORTAGE_EPREFIX@/lib64:@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.8"
-BOOTCLASSPATH="${JAVA_HOME}/lib/resources.jar:${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar:${JAVA_HOME}/classes"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jre-bin/metadata.xml
b/dev-java/oracle-jre-bin/metadata.xml
index 8442caf..edb6ab7 100644
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -11,6 +11,5 @@
<flag name="headless-awt">Don't install the X backend for AWT, needed by
some GUIs (used to be X flag)</flag>
<flag name="javafx">Install JavaFX libraries</flag>
<flag name="jce">Install Java Cryptographic Extension Unlimited Strength
Jurisdiction Policy Files</flag>
- <flag name="pax_kernel">Use paxctl to mark the JVM binaries</flag>
</use>
</pkgmetadata>
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.112.ebuild
b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.112.ebuild
deleted file mode 100644
index 760f886..00000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.112.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html";
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html";
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
- S_PV="$(get_version_component_range 1-3)"
-else
- MY_PV_EXT="u$(get_version_component_range 4)"
- S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
-AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/";
-SRC_URI="
- amd64? ( ${AT_amd64} )
- x86? ( ${AT_x86} )
- jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="amd64 x86"
-IUSE="alsa cups +fontconfig headless-awt javafx jce nsplugin pax_kernel
selinux"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-# important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-# under MacOS. It doesn't appear to use many, if any, of the
-# dependencies below.
-#
-RDEPEND="!x64-macos? (
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )
- javafx? (
- dev-libs/glib:2
- dev-libs/libxml2:2
- dev-libs/libxslt
- media-libs/freetype:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXxf86vm
- x11-libs/pango
- virtual/opengl
- )
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- fontconfig? ( media-libs/fontconfig:1.0 )
- !prefix? ( sys-libs/glibc:* )
- selinux? ( sec-policy/selinux-java )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="app-arch/zip
- jce? ( app-arch/unzip )
- pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre"
-
-pkg_nofetch() {
- local AT_ARCH="AT_${ARCH}"
- local AT="${!AT_ARCH}"
-
- 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-javase8-2177648.html#jre-${MY_PV}-oth-JPR";
- einfo
-
-}
-
-src_unpack() {
- default
-
- # Upstream is changing their versioning scheme every release around
1.8.0.*;
- # to stop having to change it over and over again, just wildcard match
and
- # live a happy life instead of trying to get this new jre1.8.0_05 to
work.
- mv "${WORKDIR}"/jre* "${S}" || die
-}
-
-src_prepare() {
- if use jce ; then
- mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
- fi
-
- # Remove the hook that calls Oracle's evil usage tracker. Not just
- # because it's evil but because it breaks the sandbox during builds
- # and we can't find any other feasible way to disable it or make it
- # write somewhere else. See bug #559936 for details.
- zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-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
-
- if ! use alsa ; then
- rm -vf lib/*/libjsoundalsa.* || die
- fi
-
- if use headless-awt ; then
- rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
- bin/{javaws,policytool} || die
- fi
-
- if ! use javafx ; then
- rm -vf lib/*/lib*{decora,fx,glass,prism}* \
- lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
- fi
-
- if ! use nsplugin ; then
- rm -vf lib/*/libnpjp2.* || die
- else
- local nsplugin=$(echo lib/*/libnpjp2.*)
- fi
-
- # Even though plugins linked against multiple ffmpeg versions are
- # provided, they generally lag behind what Gentoo has available.
- rm -vf lib/*/libavplugin* || die
-
- dodoc COPYRIGHT
- dodir "${dest}"
- cp -pPR bin lib man "${ddest}" || die
-
- 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
- local nsplugin_link=${nsplugin##*/}
- nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
- dosym "${dest}/${nsplugin}"
"/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
- 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/8/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
-
- # 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
-
- set_java_env
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if ! use headless-awt && ! use javafx; then
- ewarn "You have disabled the javafx flag. Some modern desktop
Java applications"
- ewarn "require this and they may fail with a confusing error
message."
- fi
-}
