[java-1.7.0-openjdk/f20] All except arm32 arch updated to icedtea 2.4. Arm32 is keeping 2.3 (few patches duplicated)
jiri vanek
jvanek at fedoraproject.org
Mon Sep 2 15:49:53 UTC 2013
commit 2fdffb94340af5bcf02ab527376964f4ab020445
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Mon Sep 2 17:49:03 2013 +0200
All except arm32 arch updated to icedtea 2.4. Arm32 is keeping 2.3 (few patches duplicated)
.gitignore | 1 +
aarch64.patch | 4 +-
fsg.sh | 115 ++++++++++++++
gstackbounds-2.3.patch | 139 +++++++++++++++++
gstackbounds.patch | 9 +-
java-1.7.0-openjdk-disable-system-lcms-2.3.patch | 36 +++++
java-1.7.0-openjdk-disable-system-lcms.patch | 24 ++--
java-1.7.0-openjdk-doNotUseDisabledEcc.patch | 26 ++++
...0-openjdk-java-access-bridge-security-2.3.patch | 25 +++
...1.7.0-openjdk-java-access-bridge-security.patch | 25 ++--
java-1.7.0-openjdk-ppc-zero-hotspot.patch | 1 -
java-1.7.0-openjdk-size_t.patch | 40 +++---
java-1.7.0-openjdk.spec | 79 ++++++++++-
rhino-2.3.patch | 157 ++++++++++++++++++++
rhino.patch | 4 +-
sources | 1 +
16 files changed, 628 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b46b1dc..319d0be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/openjdk-icedtea-2.3.10.tar.xz
/openjdk-icedtea-2.3.11.tar.xz
/openjdk-icedtea-2.3.12.tar.xz
+/openjdk-icedtea-2.4.1.tar.xz
diff --git a/aarch64.patch b/aarch64.patch
index ccb84a6..91a99bf 100644
--- a/aarch64.patch
+++ b/aarch64.patch
@@ -114,8 +114,8 @@ index 7e0b8de..d27129f 100644
# ZERO_ENDIANNESS is the endianness of the processor
case "${ZERO_LIBARCH}" in
-- i386|amd64|ia64|arm)
-+ i386|amd64|ia64|arm|aarch64)
+- i386|amd64|ia64)
++ i386|amd64|ia64|aarch64)
ZERO_ENDIANNESS=little
;;
ppc*|s390*|sparc*|alpha)
diff --git a/fsg.sh b/fsg.sh
new file mode 100644
index 0000000..062ffd4
--- /dev/null
+++ b/fsg.sh
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+echo "Further liberating OpenJDK..."
+
+# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+# PR146/S6713083
+# Remove binaries
+rm -vf \
+ openjdk/jdk/test/sun/management/windows/revokeall.exe \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
+
+rm -vf \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
+
+rm -vf \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
+
+# Remove test sources with questionable license headers.
+rm -vf \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
+ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
+ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
+ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTest.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
+ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
+ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
+
+# Remove J2DBench sources, some of which have questionable license
+# headers.
+rm -rvf \
+ openjdk/jdk/src/share/demo/java2d/J2DBench
+
+# BEGIN Debian/Ubuntu additions
+
+# binary files
+rm -vf \
+ openjdk/jdk/test/sun/net/idn/nfscis.spp
+
+# TODO
+#$ find openjdk -name '*.jar' -o -name '*.class'|grep -v test
+
+# PR140, S6695776
+# Also see patches/icedtea-jscheme.patch
+rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib
+rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts
+
+# PR139, S6710791
+rm -vf \
+ openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar \
+ openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar \
+
+# END Debian/Ubuntu additions
+
+echo "Removing support for proprietary SNMP plug"
+rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp
+rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
+rm -rvf openjdk/jdk/test/com/sun/jmx/snmp
+
+echo "Removing registration tests"
+rm -rvf openjdk/jdk/test/com/sun/servicetag
+
+echo "Removing EC source code we don't build"
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunECEntries.java
+rm -rvf openjdk/jdk/src/share/native/sun/security/ec
+rm -rvf openjdk/jdk/make/sun/security/ec
diff --git a/gstackbounds-2.3.patch b/gstackbounds-2.3.patch
new file mode 100644
index 0000000..a579dcd
--- /dev/null
+++ b/gstackbounds-2.3.patch
@@ -0,0 +1,139 @@
+diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -2763,39 +2763,47 @@
+ // writing thread stacks don't use growable mappings (i.e. those
+ // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this
+ // only applies to the main thread.
+-
+-static
+-bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) {
+-
+- char buf[128];
+- int fd, sz;
+-
+- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) {
++static bool
++get_stack_bounds(uintptr_t *bottom, uintptr_t *top)
++{
++ FILE *f = fopen("/proc/self/maps", "r");
++ if (f == NULL)
+ return false;
+- }
+-
+- const char kw[] = "[stack]";
+- const int kwlen = sizeof(kw)-1;
+-
+- // Address part of /proc/self/maps couldn't be more than 128 bytes
+- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) {
+- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) {
+- // Extract addresses
+- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
+- uintptr_t sp = (uintptr_t) __builtin_frame_address(0);
+- if (sp >= *bottom && sp <= *top) {
+- ::close(fd);
+- return true;
+- }
++
++ while (!feof(f)) {
++ size_t dummy;
++ char *str = NULL;
++ ssize_t len = getline(&str, &dummy, f);
++ if (len == -1) {
++ fclose(f);
++ if (str != NULL)
++ free(str);
++ return false;
++ }
++
++ if (len > 0 && str[len-1] == '\n') {
++ str[len-1] = 0;
++ len--;
++ }
++
++ static const char *stack_str = "[stack]";
++ if (len > (ssize_t)strlen(stack_str)
++ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) {
++ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
++ uintptr_t sp = (uintptr_t)__builtin_frame_address(0);
++ if (sp >= *bottom && sp <= *top) {
++ free(str);
++ fclose(f);
++ return true;
+ }
+- }
+- }
+-
+- ::close(fd);
++ }
++ }
++ free(str);
++ }
++ fclose(f);
+ return false;
+ }
+
+-
+ // If the (growable) stack mapping already extends beyond the point
+ // where we're going to put our guard pages, truncate the mapping at
+ // that point by munmap()ping it. This ensures that when we later
+diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
+--- openjdk/hotspot/src/share/vm/runtime/os.cpp
++++ openjdk/hotspot/src/share/vm/runtime/os.cpp
+@@ -1331,41 +1331,3 @@
+ }
+ return result;
+ }
+-
+-// Read file line by line, if line is longer than bsize,
+-// skip rest of line.
+-int os::get_line_chars(int fd, char* buf, const size_t bsize){
+- size_t sz, i = 0;
+-
+- // read until EOF, EOL or buf is full
+- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') {
+- ++i;
+- }
+-
+- if (buf[i] == '\n') {
+- // EOL reached so ignore EOL character and return
+-
+- buf[i] = 0;
+- return (int) i;
+- }
+-
+- buf[i+1] = 0;
+-
+- if (sz != 1) {
+- // EOF reached. if we read chars before EOF return them and
+- // return EOF on next call otherwise return EOF
+-
+- return (i == 0) ? -1 : (int) i;
+- }
+-
+- // line is longer than size of buf, skip to EOL
+- char ch;
+- while (read(fd, &ch, 1) == 1 && ch != '\n') {
+- // Do nothing
+- }
+-
+- // return initial part of line that fits in buf.
+- // If we reached EOF, it will be returned on next call.
+-
+- return (int) i;
+-}
+diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp
+--- openjdk/hotspot/src/share/vm/runtime/os.hpp
++++ openjdk/hotspot/src/share/vm/runtime/os.hpp
+@@ -672,10 +672,6 @@
+ // Hook for os specific jvm options that we don't want to abort on seeing
+ static bool obsolete_option(const JavaVMOption *option);
+
+- // Read file line by line. If line is longer than bsize,
+- // rest of line is skipped. Returns number of bytes read or -1 on EOF
+- static int get_line_chars(int fd, char *buf, const size_t bsize);
+-
+ // Extensions
+ #include "runtime/os_ext.hpp"
+
+
diff --git a/gstackbounds.patch b/gstackbounds.patch
index a579dcd..39a066a 100644
--- a/gstackbounds.patch
+++ b/gstackbounds.patch
@@ -80,11 +80,10 @@ diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
--- openjdk/hotspot/src/share/vm/runtime/os.cpp
+++ openjdk/hotspot/src/share/vm/runtime/os.cpp
-@@ -1331,41 +1331,3 @@
- }
+@@ -1353,43 +1353,6 @@
return result;
}
--
+
-// Read file line by line, if line is longer than bsize,
-// skip rest of line.
-int os::get_line_chars(int fd, char* buf, const size_t bsize){
@@ -122,6 +121,10 @@ diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
-
- return (int) i;
-}
+
+ void os::SuspendedThreadTask::run() {
+ assert(Threads_lock->owned_by_self() || (_thread == VMThread::vm_thread()), "must have threads lock to call this");
+
diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp
--- openjdk/hotspot/src/share/vm/runtime/os.hpp
+++ openjdk/hotspot/src/share/vm/runtime/os.hpp
diff --git a/java-1.7.0-openjdk-disable-system-lcms-2.3.patch b/java-1.7.0-openjdk-disable-system-lcms-2.3.patch
new file mode 100644
index 0000000..b0e8a3c
--- /dev/null
+++ b/java-1.7.0-openjdk-disable-system-lcms-2.3.patch
@@ -0,0 +1,36 @@
+diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav 2012-03-19 17:33:21.147566973 -0400
++++ openjdk/jdk/make/jdk_generic_profile.sh 2012-03-19 17:33:32.877391463 -0400
+@@ -381,24 +381,6 @@ if [ "${ZERO_BUILD}" = true ] ; then
+ fi
+ fi
+
+-# Export variables for system LCMS
+-# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
+-# link against lcms2
+-pkgconfig=$(which pkg-config 2>/dev/null)
+-if [ -x "${pkgconfig}" ] ; then
+- if [ "${LCMS_CFLAGS}" = "" ] ; then
+- LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
+- fi
+- if [ "${LCMS_LIBS}" = "" ] ; then
+- LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
+- fi
+-fi
+-if [ "${LCMS_LIBS}" = "" ] ; then
+- LCMS_LIBS="-llcms2"
+-fi
+-export LCMS_CFLAGS
+-export LCMS_LIBS
+-
+ # Export variables for system zlib
+ # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
+ # link against zlib
+@@ -452,7 +434,6 @@ fi
+ export GIF_LIBS
+
+ # IcedTea defaults; use system libraries
+-export USE_SYSTEM_LCMS=true
+ export USE_SYSTEM_ZLIB=true
+ export USE_SYSTEM_JPEG=true
+ export USE_SYSTEM_PNG=true
diff --git a/java-1.7.0-openjdk-disable-system-lcms.patch b/java-1.7.0-openjdk-disable-system-lcms.patch
index b0e8a3c..ef43cc7 100644
--- a/java-1.7.0-openjdk-disable-system-lcms.patch
+++ b/java-1.7.0-openjdk-disable-system-lcms.patch
@@ -1,9 +1,8 @@
-diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
---- openjdk/jdk/make/jdk_generic_profile.sh.sav 2012-03-19 17:33:21.147566973 -0400
-+++ openjdk/jdk/make/jdk_generic_profile.sh 2012-03-19 17:33:32.877391463 -0400
-@@ -381,24 +381,6 @@ if [ "${ZERO_BUILD}" = true ] ; then
- fi
- fi
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav
++++ openjdk/jdk/make/jdk_generic_profile.sh
+@@ -399,23 +399,6 @@
+ export ZLIB_CFLAGS
+ export ZLIB_LIBS
-# Export variables for system LCMS
-# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
@@ -22,15 +21,14 @@ diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generi
-fi
-export LCMS_CFLAGS
-export LCMS_LIBS
--
- # Export variables for system zlib
- # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
- # link against zlib
-@@ -452,7 +434,6 @@ fi
- export GIF_LIBS
+
+ # Export variables for system jpeg
+ # JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
+@@ -463,7 +446,6 @@
+ fi
# IcedTea defaults; use system libraries
-export USE_SYSTEM_LCMS=true
- export USE_SYSTEM_ZLIB=true
+ export SYSTEM_ZLIB=true
export USE_SYSTEM_JPEG=true
export USE_SYSTEM_PNG=true
diff --git a/java-1.7.0-openjdk-doNotUseDisabledEcc.patch b/java-1.7.0-openjdk-doNotUseDisabledEcc.patch
new file mode 100644
index 0000000..54d374d
--- /dev/null
+++ b/java-1.7.0-openjdk-doNotUseDisabledEcc.patch
@@ -0,0 +1,26 @@
+diff -up openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java.sav openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
+--- openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java.sav 2013-01-14 12:04:57.096097896 -0500
++++ openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java 2013-01-14 12:05:14.956835554 -0500
+@@ -120,20 +120,8 @@ public class AlgorithmId implements Seri
+ try {
+ algParams = AlgorithmParameters.getInstance(algidString);
+ } catch (NoSuchAlgorithmException e) {
+- try {
+- // Try the internal EC code so that we can fully parse EC
+- // keys even if the provider is not registered.
+- // This code can go away once we have EC in the SUN provider.
+- algParams = AlgorithmParameters.getInstance(algidString,
+- sun.security.ec.ECKeyFactory.ecInternalProvider);
+- } catch (NoSuchAlgorithmException ee) {
+- /*
+- * This algorithm parameter type is not supported, so we cannot
+- * parse the parameters.
+- */
+- algParams = null;
+- return;
+- }
++ algParams = null;
++ return;
+ }
+ // Decode (parse) the parameters
+ algParams.init(params.toByteArray());
diff --git a/java-1.7.0-openjdk-java-access-bridge-security-2.3.patch b/java-1.7.0-openjdk-java-access-bridge-security-2.3.patch
new file mode 100644
index 0000000..22deefc
--- /dev/null
+++ b/java-1.7.0-openjdk-java-access-bridge-security-2.3.patch
@@ -0,0 +1,25 @@
+diff -up openjdk/jdk/src/share/lib/security/java.security.sav openjdk/jdk/src/share/lib/security/java.security
+--- openjdk/jdk/src/share/lib/security/java.security.sav 2013-02-01 17:34:10.750939826 -0500
++++ openjdk/jdk/src/share/lib/security/java.security 2013-02-01 17:36:09.283198885 -0500
+@@ -148,7 +148,9 @@
+ com.sun.org.apache.xml.internal.utils.,\
+ com.sun.org.apache.xml.internal.security.,\
+ com.sun.org.glassfish.,\
+- org.jcp.xml.dsig.internal.
++ org.jcp.xml.dsig.internal.,\
++ org.GNOME.Accessibility.,\
++ org.GNOME.Bonobo.
+
+ #
+ # List of comma-separated packages that start with or equal this string
+@@ -185,7 +187,9 @@
+ com.sun.org.apache.xml.internal.utils.,\
+ com.sun.org.apache.xml.internal.security.,\
+ com.sun.org.glassfish.,\
+- org.jcp.xml.dsig.internal.
++ org.jcp.xml.dsig.internal.,\
++ org.GNOME.Accessibility.,\
++ org.GNOME.Bonobo.
+
+ #
+ # Determines whether this properties file can be appended to
diff --git a/java-1.7.0-openjdk-java-access-bridge-security.patch b/java-1.7.0-openjdk-java-access-bridge-security.patch
index 22deefc..6b4224b 100644
--- a/java-1.7.0-openjdk-java-access-bridge-security.patch
+++ b/java-1.7.0-openjdk-java-access-bridge-security.patch
@@ -1,25 +1,24 @@
-diff -up openjdk/jdk/src/share/lib/security/java.security.sav openjdk/jdk/src/share/lib/security/java.security
---- openjdk/jdk/src/share/lib/security/java.security.sav 2013-02-01 17:34:10.750939826 -0500
-+++ openjdk/jdk/src/share/lib/security/java.security 2013-02-01 17:36:09.283198885 -0500
-@@ -148,7 +148,9 @@
- com.sun.org.apache.xml.internal.utils.,\
+--- openjdk/jdk/src/share/lib/security/java.security-linux.orig
++++ openjdk/jdk/src/share/lib/security/java.security-linux
+@@ -154,7 +154,9 @@
com.sun.org.apache.xml.internal.security.,\
com.sun.org.glassfish.,\
-- org.jcp.xml.dsig.internal.
-+ org.jcp.xml.dsig.internal.,\
+ org.jcp.xml.dsig.internal.,\
+- oracle.jrockit.jfr.
++ oracle.jrockit.jfr.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
-
#
# List of comma-separated packages that start with or equal this string
-@@ -185,7 +187,9 @@
- com.sun.org.apache.xml.internal.utils.,\
+ # will cause a security exception to be thrown when
+@@ -192,7 +194,9 @@
com.sun.org.apache.xml.internal.security.,\
com.sun.org.glassfish.,\
-- org.jcp.xml.dsig.internal.
-+ org.jcp.xml.dsig.internal.,\
+ org.jcp.xml.dsig.internal.,\
+- oracle.jrockit.jfr.
++ oracle.jrockit.jfr.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
-
#
# Determines whether this properties file can be appended to
+ # or overridden on the command line via -Djava.security.properties
diff --git a/java-1.7.0-openjdk-ppc-zero-hotspot.patch b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
index 80c9b94..134dd26 100644
--- a/java-1.7.0-openjdk-ppc-zero-hotspot.patch
+++ b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
@@ -15,4 +15,3 @@
#endif // _LP64
define_pd_global(intx, CompilerThreadStackSize, 0);
define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
-
diff --git a/java-1.7.0-openjdk-size_t.patch b/java-1.7.0-openjdk-size_t.patch
index 554ec92..f9bfc20 100644
--- a/java-1.7.0-openjdk-size_t.patch
+++ b/java-1.7.0-openjdk-size_t.patch
@@ -46,34 +46,34 @@ diff -up openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/comp
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-03-09 16:30:30.426921691 -0500
-@@ -543,7 +543,7 @@
- #endif // _MSC_VER
-
- uint ConcurrentMark::scale_parallel_threads(uint n_par_threads) {
-- return MAX2((n_par_threads + 2) / 4, 1U);
-+ return MAX2((size_t)((n_par_threads + 2) / 4), (size_t)1);
- }
-
- ConcurrentMark::ConcurrentMark(ReservedSpace rs,
-@@ -571,7 +571,7 @@
+@@ -481,7 +481,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
_regionStack(),
// _finger set in set_non_marking_state
-- _max_task_num(MAX2((uint)ParallelGCThreads, 1U)),
+- _max_task_num(MAX2(ParallelGCThreads, (size_t)1)),
+ _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
// _active_tasks set in set_non_marking_state
// _tasks set inside the constructor
_task_queues(new CMTaskQueueSet((int) _max_task_num)),
-@@ -1318,7 +1318,7 @@
- assert(parallel_marking_threads() <= max_parallel_marking_threads(),
- "Maximum number of marking threads exceeded");
+@@ -586,7 +586,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
+ _sleep_factor = sleep_factor;
+ _marking_task_overhead = marking_task_overhead;
+ } else {
+- _parallel_marking_threads = MAX2((ParallelGCThreads + 2) / 4, (size_t)1);
++ _parallel_marking_threads = MAX2((size_t)((ParallelGCThreads + 2) / 4), (size_t)1);
+ _sleep_factor = 0.0;
+ _marking_task_overhead = 1.0;
+ }
+@@ -1116,7 +1116,7 @@ void ConcurrentMark::markFromRoots() {
-- uint active_workers = MAX2(1U, parallel_marking_threads());
-+ size_t active_workers = MAX2((size_t) 1, (size_t)parallel_marking_threads());
+ _restart_for_overflow = false;
- // Parallel task terminator is set in "set_phase()"
+- size_t active_workers = MAX2((size_t) 1, parallel_marking_threads());
++ size_t active_workers = MAX2((size_t) 1, (size_t)parallel_marking_threads());
+ force_overflow_conc()->init();
set_phase(active_workers, true /* concurrent */);
-@@ -4515,7 +4515,7 @@
+
+@@ -3689,7 +3689,7 @@ void CMTask::drain_local_queue(bool part
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -82,11 +82,11 @@ diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sa
} else {
target_size = 0;
}
-@@ -5438,7 +5438,7 @@
+@@ -4604,7 +4604,7 @@ size_t G1PrintRegionLivenessInfoClosure:
// The > 0 check is to deal with the prev and next live bytes which
// could be 0.
if (*hum_bytes > 0) {
-- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
+- bytes = MIN2((size_t) HeapRegion::GrainBytes, *hum_bytes);
+ bytes = MIN2((size_t) HeapRegion::GrainBytes, (size_t)*hum_bytes);
*hum_bytes -= bytes;
}
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 9891219..d03d94d 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,7 +1,8 @@
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-%global icedtea_version 2.3.12
+%global icedtea_version 2.4.1
+%global icedtea_version_arm32 2.3.12
%global hg_tag icedtea-{icedtea_version}
%global aarch64 aarch64 arm64 armv8
@@ -141,7 +142,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.4%{?dist}
+Release: %{icedtea_version}.1%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -161,7 +162,7 @@ URL: http://openjdk.java.net/
#head
#REPO=http://icedtea.classpath.org/hg/icedtea7-forest
#current release
-#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
+#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4
# hg clone $REPO/ openjdk -r %{hg_tag}
# hg clone $REPO/corba/ openjdk/corba -r %{hg_tag}
# hg clone $REPO/hotspot/ openjdk/hotspot -r %{hg_tag}
@@ -170,8 +171,11 @@ URL: http://openjdk.java.net/
# hg clone $REPO/jdk/ openjdk/jdk -r %{hg_tag}
# hg clone $REPO/langtools/ openjdk/langtools -r %{hg_tag}
# find openjdk -name ".hg" -exec rm -rf '{}' \;
+# sh /git/java-1.7.0-openjdk/fX/fsg.sh
# tar cJf openjdk-icedtea-%{icedtea_version}.tar.xz openjdk
Source0: openjdk-icedtea-%{icedtea_version}.tar.xz
+#for arm is used icedtea7-forest-2.3 and fsg.sh is not run
+Source100: openjdk-icedtea-%{icedtea_version_arm32}.tar.xz
# README file
# This source is under maintainer's/java-team's control
@@ -206,6 +210,7 @@ Patch1: java-1.7.0-openjdk-java-access-bridge-tck.patch
# Disable access to access-bridge packages by untrusted apps
Patch3: java-1.7.0-openjdk-java-access-bridge-security.patch
+Patch30: java-1.7.0-openjdk-java-access-bridge-security-2.3.patch
# Ignore AWTError when assistive technologies are loaded
Patch4: java-1.7.0-openjdk-accessible-toolkit.patch
@@ -222,6 +227,7 @@ Patch6: %{name}-debuginfo.patch
# Add rhino support
Patch100: rhino.patch
+Patch1000: rhino-2.3.patch
# Type fixing for s390
Patch101: %{name}-bitmap.patch
@@ -229,6 +235,7 @@ Patch102: %{name}-size_t.patch
# Disable system LCMS as 2.3.10 security release have fixes for it
Patch500: %{name}-disable-system-lcms.patch
+Patch5000: %{name}-disable-system-lcms-2.3.patch
# Patch for PPC/PPC64
Patch104: %{name}-ppc-zero-jdk.patch
@@ -236,6 +243,9 @@ Patch105: %{name}-ppc-zero-hotspot.patch
Patch106: %{name}-freetype-check-fix.patch
+#do not used disbaled ecc
+Patch112: %{name}-doNotUseDisabledEcc.patch
+
# allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable
Patch200: abrt_friendly_hs_log_jdk7.patch
@@ -255,6 +265,7 @@ Patch302: systemtap.patch
Patch401: 657854-openjdk7.patch
#Workaround RH902004
Patch402: gstackbounds.patch
+Patch4020: gstackbounds-2.3.patch
Patch403: PStack-808293.patch
Patch404: aarch64.patch
@@ -437,12 +448,19 @@ Please note, the java-atk-wrapper is still in beta, and also OpenJDK itself is s
Although working pretty fine, there are known issues with accessibility on, so do not rather install this package unless you really need.
%prep
+%ifarch %{arm}
+%setup -q -c -n %{uniquesuffix} -T -a 100
+%else
%setup -q -c -n %{uniquesuffix} -T -a 0
+%endif
cp %{SOURCE2} .
# OpenJDK patches
-
+%ifarch %{arm}
+%patch1000
+%else
%patch100
+%endif
# pulseaudio support
%if %{with_pulseaudio}
@@ -451,8 +469,10 @@ cp %{SOURCE2} .
# Add systemtap patches if enabled
%if %{with_systemtap}
+%ifarch %{arm}
%patch302
%endif
+%endif
# Remove libraries that are linked
sh %{SOURCE10}
@@ -488,7 +508,11 @@ tar xzf %{SOURCE9}
# Extract desktop files
tar xzf %{SOURCE7}
+%ifarch %{arm}
+%patch30
+%else
%patch3
+%endif
%patch4
%if %{debug}
@@ -503,7 +527,11 @@ tar xzf %{SOURCE7}
%endif
# Disable system LCMS2
+%ifarch %{arm}
+%patch5000
+%else
%patch500
+%endif
%patch106
%patch200
@@ -514,9 +542,16 @@ tar xzf %{SOURCE7}
%patch105
%endif
+%ifarch %{arm}
%patch401
+%endif
+
%ifarch %{jit_arches}
+%ifarch %{arm}
+%patch4020
+%else
%patch402
+%endif
%patch403
%endif
@@ -524,10 +559,14 @@ tar xzf %{SOURCE7}
%patch404 -p1
%endif
+%ifarch %{arm}
%patch501
%patch502
%patch503
%patch504
+%else
+%patch112
+%endif
%build
# How many cpu's do we have?
@@ -598,6 +637,10 @@ source jdk/make/jdk_generic_profile.sh
umask $oldumask
make \
+%ifnarch %{arm}
+ DISABLE_INTREE_EC=true \
+ UNLIMITED_CRYPTO=true \
+%endif
ANT="/usr/bin/ant" \
DISTRO_NAME="Fedora" \
DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
@@ -1198,6 +1241,10 @@ exit 0
%{jvmjardir}
%dir %{_jvmdir}/%{jredir}/lib/security
%{_jvmdir}/%{jredir}/lib/security/cacerts
+%ifnarch %{arm}
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
+%endif
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%config(noreplace) %{_jvmdir}/%{jredir}/lib/logging.properties
@@ -1297,6 +1344,30 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Mon Sep 02 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.4.1.1.f20
+- updated to icedtea 2.4
+ - added java-1.7.0-openjdk-doNotUseDisabledEcc.patch (2.4 only)
+ - added new file fsg.sh - to celan up sources
+ - adapted aarch64.patch
+ - adapted gstackbounds.patch
+ - adapted java-1.7.0-openjdk-disable-system-lcms.patch
+ - adapted java-1.7.0-openjdk-java-access-bridge-security.patch
+ - adapted java-1.7.0-openjdk-ppc-zero-hotspot.patch
+ - adapted java-1.7.0-openjdk-size_t.patch
+ - adapted java-1.7.0-openjdk.spec
+ - adapted rhino.patch
+- arm32 is still using icedtea 2.3. Duplicated patches are:
+ - Patch30: java-1.7.0-openjdk-java-access-bridge-security-2.3.patch
+ - Patch1000: rhino-2.3.patch
+ - Patch4020: gstackbounds-2.3.patch
+ - Patch5000: java-1.7.0-openjdk-disable-system-lcms-2.3.patch
+ - kept for 2.3 657854-openjdk7.patch
+ - kept for 2.3 callerclass-01.patch
+ - kept for 2.3 callerclass-02.patch
+ - kept for 2.3 callerclass-03.patch
+ - kept for 2.3 callerclass-04.patch
+ - kept for 2.3 systemtap.patch
+
* Tue Aug 20 2013 Omair Majid <omajid at redhat.com> -1.7.0.25-2.3.12.4c20
- Backport getCallerClass-related patches from upstream that are not in a release yet
diff --git a/rhino-2.3.patch b/rhino-2.3.patch
new file mode 100644
index 0000000..0af9a3c
--- /dev/null
+++ b/rhino-2.3.patch
@@ -0,0 +1,157 @@
+diff -ur openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
+--- openjdk.orig/jdk/make/com/sun/Makefile 2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/com/sun/Makefile 2012-02-22 14:25:10.327518016 -0500
+@@ -31,13 +31,6 @@
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+
+-ifndef OPENJDK
+- ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
+- ifneq ("$(ORG_EXISTS)", "")
+- SCRIPT_SUBDIR = script
+- endif
+-endif
+-
+ # jarsigner is part of JRE
+ SUBDIRS = java security net/ssl jarsigner
+
+@@ -45,7 +38,7 @@
+ SUBDIRS_desktop = image
+ SUBDIRS_enterprise = crypto/provider jndi \
+ org rowset net/httpserver
+-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
++SUBDIRS_misc = script tracing servicetag nio demo
+
+ # Omit mirror since it's built with the apt tool.
+ SUBDIRS_tools = tools
+diff -ur openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile
+--- openjdk.orig/jdk/make/com/sun/script/Makefile 2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/com/sun/script/Makefile 2012-02-22 14:10:53.325225237 -0500
+@@ -31,6 +31,8 @@
+
+ AUTO_FILES_JAVA_DIRS = com/sun/script
+
++OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
++
+ #
+ # Files that need to be copied
+ #
+diff -ur openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
+--- openjdk.orig/jdk/make/common/Release.gmk 2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/common/Release.gmk 2012-02-22 14:10:53.325225237 -0500
+@@ -766,6 +766,7 @@
+ $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
+ $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
+ $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
++ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
+ ifneq ($(JFR_JAR),)
+ $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
+ endif
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2012-02-22 14:10:53.325225237 -0500
+@@ -24,7 +24,7 @@
+ */
+
+ package com.sun.script.javascript;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+ import javax.script.*;
+ import java.util.*;
+
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2012-02-22 14:10:53.325225237 -0500
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+
+ import javax.script.Invocable;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+
+ /**
+ * This class implements Rhino-like JavaAdapter to help implement a Java
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2012-02-22 14:10:53.326225216 -0500
+@@ -25,7 +25,7 @@
+
+ package com.sun.script.javascript;
+
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+ import java.util.*;
+
+ /**
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2012-02-22 14:10:53.326225216 -0500
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+
+ import java.util.*;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+
+ /**
+ * This class prevents script access to certain sensitive classes.
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2012-02-22 14:10:53.326225216 -0500
+@@ -25,7 +25,7 @@
+
+ package com.sun.script.javascript;
+ import javax.script.*;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+
+ /**
+ * Represents compiled JavaScript code.
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2012-02-22 14:10:53.326225216 -0500
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ import javax.script.*;
+ import java.util.*;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+ import com.sun.script.util.*;
+
+ /**
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2012-02-22 14:10:53.327225198 -0500
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ import com.sun.script.util.*;
+ import javax.script.*;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+ import java.lang.reflect.Method;
+ import java.io.*;
+ import java.security.*;
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2012-02-22 14:10:53.327225198 -0500
+@@ -25,7 +25,7 @@
+
+ package com.sun.script.javascript;
+
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+ import java.security.AccessControlContext;
+ import javax.script.*;
+ import java.security.AccessControlContext;
+diff -ur openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-14 16:12:49.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2012-02-22 14:10:53.327225198 -0500
+@@ -27,7 +27,7 @@
+
+ import java.lang.reflect.*;
+ import static sun.security.util.SecurityConstants.*;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+
+ /**
+ * This wrap factory is used for security reasons. JSR 223 script
diff --git a/rhino.patch b/rhino.patch
index 0af9a3c..3c11620 100644
--- a/rhino.patch
+++ b/rhino.patch
@@ -19,8 +19,8 @@ diff -ur openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefil
SUBDIRS_desktop = image
SUBDIRS_enterprise = crypto/provider jndi \
org rowset net/httpserver
--SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
-+SUBDIRS_misc = script tracing servicetag nio demo
+-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo
++SUBDIRS_misc = script tracing nio demo
# Omit mirror since it's built with the apt tool.
SUBDIRS_tools = tools
diff --git a/sources b/sources
index a7979fa..1243e50 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,4 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
8eb5ad93dbf2f4fe86e52631969cfb09 systemtap-tapset.tar.gz
8d4f3df0b264c331187696bb49306634 openjdk-icedtea-2.3.12.tar.xz
+65c2017ae277f6c29664bf91dfa99c42 openjdk-icedtea-2.4.1.tar.xz
More information about the scm-commits
mailing list