changeset in /hg/icedtea6: 2008-07-16 Matthias Klose <doko at ubu...
doko at ubuntu.com
doko at ubuntu.com
Wed Jul 16 05:22:01 PDT 2008
changeset e447a6a95f93 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e447a6a95f93
description:
2008-07-16 Matthias Klose <doko at ubuntu.com>
* fsg.sh: Update for b11 code drop.
* Makefile.am: Update for b11.
* patches/icedtea-license-headers.patch, patches/icedtea-idl.patch,
patches/icedtea-jscheme.patch, patches/icedtea-security-updates.patch,
patches/icedtea-eclipse-hotspot-6614100-6b06.patch,
patches/icedtea-gtkplaf.patch, patches/icedtea-dnd-updatecursor.patch,
patches/icedtea-component.patch: Remove, applied upstream.
* HACKING: Update patch descriptions.
* NEWS: Mention update to b11.
diffstat:
13 files changed, 23 insertions(+), 3144 deletions(-)
ChangeLog | 8
HACKING | 10
Makefile.am | 26
NEWS | 4
patches/icedtea-component.patch | 159 --
patches/icedtea-dnd-updatecursor.patch | 10
patches/icedtea-eclipse-hotspot-6614100-6b06.patch | 56
patches/icedtea-gtkplaf.patch | 54
patches/icedtea-idl.patch | 505 --------
patches/icedtea-jscheme.patch | 1260 --------------------
patches/icedtea-license-headers.patch | 81 -
patches/icedtea-security-updates-nonzero.patch | 11
patches/icedtea-security-updates.patch | 983 ---------------
diffs (truncated from 3300 to 500 lines):
diff -r 96c2e4b1256a -r e447a6a95f93 ChangeLog
--- a/ChangeLog Wed Jul 16 10:44:39 2008 +0200
+++ b/ChangeLog Wed Jul 16 14:27:44 2008 +0200
@@ -1,6 +1,14 @@ 2008-07-16 Matthias Klose <doko at ubuntu
2008-07-16 Matthias Klose <doko at ubuntu.com>
* fsg.sh: Update for b11 code drop.
+ * Makefile.am: Update for b11.
+ * patches/icedtea-license-headers.patch, patches/icedtea-idl.patch,
+ patches/icedtea-jscheme.patch, patches/icedtea-security-updates.patch,
+ patches/icedtea-eclipse-hotspot-6614100-6b06.patch,
+ patches/icedtea-gtkplaf.patch, patches/icedtea-dnd-updatecursor.patch,
+ patches/icedtea-component.patch: Remove, applied upstream.
+ * HACKING: Update patch descriptions.
+ * NEWS: Mention update to b11.
2008-07-15 Lillian Angel <langel at redhat.com>
diff -r 96c2e4b1256a -r e447a6a95f93 HACKING
--- a/HACKING Wed Jul 16 10:44:39 2008 +0200
+++ b/HACKING Wed Jul 16 14:27:44 2008 +0200
@@ -7,9 +7,7 @@ The following patches are applied early
The following patches are applied early in the build to meet the Free Software guidelines and are also
included in the tarball resulting from the dist-openjdk-fsg target:
-* icedtea-idl.patch: Fix IDL licenses (PR141/S6695776).
-* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140/S6695776).
-* icedtea-license-headers.patch: Generate GPL header from automulti tool (PR148/S6713083).
+[ currently no patches applied ]
The fsg.sh script is also run to delete certain files with dubious licensing and/or only occuring
in binary format.
@@ -45,7 +43,7 @@ The following patches are currently appl
* icedtea-memory-limits.patch: Increase default memory limits.
* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
-* icedtea-print-lsb-release.patch: Generate Debian LSB file.
+* icedtea-print-lsb-release.patch: Use information from Debian LSB file for crash reports.
* icedtea-rhino.patch: Add support for Javascript.
* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
* icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
@@ -65,10 +63,6 @@ The following patches are currently appl
The following patches are only applied to OpenJDK6 in IcedTea6:
-* icedtea-component.patch: Fix deadlock in AWT code (PR159/S6608764). Fixed in OpenJDK7 b25.
-* icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
-* icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
-* icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
* icedtea-jdk-docs-target.patch: Always set DOCS_TARGET.
diff -r 96c2e4b1256a -r e447a6a95f93 Makefile.am
--- a/Makefile.am Wed Jul 16 10:44:39 2008 +0200
+++ b/Makefile.am Wed Jul 16 14:27:44 2008 +0200
@@ -1,5 +1,5 @@ OPENJDK_DATE = 30_may_2008
-OPENJDK_DATE = 30_may_2008
-OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_DATE = 10_jul_2008
+OPENJDK_MD5SUM = 8e60cdac02ec1b2d8ddb9d7369be69df
OPENJDK_VERSION = b10
CACAO_VERSION = 0.99.2
@@ -343,13 +343,10 @@ ZERO_PATCHES = \
patches/icedtea-signed-types.patch \
patches/icedtea-test-atomic-operations.patch \
patches/icedtea-zero.patch \
- patches/icedtea-ia64-bugfix.patch \
- patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+ patches/icedtea-ia64-bugfix.patch
# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
-NON_ZERO_PATCHES = \
- patches/icedtea-eclipse-hotspot-6614100-6b06.patch \
- patches/icedtea-security-updates-nonzero.patch
+NON_ZERO_PATCHES =
if ZERO_BUILD
ZERO_PATCHES_COND = $(ZERO_PATCHES)
@@ -364,10 +361,7 @@ else
SHARK_PATCH =
endif
-ICEDTEA_FSG_PATCHES = \
- patches/icedtea-license-headers.patch \
- patches/icedtea-idl.patch \
- patches/icedtea-jscheme.patch
+ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
$(ZERO_PATCHES_COND) \
@@ -389,7 +383,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/icedtea-float-double-trailing-zeros.patch \
- patches/icedtea-gtkplaf.patch \
patches/icedtea-memory-limits.patch \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
@@ -418,12 +411,9 @@ ICEDTEA_PATCHES = \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
patches/icedtea-no-bcopy.patch \
- patches/icedtea-dnd-updatecursor.patch \
- patches/icedtea-component.patch \
patches/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
patches/icedtea-jdk-docs-target.patch \
- patches/icedtea-security-updates.patch \
$(SHARK_PATCH) \
$(GCC_PATCH)
@@ -469,8 +459,9 @@ clean-extract:
rm -f stamps/extract.stamp
stamps/patch.stamp: stamps/patch-fsg.stamp
- rm -f stamps/patch.stamp.tmp
mkdir -p stamps ; \
+ rm -f stamps/patch.stamp.tmp ; \
+ touch stamps/patch.stamp.tmp ; \
all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
@@ -517,8 +508,9 @@ clean-patch:
fi
stamps/patch-fsg.stamp: stamps/extract.stamp
- rm -f stamps/patch-fsg.stamp.tmp
mkdir -p stamps ; \
+ rm -f stamps/patch-fsg.stamp.tmp ; \
+ touch stamps/patch-fsg.stamp.tmp ; \
all_patches_ok=yes; \
for p in $(ICEDTEA_FSG_PATCHES) ; \
do \
diff -r 96c2e4b1256a -r e447a6a95f93 NEWS
--- a/NEWS Wed Jul 16 10:44:39 2008 +0200
+++ b/NEWS Wed Jul 16 14:27:44 2008 +0200
@@ -1,3 +1,7 @@ New in release 1.2 (2008-05-28)
+New in release UNRELEASED (2008-xx-xx)
+
+- Updated to b11 build.
+
New in release 1.2 (2008-05-28)
- Updated to b09 build.
diff -r 96c2e4b1256a -r e447a6a95f93 patches/icedtea-component.patch
--- a/patches/icedtea-component.patch Wed Jul 16 10:44:39 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
---- openjdk.old/jdk/src/share/classes/java/awt/Component.java Fri Mar 14 20:40:09 2008 +0300
-+++ openjdk/jdk/src/share/classes/java/awt/Component.java Tue Mar 18 12:04:20 2008 +0300
-@@ -634,6 +634,11 @@ public abstract class Component implemen
- */
- private PropertyChangeSupport changeSupport;
-
-+ private transient final Object changeSupportLock = new Object();
-+ private Object getChangeSupportLock() {
-+ return changeSupportLock;
-+ }
-+
- boolean isPacked = false;
-
- /**
-@@ -7839,15 +7844,17 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners
- * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
- */
-- public synchronized void addPropertyChangeListener(
-+ public void addPropertyChangeListener(
- PropertyChangeListener listener) {
-- if (listener == null) {
-- return;
-- }
-- if (changeSupport == null) {
-- changeSupport = new PropertyChangeSupport(this);
-- }
-- changeSupport.addPropertyChangeListener(listener);
-+ synchronized (getChangeSupportLock()) {
-+ if (listener == null) {
-+ return;
-+ }
-+ if (changeSupport == null) {
-+ changeSupport = new PropertyChangeSupport(this);
-+ }
-+ changeSupport.addPropertyChangeListener(listener);
-+ }
- }
-
- /**
-@@ -7863,12 +7870,14 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners
- * @see #removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)
- */
-- public synchronized void removePropertyChangeListener(
-+ public void removePropertyChangeListener(
- PropertyChangeListener listener) {
-- if (listener == null || changeSupport == null) {
-- return;
-- }
-- changeSupport.removePropertyChangeListener(listener);
-+ synchronized (getChangeSupportLock()) {
-+ if (listener == null || changeSupport == null) {
-+ return;
-+ }
-+ changeSupport.removePropertyChangeListener(listener);
-+ }
- }
-
- /**
-@@ -7885,11 +7894,13 @@ public abstract class Component implemen
- * @see java.beans.PropertyChangeSupport#getPropertyChangeListeners
- * @since 1.4
- */
-- public synchronized PropertyChangeListener[] getPropertyChangeListeners() {
-- if (changeSupport == null) {
-- return new PropertyChangeListener[0];
-- }
-- return changeSupport.getPropertyChangeListeners();
-+ public PropertyChangeListener[] getPropertyChangeListeners() {
-+ synchronized (getChangeSupportLock()) {
-+ if (changeSupport == null) {
-+ return new PropertyChangeListener[0];
-+ }
-+ return changeSupport.getPropertyChangeListeners();
-+ }
- }
-
- /**
-@@ -7923,16 +7934,18 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners(java.lang.String)
- * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
- */
-- public synchronized void addPropertyChangeListener(
-+ public void addPropertyChangeListener(
- String propertyName,
- PropertyChangeListener listener) {
-- if (listener == null) {
-- return;
-- }
-- if (changeSupport == null) {
-- changeSupport = new PropertyChangeSupport(this);
-- }
-- changeSupport.addPropertyChangeListener(propertyName, listener);
-+ synchronized (getChangeSupportLock()) {
-+ if (listener == null) {
-+ return;
-+ }
-+ if (changeSupport == null) {
-+ changeSupport = new PropertyChangeSupport(this);
-+ }
-+ changeSupport.addPropertyChangeListener(propertyName, listener);
-+ }
- }
-
- /**
-@@ -7951,13 +7964,15 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners(java.lang.String)
- * @see #removePropertyChangeListener(java.beans.PropertyChangeListener)
- */
-- public synchronized void removePropertyChangeListener(
-+ public void removePropertyChangeListener(
- String propertyName,
- PropertyChangeListener listener) {
-- if (listener == null || changeSupport == null) {
-- return;
-- }
-- changeSupport.removePropertyChangeListener(propertyName, listener);
-+ synchronized (getChangeSupportLock()) {
-+ if (listener == null || changeSupport == null) {
-+ return;
-+ }
-+ changeSupport.removePropertyChangeListener(propertyName, listener);
-+ }
- }
-
- /**
-@@ -7974,12 +7989,14 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners
- * @since 1.4
- */
-- public synchronized PropertyChangeListener[] getPropertyChangeListeners(
-+ public PropertyChangeListener[] getPropertyChangeListeners(
- String propertyName) {
-- if (changeSupport == null) {
-- return new PropertyChangeListener[0];
-- }
-- return changeSupport.getPropertyChangeListeners(propertyName);
-+ synchronized (getChangeSupportLock()) {
-+ if (changeSupport == null) {
-+ return new PropertyChangeListener[0];
-+ }
-+ return changeSupport.getPropertyChangeListeners(propertyName);
-+ }
- }
-
- /**
-@@ -7994,7 +8011,10 @@ public abstract class Component implemen
- */
- protected void firePropertyChange(String propertyName,
- Object oldValue, Object newValue) {
-- PropertyChangeSupport changeSupport = this.changeSupport;
-+ PropertyChangeSupport changeSupport;
-+ synchronized (getChangeSupportLock()) {
-+ changeSupport = this.changeSupport;
-+ }
- if (changeSupport == null ||
- (oldValue != null && newValue != null && oldValue.equals(newValue))) {
- return;
diff -r 96c2e4b1256a -r e447a6a95f93 patches/icedtea-dnd-updatecursor.patch
--- a/patches/icedtea-dnd-updatecursor.patch Wed Jul 16 10:44:39 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java.orig 2008-06-16 12:11:39.000000000 -0700
-+++ openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java 2008-06-16 12:18:39.000000000 -0700
-@@ -466,7 +466,6 @@
-
- Cursor c = null;
-
-- targetAct = DnDConstants.ACTION_NONE;
- switch (status) {
- case ENTER:
- case OVER:
diff -r 96c2e4b1256a -r e447a6a95f93 patches/icedtea-eclipse-hotspot-6614100-6b06.patch
--- a/patches/icedtea-eclipse-hotspot-6614100-6b06.patch Wed Jul 16 10:44:39 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-# HG changeset patch
-# User never
-# Date 1212727493 25200
-# Node ID 65fe2bd8883932456557957163bf5c4e4af79469
-# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837
-6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
-Reviewed-by: kvn, jrose, rasbold
-
---- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig 2008-06-08 15:15:19.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp 2008-06-08 15:16:06.000000000 +0200
-@@ -1551,45 +1551,6 @@
- if (opt != NULL) return opt;
- }
-
-- if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
-- // Try to undo Phi of AddP:
-- // (Phi (AddP base base y) (AddP base2 base2 y))
-- // becomes:
-- // newbase := (Phi base base2)
-- // (AddP newbase newbase y)
-- //
-- // This occurs as a result of unsuccessful split_thru_phi and
-- // interferes with taking advantage of addressing modes. See the
-- // clone_shift_expressions code in matcher.cpp
-- Node* addp = in(1);
-- const Type* type = addp->in(AddPNode::Base)->bottom_type();
-- Node* y = addp->in(AddPNode::Offset);
-- if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
-- // make sure that all the inputs are similar to the first one,
-- // i.e. AddP with base == address and same offset as first AddP
-- bool doit = true;
-- for (uint i = 2; i < req(); i++) {
-- if (in(i) == NULL ||
-- in(i)->Opcode() != Op_AddP ||
-- in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
-- in(i)->in(AddPNode::Offset) != y) {
-- doit = false;
-- break;
-- }
-- // Accumulate type for resulting Phi
-- type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
-- }
-- if (doit) {
-- Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
-- for (uint i = 1; i < req(); i++) {
-- base->init_req(i, in(i)->in(AddPNode::Base));
-- }
-- phase->is_IterGVN()->register_new_node_with_optimizer(base);
-- return new (phase->C, 4) AddPNode(base, base, y);
-- }
-- }
-- }
--
- // Split phis through memory merges, so that the memory merges will go away.
- // Piggy-back this transformation on the search for a unique input....
- // It will be as if the merged memory is the unique value of the phi.
diff -r 96c2e4b1256a -r e447a6a95f93 patches/icedtea-gtkplaf.patch
--- a/patches/icedtea-gtkplaf.patch Wed Jul 16 10:44:39 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
---- openjdk6/jdk/src/solaris/native/sun/awt/gtk2_interface.c 2008-05-30 08:55:40.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c 2008-06-22 20:47:39.000000000 +0100
-@@ -333,6 +333,7 @@
- static GdkPixbuf* (*fp_gtk_widget_render_icon)(GtkWidget *widget,
- const gchar *stock_id, GtkIconSize size, const gchar *detail);
- static void (*fp_gtk_widget_set_name)(GtkWidget *widget, const gchar *name);
-+static void (*fp_gtk_widget_set_parent)(GtkWidget *widget, GtkWidget *parent);
- static void (*fp_gtk_widget_set_direction)(GtkWidget *widget,
- GtkTextDirection direction);
- static void (*fp_gtk_widget_style_get)(GtkWidget *widget,
-@@ -570,6 +571,8 @@
- dl_symbol("gtk_widget_render_icon");
- fp_gtk_widget_set_name =
- dl_symbol("gtk_widget_set_name");
-+ fp_gtk_widget_set_parent =
-+ dl_symbol("gtk_widget_set_parent");
- fp_gtk_widget_set_direction =
- dl_symbol("gtk_widget_set_direction");
- fp_gtk_widget_style_get =
-@@ -1040,7 +1043,7 @@
- (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))
- {
- gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] =
-- (*fp_gtk_button_new)();
-+ (*fp_gtk_toggle_button_new)();
- }
- result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE];
- break;
-@@ -1414,12 +1417,20 @@
- widget_type == COMBO_BOX_TEXT_FIELD)
- {
- /*
-- * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
-- * in order to trick engines into thinking it's a real combobox
-- * arrow button/text field.
-- */
-+ * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
-+ * in order to trick engines into thinking it's a real combobox
-+ * arrow button/text field.
-+ */
- GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
-- (*fp_gtk_container_add)((GtkContainer *)combo, result);
-+
-+ if (widget_type == COMBO_BOX_TEXT_FIELD)
-+ (*fp_gtk_container_add)((GtkContainer *)combo, result);
-+ else
-+ {
-+ (*fp_gtk_widget_set_parent)(result, combo);
-+ ((GtkBin*)combo)->child = result;
-+ }
-+
- (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
- (*fp_gtk_widget_realize)(result);
- return result;
diff -r 96c2e4b1256a -r e447a6a95f93 patches/icedtea-idl.patch
--- a/patches/icedtea-idl.patch Wed Jul 16 10:44:39 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,505 +0,0 @@
---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set Wed Jun 25 10:48:45 2008
-+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set Wed Jun 25 10:48:45 2008
-@@ -1,11 +1,35 @@
- /*
-+ * Copyright 1999 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.
-+ */
-+
-+/*
- * COMPONENT_NAME: idl.parser
-- *
-+ *
- * ORIGINS: 27
- *
-- * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM
- * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998
-- *
-+ *
- */
-
- CORBA IDL
---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set Wed Jun 25 10:48:46 2008
-+++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set Wed Jun 25 10:48:46 2008
-@@ -1,11 +1,35 @@
- /*
-+ * Copyright 1999 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
More information about the distro-pkg-dev
mailing list