. Update to 1.5.0_12.

6 files changed, 22 insertions, 12 deletions

diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile
index 98c39f8bf5f1..ba4da15ba415 100644
--- a/java/linux-sun-jdk15/Makefile
+++ b/java/linux-sun-jdk15/Makefile
@@ -32,7 +32,7 @@ NO_BUILD=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
 JDK_VERSION=	1.5.0
-JDK_REVISION=	11
+JDK_REVISION=	12
 DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://java.sun.com/javase/downloads/index_jdk5.jsp
diff --git a/java/linux-sun-jdk15/distinfo b/java/linux-sun-jdk15/distinfo
index b3e5984986c9..53d261a6af26 100644
--- a/java/linux-sun-jdk15/distinfo
+++ b/java/linux-sun-jdk15/distinfo
@@ -1,3 +1,3 @@
-MD5 (jdk-1_5_0_11-linux-i586.bin) = 14ba8eccfd97f6bd23d8dc32b38b1121
-SHA256 (jdk-1_5_0_11-linux-i586.bin) = d37a8448c78416025761233efbeb9eb94a791bee941e996ec47cd00a67776199
-SIZE (jdk-1_5_0_11-linux-i586.bin) = 49574613
+MD5 (jdk-1_5_0_12-linux-i586.bin) = 60e7149f8ade3c8d2cd33b36d86d2d07
+SHA256 (jdk-1_5_0_12-linux-i586.bin) = 9a9dc38080c759eb5b121106e3a72b8ac10d380ffb59699b511cdef77b1027f3
+SIZE (jdk-1_5_0_12-linux-i586.bin) = 49622107
diff --git a/java/linux-sun-jdk15/pkg-plist b/java/linux-sun-jdk15/pkg-plist
index 5ef225d66df8..b3daba861cc3 100644
--- a/java/linux-sun-jdk15/pkg-plist
+++ b/java/linux-sun-jdk15/pkg-plist
@@ -1510,6 +1510,7 @@
 %%T%%/jre/lib/cmm/sRGB.pf
 %%T%%/jre/lib/content-types.properties
 %%T%%/jre/lib/deploy.jar
+%%T%%/jre/lib/deploy/ffjcext.zip
 %%T%%/jre/lib/ext/dnsns.jar
 %%T%%/jre/lib/ext/localedata.jar
 %%T%%/jre/lib/ext/sunjce_provider.jar
@@ -1662,7 +1663,7 @@
 %%T%%/jre/lib/zi/Africa/Accra
 %%T%%/jre/lib/zi/Africa/Addis_Ababa
 %%T%%/jre/lib/zi/Africa/Algiers
-%%T%%/jre/lib/zi/Africa/Asmera
+%%T%%/jre/lib/zi/Africa/Asmara
 %%T%%/jre/lib/zi/Africa/Bamako
 %%T%%/jre/lib/zi/Africa/Bangui
 %%T%%/jre/lib/zi/Africa/Banjul
@@ -1774,6 +1775,7 @@
 %%T%%/jre/lib/zi/America/Indiana/Petersburg
 %%T%%/jre/lib/zi/America/Indiana/Vevay
 %%T%%/jre/lib/zi/America/Indiana/Vincennes
+%%T%%/jre/lib/zi/America/Indiana/Winamac
 %%T%%/jre/lib/zi/America/Inuvik
 %%T%%/jre/lib/zi/America/Iqaluit
 %%T%%/jre/lib/zi/America/Jamaica
@@ -1816,6 +1818,7 @@
 %%T%%/jre/lib/zi/America/Rankin_Inlet
 %%T%%/jre/lib/zi/America/Recife
 %%T%%/jre/lib/zi/America/Regina
+%%T%%/jre/lib/zi/America/Resolute
 %%T%%/jre/lib/zi/America/Rio_Branco
 %%T%%/jre/lib/zi/America/Santiago
 %%T%%/jre/lib/zi/America/Santo_Domingo
@@ -1929,7 +1932,7 @@
 %%T%%/jre/lib/zi/Atlantic/Bermuda
 %%T%%/jre/lib/zi/Atlantic/Canary
 %%T%%/jre/lib/zi/Atlantic/Cape_Verde
-%%T%%/jre/lib/zi/Atlantic/Faeroe
+%%T%%/jre/lib/zi/Atlantic/Faroe
 %%T%%/jre/lib/zi/Atlantic/Madeira
 %%T%%/jre/lib/zi/Atlantic/Reykjavik
 %%T%%/jre/lib/zi/Atlantic/South_Georgia
@@ -1940,6 +1943,7 @@
 %%T%%/jre/lib/zi/Australia/Broken_Hill
 %%T%%/jre/lib/zi/Australia/Currie
 %%T%%/jre/lib/zi/Australia/Darwin
+%%T%%/jre/lib/zi/Australia/Eucla
 %%T%%/jre/lib/zi/Australia/Hobart
 %%T%%/jre/lib/zi/Australia/Lindeman
 %%T%%/jre/lib/zi/Australia/Lord_Howe
@@ -2447,6 +2451,7 @@
 @dirrm %%T%%/jre/lib/i386
 @dirrm %%T%%/jre/lib/fonts
 @dirrm %%T%%/jre/lib/ext
+@dirrm %%T%%/jre/lib/deploy
 @dirrm %%T%%/jre/lib/cmm
 @dirrm %%T%%/jre/lib/audio
 @dirrm %%T%%/jre/lib/applet
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile
index 98c39f8bf5f1..ba4da15ba415 100644
--- a/java/linux-sun-jdk16/Makefile
+++ b/java/linux-sun-jdk16/Makefile
@@ -32,7 +32,7 @@ NO_BUILD=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
 JDK_VERSION=	1.5.0
-JDK_REVISION=	11
+JDK_REVISION=	12
 DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://java.sun.com/javase/downloads/index_jdk5.jsp
diff --git a/java/linux-sun-jdk16/distinfo b/java/linux-sun-jdk16/distinfo
index b3e5984986c9..53d261a6af26 100644
--- a/java/linux-sun-jdk16/distinfo
+++ b/java/linux-sun-jdk16/distinfo
@@ -1,3 +1,3 @@
-MD5 (jdk-1_5_0_11-linux-i586.bin) = 14ba8eccfd97f6bd23d8dc32b38b1121
-SHA256 (jdk-1_5_0_11-linux-i586.bin) = d37a8448c78416025761233efbeb9eb94a791bee941e996ec47cd00a67776199
-SIZE (jdk-1_5_0_11-linux-i586.bin) = 49574613
+MD5 (jdk-1_5_0_12-linux-i586.bin) = 60e7149f8ade3c8d2cd33b36d86d2d07
+SHA256 (jdk-1_5_0_12-linux-i586.bin) = 9a9dc38080c759eb5b121106e3a72b8ac10d380ffb59699b511cdef77b1027f3
+SIZE (jdk-1_5_0_12-linux-i586.bin) = 49622107
diff --git a/java/linux-sun-jdk16/pkg-plist b/java/linux-sun-jdk16/pkg-plist
index 5ef225d66df8..b3daba861cc3 100644
--- a/java/linux-sun-jdk16/pkg-plist
+++ b/java/linux-sun-jdk16/pkg-plist
@@ -1510,6 +1510,7 @@
 %%T%%/jre/lib/cmm/sRGB.pf
 %%T%%/jre/lib/content-types.properties
 %%T%%/jre/lib/deploy.jar
+%%T%%/jre/lib/deploy/ffjcext.zip
 %%T%%/jre/lib/ext/dnsns.jar
 %%T%%/jre/lib/ext/localedata.jar
 %%T%%/jre/lib/ext/sunjce_provider.jar
@@ -1662,7 +1663,7 @@
 %%T%%/jre/lib/zi/Africa/Accra
 %%T%%/jre/lib/zi/Africa/Addis_Ababa
 %%T%%/jre/lib/zi/Africa/Algiers
-%%T%%/jre/lib/zi/Africa/Asmera
+%%T%%/jre/lib/zi/Africa/Asmara
 %%T%%/jre/lib/zi/Africa/Bamako
 %%T%%/jre/lib/zi/Africa/Bangui
 %%T%%/jre/lib/zi/Africa/Banjul
@@ -1774,6 +1775,7 @@
 %%T%%/jre/lib/zi/America/Indiana/Petersburg
 %%T%%/jre/lib/zi/America/Indiana/Vevay
 %%T%%/jre/lib/zi/America/Indiana/Vincennes
+%%T%%/jre/lib/zi/America/Indiana/Winamac
 %%T%%/jre/lib/zi/America/Inuvik
 %%T%%/jre/lib/zi/America/Iqaluit
 %%T%%/jre/lib/zi/America/Jamaica
@@ -1816,6 +1818,7 @@
 %%T%%/jre/lib/zi/America/Rankin_Inlet
 %%T%%/jre/lib/zi/America/Recife
 %%T%%/jre/lib/zi/America/Regina
+%%T%%/jre/lib/zi/America/Resolute
 %%T%%/jre/lib/zi/America/Rio_Branco
 %%T%%/jre/lib/zi/America/Santiago
 %%T%%/jre/lib/zi/America/Santo_Domingo
@@ -1929,7 +1932,7 @@
 %%T%%/jre/lib/zi/Atlantic/Bermuda
 %%T%%/jre/lib/zi/Atlantic/Canary
 %%T%%/jre/lib/zi/Atlantic/Cape_Verde
-%%T%%/jre/lib/zi/Atlantic/Faeroe
+%%T%%/jre/lib/zi/Atlantic/Faroe
 %%T%%/jre/lib/zi/Atlantic/Madeira
 %%T%%/jre/lib/zi/Atlantic/Reykjavik
 %%T%%/jre/lib/zi/Atlantic/South_Georgia
@@ -1940,6 +1943,7 @@
 %%T%%/jre/lib/zi/Australia/Broken_Hill
 %%T%%/jre/lib/zi/Australia/Currie
 %%T%%/jre/lib/zi/Australia/Darwin
+%%T%%/jre/lib/zi/Australia/Eucla
 %%T%%/jre/lib/zi/Australia/Hobart
 %%T%%/jre/lib/zi/Australia/Lindeman
 %%T%%/jre/lib/zi/Australia/Lord_Howe
@@ -2447,6 +2451,7 @@
 @dirrm %%T%%/jre/lib/i386
 @dirrm %%T%%/jre/lib/fonts
 @dirrm %%T%%/jre/lib/ext
+@dirrm %%T%%/jre/lib/deploy
 @dirrm %%T%%/jre/lib/cmm
 @dirrm %%T%%/jre/lib/audio
 @dirrm %%T%%/jre/lib/applet