From 80676189b6d53ff7156a50c232684f7830538633 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 22 Jul 2007 21:08:29 +0000 Subject: Cleanup vulnerable versions. (Portage version: 2.1.3_rc8) --- dev-java/sun-jre-bin/ChangeLog | 7 +- .../sun-jre-bin/files/digest-sun-jre-bin-1.4.2.14 | 3 - .../sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11 | 6 - .../files/digest-sun-jre-bin-1.6.0.01-r1 | 6 - dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild | 159 --------------------- dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild | 134 ----------------- .../sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild | 132 ----------------- 7 files changed, 6 insertions(+), 441 deletions(-) delete mode 100644 dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.14 delete mode 100644 dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11 delete mode 100644 dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1 delete mode 100644 dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild delete mode 100644 dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild delete mode 100644 dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild (limited to 'dev-java/sun-jre-bin') diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 073ec4f01023..435bf52b9e6a 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.105 2007/07/22 18:59:26 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.106 2007/07/22 21:08:29 caster Exp $ + + 22 Jul 2007; Vlastimil Babka + -sun-jre-bin-1.4.2.14.ebuild, -sun-jre-bin-1.5.0.11.ebuild, + -sun-jre-bin-1.6.0.01-r1.ebuild: + Cleanup vulnerable versions. 22 Jul 2007; Wulf C. Krueger sun-jre-bin-1.5.0.12.ebuild, sun-jre-bin-1.6.0.02.ebuild: diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.14 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.14 deleted file mode 100644 index 5d53b3ab4198..000000000000 --- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.14 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d7fc76d19c0800b0f94e1e7a781885df j2re-1_4_2_14-linux-i586.bin 14373288 -RMD160 7054f23ae3a4fd304dfbb7e9c73da8462507c720 j2re-1_4_2_14-linux-i586.bin 14373288 -SHA256 1d211f9f2f34f108d9f3fde745838965b83695301d953775e60fcf8cc3c163d3 j2re-1_4_2_14-linux-i586.bin 14373288 diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11 deleted file mode 100644 index e6f312fcc9a8..000000000000 --- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 ace2fc1b8c9d381b4e297c66c5a9caa7 jdk-1_5_0_11-dlj-linux-amd64.bin 43954177 -RMD160 bd865019d3fb2268800696207dba158ea2986a7f jdk-1_5_0_11-dlj-linux-amd64.bin 43954177 -SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db jdk-1_5_0_11-dlj-linux-amd64.bin 43954177 -MD5 9dfdad6a166ed403513c0a5509d82e4b jdk-1_5_0_11-dlj-linux-i586.bin 49598681 -RMD160 74c5bd78450397006ea145580c3554d77b64a31d jdk-1_5_0_11-dlj-linux-i586.bin 49598681 -SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705 jdk-1_5_0_11-dlj-linux-i586.bin 49598681 diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1 deleted file mode 100644 index 7f5d8d6c8fb8..000000000000 --- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 177f241f071396f5f3d3c42ed82c2ecc jdk-6u1-dlj-linux-amd64.sh 56395232 -RMD160 90f03c9359808126c73abedabed765a1191e04f0 jdk-6u1-dlj-linux-amd64.sh 56395232 -SHA256 13b40146ef514ff6756b35a7d26ed2e8e84cadcfbbd24d1cbb35d871d9b7e78b jdk-6u1-dlj-linux-amd64.sh 56395232 -MD5 644a588f1ea9417fbf23b3e5505bbf8c jdk-6u1-dlj-linux-i586.sh 62818812 -RMD160 2858ae3036db3315c6bbd2bd43cd05cf0af6e43e jdk-6u1-dlj-linux-i586.sh 62818812 -SHA256 1a49eaadcaf480c9eec4aa558ab7392e93b7c88b8f79f53be9a8fc03a6714ddc jdk-6u1-dlj-linux-i586.sh 62818812 diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild deleted file mode 100644 index 5e7ab55dccb2..000000000000 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild,v 1.5 2007/07/22 09:29:36 graaff Exp $ - -inherit java-vm-2 eutils - -MY_PV=${PV%.*}_${PV##*.} -MY_PV2=${PV//./_} -At="j2re-${MY_PV2}-linux-i586.bin" -S="${WORKDIR}/j2re${MY_PV}" -DESCRIPTION="Sun's J2SE Platform" -HOMEPAGE="http://java.sun.com/j2se/1.4.2/" -SRC_URI=${At} -SLOT="1.4" -LICENSE="sun-bcla-java-vm-1.4.2" -KEYWORDS="-* x86" -RESTRICT="fetch" -IUSE="X alsa nsplugin" - -DEPEND="sys-apps/sed" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXp - x11-libs/libXt - x11-libs/libXtst - )" - -PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar -lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar" - -# this is needed for proper operating under a PaX kernel without activated grsecurity acl -CHPAX_CONSERVATIVE_FLAGS="pemsv" - -DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg" - -QA_TEXTRELS_x86="opt/${P}/lib/i386/libawt.so - opt/${P}/plugin/i386/ns4/libjavaplugin.so - opt/${P}/plugin/i386/ns610/libjavaplugin_oji.so - opt/${P}/plugin/i386/ns610-gcc32/libjavaplugin_oji.so" - -pkg_nofetch() { - einfo "Please download ${At} from:" - einfo ${DOWNLOAD_URL} - einfo "(accept the license, then click on 'self-extracting file' under 'Linux Platform')" - einfo "and move it to ${DISTDIR}" -} - -src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then - eerror "cannot read ${At}. Please check the permission and try again." - die - fi - #Search for the ELF Header - testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001') - startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1` - tail -n +${startAt} ${DISTDIR}/${At} > install.sfx - chmod +x install.sfx - ./install.sfx || die - rm install.sfx - - if [ -f ${S}/lib/unpack ]; then - UNPACK_CMD=${S}/lib/unpack - chmod +x $UNPACK_CMD - sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD - for i in $PACKED_JARS; do - PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack - if [ -f ${PACK_FILE} ]; then - echo " unpacking: $i" - $UNPACK_CMD ${PACK_FILE} ${S}/$i - rm -f ${PACK_FILE} - fi - done - fi -} - -src_install() { - local dirs="bin lib man javaws plugin" - dodir /opt/${P} - - for i in $dirs ; do - cp -pPR $i ${D}/opt/${P}/ - done - - dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt - dohtml Welcome.html ControlPanel.html - - if use nsplugin; then - local plugin_dir="ns610" - if has_version '>=sys-devel/gcc-3.2' ; then - plugin_dir="ns610-gcc32" - fi - install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so - fi - - # bug #147259 - dosym ../javaws/javaws /opt/${P}/bin/javaws - - # create dir for system preferences - dodir /opt/${P}/.systemPrefs - - # create dir for system preferences - dodir /opt/${P}/.systemPrefs - # Create files used as storage for system preferences. - touch ${D}/opt/${P}/.systemPrefs/.system.lock - chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock - touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile - chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile - - # install control panel for Gnome/KDE - sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \ - -e "s/\(Name=Java\)/\1 Control Panel/" \ - ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ - ${T}/sun_java-jre.desktop - domenu ${T}/sun_java-jre.desktop - - set_java_env -} - -pkg_postinst () { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - # if chpax is on the target system, set the appropriate PaX flags - # this will not hurt the binary, it modifies only unused ELF bits - # but may confuse things like AV scanners and automatic tripwire - if has_version sys-apps/chpax - then - echo - einfo "setting up conservative PaX flags for jar, javac and java" - - for paxkills in "java" - do - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills - done - - # /opt/sun-jdk-1.4.2.03/bin/java_vm - chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm - - einfo "you should have seen lots of chpax output above now" - ewarn "make sure the grsec ACL contains those entries also" - ewarn "because enabling it will override the chpax setting" - ewarn "on the physical files - help for PaX and grsecurity" - ewarn "can be given by #gentoo-hardened + hardened@gentoo.org" - fi - - if ! use X; then - echo - ewarn "Some parts of Sun's JDK require X11 libraries to be installed." - ewarn "Be careful which Java libraries you attempt to use." - fi -} diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild deleted file mode 100644 index ee8a9935b84b..000000000000 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild,v 1.6 2007/07/22 09:29:36 graaff Exp $ - -inherit pax-utils eutils java-vm-2 - -MY_PVL=${PV%.*}_${PV##*.} -MY_PVA=${PV//./_} -#S="${WORKDIR}/jdk${MY_PVL}" - -X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" -AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" - -DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" -HOMEPAGE="http://java.sun.com/j2se/1.5.0/" -SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) - amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" -SLOT="1.5" -LICENSE="dlj-1.1" -KEYWORDS="-* amd64 x86" -RESTRICT="strip" -IUSE="X alsa nsplugin" - -RDEPEND=" - sys-libs/glibc - alsa? ( media-libs/alsa-lib ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXp - x11-libs/libXt - x11-libs/libXtst - )" - -DEPEND="" - -JAVA_PROVIDE="jdbc-stdext jdbc-rowset" - -PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar" - -QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so - opt/${P}/lib/i386/libdeploy.so" - -src_unpack() { - if [ ! -r ${DISTDIR}/${A} ]; then - die "cannot read ${A}. Please check the permission and try again." - fi - - mkdir bundled-jdk - cd bundled-jdk - sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack" - - cd .. - bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" -} - -src_install() { - local dirs="bin lib man" - - # Set PaX markings on all JDK/JRE executables to allow code-generation on - # the heap by the JIT compiler. - pax-mark m $(list-paxables ${S}/bin/*) - - # only X86 has the plugin and javaws - use x86 && dirs="${dirs} javaws plugin" - dodir /opt/${P} - - for i in $dirs ; do - cp -pPR $i ${D}/opt/${P}/ || die "failed to copy" - done - dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die - dohtml Welcome.html || die - dodir /opt/${P}/share/ - - if use nsplugin; then - local plugin_dir="ns7-gcc29" - if has_version '>=sys-devel/gcc-3' ; then - plugin_dir="ns7" - fi - - if use x86 ; then - install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so - else - eerror "No plugin available for amd64 arch" - fi - fi - - # TODO Don't think we still needs these -nichoj - # create dir for system preferences - #dodir /opt/${P}/jre/.systemPrefs - # Create files used as storage for system preferences. - #touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock - #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock - #touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile - #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile - - # FIXME figure out how to handle the control pannel conflict with - # sun-jdk-bin - - # install control panel for Gnome/KDE -# sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ -# -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ -# ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ -# ${T}/sun_java-${SLOT}.desktop - -# domenu ${T}/sun_java-${SLOT}.desktop - - # bug #56444 - insinto /opt/${P}/lib/ - newins "${FILESDIR}"/fontconfig.Gentoo.properties \ - fontconfig.properties || die - - set_java_env -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - if ! use X; then - local xwarn="X11 libraries and/or" - fi - - echo - ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." - ewarn "Be careful which Java libraries you attempt to use." - - echo - elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" - elog "The epoll-based implementation of SelectorProvider is not selected by" - elog "default." - elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" -} diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild deleted file mode 100644 index af982070401b..000000000000 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild,v 1.5 2007/07/22 09:29:36 graaff Exp $ - -inherit versionator pax-utils eutils java-vm-2 - -UPDATE="$(get_version_component_range 4)" -UPDATE="${UPDATE#0}" -MY_PV="$(get_version_component_range 2)u${UPDATE}" - -X86_AT="jdk-${MY_PV}-dlj-linux-i586.sh" -AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.sh" - -DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" -HOMEPAGE="http://java.sun.com/javase/6/" -SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) - amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" -SLOT="1.6" -LICENSE="dlj-1.1" -KEYWORDS="-* amd64 x86" -RESTRICT="strip" -IUSE="X alsa nsplugin" - -RDEPEND=" - sys-libs/glibc - x86? ( =virtual/libstdc++-3.3 ) - alsa? ( media-libs/alsa-lib ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXp - x11-libs/libXt - x11-libs/libXtst - )" - -DEPEND="" - -JAVA_PROVIDE="jdbc-stdext jdbc-rowset" - -QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so - opt/${P}/lib/i386/motif21/libmawt.so - opt/${P}/lib/i386/libdeploy.so - opt/${P}/lib/i386/server/libjvm.so" - -src_unpack() { - if [ ! -r ${DISTDIR}/${A} ]; then - die "cannot read ${A}. Please check the permission and try again." - fi - - mkdir bundled-jdk - cd bundled-jdk - sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack" - - cd .. - bash ${FILESDIR}/construct-1.6.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" -} - -src_install() { - local dirs="bin lib man" - - # Set PaX markings on all JDK/JRE executables to allow code-generation on - # the heap by the JIT compiler. - pax-mark m $(list-paxables ${S}/bin/*) - - # only X86 has the plugin and javaws - use x86 && dirs="${dirs} javaws plugin" - dodir /opt/${P} - - cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" - - dodoc README THIRDPARTYLICENSEREADME.txt || die - dohtml Welcome.html || die - dodir /opt/${P}/share/ - - if use nsplugin; then - local plugin_dir="ns7-gcc29" - if has_version '>=sys-devel/gcc-3' ; then - plugin_dir="ns7" - fi - - if use x86 ; then - install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so - else - eerror "No plugin available for amd64 arch" - fi - fi - - # TODO Don't think we still needs these -nichoj - # create dir for system preferences - #dodir /opt/${P}/jre/.systemPrefs - # Create files used as storage for system preferences. - #touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock - #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock - #touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile - #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile - - # install control panel for Gnome/KDE - if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then - sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \ - -e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \ - -e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \ - ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ - ${T}/sun_jre-${SLOT}.desktop || die - domenu ${T}/sun_jre-${SLOT}.desktop || die - fi - - # bug #56444 - insinto /opt/${P}/lib/ - newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties - - set_java_env -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - if ! use X; then - local xwarn="X11 libraries and/or" - fi - - echo - ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." - ewarn "Be careful which Java libraries you attempt to use." - - echo - elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" - elog "The epoll-based implementation of SelectorProvider is not selected by" - elog "default." - elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" -} -- cgit v1.2.3-65-gdbad