diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2012-05-05 15:36:58 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2012-05-05 15:36:58 +0000 |
commit | 7b5acda3e034809b9c9ec340ede95c5ffc6a4054 (patch) | |
tree | 5cb294a1fb272f4c73265036d5ed3e8655ae8b08 /dev-java | |
parent | Add support for Oracle Instant Client via USE=oci8 (bug 366985 by Victor). (diff) | |
download | gentoo-2-7b5acda3e034809b9c9ec340ede95c5ffc6a4054.tar.gz gentoo-2-7b5acda3e034809b9c9ec340ede95c5ffc6a4054.tar.bz2 gentoo-2-7b5acda3e034809b9c9ec340ede95c5ffc6a4054.zip |
Remove vulnarable. #404071
(Portage version: 2.1.10.57/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/sun-jdk/ChangeLog | 5 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild | 151 |
2 files changed, 4 insertions, 152 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index c22777df192c..5d25aae5ff34 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/sun-jdk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.320 2012/05/05 10:26:20 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.321 2012/05/05 15:36:58 sera Exp $ + + 05 May 2012; Ralph Sennhauser <sera@gentoo.org> -sun-jdk-1.6.0.29.ebuild: + Remove vulnarable. #404071 05 May 2012; Ralph Sennhauser <sera@gentoo.org> sun-jdk-1.6.0.31.ebuild: Add workaround for large memory on x86. #405239 diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild deleted file mode 100644 index 0024c0528f60..000000000000 --- a/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild,v 1.6 2011/11/18 22:11:13 sera Exp $ - -EAPI="4" - -inherit java-vm-2 eutils pax-utils prefix versionator - -MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" -S_PV="$(replace_version_separator 3 '_')" - -X86_AT="jdk-${MY_PV}-linux-i586.bin" -AMD64_AT="jdk-${MY_PV}-linux-x64.bin" - -# check the URIs when bumping, no idea about their stability yet -JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-${MY_PV}-download-513648.html" - -DESCRIPTION="Oracle's Java SE Development Kit" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -SRC_URI="x86? ( ${X86_AT} ) - amd64? ( ${AMD64_AT} )" - -LICENSE="Oracle-BCLA-JavaSE" -KEYWORDS="amd64 x86" -SLOT="1.6" -IUSE="X alsa derby doc examples jce nsplugin" - -RESTRICT="fetch strip" -QA_TEXTRELS_x86=" - opt/${P}/jre/lib/i386/client/libjvm.so - opt/${P}/jre/lib/i386/motif21/libmawt.so - opt/${P}/jre/lib/i386/server/libjvm.so" - -RDEPEND="${DEPEND} - doc? ( dev-java/java-sdk-docs:1.6.0 ) - !prefix? ( sys-libs/glibc ) - alsa? ( media-libs/alsa-lib ) - X? ( - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libX11 - )" -DEPEND="jce? ( dev-java/sun-jce-bin:1.6 )" - -S="${WORKDIR}/jdk${S_PV}" - -pkg_nofetch() { - if use x86; then - AT=${X86_AT} - elif use amd64; then - AT=${AMD64_AT} - fi - - einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." - einfo "Alternatives are switching to dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6" - - einfo "Please download ${AT} from:" - einfo "${JDK_URI}" - einfo "and move it to ${DISTDIR}" -} - -src_unpack() { - sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" -} - -src_compile() { - # Set PaX markings on all JDK/JRE executables to allow code-generation on - # the heap by the JIT compiler. This needs to be done before CDS - #215225 - local marks="m" - use x86 && marks="msp" - pax-mark ${marks} $(list-paxables "${S}"{,/jre}/bin/*) - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - if use x86; then - "${S}"/bin/java -client -Xshare:dump || die - fi - "${S}"/bin/java -server -Xshare:dump || die -} - -src_install() { - # 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 - - dodir /opt/${P} - cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die - - if use derby; then - cp -pPR db "${ED}"/opt/${P} || die - fi - - if use examples; then - cp -pPR demo sample "${ED}"/opt/${P} || die - fi - - # Remove empty dirs we might have copied - rmdir -v $(find "${D}" -type d -empty) || die - - dodoc COPYRIGHT - dohtml README.html - - if use jce; then - dodir /opt/${P}/jre/lib/security/strong-jce - mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \ - "${ED}"/opt/${P}/jre/lib/security/strong-jce || die - mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \ - "${ED}"/opt/${P}/jre/lib/security/strong-jce || die - dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \ - /opt/${P}/jre/lib/security/US_export_policy.jar - dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \ - /opt/${P}/jre/lib/security/local_policy.jar - fi - - if use nsplugin; then - install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so - fi - - # Install desktop file for the Java Control Panel. Using VMHANDLE as file - # name to prevent file collision with jre and or other slots. - [[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die - sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)/" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \ - "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \ - "${T}"/${VMHANDLE}.desktop - - domenu "${T}"/${VMHANDLE}.desktop - - # bug #56444 - cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto /opt/${P}/jre/lib/ - doins "${T}"/fontconfig.properties - - set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" - java-vm_revdep-mask -} |