72 -> 80, security fixes

7 files changed, 25 insertions, 208 deletions

diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile
index a41a5588f5c..e24661d01f6 100644
--- a/lang/sun-jre7/Makefile
+++ b/lang/sun-jre7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/03/10 16:04:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2016/05/08 17:23:29 christos Exp $
 
 # Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -7,7 +7,7 @@
 
 DISTNAME=	jre-7u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH}
 PKGNAME=	sun-jre7-7.0.${UPDATE_NUMBER}
-PKGREVISION=	1
+#PKGREVISION=	1
 MASTER_SITES=	# empty
 
 LICENSE=	oracle-binary-code-license
diff --git a/lang/sun-jre7/Makefile.common b/lang/sun-jre7/Makefile.common
index f215acef50e..343215826ee 100644
--- a/lang/sun-jre7/Makefile.common
+++ b/lang/sun-jre7/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2016/03/10 16:04:13 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.11 2016/05/08 17:23:29 christos Exp $
 # used by lang/sun-jre7/Makefile
 # used by lang/sun-jdk7/Makefile
 
@@ -21,7 +21,7 @@ EMUL_PLATFORMS=		linux-i386 linux-x86_64 solaris-i386 solaris-x86_64
 USE_TOOLS+=	pax
 
 # JDK7 Update number
-UPDATE_NUMBER=	72
+UPDATE_NUMBER=	80
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/sun-jre7/PLIST.linux-i386 b/lang/sun-jre7/PLIST.linux-i386
index 19e02169b00..292d6167505 100644
--- a/lang/sun-jre7/PLIST.linux-i386
+++ b/lang/sun-jre7/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.5 2014/06/06 14:28:40 ryoon Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.6 2016/05/08 17:23:29 christos Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -271,52 +271,19 @@ java/sun-7/lib/security/trusted.libraries
 java/sun-7/lib/sound.properties.default
 java/sun-7/lib/zi/Africa/Abidjan
 java/sun-7/lib/zi/Africa/Accra
-java/sun-7/lib/zi/Africa/Addis_Ababa
 java/sun-7/lib/zi/Africa/Algiers
-java/sun-7/lib/zi/Africa/Asmara
-java/sun-7/lib/zi/Africa/Bamako
-java/sun-7/lib/zi/Africa/Bangui
-java/sun-7/lib/zi/Africa/Banjul
 java/sun-7/lib/zi/Africa/Bissau
-java/sun-7/lib/zi/Africa/Blantyre
-java/sun-7/lib/zi/Africa/Brazzaville
-java/sun-7/lib/zi/Africa/Bujumbura
 java/sun-7/lib/zi/Africa/Cairo
 java/sun-7/lib/zi/Africa/Casablanca
 java/sun-7/lib/zi/Africa/Ceuta
-java/sun-7/lib/zi/Africa/Conakry
-java/sun-7/lib/zi/Africa/Dakar
-java/sun-7/lib/zi/Africa/Dar_es_Salaam
-java/sun-7/lib/zi/Africa/Djibouti
-java/sun-7/lib/zi/Africa/Douala
 java/sun-7/lib/zi/Africa/El_Aaiun
-java/sun-7/lib/zi/Africa/Freetown
-java/sun-7/lib/zi/Africa/Gaborone
-java/sun-7/lib/zi/Africa/Harare
 java/sun-7/lib/zi/Africa/Johannesburg
-java/sun-7/lib/zi/Africa/Kampala
 java/sun-7/lib/zi/Africa/Khartoum
-java/sun-7/lib/zi/Africa/Kigali
-java/sun-7/lib/zi/Africa/Kinshasa
 java/sun-7/lib/zi/Africa/Lagos
-java/sun-7/lib/zi/Africa/Libreville
-java/sun-7/lib/zi/Africa/Lome
-java/sun-7/lib/zi/Africa/Luanda
-java/sun-7/lib/zi/Africa/Lubumbashi
-java/sun-7/lib/zi/Africa/Lusaka
-java/sun-7/lib/zi/Africa/Malabo
 java/sun-7/lib/zi/Africa/Maputo
-java/sun-7/lib/zi/Africa/Maseru
-java/sun-7/lib/zi/Africa/Mbabane
-java/sun-7/lib/zi/Africa/Mogadishu
 java/sun-7/lib/zi/Africa/Monrovia
 java/sun-7/lib/zi/Africa/Nairobi
 java/sun-7/lib/zi/Africa/Ndjamena
-java/sun-7/lib/zi/Africa/Niamey
-java/sun-7/lib/zi/Africa/Nouakchott
-java/sun-7/lib/zi/Africa/Ouagadougou
-java/sun-7/lib/zi/Africa/Porto-Novo
-java/sun-7/lib/zi/Africa/Sao_Tome
 java/sun-7/lib/zi/Africa/Tripoli
 java/sun-7/lib/zi/Africa/Tunis
 java/sun-7/lib/zi/Africa/Windhoek
@@ -462,7 +429,6 @@ java/sun-7/lib/zi/Antarctica/Rothera
 java/sun-7/lib/zi/Antarctica/Syowa
 java/sun-7/lib/zi/Antarctica/Troll
 java/sun-7/lib/zi/Antarctica/Vostok
-java/sun-7/lib/zi/Asia/Aden
 java/sun-7/lib/zi/Asia/Almaty
 java/sun-7/lib/zi/Asia/Amman
 java/sun-7/lib/zi/Asia/Anadyr
@@ -470,14 +436,13 @@ java/sun-7/lib/zi/Asia/Aqtau
 java/sun-7/lib/zi/Asia/Aqtobe
 java/sun-7/lib/zi/Asia/Ashgabat
 java/sun-7/lib/zi/Asia/Baghdad
-java/sun-7/lib/zi/Asia/Bahrain
 java/sun-7/lib/zi/Asia/Baku
 java/sun-7/lib/zi/Asia/Bangkok
 java/sun-7/lib/zi/Asia/Beirut
 java/sun-7/lib/zi/Asia/Bishkek
 java/sun-7/lib/zi/Asia/Brunei
+java/sun-7/lib/zi/Asia/Chita
 java/sun-7/lib/zi/Asia/Choibalsan
-java/sun-7/lib/zi/Asia/Chongqing
 java/sun-7/lib/zi/Asia/Colombo
 java/sun-7/lib/zi/Asia/Damascus
 java/sun-7/lib/zi/Asia/Dhaka
@@ -485,7 +450,6 @@ java/sun-7/lib/zi/Asia/Dili
 java/sun-7/lib/zi/Asia/Dubai
 java/sun-7/lib/zi/Asia/Dushanbe
 java/sun-7/lib/zi/Asia/Gaza
-java/sun-7/lib/zi/Asia/Harbin
 java/sun-7/lib/zi/Asia/Hebron
 java/sun-7/lib/zi/Asia/Ho_Chi_Minh
 java/sun-7/lib/zi/Asia/Hong_Kong
@@ -497,25 +461,21 @@ java/sun-7/lib/zi/Asia/Jerusalem
 java/sun-7/lib/zi/Asia/Kabul
 java/sun-7/lib/zi/Asia/Kamchatka
 java/sun-7/lib/zi/Asia/Karachi
-java/sun-7/lib/zi/Asia/Kashgar
 java/sun-7/lib/zi/Asia/Kathmandu
 java/sun-7/lib/zi/Asia/Khandyga
 java/sun-7/lib/zi/Asia/Kolkata
 java/sun-7/lib/zi/Asia/Krasnoyarsk
 java/sun-7/lib/zi/Asia/Kuala_Lumpur
 java/sun-7/lib/zi/Asia/Kuching
-java/sun-7/lib/zi/Asia/Kuwait
 java/sun-7/lib/zi/Asia/Macau
 java/sun-7/lib/zi/Asia/Magadan
 java/sun-7/lib/zi/Asia/Makassar
 java/sun-7/lib/zi/Asia/Manila
-java/sun-7/lib/zi/Asia/Muscat
 java/sun-7/lib/zi/Asia/Nicosia
 java/sun-7/lib/zi/Asia/Novokuznetsk
 java/sun-7/lib/zi/Asia/Novosibirsk
 java/sun-7/lib/zi/Asia/Omsk
 java/sun-7/lib/zi/Asia/Oral
-java/sun-7/lib/zi/Asia/Phnom_Penh
 java/sun-7/lib/zi/Asia/Pontianak
 java/sun-7/lib/zi/Asia/Pyongyang
 java/sun-7/lib/zi/Asia/Qatar
@@ -530,6 +490,7 @@ java/sun-7/lib/zi/Asia/Samarkand
 java/sun-7/lib/zi/Asia/Seoul
 java/sun-7/lib/zi/Asia/Shanghai
 java/sun-7/lib/zi/Asia/Singapore
+java/sun-7/lib/zi/Asia/Srednekolymsk
 java/sun-7/lib/zi/Asia/Taipei
 java/sun-7/lib/zi/Asia/Tashkent
 java/sun-7/lib/zi/Asia/Tbilisi
@@ -539,7 +500,6 @@ java/sun-7/lib/zi/Asia/Tokyo
 java/sun-7/lib/zi/Asia/Ulaanbaatar
 java/sun-7/lib/zi/Asia/Urumqi
 java/sun-7/lib/zi/Asia/Ust-Nera
-java/sun-7/lib/zi/Asia/Vientiane
 java/sun-7/lib/zi/Asia/Vladivostok
 java/sun-7/lib/zi/Asia/Yakutsk
 java/sun-7/lib/zi/Asia/Yekaterinburg
@@ -552,7 +512,6 @@ java/sun-7/lib/zi/Atlantic/Faroe
 java/sun-7/lib/zi/Atlantic/Madeira
 java/sun-7/lib/zi/Atlantic/Reykjavik
 java/sun-7/lib/zi/Atlantic/South_Georgia
-java/sun-7/lib/zi/Atlantic/St_Helena
 java/sun-7/lib/zi/Atlantic/Stanley
 java/sun-7/lib/zi/Australia/Adelaide
 java/sun-7/lib/zi/Australia/Brisbane
@@ -644,16 +603,13 @@ java/sun-7/lib/zi/Europe/Zaporozhye
 java/sun-7/lib/zi/Europe/Zurich
 java/sun-7/lib/zi/GMT
 java/sun-7/lib/zi/HST
-java/sun-7/lib/zi/Indian/Antananarivo
 java/sun-7/lib/zi/Indian/Chagos
 java/sun-7/lib/zi/Indian/Christmas
 java/sun-7/lib/zi/Indian/Cocos
-java/sun-7/lib/zi/Indian/Comoro
 java/sun-7/lib/zi/Indian/Kerguelen
 java/sun-7/lib/zi/Indian/Mahe
 java/sun-7/lib/zi/Indian/Maldives
 java/sun-7/lib/zi/Indian/Mauritius
-java/sun-7/lib/zi/Indian/Mayotte
 java/sun-7/lib/zi/Indian/Reunion
 java/sun-7/lib/zi/MET
 java/sun-7/lib/zi/MST
@@ -661,6 +617,7 @@ java/sun-7/lib/zi/MST7MDT
 java/sun-7/lib/zi/PST8PDT
 java/sun-7/lib/zi/Pacific/Apia
 java/sun-7/lib/zi/Pacific/Auckland
+java/sun-7/lib/zi/Pacific/Bougainville
 java/sun-7/lib/zi/Pacific/Chatham
 java/sun-7/lib/zi/Pacific/Chuuk
 java/sun-7/lib/zi/Pacific/Easter
diff --git a/lang/sun-jre7/PLIST.linux-x86_64 b/lang/sun-jre7/PLIST.linux-x86_64
index 1e4694ae71d..af121c94d20 100644
--- a/lang/sun-jre7/PLIST.linux-x86_64
+++ b/lang/sun-jre7/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.8 2014/06/06 14:28:40 ryoon Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.9 2016/05/08 17:23:29 christos Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -274,52 +274,19 @@ java/sun-7/lib/security/trusted.libraries
 java/sun-7/lib/sound.properties.default
 java/sun-7/lib/zi/Africa/Abidjan
 java/sun-7/lib/zi/Africa/Accra
-java/sun-7/lib/zi/Africa/Addis_Ababa
 java/sun-7/lib/zi/Africa/Algiers
-java/sun-7/lib/zi/Africa/Asmara
-java/sun-7/lib/zi/Africa/Bamako
-java/sun-7/lib/zi/Africa/Bangui
-java/sun-7/lib/zi/Africa/Banjul
 java/sun-7/lib/zi/Africa/Bissau
-java/sun-7/lib/zi/Africa/Blantyre
-java/sun-7/lib/zi/Africa/Brazzaville
-java/sun-7/lib/zi/Africa/Bujumbura
 java/sun-7/lib/zi/Africa/Cairo
 java/sun-7/lib/zi/Africa/Casablanca
 java/sun-7/lib/zi/Africa/Ceuta
-java/sun-7/lib/zi/Africa/Conakry
-java/sun-7/lib/zi/Africa/Dakar
-java/sun-7/lib/zi/Africa/Dar_es_Salaam
-java/sun-7/lib/zi/Africa/Djibouti
-java/sun-7/lib/zi/Africa/Douala
 java/sun-7/lib/zi/Africa/El_Aaiun
-java/sun-7/lib/zi/Africa/Freetown
-java/sun-7/lib/zi/Africa/Gaborone
-java/sun-7/lib/zi/Africa/Harare
 java/sun-7/lib/zi/Africa/Johannesburg
-java/sun-7/lib/zi/Africa/Kampala
 java/sun-7/lib/zi/Africa/Khartoum
-java/sun-7/lib/zi/Africa/Kigali
-java/sun-7/lib/zi/Africa/Kinshasa
 java/sun-7/lib/zi/Africa/Lagos
-java/sun-7/lib/zi/Africa/Libreville
-java/sun-7/lib/zi/Africa/Lome
-java/sun-7/lib/zi/Africa/Luanda
-java/sun-7/lib/zi/Africa/Lubumbashi
-java/sun-7/lib/zi/Africa/Lusaka
-java/sun-7/lib/zi/Africa/Malabo
 java/sun-7/lib/zi/Africa/Maputo
-java/sun-7/lib/zi/Africa/Maseru
-java/sun-7/lib/zi/Africa/Mbabane
-java/sun-7/lib/zi/Africa/Mogadishu
 java/sun-7/lib/zi/Africa/Monrovia
 java/sun-7/lib/zi/Africa/Nairobi
 java/sun-7/lib/zi/Africa/Ndjamena
-java/sun-7/lib/zi/Africa/Niamey
-java/sun-7/lib/zi/Africa/Nouakchott
-java/sun-7/lib/zi/Africa/Ouagadougou
-java/sun-7/lib/zi/Africa/Porto-Novo
-java/sun-7/lib/zi/Africa/Sao_Tome
 java/sun-7/lib/zi/Africa/Tripoli
 java/sun-7/lib/zi/Africa/Tunis
 java/sun-7/lib/zi/Africa/Windhoek
@@ -465,7 +432,6 @@ java/sun-7/lib/zi/Antarctica/Rothera
 java/sun-7/lib/zi/Antarctica/Syowa
 java/sun-7/lib/zi/Antarctica/Troll
 java/sun-7/lib/zi/Antarctica/Vostok
-java/sun-7/lib/zi/Asia/Aden
 java/sun-7/lib/zi/Asia/Almaty
 java/sun-7/lib/zi/Asia/Amman
 java/sun-7/lib/zi/Asia/Anadyr
@@ -473,14 +439,13 @@ java/sun-7/lib/zi/Asia/Aqtau
 java/sun-7/lib/zi/Asia/Aqtobe
 java/sun-7/lib/zi/Asia/Ashgabat
 java/sun-7/lib/zi/Asia/Baghdad
-java/sun-7/lib/zi/Asia/Bahrain
 java/sun-7/lib/zi/Asia/Baku
 java/sun-7/lib/zi/Asia/Bangkok
 java/sun-7/lib/zi/Asia/Beirut
 java/sun-7/lib/zi/Asia/Bishkek
 java/sun-7/lib/zi/Asia/Brunei
+java/sun-7/lib/zi/Asia/Chita
 java/sun-7/lib/zi/Asia/Choibalsan
-java/sun-7/lib/zi/Asia/Chongqing
 java/sun-7/lib/zi/Asia/Colombo
 java/sun-7/lib/zi/Asia/Damascus
 java/sun-7/lib/zi/Asia/Dhaka
@@ -488,7 +453,6 @@ java/sun-7/lib/zi/Asia/Dili
 java/sun-7/lib/zi/Asia/Dubai
 java/sun-7/lib/zi/Asia/Dushanbe
 java/sun-7/lib/zi/Asia/Gaza
-java/sun-7/lib/zi/Asia/Harbin
 java/sun-7/lib/zi/Asia/Hebron
 java/sun-7/lib/zi/Asia/Ho_Chi_Minh
 java/sun-7/lib/zi/Asia/Hong_Kong
@@ -500,25 +464,21 @@ java/sun-7/lib/zi/Asia/Jerusalem
 java/sun-7/lib/zi/Asia/Kabul
 java/sun-7/lib/zi/Asia/Kamchatka
 java/sun-7/lib/zi/Asia/Karachi
-java/sun-7/lib/zi/Asia/Kashgar
 java/sun-7/lib/zi/Asia/Kathmandu
 java/sun-7/lib/zi/Asia/Khandyga
 java/sun-7/lib/zi/Asia/Kolkata
 java/sun-7/lib/zi/Asia/Krasnoyarsk
 java/sun-7/lib/zi/Asia/Kuala_Lumpur
 java/sun-7/lib/zi/Asia/Kuching
-java/sun-7/lib/zi/Asia/Kuwait
 java/sun-7/lib/zi/Asia/Macau
 java/sun-7/lib/zi/Asia/Magadan
 java/sun-7/lib/zi/Asia/Makassar
 java/sun-7/lib/zi/Asia/Manila
-java/sun-7/lib/zi/Asia/Muscat
 java/sun-7/lib/zi/Asia/Nicosia
 java/sun-7/lib/zi/Asia/Novokuznetsk
 java/sun-7/lib/zi/Asia/Novosibirsk
 java/sun-7/lib/zi/Asia/Omsk
 java/sun-7/lib/zi/Asia/Oral
-java/sun-7/lib/zi/Asia/Phnom_Penh
 java/sun-7/lib/zi/Asia/Pontianak
 java/sun-7/lib/zi/Asia/Pyongyang
 java/sun-7/lib/zi/Asia/Qatar
@@ -533,6 +493,7 @@ java/sun-7/lib/zi/Asia/Samarkand
 java/sun-7/lib/zi/Asia/Seoul
 java/sun-7/lib/zi/Asia/Shanghai
 java/sun-7/lib/zi/Asia/Singapore
+java/sun-7/lib/zi/Asia/Srednekolymsk
 java/sun-7/lib/zi/Asia/Taipei
 java/sun-7/lib/zi/Asia/Tashkent
 java/sun-7/lib/zi/Asia/Tbilisi
@@ -542,7 +503,6 @@ java/sun-7/lib/zi/Asia/Tokyo
 java/sun-7/lib/zi/Asia/Ulaanbaatar
 java/sun-7/lib/zi/Asia/Urumqi
 java/sun-7/lib/zi/Asia/Ust-Nera
-java/sun-7/lib/zi/Asia/Vientiane
 java/sun-7/lib/zi/Asia/Vladivostok
 java/sun-7/lib/zi/Asia/Yakutsk
 java/sun-7/lib/zi/Asia/Yekaterinburg
@@ -555,7 +515,6 @@ java/sun-7/lib/zi/Atlantic/Faroe
 java/sun-7/lib/zi/Atlantic/Madeira
 java/sun-7/lib/zi/Atlantic/Reykjavik
 java/sun-7/lib/zi/Atlantic/South_Georgia
-java/sun-7/lib/zi/Atlantic/St_Helena
 java/sun-7/lib/zi/Atlantic/Stanley
 java/sun-7/lib/zi/Australia/Adelaide
 java/sun-7/lib/zi/Australia/Brisbane
@@ -647,16 +606,13 @@ java/sun-7/lib/zi/Europe/Zaporozhye
 java/sun-7/lib/zi/Europe/Zurich
 java/sun-7/lib/zi/GMT
 java/sun-7/lib/zi/HST
-java/sun-7/lib/zi/Indian/Antananarivo
 java/sun-7/lib/zi/Indian/Chagos
 java/sun-7/lib/zi/Indian/Christmas
 java/sun-7/lib/zi/Indian/Cocos
-java/sun-7/lib/zi/Indian/Comoro
 java/sun-7/lib/zi/Indian/Kerguelen
 java/sun-7/lib/zi/Indian/Mahe
 java/sun-7/lib/zi/Indian/Maldives
 java/sun-7/lib/zi/Indian/Mauritius
-java/sun-7/lib/zi/Indian/Mayotte
 java/sun-7/lib/zi/Indian/Reunion
 java/sun-7/lib/zi/MET
 java/sun-7/lib/zi/MST
@@ -664,6 +620,7 @@ java/sun-7/lib/zi/MST7MDT
 java/sun-7/lib/zi/PST8PDT
 java/sun-7/lib/zi/Pacific/Apia
 java/sun-7/lib/zi/Pacific/Auckland
+java/sun-7/lib/zi/Pacific/Bougainville
 java/sun-7/lib/zi/Pacific/Chatham
 java/sun-7/lib/zi/Pacific/Chuuk
 java/sun-7/lib/zi/Pacific/Easter
diff --git a/lang/sun-jre7/PLIST.solaris-i386 b/lang/sun-jre7/PLIST.solaris-i386
index 38ed50b1944..8d1630d9e4f 100644
--- a/lang/sun-jre7/PLIST.solaris-i386
+++ b/lang/sun-jre7/PLIST.solaris-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-i386,v 1.7 2014/06/06 14:28:40 ryoon Exp $
+@comment $NetBSD: PLIST.solaris-i386,v 1.8 2016/05/08 17:23:29 christos Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -254,52 +254,19 @@ java/sun-7/lib/security/ucrypto-solaris.cfg.default
 java/sun-7/lib/sound.properties.default
 java/sun-7/lib/zi/Africa/Abidjan
 java/sun-7/lib/zi/Africa/Accra
-java/sun-7/lib/zi/Africa/Addis_Ababa
 java/sun-7/lib/zi/Africa/Algiers
-java/sun-7/lib/zi/Africa/Asmara
-java/sun-7/lib/zi/Africa/Bamako
-java/sun-7/lib/zi/Africa/Bangui
-java/sun-7/lib/zi/Africa/Banjul
 java/sun-7/lib/zi/Africa/Bissau
-java/sun-7/lib/zi/Africa/Blantyre
-java/sun-7/lib/zi/Africa/Brazzaville
-java/sun-7/lib/zi/Africa/Bujumbura
 java/sun-7/lib/zi/Africa/Cairo
 java/sun-7/lib/zi/Africa/Casablanca
 java/sun-7/lib/zi/Africa/Ceuta
-java/sun-7/lib/zi/Africa/Conakry
-java/sun-7/lib/zi/Africa/Dakar
-java/sun-7/lib/zi/Africa/Dar_es_Salaam
-java/sun-7/lib/zi/Africa/Djibouti
-java/sun-7/lib/zi/Africa/Douala
 java/sun-7/lib/zi/Africa/El_Aaiun
-java/sun-7/lib/zi/Africa/Freetown
-java/sun-7/lib/zi/Africa/Gaborone
-java/sun-7/lib/zi/Africa/Harare
 java/sun-7/lib/zi/Africa/Johannesburg
-java/sun-7/lib/zi/Africa/Kampala
 java/sun-7/lib/zi/Africa/Khartoum
-java/sun-7/lib/zi/Africa/Kigali
-java/sun-7/lib/zi/Africa/Kinshasa
 java/sun-7/lib/zi/Africa/Lagos
-java/sun-7/lib/zi/Africa/Libreville
-java/sun-7/lib/zi/Africa/Lome
-java/sun-7/lib/zi/Africa/Luanda
-java/sun-7/lib/zi/Africa/Lubumbashi
-java/sun-7/lib/zi/Africa/Lusaka
-java/sun-7/lib/zi/Africa/Malabo
 java/sun-7/lib/zi/Africa/Maputo
-java/sun-7/lib/zi/Africa/Maseru
-java/sun-7/lib/zi/Africa/Mbabane
-java/sun-7/lib/zi/Africa/Mogadishu
 java/sun-7/lib/zi/Africa/Monrovia
 java/sun-7/lib/zi/Africa/Nairobi
 java/sun-7/lib/zi/Africa/Ndjamena
-java/sun-7/lib/zi/Africa/Niamey
-java/sun-7/lib/zi/Africa/Nouakchott
-java/sun-7/lib/zi/Africa/Ouagadougou
-java/sun-7/lib/zi/Africa/Porto-Novo
-java/sun-7/lib/zi/Africa/Sao_Tome
 java/sun-7/lib/zi/Africa/Tripoli
 java/sun-7/lib/zi/Africa/Tunis
 java/sun-7/lib/zi/Africa/Windhoek
@@ -445,7 +412,6 @@ java/sun-7/lib/zi/Antarctica/Rothera
 java/sun-7/lib/zi/Antarctica/Syowa
 java/sun-7/lib/zi/Antarctica/Troll
 java/sun-7/lib/zi/Antarctica/Vostok
-java/sun-7/lib/zi/Asia/Aden
 java/sun-7/lib/zi/Asia/Almaty
 java/sun-7/lib/zi/Asia/Amman
 java/sun-7/lib/zi/Asia/Anadyr
@@ -453,14 +419,13 @@ java/sun-7/lib/zi/Asia/Aqtau
 java/sun-7/lib/zi/Asia/Aqtobe
 java/sun-7/lib/zi/Asia/Ashgabat
 java/sun-7/lib/zi/Asia/Baghdad
-java/sun-7/lib/zi/Asia/Bahrain
 java/sun-7/lib/zi/Asia/Baku
 java/sun-7/lib/zi/Asia/Bangkok
 java/sun-7/lib/zi/Asia/Beirut
 java/sun-7/lib/zi/Asia/Bishkek
 java/sun-7/lib/zi/Asia/Brunei
+java/sun-7/lib/zi/Asia/Chita
 java/sun-7/lib/zi/Asia/Choibalsan
-java/sun-7/lib/zi/Asia/Chongqing
 java/sun-7/lib/zi/Asia/Colombo
 java/sun-7/lib/zi/Asia/Damascus
 java/sun-7/lib/zi/Asia/Dhaka
@@ -468,7 +433,6 @@ java/sun-7/lib/zi/Asia/Dili
 java/sun-7/lib/zi/Asia/Dubai
 java/sun-7/lib/zi/Asia/Dushanbe
 java/sun-7/lib/zi/Asia/Gaza
-java/sun-7/lib/zi/Asia/Harbin
 java/sun-7/lib/zi/Asia/Hebron
 java/sun-7/lib/zi/Asia/Ho_Chi_Minh
 java/sun-7/lib/zi/Asia/Hong_Kong
@@ -480,25 +444,21 @@ java/sun-7/lib/zi/Asia/Jerusalem
 java/sun-7/lib/zi/Asia/Kabul
 java/sun-7/lib/zi/Asia/Kamchatka
 java/sun-7/lib/zi/Asia/Karachi
-java/sun-7/lib/zi/Asia/Kashgar
 java/sun-7/lib/zi/Asia/Kathmandu
 java/sun-7/lib/zi/Asia/Khandyga
 java/sun-7/lib/zi/Asia/Kolkata
 java/sun-7/lib/zi/Asia/Krasnoyarsk
 java/sun-7/lib/zi/Asia/Kuala_Lumpur
 java/sun-7/lib/zi/Asia/Kuching
-java/sun-7/lib/zi/Asia/Kuwait
 java/sun-7/lib/zi/Asia/Macau
 java/sun-7/lib/zi/Asia/Magadan
 java/sun-7/lib/zi/Asia/Makassar
 java/sun-7/lib/zi/Asia/Manila
-java/sun-7/lib/zi/Asia/Muscat
 java/sun-7/lib/zi/Asia/Nicosia
 java/sun-7/lib/zi/Asia/Novokuznetsk
 java/sun-7/lib/zi/Asia/Novosibirsk
 java/sun-7/lib/zi/Asia/Omsk
 java/sun-7/lib/zi/Asia/Oral
-java/sun-7/lib/zi/Asia/Phnom_Penh
 java/sun-7/lib/zi/Asia/Pontianak
 java/sun-7/lib/zi/Asia/Pyongyang
 java/sun-7/lib/zi/Asia/Qatar
@@ -513,6 +473,7 @@ java/sun-7/lib/zi/Asia/Samarkand
 java/sun-7/lib/zi/Asia/Seoul
 java/sun-7/lib/zi/Asia/Shanghai
 java/sun-7/lib/zi/Asia/Singapore
+java/sun-7/lib/zi/Asia/Srednekolymsk
 java/sun-7/lib/zi/Asia/Taipei
 java/sun-7/lib/zi/Asia/Tashkent
 java/sun-7/lib/zi/Asia/Tbilisi
@@ -522,7 +483,6 @@ java/sun-7/lib/zi/Asia/Tokyo
 java/sun-7/lib/zi/Asia/Ulaanbaatar
 java/sun-7/lib/zi/Asia/Urumqi
 java/sun-7/lib/zi/Asia/Ust-Nera
-java/sun-7/lib/zi/Asia/Vientiane
 java/sun-7/lib/zi/Asia/Vladivostok
 java/sun-7/lib/zi/Asia/Yakutsk
 java/sun-7/lib/zi/Asia/Yekaterinburg
@@ -535,7 +495,6 @@ java/sun-7/lib/zi/Atlantic/Faroe
 java/sun-7/lib/zi/Atlantic/Madeira
 java/sun-7/lib/zi/Atlantic/Reykjavik
 java/sun-7/lib/zi/Atlantic/South_Georgia
-java/sun-7/lib/zi/Atlantic/St_Helena
 java/sun-7/lib/zi/Atlantic/Stanley
 java/sun-7/lib/zi/Australia/Adelaide
 java/sun-7/lib/zi/Australia/Brisbane
@@ -627,16 +586,13 @@ java/sun-7/lib/zi/Europe/Zaporozhye
 java/sun-7/lib/zi/Europe/Zurich
 java/sun-7/lib/zi/GMT
 java/sun-7/lib/zi/HST
-java/sun-7/lib/zi/Indian/Antananarivo
 java/sun-7/lib/zi/Indian/Chagos
 java/sun-7/lib/zi/Indian/Christmas
 java/sun-7/lib/zi/Indian/Cocos
-java/sun-7/lib/zi/Indian/Comoro
 java/sun-7/lib/zi/Indian/Kerguelen
 java/sun-7/lib/zi/Indian/Mahe
 java/sun-7/lib/zi/Indian/Maldives
 java/sun-7/lib/zi/Indian/Mauritius
-java/sun-7/lib/zi/Indian/Mayotte
 java/sun-7/lib/zi/Indian/Reunion
 java/sun-7/lib/zi/MET
 java/sun-7/lib/zi/MST
@@ -644,6 +600,7 @@ java/sun-7/lib/zi/MST7MDT
 java/sun-7/lib/zi/PST8PDT
 java/sun-7/lib/zi/Pacific/Apia
 java/sun-7/lib/zi/Pacific/Auckland
+java/sun-7/lib/zi/Pacific/Bougainville
 java/sun-7/lib/zi/Pacific/Chatham
 java/sun-7/lib/zi/Pacific/Chuuk
 java/sun-7/lib/zi/Pacific/Easter
diff --git a/lang/sun-jre7/PLIST.solaris-x86_64 b/lang/sun-jre7/PLIST.solaris-x86_64
index 1a528faceca..e3b4d4845df 100644
--- a/lang/sun-jre7/PLIST.solaris-x86_64
+++ b/lang/sun-jre7/PLIST.solaris-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-x86_64,v 1.7 2014/06/06 14:28:40 ryoon Exp $
+@comment $NetBSD: PLIST.solaris-x86_64,v 1.8 2016/05/08 17:23:29 christos Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -308,52 +308,19 @@ java/sun-7/lib/security/ucrypto-solaris.cfg.default
 java/sun-7/lib/sound.properties.default
 java/sun-7/lib/zi/Africa/Abidjan
 java/sun-7/lib/zi/Africa/Accra
-java/sun-7/lib/zi/Africa/Addis_Ababa
 java/sun-7/lib/zi/Africa/Algiers
-java/sun-7/lib/zi/Africa/Asmara
-java/sun-7/lib/zi/Africa/Bamako
-java/sun-7/lib/zi/Africa/Bangui
-java/sun-7/lib/zi/Africa/Banjul
 java/sun-7/lib/zi/Africa/Bissau
-java/sun-7/lib/zi/Africa/Blantyre
-java/sun-7/lib/zi/Africa/Brazzaville
-java/sun-7/lib/zi/Africa/Bujumbura
 java/sun-7/lib/zi/Africa/Cairo
 java/sun-7/lib/zi/Africa/Casablanca
 java/sun-7/lib/zi/Africa/Ceuta
-java/sun-7/lib/zi/Africa/Conakry
-java/sun-7/lib/zi/Africa/Dakar
-java/sun-7/lib/zi/Africa/Dar_es_Salaam
-java/sun-7/lib/zi/Africa/Djibouti
-java/sun-7/lib/zi/Africa/Douala
 java/sun-7/lib/zi/Africa/El_Aaiun
-java/sun-7/lib/zi/Africa/Freetown
-java/sun-7/lib/zi/Africa/Gaborone
-java/sun-7/lib/zi/Africa/Harare
 java/sun-7/lib/zi/Africa/Johannesburg
-java/sun-7/lib/zi/Africa/Kampala
 java/sun-7/lib/zi/Africa/Khartoum
-java/sun-7/lib/zi/Africa/Kigali
-java/sun-7/lib/zi/Africa/Kinshasa
 java/sun-7/lib/zi/Africa/Lagos
-java/sun-7/lib/zi/Africa/Libreville
-java/sun-7/lib/zi/Africa/Lome
-java/sun-7/lib/zi/Africa/Luanda
-java/sun-7/lib/zi/Africa/Lubumbashi
-java/sun-7/lib/zi/Africa/Lusaka
-java/sun-7/lib/zi/Africa/Malabo
 java/sun-7/lib/zi/Africa/Maputo
-java/sun-7/lib/zi/Africa/Maseru
-java/sun-7/lib/zi/Africa/Mbabane
-java/sun-7/lib/zi/Africa/Mogadishu
 java/sun-7/lib/zi/Africa/Monrovia
 java/sun-7/lib/zi/Africa/Nairobi
 java/sun-7/lib/zi/Africa/Ndjamena
-java/sun-7/lib/zi/Africa/Niamey
-java/sun-7/lib/zi/Africa/Nouakchott
-java/sun-7/lib/zi/Africa/Ouagadougou
-java/sun-7/lib/zi/Africa/Porto-Novo
-java/sun-7/lib/zi/Africa/Sao_Tome
 java/sun-7/lib/zi/Africa/Tripoli
 java/sun-7/lib/zi/Africa/Tunis
 java/sun-7/lib/zi/Africa/Windhoek
@@ -499,7 +466,6 @@ java/sun-7/lib/zi/Antarctica/Rothera
 java/sun-7/lib/zi/Antarctica/Syowa
 java/sun-7/lib/zi/Antarctica/Troll
 java/sun-7/lib/zi/Antarctica/Vostok
-java/sun-7/lib/zi/Asia/Aden
 java/sun-7/lib/zi/Asia/Almaty
 java/sun-7/lib/zi/Asia/Amman
 java/sun-7/lib/zi/Asia/Anadyr
@@ -507,14 +473,13 @@ java/sun-7/lib/zi/Asia/Aqtau
 java/sun-7/lib/zi/Asia/Aqtobe
 java/sun-7/lib/zi/Asia/Ashgabat
 java/sun-7/lib/zi/Asia/Baghdad
-java/sun-7/lib/zi/Asia/Bahrain
 java/sun-7/lib/zi/Asia/Baku
 java/sun-7/lib/zi/Asia/Bangkok
 java/sun-7/lib/zi/Asia/Beirut
 java/sun-7/lib/zi/Asia/Bishkek
 java/sun-7/lib/zi/Asia/Brunei
+java/sun-7/lib/zi/Asia/Chita
 java/sun-7/lib/zi/Asia/Choibalsan
-java/sun-7/lib/zi/Asia/Chongqing
 java/sun-7/lib/zi/Asia/Colombo
 java/sun-7/lib/zi/Asia/Damascus
 java/sun-7/lib/zi/Asia/Dhaka
@@ -522,7 +487,6 @@ java/sun-7/lib/zi/Asia/Dili
 java/sun-7/lib/zi/Asia/Dubai
 java/sun-7/lib/zi/Asia/Dushanbe
 java/sun-7/lib/zi/Asia/Gaza
-java/sun-7/lib/zi/Asia/Harbin
 java/sun-7/lib/zi/Asia/Hebron
 java/sun-7/lib/zi/Asia/Ho_Chi_Minh
 java/sun-7/lib/zi/Asia/Hong_Kong
@@ -534,25 +498,21 @@ java/sun-7/lib/zi/Asia/Jerusalem
 java/sun-7/lib/zi/Asia/Kabul
 java/sun-7/lib/zi/Asia/Kamchatka
 java/sun-7/lib/zi/Asia/Karachi
-java/sun-7/lib/zi/Asia/Kashgar
 java/sun-7/lib/zi/Asia/Kathmandu
 java/sun-7/lib/zi/Asia/Khandyga
 java/sun-7/lib/zi/Asia/Kolkata
 java/sun-7/lib/zi/Asia/Krasnoyarsk
 java/sun-7/lib/zi/Asia/Kuala_Lumpur
 java/sun-7/lib/zi/Asia/Kuching
-java/sun-7/lib/zi/Asia/Kuwait
 java/sun-7/lib/zi/Asia/Macau
 java/sun-7/lib/zi/Asia/Magadan
 java/sun-7/lib/zi/Asia/Makassar
 java/sun-7/lib/zi/Asia/Manila
-java/sun-7/lib/zi/Asia/Muscat
 java/sun-7/lib/zi/Asia/Nicosia
 java/sun-7/lib/zi/Asia/Novokuznetsk
 java/sun-7/lib/zi/Asia/Novosibirsk
 java/sun-7/lib/zi/Asia/Omsk
 java/sun-7/lib/zi/Asia/Oral
-java/sun-7/lib/zi/Asia/Phnom_Penh
 java/sun-7/lib/zi/Asia/Pontianak
 java/sun-7/lib/zi/Asia/Pyongyang
 java/sun-7/lib/zi/Asia/Qatar
@@ -567,6 +527,7 @@ java/sun-7/lib/zi/Asia/Samarkand
 java/sun-7/lib/zi/Asia/Seoul
 java/sun-7/lib/zi/Asia/Shanghai
 java/sun-7/lib/zi/Asia/Singapore
+java/sun-7/lib/zi/Asia/Srednekolymsk
 java/sun-7/lib/zi/Asia/Taipei
 java/sun-7/lib/zi/Asia/Tashkent
 java/sun-7/lib/zi/Asia/Tbilisi
@@ -576,7 +537,6 @@ java/sun-7/lib/zi/Asia/Tokyo
 java/sun-7/lib/zi/Asia/Ulaanbaatar
 java/sun-7/lib/zi/Asia/Urumqi
 java/sun-7/lib/zi/Asia/Ust-Nera
-java/sun-7/lib/zi/Asia/Vientiane
 java/sun-7/lib/zi/Asia/Vladivostok
 java/sun-7/lib/zi/Asia/Yakutsk
 java/sun-7/lib/zi/Asia/Yekaterinburg
@@ -589,7 +549,6 @@ java/sun-7/lib/zi/Atlantic/Faroe
 java/sun-7/lib/zi/Atlantic/Madeira
 java/sun-7/lib/zi/Atlantic/Reykjavik
 java/sun-7/lib/zi/Atlantic/South_Georgia
-java/sun-7/lib/zi/Atlantic/St_Helena
 java/sun-7/lib/zi/Atlantic/Stanley
 java/sun-7/lib/zi/Australia/Adelaide
 java/sun-7/lib/zi/Australia/Brisbane
@@ -681,16 +640,13 @@ java/sun-7/lib/zi/Europe/Zaporozhye
 java/sun-7/lib/zi/Europe/Zurich
 java/sun-7/lib/zi/GMT
 java/sun-7/lib/zi/HST
-java/sun-7/lib/zi/Indian/Antananarivo
 java/sun-7/lib/zi/Indian/Chagos
 java/sun-7/lib/zi/Indian/Christmas
 java/sun-7/lib/zi/Indian/Cocos
-java/sun-7/lib/zi/Indian/Comoro
 java/sun-7/lib/zi/Indian/Kerguelen
 java/sun-7/lib/zi/Indian/Mahe
 java/sun-7/lib/zi/Indian/Maldives
 java/sun-7/lib/zi/Indian/Mauritius
-java/sun-7/lib/zi/Indian/Mayotte
 java/sun-7/lib/zi/Indian/Reunion
 java/sun-7/lib/zi/MET
 java/sun-7/lib/zi/MST
@@ -698,6 +654,7 @@ java/sun-7/lib/zi/MST7MDT
 java/sun-7/lib/zi/PST8PDT
 java/sun-7/lib/zi/Pacific/Apia
 java/sun-7/lib/zi/Pacific/Auckland
+java/sun-7/lib/zi/Pacific/Bougainville
 java/sun-7/lib/zi/Pacific/Chatham
 java/sun-7/lib/zi/Pacific/Chuuk
 java/sun-7/lib/zi/Pacific/Easter
diff --git a/lang/sun-jre7/distinfo b/lang/sun-jre7/distinfo
index 457bf80bde3..e0b1237d011 100644
--- a/lang/sun-jre7/distinfo
+++ b/lang/sun-jre7/distinfo
@@ -1,17 +1,6 @@
-$NetBSD: distinfo,v 1.23 2014/11/15 21:01:26 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2016/05/08 17:23:29 christos Exp $
 
-SHA1 (UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
-RMD160 (UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
-Size (UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
-SHA1 (jre-7u72-linux-i586.tar.gz) = 8b183b88602ea52a63df3d07d6d6a221efd2967e
-RMD160 (jre-7u72-linux-i586.tar.gz) = 7f4386be28324ff521095410a77f64b04b94d6bb
-Size (jre-7u72-linux-i586.tar.gz) = 48474551 bytes
-SHA1 (jre-7u72-linux-x64.tar.gz) = 75e5cbfd9de2681ed8f585034218ff6b85831b16
-RMD160 (jre-7u72-linux-x64.tar.gz) = 8027f1ab0e13a5657ba70cb0c2db6504e3b3aa60
-Size (jre-7u72-linux-x64.tar.gz) = 47035569 bytes
-SHA1 (jre-7u72-solaris-i586.tar.gz) = 796089fe786e5a4ac9d89ce03c75424e591cfffb
-RMD160 (jre-7u72-solaris-i586.tar.gz) = 7a49f6cd17d046a438e266a12ea48c927ce0f1c8
-Size (jre-7u72-solaris-i586.tar.gz) = 54701559 bytes
-SHA1 (jre-7u72-solaris-x64.tar.gz) = 5154469647d813305755256897c40f54f7030f60
-RMD160 (jre-7u72-solaris-x64.tar.gz) = a7c5cdbfce1f7d6b14157f73f19a7da4315a2f63
-Size (jre-7u72-solaris-x64.tar.gz) = 16893239 bytes
+SHA1 (jre-7u80-linux-x64.tar.gz) = 5f5eb4a4e76cfe1d9eb02ed71ae01a809bde8440
+RMD160 (jre-7u80-linux-x64.tar.gz) = 942f0da61dde6b760c24fd144fee2555d05497a3
+SHA512 (jre-7u80-linux-x64.tar.gz) = e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d
+Size (jre-7u80-linux-x64.tar.gz) = 47110223 bytes