. Update to 7u7.

3 files changed, 25 insertions, 8 deletions

diff --git a/java/linux-sun-jre17/Makefile b/java/linux-sun-jre17/Makefile
index 00d45afdd40e..69629369f438 100644
--- a/java/linux-sun-jre17/Makefile
+++ b/java/linux-sun-jre17/Makefile
@@ -32,7 +32,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 JRE_VERSION=		7
 JRE_INTERNAL_VERSION=	1.7.0
-JRE_UPDATE_VERSION=	4
+JRE_UPDATE_VERSION=	7
 DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}_0${JRE_UPDATE_VERSION}
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
diff --git a/java/linux-sun-jre17/distinfo b/java/linux-sun-jre17/distinfo
index f5cfad1809e0..f735c17bdf76 100644
--- a/java/linux-sun-jre17/distinfo
+++ b/java/linux-sun-jre17/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jre-7u4-linux-i586.tar.gz) = e3514815588df66c26297a2dffa64ed90c383f273735700460b9f572c8d0cf8a
-SIZE (jre-7u4-linux-i586.tar.gz) = 34361614
+SHA256 (jre-7u7-linux-i586.tar.gz) = bcee505ede8024b1d74172dd93dc172ae63de271e7bbd755e0b2c0e9e2b12e5e
+SIZE (jre-7u7-linux-i586.tar.gz) = 48010449
diff --git a/java/linux-sun-jre17/pkg-plist b/java/linux-sun-jre17/pkg-plist
index 9070c55c4405..dbc7c1e84fea 100644
--- a/java/linux-sun-jre17/pkg-plist
+++ b/java/linux-sun-jre17/pkg-plist
@@ -4,6 +4,7 @@
 %%T%%/COPYRIGHT
 %%T%%/LICENSE
 %%T%%/README
+%%T%%/THIRDPARTYLICENSEREADME-JAVAFX.txt
 %%T%%/THIRDPARTYLICENSEREADME.txt
 %%T%%/Welcome.html
 %%T%%/bin/ControlPanel
@@ -32,6 +33,9 @@
 %%T%%/lib/cmm/sRGB.pf
 %%T%%/lib/content-types.properties
 %%T%%/lib/currency.data
+%%T%%/lib/deploy.jar
+%%T%%/lib/deploy/MixedCodeMainDialog.ui
+%%T%%/lib/deploy/cautionshield.icns
 %%T%%/lib/deploy/ffjcext.zip
 %%T%%/lib/deploy/java-icon.ico
 %%T%%/lib/deploy/messages.properties
@@ -46,8 +50,8 @@
 %%T%%/lib/deploy/messages_zh_CN.properties
 %%T%%/lib/deploy/messages_zh_HK.properties
 %%T%%/lib/deploy/messages_zh_TW.properties
+%%T%%/lib/deploy/mixcode_s.png
 %%T%%/lib/deploy/splash.gif
-%%T%%/lib/deploy.jar
 %%T%%/lib/desktop/applications/sun-java.desktop
 %%T%%/lib/desktop/applications/sun-javaws.desktop
 %%T%%/lib/desktop/applications/sun_java.desktop
@@ -133,6 +137,9 @@
 %%T%%/lib/i386/client/Xusage.txt
 %%T%%/lib/i386/client/libjsig.so
 %%T%%/lib/i386/client/libjvm.so
+%%T%%/lib/i386/fxavcodecplugin-52.so
+%%T%%/lib/i386/fxavcodecplugin-53.so
+%%T%%/lib/i386/fxplugins.so
 %%T%%/lib/i386/headless/libmawt.so
 %%T%%/lib/i386/jli/libjli.so
 %%T%%/lib/i386/jvm.cfg
@@ -142,6 +149,9 @@
 %%T%%/lib/i386/libdeploy.so
 %%T%%/lib/i386/libdt_socket.so
 %%T%%/lib/i386/libfontmanager.so
+%%T%%/lib/i386/libglass.so
+%%T%%/lib/i386/libgstplugins-lite.so
+%%T%%/lib/i386/libgstreamer-lite.so
 %%T%%/lib/i386/libhprof.so
 %%T%%/lib/i386/libinstrument.so
 %%T%%/lib/i386/libj2gss.so
@@ -150,6 +160,8 @@
 %%T%%/lib/i386/libjaas_unix.so
 %%T%%/lib/i386/libjava.so
 %%T%%/lib/i386/libjava_crw_demo.so
+%%T%%/lib/i386/libjavafx-font.so
+%%T%%/lib/i386/libjavafx-iio.so
 %%T%%/lib/i386/libjavaplugin_jni.so
 %%T%%/lib/i386/libjavaplugin_nscp.so
 %%T%%/lib/i386/libjavaplugin_nscp_gcc29.so
@@ -157,6 +169,8 @@
 %%T%%/lib/i386/libjawt.so
 %%T%%/lib/i386/libjdwp.so
 %%T%%/lib/i386/libjfr.so
+%%T%%/lib/i386/libjfxmedia.so
+%%T%%/lib/i386/libjfxwebkit.so
 %%T%%/lib/i386/libjpeg.so
 %%T%%/lib/i386/libjsdt.so
 %%T%%/lib/i386/libjsig.so
@@ -169,6 +183,7 @@
 %%T%%/lib/i386/libnio.so
 %%T%%/lib/i386/libnpjp2.so
 %%T%%/lib/i386/libnpt.so
+%%T%%/lib/i386/libprism-es2.so
 %%T%%/lib/i386/librmi.so
 %%T%%/lib/i386/libsctp.so
 %%T%%/lib/i386/libsplashscreen.so
@@ -193,10 +208,12 @@
 %%T%%/lib/images/icons/sun-java_HighContrast.png
 %%T%%/lib/images/icons/sun-java_HighContrastInverse.png
 %%T%%/lib/images/icons/sun-java_LowContrast.png
+%%T%%/lib/javafx.properties
 %%T%%/lib/javaws.jar
 %%T%%/lib/jce.jar
 %%T%%/lib/jexec
 %%T%%/lib/jfr.jar
+%%T%%/lib/jfxrt.jar
 %%T%%/lib/jsse.jar
 %%T%%/lib/jvm.hprof.txt
 %%T%%/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
@@ -204,21 +221,21 @@
 %%T%%/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
-%%T%%/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
+%%T%%/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/locale/pt_BR/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
-%%T%%/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
+%%T%%/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo
-%%T%%/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
+%%T%%/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/lib/logging.properties
+%%T%%/lib/management-agent.jar
 %%T%%/lib/management/jmxremote.access
 %%T%%/lib/management/jmxremote.password.template
 %%T%%/lib/management/management.properties
 %%T%%/lib/management/snmp.acl.template
-%%T%%/lib/management-agent.jar
 %%T%%/lib/meta-index
 %%T%%/lib/net.properties
 %%T%%/lib/oblique-fonts/LucidaSansDemiOblique.ttf