Update to Update 22.

3 files changed, 12 insertions, 8 deletions

diff --git a/java/linux-sun-jre15/Makefile b/java/linux-sun-jre15/Makefile
index 863a20916ef6..65c9a617dbb6 100644
--- a/java/linux-sun-jre15/Makefile
+++ b/java/linux-sun-jre15/Makefile
@@ -31,7 +31,7 @@ NO_BUILD=	yes
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 JRE_VERSION=	1.5.0
-JRE_REVISION=	13
+JRE_REVISION=	22
 DL_JRE_VERSION=	${JRE_VERSION}_${JRE_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://java.sun.com/javase/downloads/index_jdk5.jsp
@@ -51,7 +51,7 @@ pre-everything::
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} \
-	&& ${TAIL} -n +647 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
+	&& ${TAIL} -n +683 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
 	&& ${CHMOD} +x ${WRKDIR}/install.sfx \
 	&& ${WRKDIR}/install.sfx > /dev/null
 
diff --git a/java/linux-sun-jre15/distinfo b/java/linux-sun-jre15/distinfo
index 53725501f85d..4c8f1758ab5d 100644
--- a/java/linux-sun-jre15/distinfo
+++ b/java/linux-sun-jre15/distinfo
@@ -1,3 +1,2 @@
-MD5 (jre-1_5_0_13-linux-i586.bin) = 7dff6751d11749d7cdb8a8f770f5ec91
-SHA256 (jre-1_5_0_13-linux-i586.bin) = 13caf574235ba36d97a04493c3510695f1ad902e0169885930e48ebee4bdc872
-SIZE (jre-1_5_0_13-linux-i586.bin) = 17155599
+SHA256 (jre-1_5_0_22-linux-i586.bin) = e3cdd4a6f535a36e50d1a974fb5ae74c8b63588833f8f17c5ac56c0f64dcbcc5
+SIZE (jre-1_5_0_22-linux-i586.bin) = 17283082
diff --git a/java/linux-sun-jre15/pkg-plist b/java/linux-sun-jre15/pkg-plist
index c8c94e811eb8..6f568a8509d9 100644
--- a/java/linux-sun-jre15/pkg-plist
+++ b/java/linux-sun-jre15/pkg-plist
@@ -182,6 +182,7 @@
 %%T%%/lib/security/java.security
 %%T%%/lib/security/javaws.policy
 %%T%%/lib/security/local_policy.jar
+%%T%%/lib/servicetag/jdk_header.png
 %%T%%/lib/sound.properties
 %%T%%/lib/zi/Africa/Abidjan
 %%T%%/lib/zi/Africa/Accra
@@ -246,7 +247,9 @@
 %%T%%/lib/zi/America/Argentina/La_Rioja
 %%T%%/lib/zi/America/Argentina/Mendoza
 %%T%%/lib/zi/America/Argentina/Rio_Gallegos
+%%T%%/lib/zi/America/Argentina/Salta
 %%T%%/lib/zi/America/Argentina/San_Juan
+%%T%%/lib/zi/America/Argentina/San_Luis
 %%T%%/lib/zi/America/Argentina/Tucuman
 %%T%%/lib/zi/America/Argentina/Ushuaia
 %%T%%/lib/zi/America/Aruba
@@ -345,6 +348,7 @@
 %%T%%/lib/zi/America/Regina
 %%T%%/lib/zi/America/Resolute
 %%T%%/lib/zi/America/Rio_Branco
+%%T%%/lib/zi/America/Santarem
 %%T%%/lib/zi/America/Santiago
 %%T%%/lib/zi/America/Santo_Domingo
 %%T%%/lib/zi/America/Sao_Paulo
@@ -389,7 +393,6 @@
 %%T%%/lib/zi/Asia/Beirut
 %%T%%/lib/zi/Asia/Bishkek
 %%T%%/lib/zi/Asia/Brunei
-%%T%%/lib/zi/Asia/Calcutta
 %%T%%/lib/zi/Asia/Choibalsan
 %%T%%/lib/zi/Asia/Chongqing
 %%T%%/lib/zi/Asia/Colombo
@@ -400,6 +403,7 @@
 %%T%%/lib/zi/Asia/Dushanbe
 %%T%%/lib/zi/Asia/Gaza
 %%T%%/lib/zi/Asia/Harbin
+%%T%%/lib/zi/Asia/Ho_Chi_Minh
 %%T%%/lib/zi/Asia/Hong_Kong
 %%T%%/lib/zi/Asia/Hovd
 %%T%%/lib/zi/Asia/Irkutsk
@@ -410,7 +414,8 @@
 %%T%%/lib/zi/Asia/Kamchatka
 %%T%%/lib/zi/Asia/Karachi
 %%T%%/lib/zi/Asia/Kashgar
-%%T%%/lib/zi/Asia/Katmandu
+%%T%%/lib/zi/Asia/Kathmandu
+%%T%%/lib/zi/Asia/Kolkata
 %%T%%/lib/zi/Asia/Krasnoyarsk
 %%T%%/lib/zi/Asia/Kuala_Lumpur
 %%T%%/lib/zi/Asia/Kuching
@@ -434,7 +439,6 @@
 %%T%%/lib/zi/Asia/Riyadh87
 %%T%%/lib/zi/Asia/Riyadh88
 %%T%%/lib/zi/Asia/Riyadh89
-%%T%%/lib/zi/Asia/Saigon
 %%T%%/lib/zi/Asia/Sakhalin
 %%T%%/lib/zi/Asia/Samarkand
 %%T%%/lib/zi/Asia/Seoul
@@ -681,6 +685,7 @@
 @dirrm %%T%%/lib/zi/America
 @dirrm %%T%%/lib/zi/Africa
 @dirrm %%T%%/lib/zi
+@dirrm %%T%%/lib/servicetag
 @dirrm %%T%%/lib/security
 @dirrm %%T%%/lib/oblique-fonts
 @dirrm %%T%%/lib/management