summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-03-27 20:16:59 +0000
committerVlastimil Babka <caster@gentoo.org>2008-03-27 20:16:59 +0000
commitfd32871cbc00c156aea8e125ad86b7f340ee50e0 (patch)
treefcd7b7ddde15e8a887850bd785214dc0df1a67a5 /app-emulation
parentalpha/ia64 stable, remove old (diff)
downloadhistorical-fd32871cbc00c156aea8e125ad86b7f340ee50e0.tar.gz
historical-fd32871cbc00c156aea8e125ad86b7f340ee50e0.tar.bz2
historical-fd32871cbc00c156aea8e125ad86b7f340ee50e0.zip
Remove vulnerable versions. Revbump to create Class Data Sharing archive also for server VM in 1.6, bug #207282.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild4
-rw-r--r--app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild6
-rw-r--r--app-emulation/emul-linux-x86-java/files/construct-1.6.sh2
-rw-r--r--app-emulation/emul-linux-x86-java/files/construct.sh2
-rw-r--r--app-emulation/emul-linux-x86-java/files/javasettings_Linux_x86.xml16
5 files changed, 7 insertions, 23 deletions
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
index 566d05bc5de6..9b4f3c1d1477 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
@@ -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.3 2008/03/27 20:13:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v 1.4 2008/03/27 20:16:58 caster Exp $
inherit versionator pax-utils eutils java-vm-2
@@ -43,7 +43,7 @@ src_unpack() {
# see bug #207282
einfo "Creating the Class Data Sharing archives"
- "${S}"/bin/java -client -Xshare:dump || die
+ "${S}"/bin/java -client -Xshare:dump || die
}
src_install() {
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild
index 3abc368ce06d..25279baf9e66 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild
@@ -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.6.0.05-r1.ebuild,v 1.1 2008/03/27 20:13:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild,v 1.2 2008/03/27 20:16:58 caster Exp $
inherit versionator pax-utils java-vm-2 eutils
@@ -47,8 +47,8 @@ src_unpack() {
# see bug #207282
einfo "Creating the Class Data Sharing archives"
- "${S}"/bin/java -client -Xshare:dump || die
- "${S}"/bin/java -server -Xshare:dump || die
+ "${S}"/bin/java -client -Xshare:dump || die
+ "${S}"/bin/java -server -Xshare:dump || die
}
src_install() {
diff --git a/app-emulation/emul-linux-x86-java/files/construct-1.6.sh b/app-emulation/emul-linux-x86-java/files/construct-1.6.sh
index 39c7b911fe19..a70e24b86d8a 100644
--- a/app-emulation/emul-linux-x86-java/files/construct-1.6.sh
+++ b/app-emulation/emul-linux-x86-java/files/construct-1.6.sh
@@ -261,7 +261,7 @@ if [ $# -eq 3 ] ; then
copytree
createjre
unpackjars
- preparecds
+ #preparecds
jreman
elimdups
else
diff --git a/app-emulation/emul-linux-x86-java/files/construct.sh b/app-emulation/emul-linux-x86-java/files/construct.sh
index 7ee0e42729bc..aef91c267280 100644
--- a/app-emulation/emul-linux-x86-java/files/construct.sh
+++ b/app-emulation/emul-linux-x86-java/files/construct.sh
@@ -270,7 +270,7 @@ if [ $# -eq 3 ] ; then
copytree
createjre
unpackjars
- preparecds
+ #preparecds
jreman
elimdups
else
diff --git a/app-emulation/emul-linux-x86-java/files/javasettings_Linux_x86.xml b/app-emulation/emul-linux-x86-java/files/javasettings_Linux_x86.xml
deleted file mode 100644
index 046621d20f40..000000000000
--- a/app-emulation/emul-linux-x86-java/files/javasettings_Linux_x86.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--This is a generated file. Do not alter this file!-->
-<java xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<enabled xsi:nil="true"/>
-<userClassPath xsi:nil="true"/>
-<vmParameters xsi:nil="true"/>
-<jreLocations xsi:nil="true"/>
-<javaInfo xsi:nil="false" vendorUpdate="2004-01-30" autoSelect="true">
-<vendor>Blackdown Java-Linux Team</vendor>
-<location>file:///opt/java32</location>
-<version>1.4.2-02</version>
-<features>0</features>
-<requirements>1</requirements>
-<vendorData>660069006C0065003A002F002F002F006F00700074002F006A00610076006100330032002F006C00690062002F0069003300380036002F0063006C00690065006E0074002F006C00690062006A0076006D002E0073006F000A002F006F00700074002F006A00610076006100330032002F00620069006E003A002F006F00700074002F006A00610076006100330032002F006A00720065002F00620069006E003A002F006F00700074002F006A00610076006100330032002F00620069006E002F0063006C00610073007300690063003A002F006F00700074002F006A00610076006100330032002F006A00720065002F00620069006E002F0063006C00610073007300690063003A002F006F00700074002F006A00610076006100330032002F006C00690062002F0069003300380036002F0063006C00690065006E0074003A002F006F00700074002F006A00610076006100330032002F006C00690062002F0069003300380036002F0063006C00610073007300690063003A002F006F00700074002F006A00610076006100330032002F006C00690062002F0069003300380036002F006E00610074006900760065005F0074006800720065006100640073003A002F006F00700074002F006A00610076006100330032002F006C00690062002F0069003300380036000A00</vendorData>
-</javaInfo>
-</java>