/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 4 00:46:19 PDT 2011
changeset 1d110524d034 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1d110524d034
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue May 03 22:38:46 2011 +0100
Remove 'icedtea-' prefix from patches.
2011-05-03 Andrew John Hughes <ahughes at redhat.com>
* patches/boot/icedtea-jaxp-dependency.patch,
* patches/boot/icedtea-jopt.patch,
* patches/boot/icedtea-pr39408.patch,
* patches/boot/icedtea-pr40188.patch,
* patches/boot/icedtea-pr40616.patch,
* patches/debian/icedtea-uname.patch,
* patches/hotspot/default/icedtea-gcc-suffix.patch,
* patches/hotspot/default/icedtea-headers.patch,
* patches/hotspot/default/icedtea-memory-limits.patch,
* patches/hotspot/default/icedtea-params-cast-size_t.patch,
* patches/hotspot/default/icedtea-parisc-opt.patch,
* patches/hotspot/default/icedtea-sparc-ptracefix.patch,
* patches/hotspot/default/icedtea-sparc-trapsfix.patch,
* patches/hotspot/default/icedtea-text-relocations.patch,
* patches/hotspot/default/icedtea-use-idx_t.patch,
* patches/icedtea-6592792.patch,
* patches/icedtea-6733959.patch,
* patches/icedtea-6755943.patch,
* patches/icedtea-alpha-fixes.patch,
* patches/icedtea-alt-jar.patch,
* patches/icedtea-clean-crypto.patch,
* patches/icedtea-demos.patch,
* patches/icedtea-disable-intree-ec.patch,
* patches/icedtea-gcc-suffix.patch,
* patches/icedtea-headers.patch,
* patches/icedtea-hotspot-gcc-pr36917.patch,
* patches/icedtea-javafiles.patch,
* patches/icedtea-jpegclasses.patch,
* patches/icedtea-jvmtiEnv.patch,
* patches/icedtea-lc_ctype.patch,
* patches/icedtea-libraries.patch,
* patches/icedtea-linker-libs-order.patch,
* patches/icedtea-nss-config.patch,
* patches/icedtea-nss-not-enabled-config.patch,
* patches/icedtea-override-redirect-metacity.patch,
* patches/icedtea-pr261.patch,
* patches/icedtea-print-lsb-release.patch,
* patches/icedtea-pulse-soundproperties.patch,
* patches/icedtea-rhino.patch,
* patches/icedtea-rmi_amd64.patch,
* patches/icedtea-samejvm-safe.patch,
* patches/icedtea-security-updates.patch,
* patches/icedtea-signed-types.patch,
* patches/icedtea-sources.patch,
* patches/icedtea-sparc-trapsfix.patch,
* patches/icedtea-sunsrc.patch,
* patches/icedtea-systemtap.patch,
* patches/icedtea-testenv.patch,
* patches/icedtea-tests-jdk.patch,
* patches/icedtea-text-relocations.patch,
* patches/icedtea-update-bootclasspath.patch,
* patches/security/icedtea-6592792.patch,
* patches/security/icedtea-6733959.patch,
* patches/security/icedtea-6755943.patch: Remove 'icedtea-'
prefix.
* Makefile.am: (ICEDTEA_PATCHES): Remove 'icedtea-' prefix.
* patches/6592792.patch,
* patches/6733959.patch,
* patches/6755943.patch,
* patches/alpha-fixes.patch,
* patches/alt-jar.patch,
* patches/boot/jaxp-dependency.patch,
* patches/boot/jopt.patch,
* patches/boot/pr39408.patch,
* patches/boot/pr40188.patch,
* patches/boot/pr40616.patch,
* patches/clean-crypto.patch,
* patches/debian/uname.patch,
* patches/demos.patch,
* patches/disable-intree-ec.patch,
* patches/gcc-suffix.patch,
* patches/headers.patch,
* patches/hotspot-gcc-pr36917.patch,
* patches/hotspot/default/gcc-suffix.patch,
* patches/hotspot/default/headers.patch,
* patches/hotspot/default/memory-limits.patch,
* patches/hotspot/default/params-cast-size_t.patch,
* patches/hotspot/default/parisc-opt.patch,
* patches/hotspot/default/sparc-ptracefix.patch,
* patches/hotspot/default/sparc-trapsfix.patch,
* patches/hotspot/default/text-relocations.patch,
* patches/hotspot/default/use-idx_t.patch,
* patches/javafiles.patch,
* patches/jpegclasses.patch,
* patches/jvmtiEnv.patch,
* patches/lc_ctype.patch,
* patches/libraries.patch,
* patches/linker-libs-order.patch,
* patches/nss-config.patch,
* patches/nss-not-enabled-config.patch,
* patches/override-redirect-metacity.patch,
* patches/pr261.patch,
* patches/print-lsb-release.patch,
* patches/pulse-soundproperties.patch,
* patches/rhino.patch,
* patches/rmi_amd64.patch,
* patches/samejvm-safe.patch,
* patches/security-updates.patch,
* patches/security/6592792.patch,
* patches/security/6733959.patch,
* patches/security/6755943.patch,
* patches/signed-types.patch,
* patches/sources.patch,
* patches/sparc-trapsfix.patch,
* patches/sunsrc.patch,
* patches/systemtap.patch,
* patches/testenv.patch,
* patches/tests-jdk.patch,
* patches/text-relocations.patch,
* patches/update-bootclasspath.patch: Relocated versions of
above.
changeset 8fa7f2649c4c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8fa7f2649c4c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 04 08:46:05 2011 +0100
Remove unneeded hotspot/default placement of some patches.
2011-05-03 Andrew John Hughes <ahughes at redhat.com>
* patches/hotspot/default/gcc-suffix.patch,
* patches/hotspot/default/headers.patch,
* patches/hotspot/default/memory-limits.patch,
* patches/hotspot/default/params-cast-size_t.patch,
* patches/hotspot/default/parisc-opt.patch,
* patches/hotspot/default/sparc-ptracefix.patch,
* patches/hotspot/default/sparc-trapsfix.patch,
* patches/hotspot/default/text-relocations.patch,
* patches/hotspot/default/use-idx_t.patch: Remove unneeded
hotspot/default positioning.
* Makefile.am: Remove $(HSBUILD) prefixing on patches.
* patches/gcc-suffix.patch,
* patches/headers.patch,
* patches/memory-limits.patch,
* patches/params-cast-size_t.patch,
* patches/parisc-opt.patch,
* patches/sparc-ptracefix.patch,
* patches/sparc-trapsfix.patch,
* patches/text-relocations.patch,
* patches/use-idx_t.patch: Moved from hotspot/default or
merged with existing patches.
diffstat:
ChangeLog | 141 +
Makefile.am | 97 +-
patches/6592792.patch | 290 +++
patches/6733959.patch | 222 ++
patches/6755943.patch | 372 ++++
patches/alpha-fixes.patch | 31 +
patches/alt-jar.patch | 14 +
patches/boot/icedtea-jaxp-dependency.patch | 23 -
patches/boot/icedtea-jopt.patch | 24 -
patches/boot/icedtea-pr39408.patch | 17 -
patches/boot/icedtea-pr40188.patch | 14 -
patches/boot/icedtea-pr40616.patch | 50 -
patches/boot/jaxp-dependency.patch | 23 +
patches/boot/jopt.patch | 24 +
patches/boot/pr39408.patch | 17 +
patches/boot/pr40188.patch | 14 +
patches/boot/pr40616.patch | 50 +
patches/clean-crypto.patch | 1072 +++++++++++
patches/debian/icedtea-uname.patch | 24 -
patches/debian/uname.patch | 24 +
patches/demos.patch | 309 +++
patches/disable-intree-ec.patch | 22 +
patches/gcc-suffix.patch | 58 +
patches/headers.patch | 49 +
patches/hotspot-gcc-pr36917.patch | 8 +
patches/hotspot/default/icedtea-gcc-suffix.patch | 33 -
patches/hotspot/default/icedtea-headers.patch | 12 -
patches/hotspot/default/icedtea-memory-limits.patch | 22 -
patches/hotspot/default/icedtea-params-cast-size_t.patch | 97 -
patches/hotspot/default/icedtea-parisc-opt.patch | 26 -
patches/hotspot/default/icedtea-sparc-ptracefix.patch | 33 -
patches/hotspot/default/icedtea-sparc-trapsfix.patch | 20 -
patches/hotspot/default/icedtea-text-relocations.patch | 60 -
patches/hotspot/default/icedtea-use-idx_t.patch | 43 -
patches/icedtea-6592792.patch | 290 ---
patches/icedtea-6733959.patch | 222 --
patches/icedtea-6755943.patch | 372 ----
patches/icedtea-alpha-fixes.patch | 31 -
patches/icedtea-alt-jar.patch | 14 -
patches/icedtea-clean-crypto.patch | 1072 -----------
patches/icedtea-demos.patch | 309 ---
patches/icedtea-disable-intree-ec.patch | 22 -
patches/icedtea-gcc-suffix.patch | 25 -
patches/icedtea-headers.patch | 37 -
patches/icedtea-hotspot-gcc-pr36917.patch | 8 -
patches/icedtea-javafiles.patch | 157 -
patches/icedtea-jpegclasses.patch | 639 -------
patches/icedtea-jvmtiEnv.patch | 11 -
patches/icedtea-lc_ctype.patch | 30 -
patches/icedtea-libraries.patch | 1257 --------------
patches/icedtea-linker-libs-order.patch | 52 -
patches/icedtea-nss-config.patch | 9 -
patches/icedtea-nss-not-enabled-config.patch | 12 -
patches/icedtea-override-redirect-metacity.patch | 10 -
patches/icedtea-pr261.patch | 38 -
patches/icedtea-print-lsb-release.patch | 48 -
patches/icedtea-pulse-soundproperties.patch | 15 -
patches/icedtea-rhino.patch | 136 -
patches/icedtea-rmi_amd64.patch | 14 -
patches/icedtea-samejvm-safe.patch | 11 -
patches/icedtea-security-updates.patch | 100 -
patches/icedtea-signed-types.patch | 33 -
patches/icedtea-sources.patch | 16 -
patches/icedtea-sparc-trapsfix.patch | 11 -
patches/icedtea-sunsrc.patch | 58 -
patches/icedtea-systemtap.patch | 158 -
patches/icedtea-testenv.patch | 45 -
patches/icedtea-tests-jdk.patch | 13 -
patches/icedtea-text-relocations.patch | 14 -
patches/icedtea-update-bootclasspath.patch | 12 -
patches/javafiles.patch | 157 +
patches/jpegclasses.patch | 639 +++++++
patches/jvmtiEnv.patch | 11 +
patches/lc_ctype.patch | 30 +
patches/libraries.patch | 1257 ++++++++++++++
patches/linker-libs-order.patch | 52 +
patches/memory-limits.patch | 22 +
patches/nss-config.patch | 9 +
patches/nss-not-enabled-config.patch | 12 +
patches/override-redirect-metacity.patch | 10 +
patches/params-cast-size_t.patch | 97 +
patches/parisc-opt.patch | 26 +
patches/pr261.patch | 38 +
patches/print-lsb-release.patch | 48 +
patches/pulse-soundproperties.patch | 15 +
patches/rhino.patch | 136 +
patches/rmi_amd64.patch | 14 +
patches/samejvm-safe.patch | 11 +
patches/security-updates.patch | 100 +
patches/security/6592792.patch | 68 +
patches/security/6733959.patch | 18 +
patches/security/6755943.patch | 372 ++++
patches/security/icedtea-6592792.patch | 68 -
patches/security/icedtea-6733959.patch | 18 -
patches/security/icedtea-6755943.patch | 372 ----
patches/signed-types.patch | 33 +
patches/sources.patch | 16 +
patches/sparc-ptracefix.patch | 33 +
patches/sparc-trapsfix.patch | 19 +
patches/sunsrc.patch | 58 +
patches/systemtap.patch | 158 +
patches/testenv.patch | 45 +
patches/tests-jdk.patch | 13 +
patches/text-relocations.patch | 60 +
patches/update-bootclasspath.patch | 12 +
patches/use-idx_t.patch | 43 +
106 files changed, 6419 insertions(+), 6307 deletions(-)
diffs (truncated from 13492 to 500 lines):
diff -r 0bf704349e89 -r 8fa7f2649c4c ChangeLog
--- a/ChangeLog Tue May 03 14:44:49 2011 +0100
+++ b/ChangeLog Wed May 04 08:46:05 2011 +0100
@@ -1,3 +1,144 @@
+2011-05-03 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/default/gcc-suffix.patch,
+ * patches/hotspot/default/headers.patch,
+ * patches/hotspot/default/memory-limits.patch,
+ * patches/hotspot/default/params-cast-size_t.patch,
+ * patches/hotspot/default/parisc-opt.patch,
+ * patches/hotspot/default/sparc-ptracefix.patch,
+ * patches/hotspot/default/sparc-trapsfix.patch,
+ * patches/hotspot/default/text-relocations.patch,
+ * patches/hotspot/default/use-idx_t.patch:
+ Remove unneeded hotspot/default positioning.
+ * Makefile.am: Remove $(HSBUILD) prefixing on
+ patches.
+ * patches/gcc-suffix.patch,
+ * patches/headers.patch,
+ * patches/memory-limits.patch,
+ * patches/params-cast-size_t.patch,
+ * patches/parisc-opt.patch,
+ * patches/sparc-ptracefix.patch,
+ * patches/sparc-trapsfix.patch,
+ * patches/text-relocations.patch,
+ * patches/use-idx_t.patch:
+ Moved from hotspot/default or merged with existing
+ patches.
+
+2011-05-03 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/boot/icedtea-jaxp-dependency.patch,
+ * patches/boot/icedtea-jopt.patch,
+ * patches/boot/icedtea-pr39408.patch,
+ * patches/boot/icedtea-pr40188.patch,
+ * patches/boot/icedtea-pr40616.patch,
+ * patches/debian/icedtea-uname.patch,
+ * patches/hotspot/default/icedtea-gcc-suffix.patch,
+ * patches/hotspot/default/icedtea-headers.patch,
+ * patches/hotspot/default/icedtea-memory-limits.patch,
+ * patches/hotspot/default/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/default/icedtea-parisc-opt.patch,
+ * patches/hotspot/default/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/default/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/default/icedtea-text-relocations.patch,
+ * patches/hotspot/default/icedtea-use-idx_t.patch,
+ * patches/icedtea-6592792.patch,
+ * patches/icedtea-6733959.patch,
+ * patches/icedtea-6755943.patch,
+ * patches/icedtea-alpha-fixes.patch,
+ * patches/icedtea-alt-jar.patch,
+ * patches/icedtea-clean-crypto.patch,
+ * patches/icedtea-demos.patch,
+ * patches/icedtea-disable-intree-ec.patch,
+ * patches/icedtea-gcc-suffix.patch,
+ * patches/icedtea-headers.patch,
+ * patches/icedtea-hotspot-gcc-pr36917.patch,
+ * patches/icedtea-javafiles.patch,
+ * patches/icedtea-jpegclasses.patch,
+ * patches/icedtea-jvmtiEnv.patch,
+ * patches/icedtea-lc_ctype.patch,
+ * patches/icedtea-libraries.patch,
+ * patches/icedtea-linker-libs-order.patch,
+ * patches/icedtea-nss-config.patch,
+ * patches/icedtea-nss-not-enabled-config.patch,
+ * patches/icedtea-override-redirect-metacity.patch,
+ * patches/icedtea-pr261.patch,
+ * patches/icedtea-print-lsb-release.patch,
+ * patches/icedtea-pulse-soundproperties.patch,
+ * patches/icedtea-rhino.patch,
+ * patches/icedtea-rmi_amd64.patch,
+ * patches/icedtea-samejvm-safe.patch,
+ * patches/icedtea-security-updates.patch,
+ * patches/icedtea-signed-types.patch,
+ * patches/icedtea-sources.patch,
+ * patches/icedtea-sparc-trapsfix.patch,
+ * patches/icedtea-sunsrc.patch,
+ * patches/icedtea-systemtap.patch,
+ * patches/icedtea-testenv.patch,
+ * patches/icedtea-tests-jdk.patch,
+ * patches/icedtea-text-relocations.patch,
+ * patches/icedtea-update-bootclasspath.patch,
+ * patches/security/icedtea-6592792.patch,
+ * patches/security/icedtea-6733959.patch,
+ * patches/security/icedtea-6755943.patch:
+ Remove 'icedtea-' prefix.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove 'icedtea-' prefix.
+ * patches/6592792.patch,
+ * patches/6733959.patch,
+ * patches/6755943.patch,
+ * patches/alpha-fixes.patch,
+ * patches/alt-jar.patch,
+ * patches/boot/jaxp-dependency.patch,
+ * patches/boot/jopt.patch,
+ * patches/boot/pr39408.patch,
+ * patches/boot/pr40188.patch,
+ * patches/boot/pr40616.patch,
+ * patches/clean-crypto.patch,
+ * patches/debian/uname.patch,
+ * patches/demos.patch,
+ * patches/disable-intree-ec.patch,
+ * patches/gcc-suffix.patch,
+ * patches/headers.patch,
+ * patches/hotspot-gcc-pr36917.patch,
+ * patches/hotspot/default/gcc-suffix.patch,
+ * patches/hotspot/default/headers.patch,
+ * patches/hotspot/default/memory-limits.patch,
+ * patches/hotspot/default/params-cast-size_t.patch,
+ * patches/hotspot/default/parisc-opt.patch,
+ * patches/hotspot/default/sparc-ptracefix.patch,
+ * patches/hotspot/default/sparc-trapsfix.patch,
+ * patches/hotspot/default/text-relocations.patch,
+ * patches/hotspot/default/use-idx_t.patch,
+ * patches/javafiles.patch,
+ * patches/jpegclasses.patch,
+ * patches/jvmtiEnv.patch,
+ * patches/lc_ctype.patch,
+ * patches/libraries.patch,
+ * patches/linker-libs-order.patch,
+ * patches/nss-config.patch,
+ * patches/nss-not-enabled-config.patch,
+ * patches/override-redirect-metacity.patch,
+ * patches/pr261.patch,
+ * patches/print-lsb-release.patch,
+ * patches/pulse-soundproperties.patch,
+ * patches/rhino.patch,
+ * patches/rmi_amd64.patch,
+ * patches/samejvm-safe.patch,
+ * patches/security-updates.patch,
+ * patches/security/6592792.patch,
+ * patches/security/6733959.patch,
+ * patches/security/6755943.patch,
+ * patches/signed-types.patch,
+ * patches/sources.patch,
+ * patches/sparc-trapsfix.patch,
+ * patches/sunsrc.patch,
+ * patches/systemtap.patch,
+ * patches/testenv.patch,
+ * patches/tests-jdk.patch,
+ * patches/text-relocations.patch,
+ * patches/update-bootclasspath.patch:
+ Relocated versions of above.
+
2011-05-03 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 0bf704349e89 -r 8fa7f2649c4c Makefile.am
--- a/Makefile.am Tue May 03 14:44:49 2011 +0100
+++ b/Makefile.am Wed May 04 08:46:05 2011 +0100
@@ -234,55 +234,52 @@
# Patch list
ICEDTEA_PATCHES = \
- patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
- patches/icedtea-rmi_amd64.patch \
- patches/icedtea-demos.patch \
- patches/icedtea-headers.patch \
- patches/hotspot/$(HSBUILD)/icedtea-headers.patch \
- patches/icedtea-gcc-suffix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \
- patches/icedtea-sunsrc.patch \
- patches/icedtea-libraries.patch \
- patches/icedtea-print-lsb-release.patch \
- patches/icedtea-jpegclasses.patch \
- patches/debian/icedtea-uname.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
- patches/icedtea-override-redirect-metacity.patch \
- patches/icedtea-security-updates.patch \
- patches/icedtea-hotspot-gcc-pr36917.patch \
- patches/icedtea-alpha-fixes.patch \
- patches/icedtea-alt-jar.patch \
- patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \
- patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \
- patches/icedtea-clean-crypto.patch \
- $(GCC_PATCH) \
+ patches/text-relocations.patch \
+ patches/rmi_amd64.patch \
+ patches/demos.patch \
+ patches/headers.patch \
+ patches/gcc-suffix.patch \
+ patches/memory-limits.patch \
+ patches/sunsrc.patch \
+ patches/libraries.patch \
+ patches/print-lsb-release.patch \
+ patches/jpegclasses.patch \
+ patches/debian/uname.patch \
+ patches/sparc-ptracefix.patch \
+ patches/sparc-trapsfix.patch \
+ patches/override-redirect-metacity.patch \
+ patches/security-updates.patch \
+ patches/hotspot-gcc-pr36917.patch \
+ patches/alpha-fixes.patch \
+ patches/alt-jar.patch \
+ patches/use-idx_t.patch \
+ patches/params-cast-size_t.patch \
+ patches/clean-crypto.patch \
patches/cacao/arch.patch \
- patches/icedtea-signed-types.patch \
- patches/icedtea-lc_ctype.patch \
- patches/icedtea-tests-jdk.patch \
- patches/icedtea-linker-libs-order.patch \
- patches/icedtea-testenv.patch \
- patches/icedtea-samejvm-safe.patch \
- patches/icedtea-pr261.patch \
- patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \
- patches/security/icedtea-6592792.patch \
- patches/security/icedtea-6733959.patch \
- patches/security/icedtea-6755943.patch \
- patches/icedtea-jvmtiEnv.patch \
- patches/icedtea-disable-intree-ec.patch \
- patches/icedtea-sources.patch \
+ patches/signed-types.patch \
+ patches/lc_ctype.patch \
+ patches/tests-jdk.patch \
+ patches/linker-libs-order.patch \
+ patches/testenv.patch \
+ patches/samejvm-safe.patch \
+ patches/pr261.patch \
+ patches/parisc-opt.patch \
+ patches/security/6592792.patch \
+ patches/security/6733959.patch \
+ patches/security/6755943.patch \
+ patches/jvmtiEnv.patch \
+ patches/disable-intree-ec.patch \
+ patches/sources.patch \
patches/parisc.patch \
patches/sh4-support.patch \
patches/jtreg-httpTest.patch \
- patches/icedtea-update-bootclasspath.patch
+ patches/update-bootclasspath.patch
# Conditional patches
if WITH_RHINO
ICEDTEA_PATCHES += \
- patches/icedtea-rhino.patch
+ patches/rhino.patch
endif
if BUILD_CACAO
@@ -302,24 +299,24 @@
if ENABLE_PULSE_JAVA
ICEDTEA_PATCHES += \
- patches/icedtea-pulse-soundproperties.patch
+ patches/pulse-soundproperties.patch
endif
if !USE_CVMI
ICEDTEA_PATCHES += \
- patches/icedtea-javafiles.patch
+ patches/javafiles.patch
endif
if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \
+ICEDTEA_PATCHES += patches/systemtap.patch \
patches/systemtap-gcc-4.5.patch \
patches/systemtap-alloc-size-workaround.patch
endif
if ENABLE_NSS
-ICEDTEA_PATCHES += patches/icedtea-nss-config.patch
+ICEDTEA_PATCHES += patches/nss-config.patch
else
-ICEDTEA_PATCHES += patches/icedtea-nss-not-enabled-config.patch
+ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -344,8 +341,8 @@
patches/boot/tobin.patch \
patches/boot/test_gamma.patch \
patches/boot/tools.jar.patch \
- patches/boot/icedtea-jopt.patch \
- patches/boot/icedtea-jaxp-dependency.patch \
+ patches/boot/jopt.patch \
+ patches/boot/jaxp-dependency.patch \
patches/boot/genstubs-nofork.patch \
patches/boot/getannotation-cast.patch \
patches/boot/break-processbuilder-dependency.patch \
@@ -362,15 +359,15 @@
patches/boot/ecj-autoboxing.patch
if CP39408_JAVAH
-ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
+ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
endif
if CP40188_JAVAH
-ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr40188.patch
+ICEDTEA_BOOT_PATCHES += patches/boot/pr40188.patch
endif
if CP40616
-ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr40616.patch
+ICEDTEA_BOOT_PATCHES += patches/boot/pr40616.patch
endif
# Patches for when java.util.Scanner is missing
diff -r 0bf704349e89 -r 8fa7f2649c4c patches/6592792.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/6592792.patch Wed May 04 08:46:05 2011 +0100
@@ -0,0 +1,297 @@
+diff -Nru openjdk.orig/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java openjdk/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java
+--- openjdk.orig/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java 2008-12-02 15:25:05.000000000 +0000
++++ openjdk/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java 2008-12-02 15:29:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
++ * Copyright 2005-2008 Sun Microsystems, Inc. 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
+@@ -128,12 +128,7 @@
+ throws JAXBException
+ {
+ try {
+- Class spiClass;
+- if (classLoader == null) {
+- spiClass = Class.forName(className);
+- } else {
+- spiClass = classLoader.loadClass(className);
+- }
++ Class spiClass = safeLoadClass(className,classLoader);
+
+ /*
+ * javax.xml.bind.context.factory points to a class which has a
+@@ -205,11 +200,7 @@
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ Class spi;
+ try {
+- logger.fine("Trying to load "+className);
+- if (cl != null)
+- spi = cl.loadClass(className);
+- else
+- spi = Class.forName(className);
++ spi = safeLoadClass(className,cl);
+ } catch (ClassNotFoundException e) {
+ throw new JAXBException(e);
+ }
+@@ -483,4 +474,31 @@
+ * For this reason, we have to hard-code the class name into the API.
+ */
+ private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.bind.v2.ContextFactory";
++
++ /**
++ * Loads the class, provided that the calling thread has an access to the class being loaded.
++ */
++ private static Class safeLoadClass(String className, ClassLoader classLoader) throws ClassNotFoundException {
++ logger.fine("Trying to load "+className);
++ try {
++ // make sure that the current thread has an access to the package of the given name.
++ SecurityManager s = System.getSecurityManager();
++ if (s != null) {
++ int i = className.lastIndexOf('.');
++ if (i != -1) {
++ s.checkPackageAccess(className.substring(0,i));
++ }
++ }
++
++ if (classLoader == null)
++ return Class.forName(className);
++ else
++ return classLoader.loadClass(className);
++ } catch (SecurityException se) {
++ // anyone can access the platform default factory class without permission
++ if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className))
++ return Class.forName(className);
++ throw se;
++ }
++ }
+ }
+diff -Nru openjdk.orig/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java openjdk/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java
+--- openjdk.orig/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java 2008-12-02 15:25:04.000000000 +0000
++++ openjdk/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java 2008-12-02 15:29:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
++ * Copyright 2005-2008 Sun Microsystems, Inc. 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
+@@ -47,12 +47,7 @@
+ ClassLoader classLoader)
+ {
+ try {
+- Class spiClass;
+- if (classLoader == null) {
+- spiClass = Class.forName(className);
+- } else {
+- spiClass = classLoader.loadClass(className);
+- }
++ Class spiClass = safeLoadClass(className, classLoader);
+ return spiClass.newInstance();
+ } catch (ClassNotFoundException x) {
+ throw new WebServiceException(
+@@ -152,4 +147,33 @@
+
+ return newInstance(fallbackClassName, classLoader);
+ }
++
++
++ private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.ws.spi.ProviderImpl";
++
++ /**
++ * Loads the class, provided that the calling thread has an access to the class being loaded.
++ */
++ private static Class safeLoadClass(String className, ClassLoader classLoader) throws ClassNotFoundException {
++ try {
++ // make sure that the current thread has an access to the package of the given name.
++ SecurityManager s = System.getSecurityManager();
++ if (s != null) {
++ int i = className.lastIndexOf('.');
++ if (i != -1) {
++ s.checkPackageAccess(className.substring(0,i));
++ }
++ }
++
++ if (classLoader == null)
++ return Class.forName(className);
++ else
++ return classLoader.loadClass(className);
++ } catch (SecurityException se) {
++ // anyone can access the platform default factory class without permission
++ if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className))
++ return Class.forName(className);
++ throw se;
++ }
++ }
+ }
+diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security openjdk/jdk/src/share/lib/security/java.security
+--- openjdk.orig/jdk/src/share/lib/security/java.security 2008-11-20 08:44:48.000000000 +0000
++++ openjdk/jdk/src/share/lib/security/java.security 2008-12-02 15:29:09.000000000 +0000
+@@ -127,7 +127,7 @@
+ # passed to checkPackageAccess unless the
+ # corresponding RuntimePermission ("accessClassInPackage."+package) has
+ # been granted.
+-package.access=sun.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
+
+ #
+ # List of comma-separated packages that start with or equal this string
+diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-solaris openjdk/jdk/src/share/lib/security/java.security-solaris
+--- openjdk.orig/jdk/src/share/lib/security/java.security-solaris 2008-11-20 08:44:48.000000000 +0000
++++ openjdk/jdk/src/share/lib/security/java.security-solaris 2008-12-02 15:29:09.000000000 +0000
+@@ -128,7 +128,7 @@
+ # passed to checkPackageAccess unless the
+ # corresponding RuntimePermission ("accessClassInPackage."+package) has
+ # been granted.
+-package.access=sun.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
+
+ #
+ # List of comma-separated packages that start with or equal this string
+diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-windows openjdk/jdk/src/share/lib/security/java.security-windows
+--- openjdk.orig/jdk/src/share/lib/security/java.security-windows 2008-11-20 08:44:48.000000000 +0000
++++ openjdk/jdk/src/share/lib/security/java.security-windows 2008-12-02 15:29:09.000000000 +0000
+@@ -128,7 +128,7 @@
+ # passed to checkPackageAccess unless the
+ # corresponding RuntimePermission ("accessClassInPackage."+package) has
+ # been granted.
+-package.access=sun.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
+
+ #
+ # List of comma-separated packages that start with or equal this string
+diff -Nru openjdk.orig/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh
+--- openjdk.orig/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh 2008-12-02 15:29:09.000000000 +0000
+@@ -0,0 +1,61 @@
++#!/bin/sh
++
++if [ "${TESTSRC}" = "" ]
++then TESTSRC=.
++fi
++
++if [ "${TESTJAVA}" = "" ]
++then
++ PARENT=`dirname \`which java\``
++ TESTJAVA=`dirname ${PARENT}`
++ echo "TESTJAVA not set, selecting " ${TESTJAVA}
++ echo "If this is incorrect, try setting the variable manually."
++fi
++
++if [ "${TESTCLASSES}" = "" ]
++then
++ echo "TESTCLASSES not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++BIT_FLAG=""
++
++# set platform-dependent variables
++OS=`uname -s`
++case "$OS" in
More information about the distro-pkg-dev
mailing list