diff options
| author | jkim <jkim@FreeBSD.org> | 2011-01-19 03:28:11 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2011-01-19 03:28:11 +0800 |
| commit | cbc3ca496112725da0b0cf895d9d035443409466 (patch) | |
| tree | 488d9379612e2cb3b9d31d47a2ccc1d94f850164 /java | |
| parent | b54f11a665dfd8ad73802b79a96a8186b4e33e34 (diff) | |
| download | freebsd-ports-gnome-cbc3ca496112725da0b0cf895d9d035443409466.tar.gz freebsd-ports-gnome-cbc3ca496112725da0b0cf895d9d035443409466.tar.zst freebsd-ports-gnome-cbc3ca496112725da0b0cf895d9d035443409466.zip | |
Update IcedTea6 web support to 1.9.4 (CVE-2010-4351).
Feature safe: yes
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk6/distinfo | 4 | ||||
| -rw-r--r-- | java/openjdk6/files/icedtea.patch | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 86998035c5c2..1b780cd79c3a 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -7,7 +7,7 @@ PORTNAME= openjdk6 PORTVERSION= b20 -PORTREVISION= 6 +PORTREVISION= 7 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.2 +ICEDTEAVERSION= 1.9.4 ICEDTEAFILE= icedtea6-${ICEDTEAVERSION}${EXTRACT_SUFX} JTREGVERSION= b03 JTREGFILE= jtreg-4_0-bin-${JTREGVERSION}-31_mar_2009.zip diff --git a/java/openjdk6/distinfo b/java/openjdk6/distinfo index dfc3c01d6465..51eaf645ae57 100644 --- a/java/openjdk6/distinfo +++ b/java/openjdk6/distinfo @@ -8,7 +8,7 @@ SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617 SIZE (jdk6-jaf-b20.zip) = 71243 SHA256 (apache-ant-1.8.1-bin.tar.bz2) = e0c4e1133b0cb80dc4b29fc48f11b8f57e845e16474472f2749625be5cc66ca9 SIZE (apache-ant-1.8.1-bin.tar.bz2) = 6702817 -SHA256 (icedtea6-1.9.2.tar.gz) = abed4d2258fd6f047b08926fa9dbde86bdf7f47b08c82c195abb7244163cf99b -SIZE (icedtea6-1.9.2.tar.gz) = 6438043 +SHA256 (icedtea6-1.9.4.tar.gz) = 2194b59d8c17ad6ff2fb495e10f9e6023993df5f8ce8a3739bf057f6562ef077 +SIZE (icedtea6-1.9.4.tar.gz) = 6501091 SHA256 (jtreg-4_0-bin-b03-31_mar_2009.zip) = 919b3da574a8bfb96a53d9550a0cb2482dc08df6ce3e7042235e0e9067c832e6 SIZE (jtreg-4_0-bin-b03-31_mar_2009.zip) = 4824967 diff --git a/java/openjdk6/files/icedtea.patch b/java/openjdk6/files/icedtea.patch index 5e647f8ff83d..571171c5a218 100644 --- a/java/openjdk6/files/icedtea.patch +++ b/java/openjdk6/files/icedtea.patch @@ -6,8 +6,8 @@ http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=552 PR593: Increment of invalidated iterator in IcedTeaPluginUtils http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=593 ---- 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 +--- icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2010-10-04 17:26:45.636097000 -0400 ++++ icedtea6-1.9.4/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); @@ -19,8 +19,8 @@ http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=593 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.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 +--- icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-08-06 07:05:21.996828000 -0400 ++++ icedtea6-1.9.4/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>(); @@ -99,8 +99,8 @@ http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=593 } /****************************************** ---- 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 +--- icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.cc Tue Oct 19 17:55:59 2010 +0100 ++++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Nov 24 15:22:03 2010 -0500 @@ -510,11 +510,15 @@ IcedTeaPluginUtilities::invalidateInstan std::map<void*,NPP>::iterator iterator; |