From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BB2A139085 for ; Mon, 23 Jan 2017 22:52:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CC6225402D; Mon, 23 Jan 2017 22:52:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46CDE25402C for ; Mon, 23 Jan 2017 22:52:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 119543416B0 for ; Mon, 23 Jan 2017 22:52:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A6A52D17 for ; Mon, 23 Jan 2017 22:52:39 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1485211938.acf34db7204e8dc4e51b49b740078f6baa5cdd82.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/oracle-jdk-bin/Manifest dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.111.ebuild X-VCS-Directories: dev-java/oracle-jdk-bin/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: acf34db7204e8dc4e51b49b740078f6baa5cdd82 X-VCS-Branch: master Date: Mon, 23 Jan 2017 22:52:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a7b7882f-3ab8-4aed-a16f-73ee69b2dded X-Archives-Hash: b3bf5da3f361d7a14fbbe87b4990292e commit: acf34db7204e8dc4e51b49b740078f6baa5cdd82 Author: James Le Cuirot gentoo org> AuthorDate: Mon Jan 23 22:13:11 2017 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Jan 23 22:52:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf34db7 dev-java/oracle-jdk-bin: Remove vulnerable 1.8.0.111 wrt bug #606118 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-java/oracle-jdk-bin/Manifest | 4 - .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.111.ebuild | 366 --------------------- 2 files changed, 370 deletions(-) diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index 0f9974e..2973f5a 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-8u111-linux-arm32-vfp-hflt-demos.tar.gz 10406594 SHA256 dbd7ac2a37772db34bd4b5cf4bde03197666b31bc5a7216b6b6443bb5f9d6c8e SHA512 e04f23ba6cfb28316d692b52fbe79409f8cbd7bd0fcbf68d380230cf3dcc7572e77b928c189b9e997e0a526bd651b00328bab1f42d2d96454281015299cfa598 WHIRLPOOL 2113076a5ba391d4be4e5d895025c10b222c4bd31052f555256d01662701249105bf562eecd6f90553e6c7907ea4f2f70df1d10e6792ac279e6b919aef1f5e2c -DIST jdk-8u111-linux-arm32-vfp-hflt.tar.gz 81562420 SHA256 add3f9685161337fd31e433ea9b19231d6b40561dc40826057930fa2d76d7925 SHA512 efc83a3ec852448119e2b01fb4e97f061c77bc389faff4eaebde47561cd599f520dc6d617a61beacacf526badc7642d78f435d2a8972f2a33fa4c7323d09a09a WHIRLPOOL 62eea25fba522b27904dcde7664b33d6a978d6d445b56f272ece304e6d0c81f1537d573c2ea6d8e1e1c9c1d9ad5edb01e0c5b1f322172543d4fc363dc7e9da59 -DIST jdk-8u111-linux-arm64-vfp-hflt-demos.tar.gz 10422107 SHA256 226d7cc2e58b8956011846460fafacba62d4c0205c642602740cfd65ac60a91b SHA512 0ab1616924e399df4ee32b569b984a1dad01024ae723fa6d7989b79871945d824ed51e9baab3e5a81c1b867b6ed231aabc2577eca062d3ddb8d2a7f3fbb653bf WHIRLPOOL dff54472e3725a02d454a0c4dba426dd67effac23fa18ae6af4572ca75cd4098aca9425884824d8e2c2ea04d4be3f23af6a1154eb647b410fbf559c5fe9f759e -DIST jdk-8u111-linux-arm64-vfp-hflt.tar.gz 78359608 SHA256 8fd6be278b1d312c53897de66e9bd2e6eb5ce0d5b62da8bbd9b1333dc190ed15 SHA512 c3168910cca15ffa9d0ca8026baf92f1c914d28ebb4e1feb78bc7e94d24ea814cfa0456d3febd93d66aa1f65ca082a5eda2c4651889314dfc47d7e819350c6e1 WHIRLPOOL 304a2936756a40001db6fe923106838fccbfe484454d9a31879666ce01578800086e8657e28d489401ab12b058690c4638cd5bd437c4368b6a887b02c9cc9922 DIST jdk-8u112-linux-i586-demos.tar.gz 55066408 SHA256 8b3c5fe1b5c6dcec93172f79b4629898bb51daf8e7b57ea58e632185900f3d64 SHA512 cdc30633bd1d1f3b18ccb8fad22befc5df2b02e90519cca248d2e073c71439733f6913aea852894fe0b76cd8d91cadb8365d965dcad562233d882b95371455a6 WHIRLPOOL 037f592c521ba0351ce4f67248a8538d5470baa08c23f41c19637e0b6b643705b496d2dc43fd59a624350d4f90b8d4d08f24a9b2f2c9ce822ebb7295dba5f4b8 DIST jdk-8u112-linux-i586.tar.gz 185725687 SHA256 1e7c2fb80b339dd65f261d37e26ffd5f3136e5ff8778026ed227b47516df69a5 SHA512 c6b855d870013a526cc2f4e133310ddca0e6a5276d02e0972c04a05e107a2654d5199fef296c91a4284e0a66bc9fbb0c0aa5ea49ae4a0f83319f5595a0c857fa WHIRLPOOL 691788fcdb4513d8c974968b567430b24e80f38f34dc26b8c0cf267451c618975596b5891807c59624b2bd56fa0996db4d729a1d297531f3cbbe8a6ea70e4424 DIST jdk-8u112-linux-x64-demos.tar.gz 55099439 SHA256 d5cf33c3daf8cd3cf476092283288126d2e4636c7ab0b183f0155d72d91b5c9e SHA512 6ff4bbceba63f1cc23183a1248a93a5968b80ec660029c69f60a9b96ad261651be1117348b50b634e02da0250b0432a0fdb1cb2ab515445eaad0ef7a4ae38269 WHIRLPOOL 9344364253c8ee9158e31bc96f98ab0e502d1b8ce98f816f88b81f9478b6e71bdb18d88edb7a8165dcbc8b2350082fb6a21c46e6caaf2663484f855713e7cedd diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.111.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.111.ebuild deleted file mode 100644 index 9840a6f..00000000 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.111.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 -}