3 files changed, 67 insertions, 10 deletions

diff --git a/java/linux-sun-jdk17/Makefile b/java/linux-sun-jdk17/Makefile
index 28f01b8de996..544c6d7d70d7 100644
--- a/java/linux-sun-jdk17/Makefile
+++ b/java/linux-sun-jdk17/Makefile
@@ -34,7 +34,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 JDK_VERSION=		7
 JDK_INTERNAL_VERSION=	1.7.0
-JDK_UPDATE_VERSION=	5
+JDK_UPDATE_VERSION=	6
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_0${JDK_UPDATE_VERSION}
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
diff --git a/java/linux-sun-jdk17/distinfo b/java/linux-sun-jdk17/distinfo
index b98c0524feed..e1794d255d1e 100644
--- a/java/linux-sun-jdk17/distinfo
+++ b/java/linux-sun-jdk17/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jdk-7u5-linux-i586.tar.gz) = 422dfe67a4885d47c0053b97f4a56fb4dced60799a1bb82f8266b0745a7149f7
-SIZE (jdk-7u5-linux-i586.tar.gz) = 82947286
-SHA256 (jdk-7u5-linux-i586-demos.tar.gz) = cd3d76ba4b7e8c293b11810b55c70a31b97cc2ebe87e3963c0e7657e3ac52a41
-SIZE (jdk-7u5-linux-i586-demos.tar.gz) = 14027554
+SHA256 (jdk-7u6-linux-i586.tar.gz) = 852cf2db507d1ff831dec01e757912023bb6219f32de83912ba52f04af6a8275
+SIZE (jdk-7u6-linux-i586.tar.gz) = 97360299
+SHA256 (jdk-7u6-linux-i586-demos.tar.gz) = 15001be7615e92ffb21e805fdd17b56e2ac7cfa29eb7e429c8d2a81e9cff3dfc
+SIZE (jdk-7u6-linux-i586-demos.tar.gz) = 14741227
diff --git a/java/linux-sun-jdk17/pkg-plist b/java/linux-sun-jdk17/pkg-plist
index d124c8ae15a6..2a4fe39b2eb2 100644
--- a/java/linux-sun-jdk17/pkg-plist
+++ b/java/linux-sun-jdk17/pkg-plist
@@ -2,6 +2,7 @@
 %%T%%/COPYRIGHT
 %%T%%/LICENSE
 %%T%%/README.html
+%%T%%/THIRDPARTYLICENSEREADME-JAVAFX.txt
 %%T%%/THIRDPARTYLICENSEREADME.txt
 %%T%%/bin/ControlPanel
 %%T%%/bin/appletviewer
@@ -14,6 +15,7 @@
 %%T%%/bin/java-rmi.cgi
 %%T%%/bin/javac
 %%T%%/bin/javadoc
+%%T%%/bin/javafxpackager
 %%T%%/bin/javah
 %%T%%/bin/javap
 %%T%%/bin/javaws
@@ -92,6 +94,7 @@
 %%T%%/db/lib/derbytools.jar
 %%DEMO%%%%T%%/demo/DEMOS_LICENSE
 %%DEMO%%%%T%%/demo/README
+%%DEMO%%%%T%%/demo/applets.html
 %%DEMO%%%%T%%/demo/applets/Animator/Animation.class
 %%DEMO%%%%T%%/demo/applets/Animator/AnimationFrame.class
 %%DEMO%%%%T%%/demo/applets/Animator/Animator.class
@@ -276,9 +279,9 @@
 %%DEMO%%%%T%%/demo/applets/WireFrame/models/dinasaur.obj
 %%DEMO%%%%T%%/demo/applets/WireFrame/models/hughes_500.obj
 %%DEMO%%%%T%%/demo/applets/WireFrame/models/knoxS.obj
-%%DEMO%%%%T%%/demo/applets.html
 %%DEMO%%%%T%%/demo/db/README-JDK-DEMOS.html
 %%DEMO%%%%T%%/demo/db/README.txt
+%%DEMO%%%%T%%/demo/db/databases/toursdb.jar
 %%DEMO%%%%T%%/demo/db/databases/toursdb/log/log.ctrl
 %%DEMO%%%%T%%/demo/db/databases/toursdb/log/log1.dat
 %%DEMO%%%%T%%/demo/db/databases/toursdb/log/logmirror.ctrl
@@ -371,7 +374,6 @@
 %%DEMO%%%%T%%/demo/db/databases/toursdb/seg0/ce1.dat
 %%DEMO%%%%T%%/demo/db/databases/toursdb/seg0/cf0.dat
 %%DEMO%%%%T%%/demo/db/databases/toursdb/service.properties
-%%DEMO%%%%T%%/demo/db/databases/toursdb.jar
 %%DEMO%%%%T%%/demo/db/programs/csfull.css
 %%DEMO%%%%T%%/demo/db/programs/demo.html
 %%DEMO%%%%T%%/demo/db/programs/derbylogo128_bluebg.png
@@ -667,6 +669,7 @@
 %%DEMO%%%%T%%/demo/nio/zipfs/README.txt
 %%DEMO%%%%T%%/demo/nio/zipfs/src.zip
 %%DEMO%%%%T%%/demo/nio/zipfs/zipfs.jar
+%%DEMO%%%%T%%/demo/plugin/applets.html
 %%DEMO%%%%T%%/demo/plugin/applets/Animator/Animation.class
 %%DEMO%%%%T%%/demo/plugin/applets/Animator/AnimationFrame.class
 %%DEMO%%%%T%%/demo/plugin/applets/Animator/Animator.class
@@ -851,7 +854,6 @@
 %%DEMO%%%%T%%/demo/plugin/applets/WireFrame/models/dinasaur.obj
 %%DEMO%%%%T%%/demo/plugin/applets/WireFrame/models/hughes_500.obj
 %%DEMO%%%%T%%/demo/plugin/applets/WireFrame/models/knoxS.obj
-%%DEMO%%%%T%%/demo/plugin/applets.html
 %%DEMO%%%%T%%/demo/plugin/jfc/CodePointIM/CodePointIM.jar
 %%DEMO%%%%T%%/demo/plugin/jfc/CodePointIM/README.html
 %%DEMO%%%%T%%/demo/plugin/jfc/CodePointIM/README_ja.html
@@ -915,6 +917,7 @@
 %%T%%/jre/COPYRIGHT
 %%T%%/jre/LICENSE
 %%T%%/jre/README
+%%T%%/jre/THIRDPARTYLICENSEREADME-JAVAFX.txt
 %%T%%/jre/THIRDPARTYLICENSEREADME.txt
 %%T%%/jre/Welcome.html
 %%T%%/jre/bin/ControlPanel
@@ -943,6 +946,8 @@
 %%T%%/jre/lib/content-types.properties
 %%T%%/jre/lib/currency.data
 %%T%%/jre/lib/deploy.jar
+%%T%%/jre/lib/deploy/MixedCodeMainDialog.ui
+%%T%%/jre/lib/deploy/cautionshield.icns
 %%T%%/jre/lib/deploy/ffjcext.zip
 %%T%%/jre/lib/deploy/java-icon.ico
 %%T%%/jre/lib/deploy/messages.properties
@@ -957,6 +962,7 @@
 %%T%%/jre/lib/deploy/messages_zh_CN.properties
 %%T%%/jre/lib/deploy/messages_zh_HK.properties
 %%T%%/jre/lib/deploy/messages_zh_TW.properties
+%%T%%/jre/lib/deploy/mixcode_s.png
 %%T%%/jre/lib/deploy/splash.gif
 %%T%%/jre/lib/desktop/applications/sun-java.desktop
 %%T%%/jre/lib/desktop/applications/sun-javaws.desktop
@@ -1043,6 +1049,9 @@
 %%T%%/jre/lib/i386/client/Xusage.txt
 %%T%%/jre/lib/i386/client/libjsig.so
 %%T%%/jre/lib/i386/client/libjvm.so
+%%T%%/jre/lib/i386/fxavcodecplugin-52.so
+%%T%%/jre/lib/i386/fxavcodecplugin-53.so
+%%T%%/jre/lib/i386/fxplugins.so
 %%T%%/jre/lib/i386/headless/libmawt.so
 %%T%%/jre/lib/i386/jli/libjli.so
 %%T%%/jre/lib/i386/jvm.cfg
@@ -1053,6 +1062,9 @@
 %%T%%/jre/lib/i386/libdeploy.so
 %%T%%/jre/lib/i386/libdt_socket.so
 %%T%%/jre/lib/i386/libfontmanager.so
+%%T%%/jre/lib/i386/libglass.so
+%%T%%/jre/lib/i386/libgstplugins-lite.so
+%%T%%/jre/lib/i386/libgstreamer-lite.so
 %%T%%/jre/lib/i386/libhprof.so
 %%T%%/jre/lib/i386/libinstrument.so
 %%T%%/jre/lib/i386/libj2gss.so
@@ -1061,6 +1073,8 @@
 %%T%%/jre/lib/i386/libjaas_unix.so
 %%T%%/jre/lib/i386/libjava.so
 %%T%%/jre/lib/i386/libjava_crw_demo.so
+%%T%%/jre/lib/i386/libjavafx-font.so
+%%T%%/jre/lib/i386/libjavafx-iio.so
 %%T%%/jre/lib/i386/libjavaplugin_jni.so
 %%T%%/jre/lib/i386/libjavaplugin_nscp.so
 %%T%%/jre/lib/i386/libjavaplugin_nscp_gcc29.so
@@ -1068,6 +1082,8 @@
 %%T%%/jre/lib/i386/libjawt.so
 %%T%%/jre/lib/i386/libjdwp.so
 %%T%%/jre/lib/i386/libjfr.so
+%%T%%/jre/lib/i386/libjfxmedia.so
+%%T%%/jre/lib/i386/libjfxwebkit.so
 %%T%%/jre/lib/i386/libjpeg.so
 %%T%%/jre/lib/i386/libjsdt.so
 %%T%%/jre/lib/i386/libjsig.so
@@ -1080,6 +1096,7 @@
 %%T%%/jre/lib/i386/libnio.so
 %%T%%/jre/lib/i386/libnpjp2.so
 %%T%%/jre/lib/i386/libnpt.so
+%%T%%/jre/lib/i386/libprism-es2.so
 %%T%%/jre/lib/i386/librmi.so
 %%T%%/jre/lib/i386/libsaproc.so
 %%T%%/jre/lib/i386/libsctp.so
@@ -1105,10 +1122,12 @@
 %%T%%/jre/lib/images/icons/sun-java_HighContrast.png
 %%T%%/jre/lib/images/icons/sun-java_HighContrastInverse.png
 %%T%%/jre/lib/images/icons/sun-java_LowContrast.png
+%%T%%/jre/lib/javafx.properties
 %%T%%/jre/lib/javaws.jar
 %%T%%/jre/lib/jce.jar
 %%T%%/jre/lib/jexec
 %%T%%/jre/lib/jfr.jar
+%%T%%/jre/lib/jfxrt.jar
 %%T%%/jre/lib/jsse.jar
 %%T%%/jre/lib/jvm.hprof.txt
 %%T%%/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
@@ -1610,9 +1629,12 @@
 %%T%%/jre/plugin/desktop/sun_java.desktop
 %%T%%/jre/plugin/desktop/sun_java.png
 %%T%%/jre/plugin/i386/ns7/libjavaplugin_oji.so
+%%T%%/lib/ant-javafx.jar
 %%T%%/lib/ct.sym
 %%T%%/lib/dt.jar
 %%T%%/lib/ir.idl
+%%T%%/lib/javafx-doclet.jar
+%%T%%/lib/javafx-mx.jar
 %%T%%/lib/jconsole.jar
 %%T%%/lib/jexec
 %%T%%/lib/orb.idl
@@ -1629,6 +1651,7 @@
 %%T%%/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-explorer.xml
 %%T%%/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-loaders.xml
 %%T%%/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-modules.xml
+%%T%%/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-nodes.xml
 %%T%%/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-text.xml
 %%T%%/lib/visualvm/platform/config/ModuleAutoDeps/org-openide-util.xml
 %%T%%/lib/visualvm/platform/config/Modules/org-netbeans-api-annotations-common.xml
@@ -1759,8 +1782,6 @@
 %%T%%/lib/visualvm/platform/modules/locale/org-netbeans-modules-settings_zh_CN.jar
 %%T%%/lib/visualvm/platform/modules/locale/org-netbeans-modules-spi-actions_ja.jar
 %%T%%/lib/visualvm/platform/modules/locale/org-netbeans-modules-spi-actions_zh_CN.jar
-%%T%%/lib/visualvm/platform/modules/locale/org-netbeans-modules-templates_ja.jar
-%%T%%/lib/visualvm/platform/modules/locale/org-netbeans-modules-templates_zh_CN.jar
 %%T%%/lib/visualvm/platform/modules/locale/org-netbeans-spi-quicksearch_ja.jar
 %%T%%/lib/visualvm/platform/modules/locale/org-netbeans-spi-quicksearch_zh_CN.jar
 %%T%%/lib/visualvm/platform/modules/locale/org-netbeans-swing-outline_ja.jar
@@ -1899,7 +1920,13 @@
 %%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-lib-profiler-common.xml
 %%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-lib-profiler-ui.xml
 %%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-lib-profiler.xml
+%%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-api.xml
+%%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-attach.xml
+%%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-heapwalker.xml
 %%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-oql.xml
+%%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-selector-api.xml
+%%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-selector-ui.xml
+%%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler-utilities.xml
 %%T%%/lib/visualvm/profiler/config/Modules/org-netbeans-modules-profiler.xml
 %%T%%/lib/visualvm/profiler/lib/deployed/jdk15/linux/libprofilerinterface.so
 %%T%%/lib/visualvm/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so
@@ -1915,21 +1942,45 @@
 %%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-lib-profiler-ui_zh_CN.jar
 %%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-lib-profiler_ja.jar
 %%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-lib-profiler_zh_CN.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-api_ja.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-api_zh_CN.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-attach_ja.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-attach_zh_CN.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-heapwalker_ja.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-heapwalker_zh_CN.jar
 %%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-oql_ja.jar
 %%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-oql_zh_CN.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-selector-api_ja.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-selector-api_zh_CN.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-selector-ui_ja.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-selector-ui_zh_CN.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-utilities_ja.jar
+%%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler-utilities_zh_CN.jar
 %%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler_ja.jar
 %%T%%/lib/visualvm/profiler/modules/locale/org-netbeans-modules-profiler_zh_CN.jar
 %%T%%/lib/visualvm/profiler/modules/org-netbeans-lib-profiler-charts.jar
 %%T%%/lib/visualvm/profiler/modules/org-netbeans-lib-profiler-common.jar
 %%T%%/lib/visualvm/profiler/modules/org-netbeans-lib-profiler-ui.jar
 %%T%%/lib/visualvm/profiler/modules/org-netbeans-lib-profiler.jar
+%%T%%/lib/visualvm/profiler/modules/org-netbeans-modules-profiler-api.jar
+%%T%%/lib/visualvm/profiler/modules/org-netbeans-modules-profiler-attach.jar
+%%T%%/lib/visualvm/profiler/modules/org-netbeans-modules-profiler-heapwalker.jar
 %%T%%/lib/visualvm/profiler/modules/org-netbeans-modules-profiler-oql.jar
+%%T%%/lib/visualvm/profiler/modules/org-netbeans-modules-profiler-selector-api.jar
+%%T%%/lib/visualvm/profiler/modules/org-netbeans-modules-profiler-selector-ui.jar
+%%T%%/lib/visualvm/profiler/modules/org-netbeans-modules-profiler-utilities.jar
 %%T%%/lib/visualvm/profiler/modules/org-netbeans-modules-profiler.jar
 %%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-lib-profiler-charts.xml
 %%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-lib-profiler-common.xml
 %%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-lib-profiler-ui.xml
 %%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-lib-profiler.xml
+%%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-modules-profiler-api.xml
+%%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-modules-profiler-attach.xml
+%%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-modules-profiler-heapwalker.xml
 %%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-modules-profiler-oql.xml
+%%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-modules-profiler-selector-api.xml
+%%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-modules-profiler-selector-ui.xml
+%%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-modules-profiler-utilities.xml
 %%T%%/lib/visualvm/profiler/update_tracking/org-netbeans-modules-profiler.xml
 %%T%%/lib/visualvm/visualvm/.lastModified
 %%T%%/lib/visualvm/visualvm/config/Modules/com-sun-tools-visualvm-api-caching.xml
@@ -1956,12 +2007,15 @@
 %%T%%/lib/visualvm/visualvm/config/Modules/com-sun-tools-visualvm-uisupport.xml
 %%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-api-visual.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-core-execution.xml_hidden
+%%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-core-io-ui.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-core-output2.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-core-kit.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-favorites.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-options-keymap.xml_hidden
+%%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-print.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-netbeans-modules-spi-actions.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-openide-compat.xml_hidden
+%%T%%/lib/visualvm/visualvm/config/Modules/org-openide-execution.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-openide-options.xml_hidden
 %%T%%/lib/visualvm/visualvm/config/Modules/org-openide-util-enumerations.xml_hidden
 %%T%%/lib/visualvm/visualvm/core/com-sun-tools-visualvm-modules-startup.jar
@@ -2070,6 +2124,7 @@
 %%T%%/man/ja_JP.UTF-8/man1/java.1
 %%T%%/man/ja_JP.UTF-8/man1/javac.1
 %%T%%/man/ja_JP.UTF-8/man1/javadoc.1
+%%T%%/man/ja_JP.UTF-8/man1/javafxpackager.1
 %%T%%/man/ja_JP.UTF-8/man1/javah.1
 %%T%%/man/ja_JP.UTF-8/man1/javap.1
 %%T%%/man/ja_JP.UTF-8/man1/javaws.1
@@ -2085,6 +2140,7 @@
 %%T%%/man/ja_JP.UTF-8/man1/jstack.1
 %%T%%/man/ja_JP.UTF-8/man1/jstat.1
 %%T%%/man/ja_JP.UTF-8/man1/jstatd.1
+%%T%%/man/ja_JP.UTF-8/man1/jvisualvm.1
 %%T%%/man/ja_JP.UTF-8/man1/keytool.1
 %%T%%/man/ja_JP.UTF-8/man1/native2ascii.1
 %%T%%/man/ja_JP.UTF-8/man1/orbd.1
@@ -2110,6 +2166,7 @@
 %%T%%/man/man1/java.1
 %%T%%/man/man1/javac.1
 %%T%%/man/man1/javadoc.1
+%%T%%/man/man1/javafxpackager.1
 %%T%%/man/man1/javah.1
 %%T%%/man/man1/javap.1
 %%T%%/man/man1/javaws.1