Update to 9.0.4.

http://www.oracle.com/technetwork/java/javase/9-0-4-relnotes-4021191.html

MFH:		2018Q1

6 files changed, 138 insertions, 134 deletions

diff --git a/java/linux-oracle-jdk9/Makefile b/java/linux-oracle-jdk9/Makefile
index 243ea3e5c396..18ed982b1cfe 100644
--- a/java/linux-oracle-jdk9/Makefile
+++ b/java/linux-oracle-jdk9/Makefile
@@ -26,7 +26,7 @@ USE_LINUX=	xorglibs
 JDK_VENDOR=		oracle
 JDK_VERSION=		9
 JDK_UPDATE_VERSION=	0
-JDK_PATCH_VERSION=	1
+JDK_PATCH_VERSION=	4
 .if ${JDK_PATCH_VERSION} == 0
 .if ${JDK_UPDATE_VERSION} == 0
 DL_JDK_VERSION=		${JDK_VERSION}
diff --git a/java/linux-oracle-jdk9/distinfo b/java/linux-oracle-jdk9/distinfo
index d25de7174857..14196ec34125 100644
--- a/java/linux-oracle-jdk9/distinfo
+++ b/java/linux-oracle-jdk9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508698636
-SHA256 (jdk-9.0.1_linux-x64_bin.tar.gz) = 2cdaf0ff92d0829b510edd883a4ac8322c02f2fc1beae95d048b6716076bc014
-SIZE (jdk-9.0.1_linux-x64_bin.tar.gz) = 354531775
+TIMESTAMP = 1517263611
+SHA256 (jdk-9.0.4_linux-x64_bin.tar.gz) = 90c4ea877e816e3440862cfa36341bc87d05373d53389ec0f2d54d4e8c95daa2
+SIZE (jdk-9.0.4_linux-x64_bin.tar.gz) = 354635831
diff --git a/java/linux-oracle-jdk9/pkg-plist b/java/linux-oracle-jdk9/pkg-plist
index 8a245e0678d2..2c27877e6bf0 100644
--- a/java/linux-oracle-jdk9/pkg-plist
+++ b/java/linux-oracle-jdk9/pkg-plist
@@ -519,7 +519,9 @@
 %%T%%/lib/libavplugin-54.so
 %%T%%/lib/libavplugin-55.so
 %%T%%/lib/libavplugin-56.so
+%%T%%/lib/libavplugin-57.so
 %%T%%/lib/libavplugin-ffmpeg-56.so
+%%T%%/lib/libavplugin-ffmpeg-57.so
 %%T%%/lib/libawt.so
 %%T%%/lib/libawt_headless.so
 %%T%%/lib/libawt_xawt.so
@@ -600,22 +602,22 @@
 %%T%%/lib/missioncontrol/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 %%T%%/lib/missioncontrol/configuration/org.eclipse.update/platform.xml
 %%T%%/lib/missioncontrol/dropins/README.TXT
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.console_6.0.0.173472/feature.properties
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.console_6.0.0.173472/feature.xml
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.core_6.0.0.173472/feature.properties
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.core_6.0.0.173472/feature.xml
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.flightrecorder_6.0.0.173472/feature.properties
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.flightrecorder_6.0.0.173472/feature.xml
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.ja_6.0.0.173472/feature.properties
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.ja_6.0.0.173472/feature.xml
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.update_6.0.0.173472/feature.properties
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.update_6.0.0.173472/feature.xml
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.zh_CN_6.0.0.173472/feature.properties
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.zh_CN_6.0.0.173472/feature.xml
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp_6.0.0.173472/feature.properties
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp_6.0.0.173472/feature.xml
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.rcp.product_6.0.0.173472/feature.properties
-%%T%%/lib/missioncontrol/features/com.oracle.jmc.rcp.product_6.0.0.173472/feature.xml
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.console_6.0.0.173920/feature.properties
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.console_6.0.0.173920/feature.xml
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.core_6.0.0.173920/feature.properties
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.core_6.0.0.173920/feature.xml
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.flightrecorder_6.0.0.173920/feature.properties
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.flightrecorder_6.0.0.173920/feature.xml
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.ja_6.0.0.173920/feature.properties
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.ja_6.0.0.173920/feature.xml
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.update_6.0.0.173920/feature.properties
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.update_6.0.0.173920/feature.xml
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.zh_CN_6.0.0.173920/feature.properties
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp.zh_CN_6.0.0.173920/feature.xml
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp_6.0.0.173920/feature.properties
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.feature.rcp_6.0.0.173920/feature.xml
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.rcp.product_6.0.0.173920/feature.properties
+%%T%%/lib/missioncontrol/features/com.oracle.jmc.rcp.product_6.0.0.173920/feature.xml
 %%T%%/lib/missioncontrol/features/org.eclipse.babel.nls_eclipse_ja_4.5.0.v20151128060001/about.html
 %%T%%/lib/missioncontrol/features/org.eclipse.babel.nls_eclipse_ja_4.5.0.v20151128060001/eclipse_update_120.jpg
 %%T%%/lib/missioncontrol/features/org.eclipse.babel.nls_eclipse_ja_4.5.0.v20151128060001/epl-v10.html
@@ -737,117 +739,117 @@
 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
 %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/.lock
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1496259263479.profile.gz
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1496259264596.profile.gz
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1496259273251.profile.gz
-%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1496259274771.profile.gz
+%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1509481958900.profile.gz
+%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1509481959257.profile.gz
+%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1509481967479.profile.gz
+%%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/1509481968617.profile.gz
 %%T%%/lib/missioncontrol/plugins/com.ibm.icu_56.1.0.v201601250100.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.alert.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.alert.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.alert_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.attach_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.attach.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.attach.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.attach_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.jdp.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.jdp.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.jdp_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.commands_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.common.internal_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.common_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.persistence.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.persistence.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.persistence_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.diagnostic.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.diagnostic.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.diagnostic_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.mbeanbrowser.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.mbeanbrowser.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.mbeanbrowser_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/META-INF/MANIFEST.MF
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/com.oracle.jmc.console.ui.notification_contexts.xml
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/icons/alert_obj.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/icons/file_obj.gif
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/icons/flight_recorder.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/icons/new-trigger-wiz.gif
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/notification_plugin.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/plugin.properties
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173472/plugin.xml
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.core_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.docs.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.docs.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.docs_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.configuration_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.controlpanel.ui.configuration_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.controlpanel.ui.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.controlpanel.ui.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.controlpanel.ui_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.rules.extensionprovider_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.rules.jdk_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.rules_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.ui.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.ui.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.ui_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.greychart.ui.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.greychart.ui.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.greychart.ui_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.greychartplugin_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.javafx.osgi_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.jdp_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.p2.ui.overridden_5.5.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.application.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.application.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.application_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.intro.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.intro.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.intro_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ext_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.services.jfr_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ui.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ui.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ui_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/META-INF/MANIFEST.MF
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/icons/console_view.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/icons/date-span-16.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/icons/day-of-week-16.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/icons/diagnostic-command-16.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/icons/hprof-16.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/icons/send-email-16.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/icons/time-span-16.png
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/lib/dsn.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/lib/gimap.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/lib/imap.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/lib/mailapi.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/lib/pop3.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/lib/smtp.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/plugin.properties
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/plugin.xml
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/rjmx.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/com.oracle.jmc.rjmx.actionProvider.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/com.oracle.jmc.rjmx.attributeTransformation.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/com.oracle.jmc.rjmx.descriptorProvider.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/com.oracle.jmc.rjmx.metadataprovider.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/com.oracle.jmc.rjmx.service.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/com.oracle.jmc.rjmx.syntheticattribute.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/com.oracle.jmc.rjmx.syntheticnotification.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/triggerActionExceptionHandlers.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/triggerActions.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/triggerConstraints.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173472/schema/triggerEvaluators.exsd
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.ui.ja_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.ui.zh_CN_6.0.0.173472.jar
-%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.ui_6.0.0.173472.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.alert.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.alert.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.alert_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.attach_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.attach.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.attach.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.attach_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.jdp.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.jdp.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.jdp_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.browser_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.commands_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.common.internal_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.common_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.persistence.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.persistence.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.persistence_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.diagnostic.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.diagnostic.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.diagnostic_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.mbeanbrowser.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.mbeanbrowser.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.mbeanbrowser_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/META-INF/MANIFEST.MF
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/com.oracle.jmc.console.ui.notification_contexts.xml
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/icons/alert_obj.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/icons/file_obj.gif
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/icons/flight_recorder.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/icons/new-trigger-wiz.gif
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/notification_plugin.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/plugin.properties
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.notification_6.0.0.173920/plugin.xml
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.console.ui_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.core_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.docs.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.docs.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.docs_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.configuration_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.controlpanel.ui.configuration_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.controlpanel.ui.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.controlpanel.ui.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.controlpanel.ui_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.rules.extensionprovider_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.rules.jdk_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.rules_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.ui.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.ui.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder.ui_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.flightrecorder_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.greychart.ui.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.greychart.ui.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.greychart.ui_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.greychartplugin_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.javafx.osgi_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.jdp_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.p2.ui.overridden_5.5.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.application.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.application.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.application_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.intro.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.intro.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rcp.intro_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ext_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.services.jfr_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ui.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ui.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.ui_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/META-INF/MANIFEST.MF
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/icons/console_view.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/icons/date-span-16.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/icons/day-of-week-16.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/icons/diagnostic-command-16.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/icons/hprof-16.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/icons/send-email-16.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/icons/time-span-16.png
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/lib/dsn.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/lib/gimap.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/lib/imap.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/lib/mailapi.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/lib/pop3.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/lib/smtp.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/plugin.properties
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/plugin.xml
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/rjmx.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/com.oracle.jmc.rjmx.actionProvider.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/com.oracle.jmc.rjmx.attributeTransformation.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/com.oracle.jmc.rjmx.descriptorProvider.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/com.oracle.jmc.rjmx.metadataprovider.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/com.oracle.jmc.rjmx.service.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/com.oracle.jmc.rjmx.syntheticattribute.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/com.oracle.jmc.rjmx.syntheticnotification.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/triggerActionExceptionHandlers.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/triggerActions.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/triggerConstraints.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.rjmx_6.0.0.173920/schema/triggerEvaluators.exsd
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.ui.ja_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.ui.zh_CN_6.0.0.173920.jar
+%%T%%/lib/missioncontrol/plugins/com.oracle.jmc.ui_6.0.0.173920.jar
 %%T%%/lib/missioncontrol/plugins/com.sun.el_2.2.0.v201303151357.jar
 %%T%%/lib/missioncontrol/plugins/javax.annotation_1.2.0.v201602091430.jar
 %%T%%/lib/missioncontrol/plugins/javax.el_2.2.0.v201303151357.jar
diff --git a/java/linux-oracle-jre9/Makefile b/java/linux-oracle-jre9/Makefile
index c2c5cec26ffe..0e941d51f3eb 100644
--- a/java/linux-oracle-jre9/Makefile
+++ b/java/linux-oracle-jre9/Makefile
@@ -26,7 +26,7 @@ USE_LINUX=	xorglibs
 JRE_VENDOR=		oracle
 JRE_VERSION=		9
 JRE_UPDATE_VERSION=	0
-JRE_PATCH_VERSION=	1
+JRE_PATCH_VERSION=	4
 .if ${JRE_PATCH_VERSION} == 0
 .if ${JRE_UPDATE_VERSION} == 0
 DL_JRE_VERSION=		${JRE_VERSION}
diff --git a/java/linux-oracle-jre9/distinfo b/java/linux-oracle-jre9/distinfo
index 25a5fbd41c55..4385be78c2a2 100644
--- a/java/linux-oracle-jre9/distinfo
+++ b/java/linux-oracle-jre9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508699881
-SHA256 (jre-9.0.1_linux-x64_bin.tar.gz) = 3c64953465e98dbab0e449954a918fada703cd0341aa98cff68854852663ee86
-SIZE (jre-9.0.1_linux-x64_bin.tar.gz) = 86986075
+TIMESTAMP = 1517263645
+SHA256 (jre-9.0.4_linux-x64_bin.tar.gz) = 331d6560ba0eadd6266e082e1a3ccd26777c48db881be07cb496805cd301d705
+SIZE (jre-9.0.4_linux-x64_bin.tar.gz) = 87045353
diff --git a/java/linux-oracle-jre9/pkg-plist b/java/linux-oracle-jre9/pkg-plist
index f39bb4e551ff..76123723deed 100644
--- a/java/linux-oracle-jre9/pkg-plist
+++ b/java/linux-oracle-jre9/pkg-plist
@@ -320,7 +320,9 @@
 %%T%%/lib/libavplugin-54.so
 %%T%%/lib/libavplugin-55.so
 %%T%%/lib/libavplugin-56.so
+%%T%%/lib/libavplugin-57.so
 %%T%%/lib/libavplugin-ffmpeg-56.so
+%%T%%/lib/libavplugin-ffmpeg-57.so
 %%T%%/lib/libawt.so
 %%T%%/lib/libawt_headless.so
 %%T%%/lib/libawt_xawt.so