----- Original Message -----
> Hi,
>
> I am requesting approval to push the Jan 2014 CPU fixes into openjdk6.
>
> Webrev is available at:
> http://cr.openjdk.java.net/~omajid/webrevs/2014-01-14-cpu/
>
> It contains all the security fixes along with the backports needed to
> apply the security fixes.
>
> The combined patch should be identical to the icedtea6 changes pushed:
> http://icedtea.classpath.org/hg/release/icedtea6-1.11/rev/a3249839270a
>
> Thanks,
> Omair
>
> --
> PGP Key: 66484681 (http://pgp.mit.edu/)
> Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681
>
Good news! I managed to get the same result by applying the 1.12 patches as
from
applying this webrev patch.
Some backports were better than others. Of particular note, 8023069-tls.patch
was very
hard to check, some of it due to existing changes in the files but others seem
to be
down to odd backporting changes (e.g. the exception variable name was changed
for no
reason).
Comparing with the 7 versions, there are a few things worthy of note:
* 8010935: This fragment is missing in 6, as the file is differently structured.
+diff -r 2240523feb96 -r d2c4d2c9fc71
src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
+---
a/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
Thu Oct 10 10:16:39 2013 -0700
++++
b/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
Wed Oct 16 10:23:23 2013 -0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights
reserved.
++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights
reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -61,7 +61,7 @@
+
+ private static final AbstractWrapperBeanGenerator RUNTIME_GENERATOR =
+ new RuntimeWrapperBeanGenerator(new
RuntimeInlineAnnotationReader(),
+- Navigator.REFLECTION, FIELD_FACTORY);
++ Utils.REFLECTION_NAVIGATOR, FIELD_FACTORY);
+
+ private static final class RuntimeWrapperBeanGenerator extends
AbstractWrapperBeanGenerator<java.lang.reflect.Type, Class,
java.lang.reflect.Method, Field> {
+
* 8024530: Changes to
src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp are missing
(not present in 6) and a GXLayoutEngine2 else block in LayoutEngine.cpp. Some
lines in LETypes.h
are also in different places.
and one addition that needs to be made:
* 8022945: The update to the corresponding test is missing:
+diff -r c0ff56eaaa96 -r 4b7df9a8efc3
test/java/lang/SecurityManager/CheckPackageAccess.java
+--- a/test/java/lang/SecurityManager/CheckPackageAccess.java Fri Aug 09
13:50:13 2013 +0100
++++ b/test/java/lang/SecurityManager/CheckPackageAccess.java Mon Aug 19
22:43:32 2013 +0800
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 6741606 7146431 8000450
++ * @bug 6741606 7146431 8000450 8022945
+ * @summary Make sure all restricted packages listed in the package.access
+ * property in the java.security file are blocked
+ * @run main/othervm CheckPackageAccess
+@@ -54,6 +54,7 @@
+ "com.sun.imageio.",
+ "com.sun.istack.internal.",
+ "com.sun.jmx.",
++ "com.sun.naming.internal.",
+ "com.sun.proxy.",
+ "com.sun.org.apache.bcel.internal.",
+ "com.sun.org.apache.regexp.internal.",
Unless you can alter the existing 8022945, you'll need to add that via an
OPENJDK-6 bug.
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07
