changeset in /hg/icedtea6: 2009-04-16 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Thu Apr 16 08:26:25 PDT 2009
changeset 7e38108fb278 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7e38108fb278
description:
2009-04-16 Lillian Angel <langel at redhat.com>
* HACKING: Updated.
* Makefile.am: Updated to b16 bundle.
(ICEDTEA_PATCHES): Removed unneeded patches
(icedtea.stamp): fixed build path.
(icedtea-ecj.stamp): Likewise.
* patches/ecj/icedtea.patch: Fixed path.
* patches/icedtea-bytebuffer-compact.patch: Updated.
* patches/icedtea-core-build.patch: Fixed path.
* patches/icedtea-jdk-docs-target.patch: Fixed path.
* patches/icedtea-shark-build.patch: Fixed path.
* patches/icedtea-version.patch: Updated
* patches/icedtea-display-mode-changer.patch,
patches/icedtea-io_util-overflow.patch,
patches/security/icedtea-6536193.patch,
patches/security/icedtea-6610888.patch,
patches/security/icedtea-6610896.patch,
patches/security/icedtea-6630639.patch,
patches/security/icedtea-6632886.patch,
patches/security/icedtea-6636360.patch,
patches/security/icedtea-6652463.patch,
patches/security/icedtea-6656633.patch,
patches/security/icedtea-6658158.patch,
patches/security/icedtea-6691246.patch,
patches/security/icedtea-6717680.patch,
patches/security/icedtea-6721651.patch,
patches/security/icedtea-6737315.patch,
patches/security/icedtea-6792554.patch,
patches/security/icedtea-6804996.patch,
patches/security/icedtea-6804997.patch,
patches/security/icedtea-6804998.patch: Removed.
diffstat:
28 files changed, 51 insertions(+), 3548 deletions(-)
ChangeLog | 33 +
HACKING | 5
Makefile.am | 42 -
patches/ecj/icedtea.patch | 2
patches/icedtea-bytebuffer-compact.patch | 20
patches/icedtea-core-build.patch | 2
patches/icedtea-display-mode-changer.patch | 100 ---
patches/icedtea-io_util-overflow.patch | 37 -
patches/icedtea-jdk-docs-target.patch | 2
patches/icedtea-shark-build.patch | 2
patches/icedtea-version.patch | 16
patches/security/icedtea-6536193.patch | 102 ---
patches/security/icedtea-6610888.patch | 58 -
patches/security/icedtea-6610896.patch | 189 ------
patches/security/icedtea-6630639.patch | 31 -
patches/security/icedtea-6632886.patch | 502 -----------------
patches/security/icedtea-6636360.patch | 34 -
patches/security/icedtea-6652463.patch | 28
patches/security/icedtea-6656633.patch | 51 -
patches/security/icedtea-6658158.patch | 815 ----------------------------
patches/security/icedtea-6691246.patch | 166 -----
patches/security/icedtea-6717680.patch | 27
patches/security/icedtea-6721651.patch | 735 -------------------------
patches/security/icedtea-6737315.patch | 44 -
patches/security/icedtea-6792554.patch | 415 --------------
patches/security/icedtea-6804996.patch | 75 --
patches/security/icedtea-6804997.patch | 31 -
patches/security/icedtea-6804998.patch | 35 -
diffs (truncated from 3824 to 500 lines):
diff -r 147eb19a7637 -r 7e38108fb278 ChangeLog
--- a/ChangeLog Thu Apr 16 10:55:27 2009 -0400
+++ b/ChangeLog Thu Apr 16 11:26:48 2009 -0400
@@ -1,3 +1,36 @@ 2009-04-16 Omair Majid <omajid at redhat.
+2009-04-16 Lillian Angel <langel at redhat.com>
+
+ * HACKING: Updated.
+ * Makefile.am: Updated to b16 bundle.
+ (ICEDTEA_PATCHES): Removed unneeded patches
+ (icedtea.stamp): fixed build path.
+ (icedtea-ecj.stamp): Likewise.
+ * patches/ecj/icedtea.patch: Fixed path.
+ * patches/icedtea-bytebuffer-compact.patch: Updated.
+ * patches/icedtea-core-build.patch: Fixed path.
+ * patches/icedtea-jdk-docs-target.patch: Fixed path.
+ * patches/icedtea-shark-build.patch: Fixed path.
+ * patches/icedtea-version.patch: Updated
+ * patches/icedtea-display-mode-changer.patch,
+ patches/icedtea-io_util-overflow.patch,
+ patches/security/icedtea-6536193.patch,
+ patches/security/icedtea-6610888.patch,
+ patches/security/icedtea-6610896.patch,
+ patches/security/icedtea-6630639.patch,
+ patches/security/icedtea-6632886.patch,
+ patches/security/icedtea-6636360.patch,
+ patches/security/icedtea-6652463.patch,
+ patches/security/icedtea-6656633.patch,
+ patches/security/icedtea-6658158.patch,
+ patches/security/icedtea-6691246.patch,
+ patches/security/icedtea-6717680.patch,
+ patches/security/icedtea-6721651.patch,
+ patches/security/icedtea-6737315.patch,
+ patches/security/icedtea-6792554.patch,
+ patches/security/icedtea-6804996.patch,
+ patches/security/icedtea-6804997.patch,
+ patches/security/icedtea-6804998.patch: Removed.
+
2009-04-16 Omair Majid <omajid at redhat.com>
* patches/hotspot/default/icedtea-ignore-unrecognized-options.patch: New
diff -r 147eb19a7637 -r 7e38108fb278 HACKING
--- a/HACKING Thu Apr 16 10:55:27 2009 -0400
+++ b/HACKING Thu Apr 16 11:26:48 2009 -0400
@@ -32,8 +32,7 @@ The following patches are currently appl
* icedtea-javac-debuginfo.patch: Ensure debugging information is generated for all class files.
* icedtea-javafiles.patch: Add missing Java files to list.
* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
-* icedtea-lcms-leak.patch: Fix LCMS memory leak.
-* icedtea-LCMS-setTagData.patch: Add support for setTagData to LCMS peer.
+* icedtea-lcms: Updates lcms to 1.18 and applies other security patches.
* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
* icedtea-libraries.patch: Use system JPEG and zlib libraries.
* icedtea-linker-options.patch: Add -Xlinker option when linking.
@@ -69,13 +68,11 @@ The following patches are currently appl
* icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244, S6779290)
* icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
#6761856, swing TextLayout.getBounds() returns shifted bounds.
-* icedtea-display-mode-changer.patch: Add extra test class.
* icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
* icedtea-samejvm-safe.patch: Add samejvmsafe dirs to TEST.ROOT.
* icedtea-6728542-epoll.patch: Make EPoll work on non-x86 platforms. (PR265)
* icedtea-fortify-source.patch: Fix build failures with -D_FORTIFY_SOURCE=2.
* icedtea-format-warnings.patch: Fix build failures with -Wformat=1.
-* icedtea-io_util-overflow.patch: Replace some code to correctly handle overflows. (S6788196)
* icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter.
* icedtea-demo-swingapplet.patch: Add missing html file needed to run the demo.
* icedtea-6791168.patch: Fix build failure with GCC-4.4 (PR 38725) and compiler warnings.
diff -r 147eb19a7637 -r 7e38108fb278 Makefile.am
--- a/Makefile.am Thu Apr 16 10:55:27 2009 -0400
+++ b/Makefile.am Thu Apr 16 11:26:48 2009 -0400
@@ -1,6 +1,6 @@ OPENJDK_DATE = 25_nov_2008
-OPENJDK_DATE = 25_nov_2008
-OPENJDK_MD5SUM = 9f9773a822156dd3d576d83d794364ce
-OPENJDK_VERSION = b14
+OPENJDK_DATE = 13_apr_2009
+OPENJDK_MD5SUM = d395b4d4ac8b2aff70730b953f9e2736
+OPENJDK_VERSION = b16
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -106,8 +106,8 @@ EXTRA_DIST = rt generated \
# OpenJDK build environment.
OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(OS_DIR)
-ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/control/build/$(OS_DIR)
+BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR)
+ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/build/$(OS_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
ICEDTEA_RT = \
@@ -544,23 +544,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-javafiles.patch \
patches/icedtea-core-build.patch \
patches/icedtea-jvmtiEnv.patch \
- patches/icedtea-lcms.patch \
- patches/security/icedtea-6536193.patch \
- patches/security/icedtea-6610888.patch \
- patches/security/icedtea-6610896.patch \
- patches/security/icedtea-6630639.patch \
- patches/security/icedtea-6632886.patch \
- patches/security/icedtea-6652463.patch \
- patches/security/icedtea-6656633.patch \
- patches/security/icedtea-6658158.patch \
- patches/security/icedtea-6691246.patch \
- patches/security/icedtea-6717680.patch \
- patches/security/icedtea-6721651.patch \
- patches/security/icedtea-6737315.patch \
- patches/security/icedtea-6792554.patch \
- patches/security/icedtea-6804996.patch \
- patches/security/icedtea-6804997.patch \
- patches/security/icedtea-6804998.patch
+ patches/icedtea-lcms.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -615,11 +599,9 @@ ICEDTEA_PATCHES += \
patches/icedtea-linker-libs-order.patch \
patches/icedtea-f2i-overflow.patch \
patches/icedtea-6761856-freetypescaler.patch \
- patches/icedtea-display-mode-changer.patch \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
patches/icedtea-6728542-epoll.patch \
- patches/icedtea-io_util-overflow.patch \
patches/icedtea-cc-interp-jvmti.patch \
patches/icedtea-pr261.patch \
patches/icedtea-doc-headers.patch \
@@ -1130,7 +1112,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make/ \
+ -C openjdk \
$(ICEDTEA_BUILD_TARGET)
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
@@ -1197,7 +1179,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make \
+ -C openjdk \
$(ICEDTEA_DEBUG_BUILD_TARGET)
mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
@@ -1260,7 +1242,7 @@ clean-icedtea: stamps/extract.stamp
clean-icedtea: stamps/extract.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make clobber
+ -C openjdk clobber
rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
icedtea-against-icedtea: \
@@ -1287,7 +1269,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstr
stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make \
+ -C openjdk-ecj/make \
$(ICEDTEA_BUILD_TARGET)
@echo "ecj-poured IcedTea is served:" \
$(ECJ_BUILD_OUTPUT_DIR)
@@ -1309,13 +1291,13 @@ hotspot-helper: stamps/bootstrap-directo
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make hotspot
+ -C openjdk-ecj/make hotspot
clean-icedtea-ecj: stamps/extract-ecj.stamp
rm -f stamps/icedtea-ecj.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make clobber
+ -C openjdk-ecj/make clobber
stamps/icedtea-against-ecj.stamp: \
stamps/bootstrap-directory-symlink-ecj.stamp \
diff -r 147eb19a7637 -r 7e38108fb278 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Thu Apr 16 10:55:27 2009 -0400
+++ b/patches/ecj/icedtea.patch Thu Apr 16 11:26:48 2009 -0400
@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/control/make/
diff -Nru openjdk-ecj.orig/control/make/make/jdk-rules.gmk openjdk-ecj/control/make/make/jdk-rules.gmk
--- openjdk-ecj.orig/control/make/make/jdk-rules.gmk 2008-10-20 18:45:00.000000000 +0100
-+++ openjdk-ecj/control/make/make/jdk-rules.gmk 2008-10-20 18:50:20.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk 2008-10-20 18:50:20.000000000 +0100
@@ -58,7 +58,7 @@
endif
diff -r 147eb19a7637 -r 7e38108fb278 patches/icedtea-bytebuffer-compact.patch
--- a/patches/icedtea-bytebuffer-compact.patch Thu Apr 16 10:55:27 2009 -0400
+++ b/patches/icedtea-bytebuffer-compact.patch Thu Apr 16 11:26:48 2009 -0400
@@ -60,23 +60,3 @@
+ }
+
}
---- ../openjdkb23/openjdk.old/jdk/src/share/classes/java/nio/Direct-X-Buffer.java 2007-10-30 04:36:08.000000000 -0400
-+++ openjdk/jdk/src/share/classes/java/nio/Direct-X-Buffer.java 2007-11-13 13:34:14.000000000 -0500
-@@ -354,6 +354,7 @@
- unsafe.copyMemory(ix(pos), ix(0), rem << $LG_BYTES_PER_VALUE$);
- position(rem);
- limit(capacity());
-+ clearMark();
- return this;
- #else[rw]
- throw new ReadOnlyBufferException();
---- ../openjdkb23/openjdk.old/jdk/src/share/classes/java/nio/Heap-X-Buffer.java 2007-10-30 04:36:08.000000000 -0400
-+++ openjdk/jdk/src/share/classes/java/nio/Heap-X-Buffer.java 2007-11-13 13:34:27.000000000 -0500
-@@ -222,6 +222,7 @@
- System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
- position(remaining());
- limit(capacity());
-+ clearMark();
- return this;
- #else[rw]
- throw new ReadOnlyBufferException();
diff -r 147eb19a7637 -r 7e38108fb278 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Thu Apr 16 10:55:27 2009 -0400
+++ b/patches/icedtea-core-build.patch Thu Apr 16 11:26:48 2009 -0400
@@ -1,6 +1,6 @@ diff -ru openjdk.orig/control/make/make/
diff -ru openjdk.orig/control/make/make/hotspot-rules.gmk openjdk/control/make/hotspot-rules.gmk
--- openjdk.orig/control/make/make/hotspot-rules.gmk 2007-10-12 08:45:09.000000000 +0100
-+++ openjdk/control/make/make/hotspot-rules.gmk 2007-11-08 09:40:57.000000000 +0000
++++ openjdk/make/hotspot-rules.gmk 2007-11-08 09:40:57.000000000 +0000
@@ -72,6 +72,10 @@
HOTSPOT_TARGET = all_fastdebug
endif
diff -r 147eb19a7637 -r 7e38108fb278 patches/icedtea-display-mode-changer.patch
--- a/patches/icedtea-display-mode-changer.patch Thu Apr 16 10:55:27 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-6733718: test /java/awt/FullScreen/UninitializedDisplayModeChangeTest/ fails
-Reviewed-by: igor
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java Tue Aug 05 09:37:03 2008 -0700
-@@ -0,0 +1,93 @@
-+/*
-+ * Copyright 2006-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
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+import java.awt.DisplayMode;
-+import java.awt.EventQueue;
-+import java.awt.Frame;
-+import java.awt.GraphicsDevice;
-+import java.awt.GraphicsEnvironment;
-+import java.lang.reflect.InvocationTargetException;
-+
-+/**
-+ * Used by the UninitializedDisplayModeChangeTest to change the
-+ * display mode.
-+ */
-+public class DisplayModeChanger {
-+
-+ public static void main(String[] args)
-+ throws InterruptedException, InvocationTargetException
-+ {
-+ final GraphicsDevice gd =
-+ GraphicsEnvironment.getLocalGraphicsEnvironment().
-+ getDefaultScreenDevice();
-+
-+ EventQueue.invokeAndWait(new Runnable() {
-+ public void run() {
-+ Frame f = null;
-+ if (gd.isFullScreenSupported()) {
-+ try {
-+ f = new Frame("DisplayChanger Frame");
-+ gd.setFullScreenWindow(f);
-+ if (gd.isDisplayChangeSupported()) {
-+ DisplayMode dm = findDisplayMode(gd);
-+ if (gd != null) {
-+ gd.setDisplayMode(dm);
-+ }
-+ }
-+ try {
-+ Thread.sleep(1000);
-+ } catch (InterruptedException ex) {
-+ ex.printStackTrace();
-+ }
-+ gd.setFullScreenWindow(null);
-+ } finally {
-+ if (f != null) {
-+ f.dispose();
-+ }
-+ }
-+ }
-+ }
-+ });
-+ }
-+
-+ /**
-+ * Finds a display mode that is different from the current display
-+ * mode and is likely to cause a display change event.
-+ */
-+ private static DisplayMode findDisplayMode(GraphicsDevice gd) {
-+ DisplayMode dms[] = gd.getDisplayModes();
-+ DisplayMode currentDM = gd.getDisplayMode();
-+ for (DisplayMode dm : dms) {
-+ if (!dm.equals(currentDM) &&
-+ dm.getRefreshRate() == currentDM.getRefreshRate())
-+ {
-+ // different from the current dm and refresh rate is the same
-+ // means that something else is different => more likely to
-+ // cause a DM change event
-+ return dm;
-+ }
-+ }
-+ return null;
-+ }
-+
-+}
-
diff -r 147eb19a7637 -r 7e38108fb278 patches/icedtea-io_util-overflow.patch
--- a/patches/icedtea-io_util-overflow.patch Thu Apr 16 10:55:27 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-diff -r 201a75db9b35 openjdk/jdk/src/share/native/java/io/io_util.c
---- openjdk/jdk/src/share/native/java/io/io_util.c Mon Dec 22 12:32:44 2008 +0000
-+++ openjdk/jdk/src/share/native/java/io/io_util.c Mon Dec 22 12:48:49 2008 +0000
-@@ -25,6 +25,7 @@
-
- #include <stdlib.h>
- #include <string.h>
-+#include <assert.h>
-
- #include "jni.h"
- #include "jni_util.h"
-@@ -73,9 +74,10 @@
- return -1;
- }
- datalen = (*env)->GetArrayLength(env, bytes);
-+ assert(datalen >= 0);
-
-- if ((off < 0) || (off > datalen) ||
-- (len < 0) || ((off + len) > datalen) || ((off + len) < 0)) {
-+ if ((off < 0) || (len < 0) ||
-+ (((uint32_t) off + (uint32_t) len) > (uint32_t) datalen)) {
- JNU_ThrowByName(env, "java/lang/IndexOutOfBoundsException", 0);
- return -1;
- }
-@@ -146,9 +148,10 @@
- return;
- }
- datalen = (*env)->GetArrayLength(env, bytes);
-+ assert(datalen >= 0);
-
-- if ((off < 0) || (off > datalen) ||
-- (len < 0) || ((off + len) > datalen) || ((off + len) < 0)) {
-+ if ((off < 0) || (len < 0) ||
-+ (((uint32_t) off + (uint32_t) len) > (uint32_t) datalen)) {
- JNU_ThrowByName(env, "java/lang/IndexOutOfBoundsException", 0);
- return;
- }
diff -r 147eb19a7637 -r 7e38108fb278 patches/icedtea-jdk-docs-target.patch
--- a/patches/icedtea-jdk-docs-target.patch Thu Apr 16 10:55:27 2009 -0400
+++ b/patches/icedtea-jdk-docs-target.patch Thu Apr 16 11:26:48 2009 -0400
@@ -1,5 +1,5 @@
--- openjdk/control/make/make/jdk-rules.gmk 2008-06-29 10:09:47.002591764 +0000
-+++ openjdk/control/make/make/jdk-rules.gmk 2008-06-29 15:04:01.228901751 +0000
++++ openjdk/make/jdk-rules.gmk 2008-06-29 15:04:01.228901751 +0000
@@ -36,12 +36,7 @@
IMAGES_TARGET = images
endif
diff -r 147eb19a7637 -r 7e38108fb278 patches/icedtea-shark-build.patch
--- a/patches/icedtea-shark-build.patch Thu Apr 16 10:55:27 2009 -0400
+++ b/patches/icedtea-shark-build.patch Thu Apr 16 11:26:48 2009 -0400
@@ -1,6 +1,6 @@ diff -r 8e41d25d7665 openjdk/control/mak
diff -r 8e41d25d7665 openjdk/control/make/make/hotspot-rules.gmk
--- openjdk/control/make/make/hotspot-rules.gmk Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/control/make/make/hotspot-rules.gmk Fri Jun 20 13:26:20 2008 +0100
++++ openjdk/make/hotspot-rules.gmk Fri Jun 20 13:26:20 2008 +0100
@@ -75,6 +75,9 @@ ifdef ICEDTEA_CORE_BUILD
ifdef ICEDTEA_CORE_BUILD
HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
diff -r 147eb19a7637 -r 7e38108fb278 patches/icedtea-version.patch
--- a/patches/icedtea-version.patch Thu Apr 16 10:55:27 2009 -0400
+++ b/patches/icedtea-version.patch Thu Apr 16 11:26:48 2009 -0400
@@ -1,18 +1,4 @@
---- openjdk/langtools/make/Makefile.orig
-+++ openjdk/langtools/make/Makefile
-@@ -82,7 +82,11 @@
- endif
-
- ifdef MILESTONE
-+ifneq ($(MILESTONE),fcs)
- ANT_OPTIONS += -Dmilestone=$(MILESTONE)
-+else
-+ ANT_OPTIONS += -Drelease=$(JDK_VERSION)
-+endif
- endif
-
- ifdef BUILD_NUMBER
---- ../openjdk6/jdk/make/common/shared/Defs.gmk 2008-08-28 04:10:47.000000000 -0400
+--- openjdkold/jdk/make/common/shared/Defs.gmk 2008-08-28 04:10:47.000000000 -0400
+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-02-08 08:30:21.000000000 -0500
@@ -194,7 +194,7 @@
diff -r 147eb19a7637 -r 7e38108fb278 patches/security/icedtea-6536193.patch
--- a/patches/security/icedtea-6536193.patch Thu Apr 16 10:55:27 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
---- old/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java Tue Mar 3 11:34:51 2009
-+++ openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java Tue Mar 3 11:34:50 2009
-@@ -1,27 +1,3 @@
--/*
-- * Copyright 2005-2006 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
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Sun designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Sun in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-- * CA 95054 USA or visit www.sun.com if you need additional information or
-- * have any questions.
-- */
- package com.sun.xml.internal.bind.v2.runtime.output;
-
- import java.io.IOException;
-@@ -32,6 +8,7 @@
- import com.sun.xml.internal.bind.DatatypeConverterImpl;
- import com.sun.xml.internal.bind.v2.runtime.Name;
- import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
-+import com.sun.xml.internal.bind.v2.runtime.MarshallerImpl;
-
- import org.xml.sax.SAXException;
-
-@@ -81,6 +58,11 @@
- protected boolean closeStartTagPending = false;
-
- /**
-+ * @see MarshallerImpl#header
-+ */
-+ private String header;
-+
-+ /**
- *
- * @param localNames
- * local names encoded in UTF-8.
-@@ -92,6 +74,10 @@
- prefixes[i] = new Encoded();
- }
-
-+ public void setHeader(String header) {
-+ this.header = header;
-+ }
-+
- @Override
- public void startDocument(XMLSerializer serializer, boolean fragment, int[] nsUriIndex2prefixIndex, NamespaceContextImpl nsContext) throws IOException, SAXException, XMLStreamException {
- super.startDocument(serializer, fragment,nsUriIndex2prefixIndex,nsContext);
-@@ -100,6 +86,10 @@
- if(!fragment) {
- write(XML_DECL);
- }
-+ if(header!=null) {
-+ textBuffer.set(header);
-+ textBuffer.write(this);
-+ }
- }
-
- public void endDocument(boolean fragment) throws IOException, SAXException, XMLStreamException {
-@@ -383,11 +373,23 @@
- return buf;
- }
-
-- private static final byte[] XMLNS_EQUALS = toBytes(" xmlns=\"");
-- private static final byte[] XMLNS_COLON = toBytes(" xmlns:");
More information about the distro-pkg-dev
mailing list