commit: c92d046e02e6c85128a57580293a7e97f6b3534e Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Sat Jul 16 10:48:59 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sat Jul 16 12:57:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c92d046e
dev-java/oracle-jdk-bin: Clean up vulnerable version. Gentoo-Bug: https://bugs.gentoo.org/580608 Package-Manager: portage-2.2.28 dev-java/oracle-jdk-bin/Manifest | 4 - .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.91.ebuild | 366 --------------------- 2 files changed, 370 deletions(-) diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index 0598f7d..33d6934 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -1,8 +1,4 @@ DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc -DIST jdk-8u91-linux-arm32-vfp-hflt-demos.tar.gz 10403988 SHA256 3314a782f16ba67c9a1647b5a04d5955c8f0005b864530be615d3206453cd364 SHA512 f8b421b2ec3a0d2ae460356f7573c2f05424664f0479b930d97cb41510373790b3538d415464e12958fd38d3f6367e75bf225262b79e823bb70d0d80abf9b65f WHIRLPOOL e6a7e2e5bf35d980915c427b21cd735ca7b74eb8213d7edf3d125f1a7183bf0a2a078c02ad74be1566802575f077ea1602f2190f098c968b9a4ea09958e20d5a -DIST jdk-8u91-linux-arm32-vfp-hflt.tar.gz 81491339 SHA256 79dda1dec6ccd7130b5204e75d1a8300e5b02c18f70888697f51764a777e5339 SHA512 c0487836d09df1d23ac2118e2b2ed60a85bf54a0d706486d19c44b1c3226b0317f5a86780f9956fee49b3aa9d4ba90779ad0483a5dfdf6fa56bb9880e099e44b WHIRLPOOL b1ed11cd171ff03f7d4d1a6f0c771003e35274aab0c1954a152315853b6baf7c408e478197b5ac7a9660a2e74d40f9885dde30b29ade0ffea0e78e57ee54f57b -DIST jdk-8u91-linux-arm64-vfp-hflt-demos.tar.gz 10425383 SHA256 f5e4f27491779adeb62a272a112cdaff242a1d9899dced2d35e3da1e709e84b2 SHA512 6e80d5ebe80d83759443a8f4835efb81f29b58ca1976f4570eaad33274b8333ccd831dba9f67938be2a709051b2e95abb5ee16b9f0d02f6de69b28292a27cae1 WHIRLPOOL 7cc4150c8a0f6704079e42a607bc237379c5d22f0f0f9480b168edb3b8e9314f027a5b6c0e7f951647ec48a0b4a54ea0c9aecc015929b8dae5fd16ba63a84392 -DIST jdk-8u91-linux-arm64-vfp-hflt.tar.gz 78321279 SHA256 3dededc2e31bfda0a129b1df394e37078f339aa99e82e56d35cabff28ccfeb3b SHA512 8c30135f317c366aa755e4342f04da83a3de4c840b7da6e4ccd740e5f1f1e86a4408d192de1cedaf333426c3d80ef7d9841488eec672fb77e2643f32df38148d WHIRLPOOL 208b25af0b65f1ff1088b6e61b6463ef44ee7ac6ff41ef1268c8ec16d871fade681bfd3f717e09f5be7765c25e212d4780912656effda95a35dfd09ddc63f31b DIST jdk-8u92-linux-i586-demos.tar.gz 55064676 SHA256 e89fac1a329cb4d4a09ce045dbedc44fe3d99efb32bdf8fda39c8ffa0533c36a SHA512 b3eed7bc92142c8811415d54f62bd1454f5755d1e7ec95e6f2c83569ccc3524465d1755784a9aa0d3170ab5b8b3204b5ab22e0f7c1bf074c1082a9d697a406e4 WHIRLPOOL 222acce19d625ad7b637831feeb31d0bda5ba36317e9e8dc924e94e818cafcb8a70a6f7ee625d0f05d15061bec1d52a74b2f5e24f61ae2f7c240e1e958b7a29a DIST jdk-8u92-linux-i586.tar.gz 183433226 SHA256 7203592329877735bb6259844a3a30640edc61920d132f952c40ab2e2014b224 SHA512 fcb2db52e8cb392de91ca914dae13bc7786954334e7df346619686837bceab9ca49699153d308d869499d2948c5eb67ae39583e28db3c63a537afd33f6b1226d WHIRLPOOL b8a6df77307627baa3f81f14fbd2e526f40a1b628772bd6ea7599068a0b88bdbe164a8de340414ddc363b6e7fa3054f4c687143aaf9c5b57716c492fb8545a17 DIST jdk-8u92-linux-x64-demos.tar.gz 55132437 SHA256 afebf7ae44afc8ef1199dd02b32c1d50d1fb16b9bc4f4e2443bd8d4d122e2178 SHA512 89d24f188f5d80524d952eb16af0913eac6ef2184ec79f8116ed91927f30aad73d057e0160502545c1a5a6fd2cbaa42ce50d9df5a73504813132ad002215bea0 WHIRLPOOL 8c02e4c98408fd1d1dc5368fb67ec904a6145b569a2d59c36d64fefbf9630c835d74e302ac651b803d3be9ad2c34bc4b80b3c15714b2982ffae8e0262f2b58c2 diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.91.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.91.ebuild deleted file mode 100644 index 9840a6f..0000000 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.91.ebuild +++ /dev/null @@ -1,366 +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 to be updated when bumping! -JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"; -JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"; - -# This is a list of archs supported by this update. -# Currently arm comes and goes. -AT_AVAILABLE=( arm arm64 ) - -# Sometimes some or all of the demos are missing, this is to not have to rewrite half -# the ebuild when it happens. -DEMOS_AVAILABLE=( arm arm64 ) - -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="jdk-${MY_PV}-linux-x64.tar.gz" -AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz" -AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz" -AT_x86="jdk-${MY_PV}-linux-i586.tar.gz" -AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz" -AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz" -AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg" - -DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz" -DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz" -DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz" -DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz" -DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz" -DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz" -DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip" - -JCE_DIR="UnlimitedJCEPolicyJDK8" -JCE_FILE="jce_policy-8.zip" - -DESCRIPTION="Oracle's Java SE Development Kit" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"; -for d in "${AT_AVAILABLE[@]}"; do - SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")" - if has ${d} "${DEMOS_AVAILABLE[@]}"; then - SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )" - fi - SRC_URI+=" )" -done -unset d -SRC_URI+=" jce? ( ${JCE_FILE} )" - -LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" -SLOT="1.8" -KEYWORDS="~arm ~arm64" -IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source" -REQUIRED_USE="javafx? ( alsa fontconfig )" - -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 ) - doc? ( dev-java/java-sdk-docs:${SLOT} ) - 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 ) - examples? ( x64-macos? ( app-arch/unzip ) ) - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}/jdk" - -check_tarballs_available() { - local uri=$1; shift - local dl= unavailable= - for dl in "${@}" ; do - [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}" - done - - if [[ -n "${unavailable}" ]] ; then - if [[ -z ${_check_tarballs_available_once} ]] ; then - einfo - einfo "Oracle requires you to download the needed files manually after" - einfo "accepting their license through a javascript capable web browser." - einfo - _check_tarballs_available_once=1 - fi - einfo "Download the following files:" - for dl in ${unavailable}; do - einfo " ${dl}" - done - einfo "at '${uri}'" - einfo "and move them to '${DISTDIR}'" - 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#jdk-${MY_PV}-oth-JPR"; - einfo - fi -} - -pkg_nofetch() { - local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") ) - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then - distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) - fi - check_tarballs_available "${JDK_URI}" "${distfiles[@]}" - - use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" -} - -src_unpack() { - if use x64-macos ; then - pushd "${T}" > /dev/null - mkdir dmgmount - hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ - -mountpoint "${T}"/dmgmount - local update=$(get_version_component_range 4) - [[ ${#update} == 1 ]] && update="0${update}" - xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg - hdiutil detach "${T}"/dmgmount - zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv - mv Contents/Home "${WORKDIR}"/jdk${MY_PV} - popd > /dev/null - use jce && unpack "${JCE_FILE}" - else - default - fi - - # 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 jdk1.8.0_05 to work. - mv "${WORKDIR}"/jdk* "${S}" || die -} - -src_prepare() { - if use jce ; then - mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die - fi - - if [[ -n ${JAVA_PKG_STRICT} ]] ; then - # Mark this binary early to run it now. - pax-mark Cm ./bin/javap - - eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936." - eqawarn - eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || 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 jre/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 jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - if ! use alsa ; then - rm -vf jre/lib/*/libjsoundalsa.* || die - fi - - if use headless-awt ; then - rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/{javaws,policytool} \ - bin/appletviewer || die - fi - - if ! use javafx ; then - rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \ - jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \ - bin/*javafx* bin/javapackager || die - fi - - if ! use nsplugin ; then - rm -vf jre/lib/*/libnpjp2.* || die - else - local nsplugin=$(echo jre/lib/*/libnpjp2.*) - fi - - # Even though plugins linked against multiple ffmpeg versions are - # provided, they generally lag behind what Gentoo has available. - rm -vf jre/lib/*/libavplugin* || die - - dodoc COPYRIGHT - dodir "${dest}" - cp -pPR bin include jre lib man "${ddest}" || die - - if use derby ; then - cp -pPR db "${ddest}" || die - fi - - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then - cp -pPR demo sample "${ddest}" || die - fi - - if use jce ; then - dodir "${dest}"/jre/lib/security/strong-jce - mv "${ddest}"/jre/lib/security/US_export_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - mv "${ddest}"/jre/lib/security/local_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/jre/lib/security/US_export_policy.jar - dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/jre/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 - - if use source ; then - cp -v src.zip "${ddest}" || die - - if use javafx ; then - cp -v javafx-src.zip "${ddest}" || die - fi - fi - - if [[ -d jre/lib/desktop ]] ; then - # 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 jre/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 JDK ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - jre/lib/desktop/applications/sun_java.desktop \ - > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - fi - - # 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}"/jre/lib/fontconfig.* - if ! use fontconfig ; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/jre/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 - - if use x64-macos ; then - # Fix miscellaneous install_name issues. - pushd "${ddest}"/jre/lib > /dev/null || die - local lib needed nlib npath - for lib in decora_sse glass prism_{common,es2,sw} ; do - lib=lib${lib}.dylib - einfo "Fixing self-reference of ${lib}" - install_name_tool \ - -id "${EPREFIX}${dest}/jre/lib/${lib}" \ - "${lib}" - done - popd > /dev/null - - # This is still jdk1{5,6}, even on Java 8, so don't change it - # until you know different. - for nlib in jdk1{5,6} ; do - install_name_tool -change \ - /usr/lib/libgcc_s_ppc64.1.dylib \ - /usr/lib/libSystem.B.dylib \ - "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib - install_name_tool -id \ - "${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \ - "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib - done - fi - - 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 -}
