commit 325a52f

hovercats  ·  2024-02-08 22:37:11 +0000 UTC
parent 0a4eec1 
tz: sync with upstream

details here: https://github.com/oasislinux/oasis/pull/92#issuecomment-1933372162
3 files changed,  +6, -130
M pkg/tz/data.lua
M pkg/tz/tzdir.h
M pkg/tz/ver
M pkg/tz/data.lua
+3, -123 
  1@@ -5,57 +5,19 @@ return {
  2 		["Atlantic/Cape_Verde"]=false,
  3 		["Africa/Ndjamena"]=false,
  4 		["Africa/Abidjan"]=false,
  5-		["Africa/Accra"]="Africa/Abidjan",
  6-		["Africa/Bamako"]="Africa/Abidjan",
  7-		["Africa/Banjul"]="Africa/Abidjan",
  8-		["Africa/Conakry"]="Africa/Abidjan",
  9-		["Africa/Dakar"]="Africa/Abidjan",
 10-		["Africa/Freetown"]="Africa/Abidjan",
 11-		["Africa/Lome"]="Africa/Abidjan",
 12-		["Africa/Nouakchott"]="Africa/Abidjan",
 13-		["Africa/Ouagadougou"]="Africa/Abidjan",
 14-		["Atlantic/Reykjavik"]="Africa/Abidjan",
 15-		["Atlantic/St_Helena"]="Africa/Abidjan",
 16 		["Africa/Cairo"]=false,
 17 		["Africa/Bissau"]=false,
 18 		["Africa/Nairobi"]=false,
 19-		["Africa/Addis_Ababa"]="Africa/Nairobi",
 20-		["Africa/Asmara"]="Africa/Nairobi",
 21-		["Africa/Dar_es_Salaam"]="Africa/Nairobi",
 22-		["Africa/Djibouti"]="Africa/Nairobi",
 23-		["Africa/Kampala"]="Africa/Nairobi",
 24-		["Africa/Mogadishu"]="Africa/Nairobi",
 25-		["Indian/Antananarivo"]="Africa/Nairobi",
 26-		["Indian/Comoro"]="Africa/Nairobi",
 27-		["Indian/Mayotte"]="Africa/Nairobi",
 28 		["Africa/Monrovia"]=false,
 29 		["Africa/Tripoli"]=false,
 30 		["Indian/Mauritius"]=false,
 31 		["Africa/Casablanca"]=false,
 32 		["Africa/El_Aaiun"]=false,
 33 		["Africa/Maputo"]=false,
 34-		["Africa/Blantyre"]="Africa/Maputo",
 35-		["Africa/Bujumbura"]="Africa/Maputo",
 36-		["Africa/Gaborone"]="Africa/Maputo",
 37-		["Africa/Harare"]="Africa/Maputo",
 38-		["Africa/Kigali"]="Africa/Maputo",
 39-		["Africa/Lubumbashi"]="Africa/Maputo",
 40-		["Africa/Lusaka"]="Africa/Maputo",
 41 		["Africa/Windhoek"]=false,
 42 		["Africa/Lagos"]=false,
 43-		["Africa/Bangui"]="Africa/Lagos",
 44-		["Africa/Brazzaville"]="Africa/Lagos",
 45-		["Africa/Douala"]="Africa/Lagos",
 46-		["Africa/Kinshasa"]="Africa/Lagos",
 47-		["Africa/Libreville"]="Africa/Lagos",
 48-		["Africa/Luanda"]="Africa/Lagos",
 49-		["Africa/Malabo"]="Africa/Lagos",
 50-		["Africa/Niamey"]="Africa/Lagos",
 51-		["Africa/Porto-Novo"]="Africa/Lagos",
 52 		["Africa/Sao_Tome"]=false,
 53 		["Africa/Johannesburg"]=false,
 54-		["Africa/Maseru"]="Africa/Johannesburg",
 55-		["Africa/Mbabane"]="Africa/Johannesburg",
 56 		["Africa/Khartoum"]=false,
 57 		["Africa/Juba"]=false,
 58 		["Africa/Tunis"]=false,
 59@@ -65,6 +27,7 @@ return {
 60 		["Antarctica/Davis"]=false,
 61 		["Antarctica/Mawson"]=false,
 62 		["Antarctica/Troll"]=false,
 63+		["Antarctica/Vostok"]=false,
 64 		["Antarctica/Rothera"]=false,
 65 	},
 66 	asia={
 67@@ -75,16 +38,13 @@ return {
 68 		["Asia/Thimphu"]=false,
 69 		["Indian/Chagos"]=false,
 70 		["Asia/Yangon"]=false,
 71-		["Indian/Cocos"]="Asia/Yangon",
 72 		["Asia/Shanghai"]=false,
 73 		["Asia/Urumqi"]=false,
 74-		["Antarctica/Vostok"]="Asia/Urumqi",
 75 		["Asia/Hong_Kong"]=false,
 76 		["Asia/Taipei"]=false,
 77 		["Asia/Macau"]=false,
 78 		["Asia/Nicosia"]=false,
 79 		["Asia/Famagusta"]=false,
 80-		["Europe/Nicosia"]="Asia/Nicosia",
 81 		["Asia/Tbilisi"]=false,
 82 		["Asia/Dili"]=false,
 83 		["Asia/Kolkata"]=false,
 84@@ -109,9 +69,7 @@ return {
 85 		["Asia/Pyongyang"]=false,
 86 		["Asia/Beirut"]=false,
 87 		["Asia/Kuching"]=false,
 88-		["Asia/Brunei"]="Asia/Kuching",
 89 		["Indian/Maldives"]=false,
 90-		["Indian/Kerguelen"]="Indian/Maldives",
 91 		["Asia/Hovd"]=false,
 92 		["Asia/Ulaanbaatar"]=false,
 93 		["Asia/Choibalsan"]=false,
 94@@ -121,25 +79,14 @@ return {
 95 		["Asia/Hebron"]=false,
 96 		["Asia/Manila"]=false,
 97 		["Asia/Qatar"]=false,
 98-		["Asia/Bahrain"]="Asia/Qatar",
 99 		["Asia/Riyadh"]=false,
100-		["Antarctica/Syowa"]="Asia/Riyadh",
101-		["Asia/Aden"]="Asia/Riyadh",
102-		["Asia/Kuwait"]="Asia/Riyadh",
103 		["Asia/Singapore"]=false,
104-		["Asia/Kuala_Lumpur"]="Asia/Singapore",
105 		["Asia/Colombo"]=false,
106 		["Asia/Damascus"]=false,
107 		["Asia/Dushanbe"]=false,
108 		["Asia/Bangkok"]=false,
109-		["Asia/Phnom_Penh"]="Asia/Bangkok",
110-		["Asia/Vientiane"]="Asia/Bangkok",
111-		["Indian/Christmas"]="Asia/Bangkok",
112 		["Asia/Ashgabat"]=false,
113 		["Asia/Dubai"]=false,
114-		["Asia/Muscat"]="Asia/Dubai",
115-		["Indian/Mahe"]="Asia/Dubai",
116-		["Indian/Reunion"]="Asia/Dubai",
117 		["Asia/Samarkand"]=false,
118 		["Asia/Tashkent"]=false,
119 		["Asia/Ho_Chi_Minh"]=false,
120@@ -162,12 +109,7 @@ return {
121 		["Pacific/Marquesas"]=false,
122 		["Pacific/Tahiti"]=false,
123 		["Pacific/Guam"]=false,
124-		["Pacific/Saipan"]="Pacific/Guam",
125 		["Pacific/Tarawa"]=false,
126-		["Pacific/Funafuti"]="Pacific/Tarawa",
127-		["Pacific/Majuro"]="Pacific/Tarawa",
128-		["Pacific/Wake"]="Pacific/Tarawa",
129-		["Pacific/Wallis"]="Pacific/Tarawa",
130 		["Pacific/Kanton"]=false,
131 		["Pacific/Kiritimati"]=false,
132 		["Pacific/Kwajalein"]=false,
133@@ -175,31 +117,23 @@ return {
134 		["Pacific/Nauru"]=false,
135 		["Pacific/Noumea"]=false,
136 		["Pacific/Auckland"]=false,
137-		["Antarctica/McMurdo"]="Pacific/Auckland",
138 		["Pacific/Chatham"]=false,
139 		["Pacific/Rarotonga"]=false,
140 		["Pacific/Niue"]=false,
141 		["Pacific/Norfolk"]=false,
142 		["Pacific/Palau"]=false,
143 		["Pacific/Port_Moresby"]=false,
144-		["Antarctica/DumontDUrville"]="Pacific/Port_Moresby",
145-		["Pacific/Chuuk"]="Pacific/Port_Moresby",
146 		["Pacific/Bougainville"]=false,
147 		["Pacific/Pitcairn"]=false,
148 		["Pacific/Pago_Pago"]=false,
149-		["Pacific/Midway"]="Pacific/Pago_Pago",
150 		["Pacific/Apia"]=false,
151 		["Pacific/Guadalcanal"]=false,
152-		["Pacific/Pohnpei"]="Pacific/Guadalcanal",
153 		["Pacific/Fakaofo"]=false,
154 		["Pacific/Tongatapu"]=false,
155 		["Pacific/Efate"]=false,
156 	},
157 	europe={
158 		["Europe/London"]=false,
159-		["Europe/Jersey"]="Europe/London",
160-		["Europe/Guernsey"]="Europe/London",
161-		["Europe/Isle_of_Man"]="Europe/London",
162 		["Europe/Dublin"]=false,
163 		["WET"]=false,
164 		["CET"]=false,
165@@ -210,11 +144,8 @@ return {
166 		["Europe/Vienna"]=false,
167 		["Europe/Minsk"]=false,
168 		["Europe/Brussels"]=false,
169-		["Europe/Amsterdam"]="Europe/Brussels",
170-		["Europe/Luxembourg"]="Europe/Brussels",
171 		["Europe/Sofia"]=false,
172 		["Europe/Prague"]=false,
173-		["Europe/Bratislava"]="Europe/Prague",
174 		["Atlantic/Faroe"]=false,
175 		["America/Danmarkshavn"]=false,
176 		["America/Scoresbysund"]=false,
177@@ -222,20 +153,12 @@ return {
178 		["America/Thule"]=false,
179 		["Europe/Tallinn"]=false,
180 		["Europe/Helsinki"]=false,
181-		["Europe/Mariehamn"]="Europe/Helsinki",
182 		["Europe/Paris"]=false,
183-		["Europe/Monaco"]="Europe/Paris",
184 		["Europe/Berlin"]=false,
185-		["Arctic/Longyearbyen"]="Europe/Berlin",
186-		["Europe/Copenhagen"]="Europe/Berlin",
187-		["Europe/Oslo"]="Europe/Berlin",
188-		["Europe/Stockholm"]="Europe/Berlin",
189 		["Europe/Gibraltar"]=false,
190 		["Europe/Athens"]=false,
191 		["Europe/Budapest"]=false,
192 		["Europe/Rome"]=false,
193-		["Europe/Vatican"]="Europe/Rome",
194-		["Europe/San_Marino"]="Europe/Rome",
195 		["Europe/Riga"]=false,
196 		["Europe/Vilnius"]=false,
197 		["Europe/Malta"]=false,
198@@ -273,22 +196,12 @@ return {
199 		["Asia/Kamchatka"]=false,
200 		["Asia/Anadyr"]=false,
201 		["Europe/Belgrade"]=false,
202-		["Europe/Ljubljana"]="Europe/Belgrade",
203-		["Europe/Podgorica"]="Europe/Belgrade",
204-		["Europe/Sarajevo"]="Europe/Belgrade",
205-		["Europe/Skopje"]="Europe/Belgrade",
206-		["Europe/Zagreb"]="Europe/Belgrade",
207 		["Europe/Madrid"]=false,
208 		["Africa/Ceuta"]=false,
209 		["Atlantic/Canary"]=false,
210 		["Europe/Zurich"]=false,
211-		["Europe/Busingen"]="Europe/Zurich",
212-		["Europe/Vaduz"]="Europe/Zurich",
213 		["Europe/Istanbul"]=false,
214-		["Asia/Istanbul"]="Europe/Istanbul",
215 		["Europe/Kyiv"]=false,
216-		["Europe/Uzhgorod"]=false,
217-		["Europe/Zaporozhye"]=false,
218 	},
219 	northamerica={
220 		["EST"]=false,
221@@ -314,7 +227,6 @@ return {
222 		["America/Adak"]=false,
223 		["Pacific/Honolulu"]=false,
224 		["America/Phoenix"]=false,
225-		["America/Creston"]="America/Phoenix",
226 		["America/Boise"]=false,
227 		["America/Indiana/Indianapolis"]=false,
228 		["America/Indiana/Marengo"]=false,
229@@ -334,10 +246,6 @@ return {
230 		["America/Glace_Bay"]=false,
231 		["America/Moncton"]=false,
232 		["America/Toronto"]=false,
233-		["America/Nassau"]="America/Toronto",
234-		["America/Thunder_Bay"]=false,
235-		["America/Nipigon"]=false,
236-		["America/Rainy_River"]=false,
237 		["America/Winnipeg"]=false,
238 		["America/Regina"]=false,
239 		["America/Swift_Current"]=false,
240@@ -345,12 +253,10 @@ return {
241 		["America/Vancouver"]=false,
242 		["America/Dawson_Creek"]=false,
243 		["America/Fort_Nelson"]=false,
244-		["America/Pangnirtung"]=false,
245 		["America/Iqaluit"]=false,
246 		["America/Resolute"]=false,
247 		["America/Rankin_Inlet"]=false,
248 		["America/Cambridge_Bay"]=false,
249-		["America/Yellowknife"]=false,
250 		["America/Inuvik"]=false,
251 		["America/Whitehorse"]=false,
252 		["America/Dawson"]=false,
253@@ -359,6 +265,7 @@ return {
254 		["America/Matamoros"]=false,
255 		["America/Monterrey"]=false,
256 		["America/Mexico_City"]=false,
257+		["America/Ciudad_Juarez"]=false,
258 		["America/Ojinaga"]=false,
259 		["America/Chihuahua"]=false,
260 		["America/Hermosillo"]=false,
261@@ -379,28 +286,7 @@ return {
262 		["America/Martinique"]=false,
263 		["America/Managua"]=false,
264 		["America/Panama"]=false,
265-		["America/Atikokan"]="America/Panama",
266-		["America/Cayman"]="America/Panama",
267 		["America/Puerto_Rico"]=false,
268-		["America/Anguilla"]="America/Puerto_Rico",
269-		["America/Antigua"]="America/Puerto_Rico",
270-		["America/Aruba"]="America/Puerto_Rico",
271-		["America/Curacao"]="America/Puerto_Rico",
272-		["America/Blanc-Sablon"]="America/Puerto_Rico",
273-		["America/Dominica"]="America/Puerto_Rico",
274-		["America/Grenada"]="America/Puerto_Rico",
275-		["America/Guadeloupe"]="America/Puerto_Rico",
276-		["America/Kralendijk"]="America/Puerto_Rico",
277-		["America/Lower_Princes"]="America/Puerto_Rico",
278-		["America/Marigot"]="America/Puerto_Rico",
279-		["America/Montserrat"]="America/Puerto_Rico",
280-		["America/Port_of_Spain"]="America/Puerto_Rico",
281-		["America/St_Barthelemy"]="America/Puerto_Rico",
282-		["America/St_Kitts"]="America/Puerto_Rico",
283-		["America/St_Lucia"]="America/Puerto_Rico",
284-		["America/St_Thomas"]="America/Puerto_Rico",
285-		["America/St_Vincent"]="America/Puerto_Rico",
286-		["America/Tortola"]="America/Puerto_Rico",
287 		["America/Miquelon"]=false,
288 		["America/Grand_Turk"]=false,
289 	},
290@@ -452,15 +338,9 @@ return {
291 		["America/Caracas"]=false,
292 	},
293 	etcetera={
294-		["Etc/GMT"]=false,
295 		["Etc/UTC"]=false,
296+		["Etc/GMT"]=false,
297 		["GMT"]="Etc/GMT",
298-		["Etc/Universal"]="Etc/UTC",
299-		["Etc/Zulu"]="Etc/UTC",
300-		["Etc/Greenwich"]="Etc/GMT",
301-		["Etc/GMT-0"]="Etc/GMT",
302-		["Etc/GMT+0"]="Etc/GMT",
303-		["Etc/GMT0"]="Etc/GMT",
304 		["Etc/GMT-14"]=false,
305 		["Etc/GMT-13"]=false,
306 		["Etc/GMT-12"]=false,
M pkg/tz/tzdir.h
+2, -6 
1@@ -1,6 +1,2 @@
2-#ifndef TZDEFAULT
3-# define TZDEFAULT "/etc/localtime" /* default zone */
4-#endif
5-#ifndef TZDIR
6-# define TZDIR "/usr/share/zoneinfo" /* TZif directory */
7-#endif
8+#define TZDEFAULT "/etc/localtime" /* default zone */
9+#define TZDIR "/share/zoneinfo" /* TZif directory */
M pkg/tz/ver
+1, -1 
1@@ -1 +1 @@
2-2024a r0
3+2024a r1