From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1L8xU7-0006rl-A7 for garchives@archives.gentoo.org; Sat, 06 Dec 2008 13:46:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8194E01F3; Sat, 6 Dec 2008 13:46:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 30EA3E01F3 for ; Sat, 6 Dec 2008 13:46:14 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id BBA4D64E4A for ; Sat, 6 Dec 2008 13:46:13 +0000 (UTC) Received: from betelgeuse by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1L8xU5-0000hU-HC for gentoo-commits@lists.gentoo.org; Sat, 06 Dec 2008 13:46:13 +0000 From: "Petteri Raty (betelgeuse)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, betelgeuse@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-java: ChangeLog emul-linux-x86-java-1.5.0.17.ebuild emul-linux-x86-java-1.6.0.11.ebuild emul-linux-x86-java-1.4.2.19.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog emul-linux-x86-java-1.5.0.17.ebuild emul-linux-x86-java-1.6.0.11.ebuild emul-linux-x86-java-1.4.2.19.ebuild X-VCS-Directories: app-emulation/emul-linux-x86-java X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Raty Content-Type: text/plain; charset=utf8 Message-Id: Sender: Petteri Raty Date: Sat, 06 Dec 2008 13:46:13 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4f9dcf88-3671-4447-a07b-ddc305b5d783 X-Archives-Hash: 4a08629ed7b8823a57cc9c321c5a8404 betelgeuse 08/12/06 13:46:13 Modified: ChangeLog Added: emul-linux-x86-java-1.5.0.17.ebuild emul-linux-x86-java-1.6.0.11.ebuild emul-linux-x86-java-1.4.2.19.ebuild Log: Version bumps for security bug #250012. (Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r2 i686) Revision Changes Path 1.63 app-emulation/emul-linux-x86-java/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/ChangeLog?rev=3D1.63&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/ChangeLog?rev=3D1.63&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/ChangeLog?r1=3D1.62&r2=3D1.63 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/Chang= eLog,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- ChangeLog 6 Dec 2008 13:41:33 -0000 1.62 +++ ChangeLog 6 Dec 2008 13:46:13 -0000 1.63 @@ -1,6 +1,16 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/Cha= ngeLog,v 1.62 2008/12/06 13:41:33 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/Cha= ngeLog,v 1.63 2008/12/06 13:46:13 betelgeuse Exp $ + +*emul-linux-x86-java-1.6.0.11 (06 Dec 2008) +*emul-linux-x86-java-1.5.0.17 (06 Dec 2008) +*emul-linux-x86-java-1.4.2.19 (06 Dec 2008) + + 06 Dec 2008; Petteri R=C3=A4ty + +emul-linux-x86-java-1.4.2.19.ebuild, + +emul-linux-x86-java-1.5.0.17.ebuild, + +emul-linux-x86-java-1.6.0.11.ebuild: + Version bumps for security bug #250012. =20 06 Dec 2008; Petteri R=C3=A4ty -emul-linux-x86-java-1.4.2.17.ebuild, 1.1 app-emulation/emul-linux-x86-java/emul-linux-x86-jav= a-1.5.0.17.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/emul-linux-x86-java-1.5.0.17.ebuild?rev=3D1.1&view=3Dmark= up plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/emul-linux-x86-java-1.5.0.17.ebuild?rev=3D1.1&content-typ= e=3Dtext/plain Index: emul-linux-x86-java-1.5.0.17.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul= -linux-x86-java-1.5.0.17.ebuild,v 1.1 2008/12/06 13:46:13 betelgeuse Exp = $ inherit versionator pax-utils eutils java-vm-2 UPDATE=3D"$(get_version_component_range 4)" UPDATE=3D"${UPDATE#0}" MY_PV=3D"$(get_version_component_range 2-3)u${UPDATE}" At=3D"jdk-${MY_PV}-dlj-linux-i586.bin" DESCRIPTION=3D"32bit version Sun's J2SE Runtime Environment" HOMEPAGE=3D"http://java.sun.com/j2se/1.5.0/" SRC_URI=3D"http://download.java.net/dlj/binaries/${At}" SLOT=3D"1.5" LICENSE=3D"dlj-1.1" KEYWORDS=3D"-* ~amd64" RESTRICT=3D"strip" IUSE=3D"X alsa nsplugin" JAVA_VM_NO_GENERATION1=3Dtrue RDEPEND=3D"alsa? ( app-emulation/emul-linux-x86-soundlibs ) X? ( app-emulation/emul-linux-x86-xlibs )" JAVA_PROVIDE=3D"jdbc-stdext jdbc-rowset" QA_TEXTRELS_amd64=3D"opt/${P}/lib/i386/motif21/libmawt.so opt/${P}/lib/i386/libdeploy.so" src_unpack() { mkdir bundled-jdk cd bundled-jdk sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack= " cd .. bash "${FILESDIR}"/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "= construct.sh failed" } src_compile() { # Set PaX markings on all JDK/JRE executables to allow code-generation o= n # the heap by the JIT compiler. This has to be done before CDS - #215225 pax-mark m $(list-paxables "${S}"/bin/*) # see bug #207282 einfo "Creating the Class Data Sharing archives" "${S}"/bin/java -client -Xshare:dump || die } src_install() { dodir /opt/${P} cp -pPR bin lib man javaws plugin "${D}/opt/${P}/" || die "failed to cop= y" dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die dohtml Welcome.html || die if use nsplugin; then local plugin_dir=3D"ns7-gcc29" if has_version '>=3Dsys-devel/gcc-3' ; then plugin_dir=3D"ns7" fi install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_= oji.so fi # 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=3DJava\)/\1 Control Panel ${SLOT}/" \ # ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ # ${T}/sun_java-${SLOT}.desktop # domenu ${T}/sun_java-${SLOT}.desktop set_java_env java-vm_revdep-mask } pkg_postinst() { # Set as default VM if none exists java-vm-2_pkg_postinst if ! use X; then local xwarn=3D"X11 libraries and/or" fi echo ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be instal= led." 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=3Dsun.nio.ch.EPo= llSelectorProvider" } 1.1 app-emulation/emul-linux-x86-java/emul-linux-x86-jav= a-1.6.0.11.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/emul-linux-x86-java-1.6.0.11.ebuild?rev=3D1.1&view=3Dmark= up plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/emul-linux-x86-java-1.6.0.11.ebuild?rev=3D1.1&content-typ= e=3Dtext/plain Index: emul-linux-x86-java-1.6.0.11.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul= -linux-x86-java-1.6.0.11.ebuild,v 1.1 2008/12/06 13:46:13 betelgeuse Exp = $ inherit versionator pax-utils java-vm-2 eutils UPDATE=3D"$(get_version_component_range 4)" UPDATE=3D"${UPDATE#0}" MY_PV=3D"$(get_version_component_range 2)u${UPDATE}" At=3D"jdk-${MY_PV}-dlj-linux-i586.bin" DESCRIPTION=3D"32bit version Sun's J2SE Runtime Environment" HOMEPAGE=3D"http://java.sun.com/javase/6/" #SRC_URI=3D"http://download.java.net/dlj/binaries/${At}" SRC_URI=3D"http://dlc.sun.com/dlj/binaries/${At}" SLOT=3D"1.6" LICENSE=3D"dlj-1.1" KEYWORDS=3D"-* ~amd64" RESTRICT=3D"strip" IUSE=3D"X alsa nsplugin" JAVA_VM_NO_GENERATION1=3Dtrue RDEPEND=3D"alsa? ( app-emulation/emul-linux-x86-soundlibs ) X? ( app-emulation/emul-linux-x86-xlibs ) app-emulation/emul-linux-x86-compat" JAVA_PROVIDE=3D"jdbc-stdext jdbc-rowset" QA_TEXTRELS_amd64=3D"opt/${P}/lib/i386/motif21/libmawt.so opt/${P}/lib/i386/libdeploy.so opt/${P}/lib/i386/client/libjvm.so opt/${P}/lib/i386/server/libjvm.so" src_unpack() { mkdir bundled-jdk cd bundled-jdk sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack= " cd .. bash "${FILESDIR}"/construct-${SLOT}.sh bundled-jdk sun-jdk-${PV} ${P} = || die "construct-${SLOT}.sh failed" } src_compile() { # Set PaX markings on all JDK/JRE executables to allow code-generation o= n # the heap by the JIT compiler. This has to be done before CDS - #215225 pax-mark m $(list-paxables "${S}"/bin/*) # see bug #207282 einfo "Creating the Class Data Sharing archives" "${S}"/bin/java -client -Xshare:dump || die "${S}"/bin/java -server -Xshare:dump || die } src_install() { local dirs=3D"bin lib man 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=3D"ns7-gcc29" if has_version '>=3Dsys-devel/gcc-3' ; then plugin_dir=3D"ns7" fi install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_= oji.so install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2 fi # 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=3DJava\)/\1 Control Panel ${SLOT}/" \ # ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ # ${T}/sun_java-${SLOT}.desktop # domenu ${T}/sun_java-${SLOT}.desktop set_java_env java-vm_revdep-mask } pkg_postinst() { # Set as default VM if none exists java-vm-2_pkg_postinst elog elog "Two variants of the nsplugin are available via eselect java-nsplug= in:" elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) = " ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!" elog "For more info see https://jdk6.dev.java.net/plugin2/" elog if ! use X; then local xwarn=3D"X11 libraries and/or" fi echo ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be instal= led." ewarn "Be careful which Java libraries you attempt to use." } 1.1 app-emulation/emul-linux-x86-java/emul-linux-x86-jav= a-1.4.2.19.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/emul-linux-x86-java-1.4.2.19.ebuild?rev=3D1.1&view=3Dmark= up plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul= -linux-x86-java/emul-linux-x86-java-1.4.2.19.ebuild?rev=3D1.1&content-typ= e=3Dtext/plain Index: emul-linux-x86-java-1.4.2.19.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul= -linux-x86-java-1.4.2.19.ebuild,v 1.1 2008/12/06 13:46:13 betelgeuse Exp = $ inherit multilib eutils pax-utils java-vm-2 MY_PV=3D${PV%.*}_${PV##*.} MY_PV2=3D${PV//./_} MY_PN=3Dj2re At=3D"${MY_PN}-${MY_PV2}-linux-i586.bin" S=3D"${WORKDIR}/j2re${MY_PV}" DESCRIPTION=3D"Sun's JRE (32bit)" HOMEPAGE=3D"http://java.sun.com/j2se/1.4.2/" SRC_URI=3D${At} SLOT=3D"1.4" LICENSE=3D"sun-bcla-java-vm-1.4.2" KEYWORDS=3D"-* ~amd64" # pre stripped RESTRICT=3D"fetch strip" IUSE=3D"X alsa nsplugin" DEPEND=3D"" RDEPEND=3D"alsa? ( app-emulation/emul-linux-x86-soundlibs ) X? ( app-emulation/emul-linux-x86-xlibs )" DL_PREFIX=3D"https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_De= veloper-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=3D" DOWNLOAD_URL=3D"${DL_PREFIX}${MY_PN}-${MY_PV}-oth-JPR@CDS-CDS_Developer" QA_TEXTRELS_amd64=3D"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 "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=3D$(echo -e '\0177\0105\0114\0106\0001\0001\0001') startAt=3D`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=3D"${S}"/lib/unpack chmod +x $UNPACK_CMD sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_= CMD local PACKED_JARS=3D"lib/rt.jar lib/jsse.jar lib/charsets.jar \ lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar" for i in $PACKED_JARS; do PACK_FILE=3D${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=3D"bin lib man javaws plugin" dodir /opt/${P} cp -pPR ${dirs} "${D}/opt/${P}/" pax-mark srpm $(list-paxables "${D}"/opt/${P}/bin/*) dodoc CHANGES COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die dohtml Welcome.html ControlPanel.html || die if use nsplugin; then local plugin_dir=3D"ns610" if has_version '>=3Dsys-devel/gcc-3.2' ; then plugin_dir=3D"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" # 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}/" \ # -e "s/\(Name=3DJava\)/\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 java-vm_revdep-mask }