freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update IcedTea6 web support to 1.9.2.

Browse Source 
- Add a patch to fix browser plugin crash[1].

Submitted by:	Barbara (barbara dot xxx1975 at libero dot it)[1]
This commit is contained in:
Jung-uk Kim
2010-11-24 23:35:32 +00:00
parent 79f30a040e
commit 3f8405abd2
4 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openjdk6/Makefile
+2 -2
View File
@@ -7,7 +7,7 @@
PORTNAME= openjdk6
PORTVERSION= b20
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
https://jaxp.dev.java.net/files/documents/913/150648/:jaxp \
@@ -63,7 +63,7 @@ JAXWS_BUILD= b20
JAXWSFILE= jdk6-jaxws-${JAXWS_BUILD}.zip
JAF_BUILD= b20
JAFFILE= jdk6-jaf-${JAF_BUILD}.zip
ICEDTEAVERSION= 1.9.1
ICEDTEAVERSION= 1.9.2
ICEDTEAFILE= icedtea6-${ICEDTEAVERSION}${EXTRACT_SUFX}
JTREGVERSION= b03
JTREGFILE= jtreg-4_0-bin-${JTREGVERSION}-31_mar_2009.zip
java/openjdk6/distinfo
+2 -9
View File
@@ -1,21 +1,14 @@
MD5 (openjdk-6-src-b20-21_jun_2010.tar.gz) = 0b36adbf67e4f261e1b827ed4be4f447
SHA256 (openjdk-6-src-b20-21_jun_2010.tar.gz) = fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b
SIZE (openjdk-6-src-b20-21_jun_2010.tar.gz) = 45078703
MD5 (jdk6-jaxp-b20.zip) = 22e95fbdb9fb7d8b6b6fc0a1d76d1fbd
SHA256 (jdk6-jaxp-b20.zip) = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
SIZE (jdk6-jaxp-b20.zip) = 5944804
MD5 (jdk6-jaxws-b20.zip) = 91adfd41e6f001add4f92ae31216b1e3
SHA256 (jdk6-jaxws-b20.zip) = 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
SIZE (jdk6-jaxws-b20.zip) = 5513069
MD5 (jdk6-jaf-b20.zip) = bc95c133620bd68c161cac9891592901
SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
SIZE (jdk6-jaf-b20.zip) = 71243
MD5 (apache-ant-1.7.1-bin.tar.bz2) = 9330447f3763b87570dd1118c49a8efd
SHA256 (apache-ant-1.7.1-bin.tar.bz2) = 24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97
SIZE (apache-ant-1.7.1-bin.tar.bz2) = 7641928
MD5 (icedtea6-1.9.1.tar.gz) = 8cb71d69a74152b369d3929c5b5badfd
SHA256 (icedtea6-1.9.1.tar.gz) = d773a6eb60f560d291206bfdeb83b1da03b79c7c09b7ae53da1877e57ddb3cea
SIZE (icedtea6-1.9.1.tar.gz) = 6395453
MD5 (jtreg-4_0-bin-b03-31_mar_2009.zip) = 99c4c119c2dd8e7a39c184896a56a00e
SHA256 (icedtea6-1.9.2.tar.gz) = abed4d2258fd6f047b08926fa9dbde86bdf7f47b08c82c195abb7244163cf99b
SIZE (icedtea6-1.9.2.tar.gz) = 6438043
SHA256 (jtreg-4_0-bin-b03-31_mar_2009.zip) = 919b3da574a8bfb96a53d9550a0cb2482dc08df6ce3e7042235e0e9067c832e6
SIZE (jtreg-4_0-bin-b03-31_mar_2009.zip) = 4824967
java/openjdk6/files/icedtea.patch
+28 -20
View File
@@ -1,25 +1,13 @@
$FreeBSD$
This patch works around POSIX thread implementation differences between
FreeBSD's libthr and Linux's NPTL:
PR552: Support for FreeBSD's pthread implementation
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=552
- We do not support static allocations of mutex and condition variable.
Instead, they are allocated dynamically when they are used for the first
time if they are properly initialized with PTHREAD_MUTEX_INITIALIZER and
PTHREAD_COND_INITIALIZER. Thus, we explicitly initialize and destroy
them to be safer.
PR593: Increment of invalidated iterator in IcedTeaPluginUtils
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=593
- We must initialize mutex before calling pthread_cond_wait(3). Otherwise,
it fails with EINVAL.
- We must lock mutex before calling pthread_cond_wait(3). Otherwise, it
fails with EPERM. This is a POSIX requirement.
- We must join threads via pthread_join(3) after calling pthread_cancel(3).
Otherwise, we may destroy mutex or condition variable in use.
--- icedtea6-1.9.1/plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2010-10-04 17:26:45.636097000 -0400
+++ icedtea6-1.9.1/plugin/icedteanp/IcedTeaNPPlugin.cc 2010-10-13 14:23:10.000000000 -0400
--- icedtea6-1.9.2/plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2010-10-04 17:26:45.636097000 -0400
+++ icedtea6-1.9.2/plugin/icedteanp/IcedTeaNPPlugin.cc 2010-10-13 14:23:10.000000000 -0400
@@ -2355,6 +2355,10 @@ NP_Shutdown (void)
pthread_cancel(plugin_request_processor_thread2);
pthread_cancel(plugin_request_processor_thread3);
@@ -31,8 +19,8 @@ Otherwise, we may destroy mutex or condition variable in use.
java_to_plugin_bus->unSubscribe(plugin_req_proc);
plugin_to_java_bus->unSubscribe(java_req_proc);
//internal_bus->unSubscribe(java_req_proc);
--- icedtea6-1.9.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-08-06 07:05:21.996828000 -0400
+++ icedtea6-1.9.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-10-13 14:23:10.000000000 -0400
--- icedtea6-1.9.2/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-08-06 07:05:21.996828000 -0400
+++ icedtea6-1.9.2/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-10-13 14:23:10.000000000 -0400
@@ -63,6 +63,12 @@ PluginRequestProcessor::PluginRequestPro
this->pendingRequests = new std::map<pthread_t, uintmax_t>();
@@ -111,3 +99,23 @@ Otherwise, we may destroy mutex or condition variable in use.
}
/******************************************
--- icedtea6-1.9.2/plugin/icedteanp/IcedTeaPluginUtils.cc Tue Oct 19 17:55:59 2010 +0100
+++ icedtea6-1.9.2/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Nov 24 15:22:03 2010 -0500
@@ -510,11 +510,15 @@ IcedTeaPluginUtilities::invalidateInstan
std::map<void*,NPP>::iterator iterator;
- for (iterator = instance_map->begin(); iterator != instance_map->end(); iterator++)
+ for (iterator = instance_map->begin(); iterator != instance_map->end(); )
{
if ((*iterator).second == instance)
{
- instance_map->erase((*iterator).first);
+ instance_map->erase(iterator++);
+ }
+ else
+ {
+ ++iterator;
}
}
}
java/openjdk6/files/plugin.patch
+4 -3
View File
@@ -1,14 +1,15 @@
$FreeBSD$
Applied patches from IcedTea6-1.9:
Applied patches from IcedTea6-1.9.2:
patches/hotspot/original/update-bootclasspath.patch
patches/icedtea-demo-swingapplet.patch
patches/update-bootclasspath.patch
patches/extensions/netx.patch
patches/extensions/netx-umask.patch
patches/extensions/liveconnect.patch
Note: patches/update-bootclasspath.patch was applied without rhino support.
Note: patches/hotspot/original/update-bootclasspath.patch was applied without
rhino support.
--- hotspot/src/share/vm/runtime/os.cpp.orig 2010-06-21 17:12:21.000000000 -0400
+++ hotspot/src/share/vm/runtime/os.cpp 2010-09-09 16:24:52.000000000 -0400