cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to early access b43:

Browse Source 
http://download.java.net/jdk7/changes/jdk7-b43.html
- Remove KOI8_U char encoding which no longer applies
- Correct datatype warning in fork_and_exec()
- Sync patches
This commit is contained in:
kurt 2009-01-17 11:37:42 +00:00
parent 430ed53fda
commit b3c5b98ff9
12 changed files with 37 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/jdk/1.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2009/01/16 16:49:29 kurt Exp $
# $OpenBSD: Makefile,v 1.26 2009/01/17 11:37:42 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= i386 amd64
@ -6,12 +6,12 @@ ONLY_FOR_ARCHS= i386 amd64
COMMENT-main= Java2(TM) SE Dev Kit v${V} Early Access ${B}
COMMENT-jre= Java2(TM) SE Runtime Environment v${V} Early Access ${B}
V= 1.7.0.00
B= b42
DISTFILES= openjdk-7-ea-src-${B}-19_dec_2008.zip \
B= b43
DISTFILES= openjdk-7-ea-src-${B}-15_jan_2009.zip \
jdk-7-icedtea-plugs-1.6a.tar.gz:0
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}${B}p0
PKGNAME-jre= jre-${V}${B}p0
PKGNAME-main= jdk-${V}${B}
PKGNAME-jre= jre-${V}${B}
CATEGORIES= devel/jdk java

10
devel/jdk/1.7/distinfo
View File

@ -1,10 +1,10 @@
MD5 (jdk-7-icedtea-plugs-1.6a.tar.gz) = lh6B1+T6Isb1o6OGufbK4g==
MD5 (openjdk-7-ea-src-b42-19_dec_2008.zip) = iesoqqPonpNQ8V5eS3GKQA==
MD5 (openjdk-7-ea-src-b43-15_jan_2009.zip) = cdaA6rCo6Cump29mMi/yqw==
RMD160 (jdk-7-icedtea-plugs-1.6a.tar.gz) = xfN51TYwgBeV3HhlUZgf3HtQTYQ=
RMD160 (openjdk-7-ea-src-b42-19_dec_2008.zip) = bS/IdsJNyIVQ62lVSM9+6agU6VY=
RMD160 (openjdk-7-ea-src-b43-15_jan_2009.zip) = 9xtWMB2boBL1kLjyyZPT0NZYxuE=
SHA1 (jdk-7-icedtea-plugs-1.6a.tar.gz) = A3qIJwYAfjM0JUCOAG9VZVT9pRQ=
SHA1 (openjdk-7-ea-src-b42-19_dec_2008.zip) = C7yXcHZaEX7/7K7skXg2XY6ySmE=
SHA1 (openjdk-7-ea-src-b43-15_jan_2009.zip) = zdHC0tZ6Rem0Al8BS3pDV1Fj31c=
SHA256 (jdk-7-icedtea-plugs-1.6a.tar.gz) = dXe+50eFCjVr0Y2we2APrhOTycQNS81Psy6yyWbIaNc=
SHA256 (openjdk-7-ea-src-b42-19_dec_2008.zip) = 2uIMhu2aaYKAA/0K9ffo94su94vXPujNGDpbywxLz+g=
SHA256 (openjdk-7-ea-src-b43-15_jan_2009.zip) = THQ7uNapXxXkbEuLw084VVDM5CPHQCmVC57vG/s6aA0=
SIZE (jdk-7-icedtea-plugs-1.6a.tar.gz) = 64679
SIZE (openjdk-7-ea-src-b42-19_dec_2008.zip) = 87715520
SIZE (openjdk-7-ea-src-b43-15_jan_2009.zip) = 87658938

18
devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.8 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Wed Jan 14 13:01:37 2009
+++ hotspot/src/os/bsd/vm/os_bsd.cpp Wed Jan 14 13:03:52 2009
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.9 2009/01/17 11:37:42 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Fri Jan 16 12:16:37 2009
+++ hotspot/src/os/bsd/vm/os_bsd.cpp Fri Jan 16 12:52:29 2009
@@ -47,13 +47,26 @@
# include <semaphore.h>
# include <fcntl.h>
@ -976,7 +976,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.8 2009/01/16 16:49:29 kurt
status, "cond_timedwait");
#ifdef ASSERT
@@ -4705,28 +5039,19 @@ void Parker::unpark() {
@@ -4705,14 +5039,6 @@ void Parker::unpark() {
extern char** environ;
@ -991,13 +991,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.8 2009/01/16 16:49:29 kurt
// Run the specified command in a separate process. Return its exit value,
// or -1 on failure (e.g. can't fork a new process).
// Unlike system(), this function can be called from signal handler. It
// doesn't block SIGINT et al.
int os::fork_and_exec(char* cmd) {
- const char * argv[4] = {"sh", "-c", cmd, NULL};
+ char * const argv[4] = {"sh", "-c", cmd, NULL};
// fork() in BsdThreads/NPTL is not async-safe. It needs to run
// pthread_atfork handlers and reset pthread library. All we need is a
@@ -4725,8 +5051,7 @@ int os::fork_and_exec(char* cmd) {
// separate process to execve. Make a direct syscall to fork process.
// On IA64 there's no fork syscall, we have to use fork() and hope for
// the best...
@ -1013,7 +1007,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.8 2009/01/16 16:49:29 kurt
// above.
- NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);)
- IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);)
+ execve("/bin/sh", argv, environ);
+ execve("/bin/sh", (char* const*)argv, environ);
// execve failed
_exit(-1);

22
devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig Wed Dec 24 13:41:51 2008
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun Dec 28 17:28:37 2008
$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.3 2009/01/17 11:37:42 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig Fri Jan 16 12:16:38 2009
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Jan 16 12:16:43 2009
@@ -44,23 +44,158 @@
# include <sys/wait.h>
# include <pwd.h>
@ -302,7 +302,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23
int page_size = os::vm_page_size();
address addr = (address) info->si_addr;
address pc = os::Bsd::ucontext_get_pc(uc);
@@ -465,7 +631,7 @@ JVM_handle_bsd_signal(int sig,
@@ -466,7 +632,7 @@ JVM_handle_bsd_signal(int sig,
// save all thread context in case we need to restore it
if (thread != NULL) thread->set_saved_exception_pc(pc);
@ -311,7 +311,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23
return true;
}
@@ -495,13 +661,24 @@ JVM_handle_bsd_signal(int sig,
@@ -496,13 +662,24 @@ JVM_handle_bsd_signal(int sig,
ShouldNotReachHere();
}
@ -336,7 +336,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23
int os::Bsd::get_fpu_control_word(void) {
#ifdef AMD64
return 0;
@@ -517,11 +694,12 @@ void os::Bsd::set_fpu_control_word(int fpu_control) {
@@ -518,11 +695,12 @@ void os::Bsd::set_fpu_control_word(int fpu_control) {
_FPU_SETCW(fpu_control);
#endif // !AMD64
}
@ -350,7 +350,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23
return true;
#else
struct utsname uts;
@@ -575,6 +753,9 @@ size_t os::Bsd::min_stack_allowed = (48 DEBUG_ONLY(+
@@ -576,6 +754,9 @@ size_t os::Bsd::min_stack_allowed = (48 DEBUG_ONLY(+
#define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
#endif
@ -360,7 +360,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23
// Test if pthread library can support variable thread stack size. BsdThreads
// in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads
// in floating stack mode and NPTL support variable stack size.
@@ -611,6 +792,7 @@ bool os::Bsd::supports_variable_stack_size() {
@@ -612,6 +793,7 @@ bool os::Bsd::supports_variable_stack_size() {
#endif
}
}
@ -368,7 +368,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23
#endif // AMD64
// return default stack size for thr_type
@@ -664,6 +846,41 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
@@ -665,6 +847,41 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
// pthread_attr_getstack()
static void current_stack_region(address * bottom, size_t * size) {
@ -410,7 +410,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23
if (os::Bsd::is_initial_thread()) {
// initial thread needs special handling because pthread_getattr_np()
// may return bogus value.
@@ -690,6 +907,7 @@ static void current_stack_region(address * bottom, siz
@@ -691,6 +908,7 @@ static void current_stack_region(address * bottom, siz
pthread_attr_destroy(&attr);
}
@ -418,7 +418,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23
assert(os::current_stack_pointer() >= *bottom &&
os::current_stack_pointer() < *bottom + *size, "just checking");
}
@@ -718,46 +936,44 @@ void os::print_context(outputStream *st, void *context
@@ -719,46 +937,44 @@ void os::print_context(outputStream *st, void *context
ucontext_t *uc = (ucontext_t*)context;
st->print_cr("Registers:");
#ifdef AMD64

17
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_opto_macro_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-hotspot_src_share_vm_opto_macro_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/opto/macro.cpp.orig Wed Dec 24 10:12:36 2008
+++ hotspot/src/share/vm/opto/macro.cpp Wed Dec 24 10:13:01 2008
@@ -1724,6 +1724,13 @@ void PhaseMacroExpand::expand_lock_node(LockNode *lock
if (klass_node == NULL) {
Node* k_adr = basic_plus_adr(obj, oopDesc::klass_offset_in_bytes());
klass_node = transform_later( LoadKlassNode::make(_igvn, mem, k_adr, _igvn.type(k_adr)->is_ptr()) );
+#ifdef _LP64
+ if (UseCompressedOops && klass_node->is_DecodeN()) {
+ assert(klass_node->in(1)->Opcode() == Op_LoadNKlass, "sanity");
+ klass_node->in(1)->init_req(0, ctrl);
+ } else
+#endif
+ klass_node->init_req(0, ctrl);
}
Node *proto_node = make_load(ctrl, mem, klass_node, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), TypeX_X, TypeX_X->basic_type());

8
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_vmError_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.4 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/vmError.cpp.orig Thu Jul 17 03:40:35 2008
+++ hotspot/src/share/vm/utilities/vmError.cpp Sat Aug 2 16:12:53 2008
$OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.5 2009/01/17 11:37:42 kurt Exp $
--- hotspot/src/share/vm/utilities/vmError.cpp.orig Thu Jan 15 03:41:24 2009
+++ hotspot/src/share/vm/utilities/vmError.cpp Fri Jan 16 12:16:44 2009
@@ -31,7 +31,7 @@ const char *env_list[] = {
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
"JAVA_COMPILER", "PATH", "USERNAME",
@ -27,7 +27,7 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.4 2009/01/04 23:2
// If the crash is in native code, encourage user to submit a bug to the
// provider of that code.
if (thread && thread->is_Java_thread() &&
@@ -792,7 +799,7 @@ void VMError::report_and_die() {
@@ -794,7 +801,7 @@ void VMError::report_and_die() {
const char* ptr = OnError;
while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
out.print_raw ("# Executing ");

12
devel/jdk/1.7/patches/patch-jdk_make_java_sun_nio_FILES_java_gmk
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-jdk_make_java_sun_nio_FILES_java_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/sun_nio/FILES_java.gmk.orig Thu Jul 17 03:43:08 2008
+++ jdk/make/java/sun_nio/FILES_java.gmk Sat Aug 2 16:12:53 2008
@@ -131,6 +131,8 @@ FILES_java += \
sun/io/CharToByteCp1257.java \
sun/io/ByteToCharKOI8_R.java \
sun/io/CharToByteKOI8_R.java \
+ sun/io/ByteToCharKOI8_U.java \
+ sun/io/CharToByteKOI8_U.java \
sun/io/ByteToCharSingleByte.java \
sun/io/CharToByteSingleByte.java

65
devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_io_ByteToCharKOI8_U_java
View File

@ -1,65 +0,0 @@
$OpenBSD: patch-jdk_src_share_classes_sun_io_ByteToCharKOI8_U_java,v 1.1 2008/03/19 18:05:46 kurt Exp $
--- jdk/src/share/classes/sun/io/ByteToCharKOI8_U.java.orig Wed Nov 7 18:16:18 2007
+++ jdk/src/share/classes/sun/io/ByteToCharKOI8_U.java Wed Nov 7 18:16:18 2007
@@ -0,0 +1,61 @@
+/*
+ * @(#)ByteToCharKOI8_U.java 1.0 01/05/01
+ *
+ *
+ */
+
+package sun.io;
+
+/**
+ * A table to convert KOI8_U to Unicode
+ *
+ * @author Andriy Rysin
+ * @version >= JDK1.1.6
+ */
+
+public class ByteToCharKOI8_U extends ByteToCharSingleByte {
+
+ public String getCharacterEncoding() {
+ return "KOI8_U";
+ }
+
+ public ByteToCharKOI8_U() {
+ super.byteToCharTable = byteToCharTable;
+ }
+
+ private final static String byteToCharTable =
+
+ "\u2500\u2502\u250C\u2510\u2514\u2518\u251C\u2524" + // 0x80 - 0x87
+ "\u252C\u2534\u253C\u2580\u2584\u2588\u258C\u2590" + // 0x88 - 0x8F
+ "\u2591\u2592\u2593\u2320\u25A0\u2219\u221A\u2248" + // 0x90 - 0x97
+ "\u2264\u2265\u00A0\u2321\u00B0\u00B2\u00B7\u00F7" + // 0x98 - 0x9F
+ "\u2550\u2551\u2552\u0451\u0454\u2554\u0456\u0457" + // 0xA0 - 0xA7
+ "\u2557\u2558\u2559\u255A\u255B\u0491\u045E\u255E" + // 0xA8 - 0xAF
+ "\u255F\u2560\u2561\u0401\u0404\u2563\u0406\u0407" + // 0xB0 - 0xB7
+ "\u2566\u2567\u2568\u2569\u256A\u0490\u040E\u00A9" + // 0xB8 - 0xBF
+ "\u044E\u0430\u0431\u0446\u0434\u0435\u0444\u0433" + // 0xC0 - 0xC7
+ "\u0445\u0438\u0439\u043A\u043B\u043C\u043D\u043E" + // 0xC8 - 0xCF
+ "\u043F\u044F\u0440\u0441\u0442\u0443\u0436\u0432" + // 0xD0 - 0xD7
+ "\u044C\u044B\u0437\u0448\u044D\u0449\u0447\u044A" + // 0xD8 - 0xDF
+ "\u042E\u0410\u0411\u0426\u0414\u0415\u0424\u0413" + // 0xE0 - 0xE7
+ "\u0425\u0418\u0419\u041A\u041B\u041C\u041D\u041E" + // 0xE8 - 0xEF
+ "\u041F\u042F\u0420\u0421\u0422\u0423\u0416\u0412" + // 0xF0 - 0xF7
+ "\u042C\u042B\u0417\u0428\u042D\u0429\u0427\u042A" + // 0xF8 - 0xFF
+ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" + // 0x00 - 0x07
+ "\b\t\n\u000B\f\r\u000E\u000F" + // 0x08 - 0x0F
+ "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" + // 0x10 - 0x17
+ "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" + // 0x18 - 0x1F
+ "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" + // 0x20 - 0x27
+ "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" + // 0x28 - 0x2F
+ "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" + // 0x30 - 0x37
+ "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" + // 0x38 - 0x3F
+ "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" + // 0x40 - 0x47
+ "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" + // 0x48 - 0x4F
+ "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" + // 0x50 - 0x57
+ "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" + // 0x58 - 0x5F
+ "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" + // 0x60 - 0x67
+ "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" + // 0x68 - 0x6F
+ "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" + // 0x70 - 0x77
+ "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F"; // 0x78 - 0x7F
+
+}

240
devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_io_CharToByteKOI8_U_java
View File

@ -1,240 +0,0 @@
$OpenBSD: patch-jdk_src_share_classes_sun_io_CharToByteKOI8_U_java,v 1.1 2008/03/19 18:05:46 kurt Exp $
--- jdk/src/share/classes/sun/io/CharToByteKOI8_U.java.orig Wed Nov 7 18:16:18 2007
+++ jdk/src/share/classes/sun/io/CharToByteKOI8_U.java Wed Nov 7 18:16:18 2007
@@ -0,0 +1,236 @@
+/*
+ * @(#)CharToByteKOI8_U.java 1.0 01/05/01
+ *
+ *
+ */
+
+package sun.io;
+
+/**
+ * Tables and data to convert Unicode to KOI8_U
+ *
+ * @author Andriy Rysin
+ * @version >= JDK1.1.6
+ */
+
+public class CharToByteKOI8_U extends CharToByteSingleByte {
+
+ public String getCharacterEncoding() {
+ return "KOI8_U";
+ }
+
+ public CharToByteKOI8_U() {
+ super.mask1 = 0xFF00;
+ super.mask2 = 0x00FF;
+ super.shift = 8;
+ super.index1 = index1;
+ super.index2 = index2;
+ }
+
+ private final static String index2 =
+
+ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" +
+ "\b\t\n\u000B\f\r\u000E\u000F" +
+ "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" +
+ "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" +
+ "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" +
+ "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" +
+ "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" +
+ "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" +
+ "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" +
+ "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" +
+ "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" +
+ "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" +
+ "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" +
+ "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" +
+ "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" +
+ "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u009A\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u00BF\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u009C\u0000\u009D\u0000\u0000\u0000\u0000\u009E" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u009F" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u00B3\u0000\u0000\u00B4\u0000\u00B6\u00B7\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u00BE\u0000\u00E1" +
+ "\u00E2\u00F7\u00E7\u00E4\u00E5\u00F6\u00FA\u00E9" +
+ "\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F0\u00F2" +
+ "\u00F3\u00F4\u00F5\u00E6\u00E8\u00E3\u00FE\u00FB" +
+ "\u00FD\u00FF\u00F9\u00F8\u00FC\u00E0\u00F1\u00C1" +
+ "\u00C2\u00D7\u00C7\u00C4\u00C5\u00D6\u00DA\u00C9" +
+ "\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0\u00D2" +
+ "\u00D3\u00D4\u00D5\u00C6\u00C8\u00C3\u00DE\u00DB" +
+ "\u00DD\u00DF\u00D9\u00D8\u00DC\u00C0\u00D1\u0000" +
+ "\u00A3\u0000\u0000\u00A4\u0000\u00A6\u00A7\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u00AE\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00BD" +
+ "\u00AD\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0095" +
+ "\u0096\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0097\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0098\u0099\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0093\u009B" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0080\u0000" +
+ "\u0081\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0082\u0000\u0000\u0000\u0083\u0000" +
+ "\u0000\u0000\u0084\u0000\u0000\u0000\u0085\u0000" +
+ "\u0000\u0000\u0086\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0087\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0088\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0089\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u008A\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u00A0\u00A1" +
+ "\u00A2\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9\u00AA" +
+ "\u00AB\u00AC\u00AD\u00AE\u00AF\u00B0\u00B1\u00B2" +
+ "\u00B4\u00B5\u00B6\u00B7\u00B8\u00B9\u00BA\u00BB" +
+ "\u00BC\u00BD\u00BE\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u008B\u0000" +
+ "\u0000\u0000\u008C\u0000\u0000\u0000\u008D\u0000" +
+ "\u0000\u0000\u008E\u0000\u0000\u0000\u008F\u0090" +
+ "\u0091\u0092\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0094\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
+ "\u0000\u0000\u0000\u0000\u0000\u0000";
+
+ private final static short index1[] = {
+ 0, 248, 248, 248, 503, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 734, 958, 248, 1214, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
+ };
+
+}

26
devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_io_CharacterEncoding_java
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-jdk_src_share_classes_sun_io_CharacterEncoding_java,v 1.1 2008/03/19 18:05:46 kurt Exp $
--- jdk/src/share/classes/sun/io/CharacterEncoding.java.orig Tue Oct 30 05:02:47 2007
+++ jdk/src/share/classes/sun/io/CharacterEncoding.java Wed Nov 7 18:16:18 2007
@@ -92,6 +92,7 @@ public class CharacterEncoding {
aliasTable.put("gb18030", "GB18030");
aliasTable.put("gbk", "GBK");
aliasTable.put("koi8-r", "KOI8_R");
+ aliasTable.put("koi8-u", "KOI8_U");
aliasTable.put("tis620.2533", "TIS620");
// Windows encodings
@@ -785,8 +786,13 @@ public class CharacterEncoding {
// Russian KOI8-R
aliasTable.put("koi8-r", "KOI8_R");
- aliasTable.put("koi8", "KOI8_R");
aliasTable.put("cskoi8r", "KOI8_R");
+
+ // Ukrainian and Bielorussian KOI8-U (includes KOI8-R)
+ aliasTable.put("koi8-u", "KOI8_U");
+ aliasTable.put("koi8", "KOI8_U");
+ aliasTable.put("koi8u", "KOI8_U");
+ aliasTable.put("cskoi8u", "KOI8_U");
// Simplified Chinese
aliasTable.put("gb2312", "EUC_CN");

12
devel/jdk/1.7/patches/patch-jdk_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java.orig Thu Oct 23 03:44:44 2008
+++ jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java Tue Dec 23 01:09:55 2008
@@ -418,7 +418,7 @@ public class X11GraphicsEnvironment
$OpenBSD: patch-jdk_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java,v 1.3 2009/01/17 11:37:42 kurt Exp $
--- jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java.orig Thu Jan 15 03:44:44 2009
+++ jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java Fri Jan 16 12:16:51 2009
@@ -419,7 +419,7 @@ public class X11GraphicsEnvironment
if (fontID != null) {
fileName = (String)fontNameMap.get(fontID);
/* On Linux check for the Lucida Oblique fonts */
@ -10,7 +10,7 @@ $OpenBSD: patch-jdk_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java,v 1.
if (oblmap == null) {
initObliqueLucidaFontMap();
}
@@ -654,7 +654,7 @@ public class X11GraphicsEnvironment
@@ -655,7 +655,7 @@ public class X11GraphicsEnvironment
if (fontConfigDirs == null) {
return;
}
@ -19,7 +19,7 @@ $OpenBSD: patch-jdk_src_solaris_classes_sun_awt_X11GraphicsEnvironment_java,v 1.
fontConfigDirs.add(jreLibDirName+File.separator+"oblique-fonts");
}
fontdirs = (String[])fontConfigDirs.toArray(new String[0]);
@@ -935,7 +935,7 @@ public class X11GraphicsEnvironment
@@ -936,7 +936,7 @@ public class X11GraphicsEnvironment
*/
FontConfiguration mFontConfig = new MFontConfiguration(this);
if (isOpenSolaris ||

12
devel/jdk/1.7/patches/patch-jdk_src_solaris_classes_sun_font_XMap_java
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-jdk_src_solaris_classes_sun_font_XMap_java,v 1.1 2008/03/19 18:05:46 kurt Exp $
--- jdk/src/solaris/classes/sun/font/XMap.java.orig Tue Oct 30 05:04:00 2007
+++ jdk/src/solaris/classes/sun/font/XMap.java Thu Nov 8 08:32:40 2007
@@ -102,6 +102,8 @@ class XMap {
jclass = "ISO8859_5";
} else if (encoding.equals("koi8-r")) {
jclass = "KOI8_R";
+ } else if (encoding.equals("koi8-u")) {
+ jclass = "KOI8_U";
} else if (encoding.equals("ansi-1251")) {
jclass = "windows-1251";
} else if (encoding.equals("iso8859-6")) {