From 6ac4427a6b0096a8041c5657b19dd7d302f6fc89 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Mon, 14 Jan 2013 06:59:45 +0000 Subject: Security bump. Arm and all demos missing ... #451206 (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A) --- dev-java/oracle-jdk-bin/ChangeLog | 12 +- .../oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild | 233 +++++++++++++++++++++ 2 files changed, 242 insertions(+), 3 deletions(-) create mode 100644 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild (limited to 'dev-java') diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog index 034e9a68e2a1..240f67977603 100644 --- a/dev-java/oracle-jdk-bin/ChangeLog +++ b/dev-java/oracle-jdk-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/oracle-jdk-bin -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.27 2012/12/19 14:36:41 sera Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.28 2013/01/14 06:59:45 sera Exp $ + +*oracle-jdk-bin-1.7.0.11 (14 Jan 2013) + + 14 Jan 2013; Ralph Sennhauser + +oracle-jdk-bin-1.7.0.11.ebuild: + Security bump. Arm and all demos missing ... #451206. *oracle-jdk-bin-1.7.0.10 (19 Dec 2012) @@ -8,7 +14,7 @@ -oracle-jdk-bin-1.7.0.5-r1.ebuild, -oracle-jdk-bin-1.7.0.5-r2.ebuild, -oracle-jdk-bin-1.7.0.6.ebuild, -oracle-jdk-bin-1.7.0.7.ebuild, +oracle-jdk-bin-1.7.0.10.ebuild: - Version bump (arm not available). #447248 + Version bump. #447248 Remove vulnerable. 23 Oct 2012; Andreas Schuerch diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild new file mode 100644 index 000000000000..0bf15999da79 --- /dev/null +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild,v 1.1 2013/01/14 06:59:45 sera Exp $ + +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/jdk7-downloads-1880260.html" +JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" +# This is a list of archs supported by this update. +# Currently arm comes and goes. +AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris ) +# Sometimes some or all of the demos are missing, this is to not have to rewrite half +# the ebuild when it happens. +#DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris ) +DEMOS_AVAILABLE=() +FX_VERSION="2_2_4" + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +AT_x86="jdk-${MY_PV}-linux-i586.tar.gz" +AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz" +AT_arm="jdk-${MY_PV}-linux-arm-sfp.tar.gz" +AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz" +AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz" +AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz" +AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz" + +FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip" + +DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz" +DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz" +DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-sfp-demos.tar.gz" +DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz" +DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz" +DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz" +DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz" + +JCE_DIR="UnlimitedJCEPolicy" +JCE_FILE="${JCE_DIR}JDK7.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}? (" + SRC_URI+=" $(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.7" +KEYWORDS="-arm ~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel source" + +RESTRICT="fetch strip" +QA_PREBUILT="*" + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + doc? ( dev-java/java-sdk-docs:1.7 ) + fontconfig? ( media-libs/fontconfig ) + !prefix? ( sys-libs/glibc )" +# scanelf won't create a PaX header, so depend on paxctl to avoid fallback +# marking. #427642 +DEPEND=" + jce? ( app-arch/unzip ) + examples? ( kernel_linux? ( app-arch/unzip ) ) + pax_kernel? ( sys-apps/paxctl )" + +S="${WORKDIR}"/jdk${S_PV} + +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 + 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_prepare() { + if use jce; then + mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die + fi +} + +src_compile() { + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + if use x86; then + bin/java -client -Xshare:dump || die + fi + bin/java -server -Xshare:dump || die + + # Create files used as storage for system preferences. + mkdir jre/.systemPrefs || die + touch jre/.systemPrefs/.system.lock || die + touch jre/.systemPrefs/.systemRootModFile || die +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest}" + + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86; then + rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ + {,jre/}lib/i386/libjavaplugin_nscp*.so + rm -vrf jre/plugin/i386 + fi + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin; then + rm -vf {,jre/}lib/${arch}/libnpjp2.so \ + {,jre/}lib/${arch}/libjavaplugin_jni.so + fi + + dodoc COPYRIGHT + dohtml README.html + + 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 + if use kernel_linux; then + cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \ + "${ddest}"/javafx-samples || die + fi + 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 + install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so + fi + + if use source; then + cp src.zip "${ddest}" || die + 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 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 + + # 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}"/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 + + # 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 +} -- cgit v1.2.3-65-gdbad