[gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-java: ChangeLog emul-linux-x86-java-1.5.0.15.ebuild emul-linux-x86-java-1.6.0.05-r1.ebuild emul-linux-x86-java-1.5.0.13.ebuild emul-linux-x86-java-1.6.0.03.ebuild emul-linux-x86-java-1.4.2.16.ebuild emul-linux-x86-java-1.6.0.04.ebuild

[Vlastimil Babka (caster)]

caster      08/03/27 20:13:30

  Modified:             ChangeLog emul-linux-x86-java-1.5.0.15.ebuild
  Added:                emul-linux-x86-java-1.6.0.05-r1.ebuild
  Removed:              emul-linux-x86-java-1.5.0.13.ebuild
                        emul-linux-x86-java-1.6.0.03.ebuild
                        emul-linux-x86-java-1.4.2.16.ebuild
                        emul-linux-x86-java-1.6.0.04.ebuild
  Log:
  Remove vulnerable versions. Revbump to create Class Data Sharing archive also for server VM in 1.6, bug #207282.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.50                 app-emulation/emul-linux-x86-java/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?r1=1.49&r2=1.50

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	27 Mar 2008 19:34:33 -0000	1.49
+++ ChangeLog	27 Mar 2008 20:13:30 -0000	1.50
@@ -1,6 +1,18 @@
 # 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/ChangeLog,v 1.49 2008/03/27 19:34:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.50 2008/03/27 20:13:30 caster Exp $
+
+*emul-linux-x86-java-1.6.0.05-r1 (27 Mar 2008)
+
+  27 Mar 2008; Vlastimil Babka <caster@g.o> files/construct-1.6.sh,
+  files/construct.sh, -files/javasettings_Linux_x86.xml,
+  -emul-linux-x86-java-1.4.2.16.ebuild,
+  -emul-linux-x86-java-1.5.0.13.ebuild, emul-linux-x86-java-1.5.0.15.ebuild,
+  -emul-linux-x86-java-1.6.0.03.ebuild,
+  -emul-linux-x86-java-1.6.0.04.ebuild,
+  +emul-linux-x86-java-1.6.0.05-r1.ebuild:
+  Remove vulnerable versions. Create Class Data Sharing archive also for
+  server VM in 1.6, bug #207282.
 
   27 Mar 2008; Markus Meier <maekke@g.o>
   emul-linux-x86-java-1.5.0.15.ebuild, emul-linux-x86-java-1.6.0.05.ebuild:



1.3                  app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild?r1=1.2&r2=1.3

Index: emul-linux-x86-java-1.5.0.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emul-linux-x86-java-1.5.0.15.ebuild	27 Mar 2008 19:34:33 -0000	1.2
+++ emul-linux-x86-java-1.5.0.15.ebuild	27 Mar 2008 20:13:30 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.15.ebuild,v 1.2 2008/03/27 19:34:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v 1.3 2008/03/27 20:13:30 caster Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -41,7 +41,9 @@
 	cd ..
 	bash "${FILESDIR}"/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
 
-	"${S}"/bin/java -client -Xshare:dump
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	"${S}"/bin/java -client	-Xshare:dump || die
 }
 
 src_install() {



1.1                  app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild?rev=1.1&content-type=text/plain

Index: emul-linux-x86-java-1.6.0.05-r1.ebuild
===================================================================
# 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.05-r1.ebuild,v 1.1 2008/03/27 20:13:30 caster Exp $

inherit versionator pax-utils java-vm-2 eutils

UPDATE="$(get_version_component_range 4)"
UPDATE="${UPDATE#0}"
MY_PV="$(get_version_component_range 2)u${UPDATE}"

At="jdk-${MY_PV}-dlj-linux-i586.bin"
DESCRIPTION="32bit version Sun's J2SE Development Kit"
HOMEPAGE="http://java.sun.com/javase/6/"
#SRC_URI="http://download.java.net/dlj/binaries/${At}"
SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"

SLOT="1.6"
LICENSE="dlj-1.1"
KEYWORDS="-* ~amd64"
RESTRICT="strip"
IUSE="X alsa nsplugin"

JAVA_VM_NO_GENERATION1=true

RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
	X? ( app-emulation/emul-linux-x86-xlibs )
	app-emulation/emul-linux-x86-compat"

JAVA_PROVIDE="jdbc-stdext jdbc-rowset"

QA_TEXTRELS_amd64="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() {
	if [[ ! -r "${DISTDIR}"/${A} ]]; then
		die "cannot read ${DISTDIR}/${A}. Please check the permission and try again."
	fi

	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"

	# 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="bin lib man javaws plugin"
	dodir /opt/${P}

	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"

	pax-mark m $(list-paxables "${D}"/opt/${P}/bin/*)

	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

		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=Java\)/\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
}

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."
}



-- 
gentoo-commits@l.g.o mailing list