SERVER-56371 Upgrade timelib to 2021.06

40 files changed, 35 insertions, 17 deletions

diff --git a/README.third_party.md b/README.third_party.md
index d731f74843e..356b70ae1f7 100644
--- a/README.third_party.md
+++ b/README.third_party.md
@@ -45,7 +45,7 @@ a notice will be included in
 | [schemastore.org]          | Apache-2.0        |                  | 6847cfc3a1        |                      |                                 |
 | [scons]                    | MIT               | 3.1.2            | 3.1.2             |                      |                                 |
 | [Snappy]                   | BSD-3-Clause      | 1.1.8            | 1.1.7             |          ✗           |                ✗                |
-| [timelib]                  | MIT               | 2021.05          | 2021.05           |                      |                ✗                |
+| [timelib]                  | MIT               | 2021.06          | 2021.06           |                      |                ✗                |
 | [TomCrypt]                 | Public Domain     | 1.18.2           | 1.18.2            |          ✗           |                ✗                |
 | [Unicode]                  | Unicode-DFS-2015  | 13.0.0           | 8.0.0             |          ✗           |                ✗                |
 | [Valgrind]                 | BSD-3-Clause<sup>\[<a href="#note_vg" id="ref_vg">1</a>]</sup> | 3.17.0 | 3.17.0 | |             ✗                |
diff --git a/etc/third_party_components.yml b/etc/third_party_components.yml
index 61059596068..62b94e73677 100644
--- a/etc/third_party_components.yml
+++ b/etc/third_party_components.yml
@@ -294,7 +294,7 @@ components:
     homepage_url: https://github.com/derickr/timelib
     open_hub_url: N/A
     release_monitoring_id: -1
-    local_directory_path: src/third_party/timelib-2021.05
+    local_directory_path: src/third_party/timelib-2021.06
     team_owner: "Query"
     # Note: Not in Black Duck
 
diff --git a/src/mongo/db/query/datetime/date_time_support.cpp b/src/mongo/db/query/datetime/date_time_support.cpp
index 85f22a2e09a..439370cb4cb 100644
--- a/src/mongo/db/query/datetime/date_time_support.cpp
+++ b/src/mongo/db/query/datetime/date_time_support.cpp
@@ -182,7 +182,8 @@ void TimeZoneDatabase::loadTimeZoneInfo(
                                << entry.id << "\": " << timelib_get_error_message(errorCode)});
         }
 
-        invariant(errorCode == TIMELIB_ERROR_NO_ERROR);
+        invariant(errorCode == TIMELIB_ERROR_NO_ERROR ||
+                  errorCode == TIMELIB_ERROR_EMPTY_POSIX_STRING);
         _timeZones[entry.id] = TimeZone{tzInfo};
     }
 }
diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index 1d2790d2cf8..c86ebb12350 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -16,7 +16,7 @@ pcreSuffix = "-8.42"
 mozjsSuffix = '-60'
 yamlSuffix = '-0.6.2'
 icuSuffix = '-57.1'
-timelibSuffix = '-2021.05'
+timelibSuffix = '-2021.06'
 tomcryptSuffix = '-1.18.2'
 variantSuffix = '-1.4.0'
 
diff --git a/src/third_party/scripts/timelib_get_sources.sh b/src/third_party/scripts/timelib_get_sources.sh
index 084e9555dd8..190658783e9 100755
--- a/src/third_party/scripts/timelib_get_sources.sh
+++ b/src/third_party/scripts/timelib_get_sources.sh
@@ -12,7 +12,7 @@ set -o errexit
 # parser to hang.
 #
 
-VERSION=2021.05
+VERSION=2021.06
 NAME=timelib
 TARBALL=$VERSION.tar.gz
 TARBALL_DIR=$NAME-$VERSION
diff --git a/src/third_party/timelib-2021.05/LICENSE.rst b/src/third_party/timelib-2021.06/LICENSE.rst
index 7ba60022b38..7ba60022b38 100644
--- a/src/third_party/timelib-2021.05/LICENSE.rst
+++ b/src/third_party/timelib-2021.06/LICENSE.rst
diff --git a/src/third_party/timelib-2021.05/Makefile b/src/third_party/timelib-2021.06/Makefile
index a2c04aba448..a2c04aba448 100644
--- a/src/third_party/timelib-2021.05/Makefile
+++ b/src/third_party/timelib-2021.06/Makefile
diff --git a/src/third_party/timelib-2021.05/README.rst b/src/third_party/timelib-2021.06/README.rst
index 7a6d856c6ed..7a6d856c6ed 100644
--- a/src/third_party/timelib-2021.05/README.rst
+++ b/src/third_party/timelib-2021.06/README.rst
diff --git a/src/third_party/timelib-2021.05/SConscript b/src/third_party/timelib-2021.06/SConscript
index 2e69b9150be..2e69b9150be 100644
--- a/src/third_party/timelib-2021.05/SConscript
+++ b/src/third_party/timelib-2021.06/SConscript
diff --git a/src/third_party/timelib-2021.05/astro.c b/src/third_party/timelib-2021.06/astro.c
index faf62d29f17..faf62d29f17 100644
--- a/src/third_party/timelib-2021.05/astro.c
+++ b/src/third_party/timelib-2021.06/astro.c
diff --git a/src/third_party/timelib-2021.05/astro.h b/src/third_party/timelib-2021.06/astro.h
index 9aa3d15bd77..9aa3d15bd77 100644
--- a/src/third_party/timelib-2021.05/astro.h
+++ b/src/third_party/timelib-2021.06/astro.h
diff --git a/src/third_party/timelib-2021.05/docs/date-from-iso-parts.c b/src/third_party/timelib-2021.06/docs/date-from-iso-parts.c
index 562403de6b4..562403de6b4 100644
--- a/src/third_party/timelib-2021.05/docs/date-from-iso-parts.c
+++ b/src/third_party/timelib-2021.06/docs/date-from-iso-parts.c
diff --git a/src/third_party/timelib-2021.05/docs/date-from-parts.c b/src/third_party/timelib-2021.06/docs/date-from-parts.c
index d20b52cc92d..d20b52cc92d 100644
--- a/src/third_party/timelib-2021.05/docs/date-from-parts.c
+++ b/src/third_party/timelib-2021.06/docs/date-from-parts.c
diff --git a/src/third_party/timelib-2021.05/docs/date-from-string.c b/src/third_party/timelib-2021.06/docs/date-from-string.c
index 8e30dd68fd1..8e30dd68fd1 100644
--- a/src/third_party/timelib-2021.05/docs/date-from-string.c
+++ b/src/third_party/timelib-2021.06/docs/date-from-string.c
diff --git a/src/third_party/timelib-2021.05/docs/date-to-parts.c b/src/third_party/timelib-2021.06/docs/date-to-parts.c
index cd46a9e0fe7..cd46a9e0fe7 100644
--- a/src/third_party/timelib-2021.05/docs/date-to-parts.c
+++ b/src/third_party/timelib-2021.06/docs/date-to-parts.c
diff --git a/src/third_party/timelib-2021.05/docs/show-tzinfo.c b/src/third_party/timelib-2021.06/docs/show-tzinfo.c
index a44b291e9d9..a44b291e9d9 100644
--- a/src/third_party/timelib-2021.05/docs/show-tzinfo.c
+++ b/src/third_party/timelib-2021.06/docs/show-tzinfo.c
diff --git a/src/third_party/timelib-2021.05/dow.c b/src/third_party/timelib-2021.06/dow.c
index 52f43b1a89d..52f43b1a89d 100644
--- a/src/third_party/timelib-2021.05/dow.c
+++ b/src/third_party/timelib-2021.06/dow.c
diff --git a/src/third_party/timelib-2021.05/fallbackmap.h b/src/third_party/timelib-2021.06/fallbackmap.h
index 5a4c6123c3a..5a4c6123c3a 100644
--- a/src/third_party/timelib-2021.05/fallbackmap.h
+++ b/src/third_party/timelib-2021.06/fallbackmap.h
diff --git a/src/third_party/timelib-2021.05/gettzmapping.php b/src/third_party/timelib-2021.06/gettzmapping.php
index 21539e8bfd8..21539e8bfd8 100644
--- a/src/third_party/timelib-2021.05/gettzmapping.php
+++ b/src/third_party/timelib-2021.06/gettzmapping.php
diff --git a/src/third_party/timelib-2021.05/interval.c b/src/third_party/timelib-2021.06/interval.c
index 0a6163d0c1d..0a6163d0c1d 100644
--- a/src/third_party/timelib-2021.05/interval.c
+++ b/src/third_party/timelib-2021.06/interval.c
diff --git a/src/third_party/timelib-2021.05/parse_date.c b/src/third_party/timelib-2021.06/parse_date.c
index c4249d9e397..6916c0d3e72 100644
--- a/src/third_party/timelib-2021.05/parse_date.c
+++ b/src/third_party/timelib-2021.06/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Tue Apr 20 10:50:52 2021 */
+/* Generated by re2c 0.15.3 on Mon Apr 26 16:21:07 2021 */
 #line 1 "parse_date.re"
 /*
  * The MIT License (MIT)
diff --git a/src/third_party/timelib-2021.05/parse_date.re b/src/third_party/timelib-2021.06/parse_date.re
index cf238340861..cf238340861 100644
--- a/src/third_party/timelib-2021.05/parse_date.re
+++ b/src/third_party/timelib-2021.06/parse_date.re
diff --git a/src/third_party/timelib-2021.05/parse_iso_intervals.c b/src/third_party/timelib-2021.06/parse_iso_intervals.c
index 1b8aa71a759..87bac156626 100644
--- a/src/third_party/timelib-2021.05/parse_iso_intervals.c
+++ b/src/third_party/timelib-2021.06/parse_iso_intervals.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Tue Apr 20 10:50:52 2021 */
+/* Generated by re2c 0.15.3 on Mon Apr 26 16:21:07 2021 */
 #line 1 "parse_iso_intervals.re"
 /*
  * The MIT License (MIT)
diff --git a/src/third_party/timelib-2021.05/parse_iso_intervals.re b/src/third_party/timelib-2021.06/parse_iso_intervals.re
index bd4015a323a..bd4015a323a 100644
--- a/src/third_party/timelib-2021.05/parse_iso_intervals.re
+++ b/src/third_party/timelib-2021.06/parse_iso_intervals.re
diff --git a/src/third_party/timelib-2021.05/parse_posix.c b/src/third_party/timelib-2021.06/parse_posix.c
index 13b6767dafc..13b6767dafc 100644
--- a/src/third_party/timelib-2021.05/parse_posix.c
+++ b/src/third_party/timelib-2021.06/parse_posix.c
diff --git a/src/third_party/timelib-2021.05/parse_tz.c b/src/third_party/timelib-2021.06/parse_tz.c
index ffeae2ec63a..4e31b9e96ee 100644
--- a/src/third_party/timelib-2021.05/parse_tz.c
+++ b/src/third_party/timelib-2021.06/parse_tz.c
@@ -553,11 +553,22 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
 		timelib_free(date_str);
 	}
 
+	if (!tz->posix_string) {
+		printf("\n%43sNo POSIX string\n", "");
+		return;
+	}
+
+	if (strcmp("", tz->posix_string) == 0) {
+		printf("\n%43sEmpty POSIX string\n", "");
+		return;
+	}
+
 	printf("\n%43sPOSIX string: %s\n", "", tz->posix_string);
-	if (tz->posix_info->std) {
+	if (tz->posix_info && tz->posix_info->std) {
 		trans_str = format_offset_type(tz, tz->posix_info->type_index_std_type);
 		printf("%43sstd: %s\n", "", trans_str);
 		timelib_free(trans_str);
+
 		if (tz->posix_info->dst) {
 			trans_str = format_offset_type(tz, tz->posix_info->type_index_dst_type);
 			printf("%43sdst: %s\n", "", trans_str);
@@ -693,8 +704,10 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
 		}
 
 		read_posix_string(&tzf, tmp);
-		if (!integrate_posix_string(tmp)) {
-			*error_code = TIMELIB_ERROR_POSIX_MISSING_TTINFO;
+		if (strcmp("", tmp->posix_string) == 0) {
+			*error_code = TIMELIB_ERROR_EMPTY_POSIX_STRING;
+		} else if (!integrate_posix_string(tmp)) {
+			*error_code = TIMELIB_ERROR_CORRUPT_POSIX_STRING;
 			timelib_tzinfo_dtor(tmp);
 			return NULL;
 		}
diff --git a/src/third_party/timelib-2021.05/parse_zoneinfo.c b/src/third_party/timelib-2021.06/parse_zoneinfo.c
index 8a174fd3852..8a174fd3852 100644
--- a/src/third_party/timelib-2021.05/parse_zoneinfo.c
+++ b/src/third_party/timelib-2021.06/parse_zoneinfo.c
diff --git a/src/third_party/timelib-2021.05/timelib.c b/src/third_party/timelib-2021.06/timelib.c
index 8db4df17f4a..92366be16fa 100644
--- a/src/third_party/timelib-2021.05/timelib.c
+++ b/src/third_party/timelib-2021.06/timelib.c
@@ -35,7 +35,7 @@
 
 #define TIMELIB_LLABS(y) (y < 0 ? (y * -1) : y)
 
-const char *timelib_error_messages[9] = {
+const char *timelib_error_messages[10] = {
 	"No error",
 	"Can not allocate buffer for parsing",
 	"Corrupt tzfile: The transitions in the file don't always increase",
@@ -44,6 +44,8 @@ const char *timelib_error_messages[9] = {
 	"The version used in this timezone identifier is unsupported",
 	"No timezone with this name could be found",
 	"A 'slim' timezone file has been detected",
+	"The embedded POSIX string is not valid",
+	"The embedded POSIX string is empty"
 };
 
 const char *timelib_get_error_message(int error_code)
diff --git a/src/third_party/timelib-2021.05/timelib.h b/src/third_party/timelib-2021.06/timelib.h
index 7073c6c1e6b..b6e84eb7abb 100644
--- a/src/third_party/timelib-2021.05/timelib.h
+++ b/src/third_party/timelib-2021.06/timelib.h
@@ -30,9 +30,9 @@
 # include "timelib_config.h"
 #endif
 
-#define TIMELIB_VERSION 202105
-#define TIMELIB_EXTENDED_VERSION 20210501
-#define TIMELIB_ASCII_VERSION "2021.05"
+#define TIMELIB_VERSION 202106
+#define TIMELIB_EXTENDED_VERSION 20210601
+#define TIMELIB_ASCII_VERSION "2021.06"
 
 #include <stdlib.h>
 #include <stdbool.h>
@@ -375,7 +375,8 @@ typedef struct _timelib_tzdb {
 #define TIMELIB_UNSET   -99999
 
 /* An entry for each of these error codes is also in the
- * timelib_error_messages array in timelib.c */
+ * timelib_error_messages array in timelib.c.
+ * Codes 0x00, 0x07, and 0x09 are warnings only. */
 #define TIMELIB_ERROR_NO_ERROR                            0x00
 #define TIMELIB_ERROR_CANNOT_ALLOCATE                     0x01
 #define TIMELIB_ERROR_CORRUPT_TRANSITIONS_DONT_INCREASE   0x02
@@ -383,8 +384,9 @@ typedef struct _timelib_tzdb {
 #define TIMELIB_ERROR_CORRUPT_NO_ABBREVIATION             0x04
 #define TIMELIB_ERROR_UNSUPPORTED_VERSION                 0x05
 #define TIMELIB_ERROR_NO_SUCH_TIMEZONE                    0x06
-#define TIMELIB_ERROR_SLIM_FILE                           0x07
-#define TIMELIB_ERROR_POSIX_MISSING_TTINFO                0x08
+#define TIMELIB_ERROR_SLIM_FILE                           0x07 /* Warns if the file is SLIM, but we can't read it */
+#define TIMELIB_ERROR_CORRUPT_POSIX_STRING                0x08
+#define TIMELIB_ERROR_EMPTY_POSIX_STRING                  0x09 /* Warns if the POSIX string is empty, but still produces results */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/third_party/timelib-2021.05/timelib_private.h b/src/third_party/timelib-2021.06/timelib_private.h
index 6f45444138a..6f45444138a 100644
--- a/src/third_party/timelib-2021.05/timelib_private.h
+++ b/src/third_party/timelib-2021.06/timelib_private.h
diff --git a/src/third_party/timelib-2021.05/timezonedb.h b/src/third_party/timelib-2021.06/timezonedb.h
index 89bf64b6cb9..89bf64b6cb9 100644
--- a/src/third_party/timelib-2021.05/timezonedb.h
+++ b/src/third_party/timelib-2021.06/timezonedb.h
diff --git a/src/third_party/timelib-2021.05/timezonemap.h b/src/third_party/timelib-2021.06/timezonemap.h
index 21b7998fcf7..21b7998fcf7 100644
--- a/src/third_party/timelib-2021.05/timezonemap.h
+++ b/src/third_party/timelib-2021.06/timezonemap.h
diff --git a/src/third_party/timelib-2021.05/tm2unixtime.c b/src/third_party/timelib-2021.06/tm2unixtime.c
index 051bb01b1b6..051bb01b1b6 100644
--- a/src/third_party/timelib-2021.05/tm2unixtime.c
+++ b/src/third_party/timelib-2021.06/tm2unixtime.c
diff --git a/src/third_party/timelib-2021.05/unixtime2tm.c b/src/third_party/timelib-2021.06/unixtime2tm.c
index f8ea9216633..f8ea9216633 100644
--- a/src/third_party/timelib-2021.05/unixtime2tm.c
+++ b/src/third_party/timelib-2021.06/unixtime2tm.c
diff --git a/src/third_party/timelib-2021.05/win_dirent.h b/src/third_party/timelib-2021.06/win_dirent.h
index a7063b05d9d..a7063b05d9d 100644
--- a/src/third_party/timelib-2021.05/win_dirent.h
+++ b/src/third_party/timelib-2021.06/win_dirent.h
diff --git a/src/third_party/timelib-2021.05/zones/Makefile b/src/third_party/timelib-2021.06/zones/Makefile
index f81a46664bc..f81a46664bc 100644
--- a/src/third_party/timelib-2021.05/zones/Makefile
+++ b/src/third_party/timelib-2021.06/zones/Makefile
diff --git a/src/third_party/timelib-2021.05/zones/README.rst b/src/third_party/timelib-2021.06/zones/README.rst
index a192b0b2a8e..a192b0b2a8e 100644
--- a/src/third_party/timelib-2021.05/zones/README.rst
+++ b/src/third_party/timelib-2021.06/zones/README.rst
diff --git a/src/third_party/timelib-2021.05/zones/create-timezonedb.php b/src/third_party/timelib-2021.06/zones/create-timezonedb.php
index b700c681cc4..b700c681cc4 100644
--- a/src/third_party/timelib-2021.05/zones/create-timezonedb.php
+++ b/src/third_party/timelib-2021.06/zones/create-timezonedb.php
diff --git a/src/third_party/timelib-2021.05/zones/update-package-version.php b/src/third_party/timelib-2021.06/zones/update-package-version.php
index 6fb25521586..6fb25521586 100644
--- a/src/third_party/timelib-2021.05/zones/update-package-version.php
+++ b/src/third_party/timelib-2021.06/zones/update-package-version.php
diff --git a/src/third_party/timelib-2021.05/zones/update-package-xml.php b/src/third_party/timelib-2021.06/zones/update-package-xml.php
index ce5c774a7cc..ce5c774a7cc 100644
--- a/src/third_party/timelib-2021.05/zones/update-package-xml.php
+++ b/src/third_party/timelib-2021.06/zones/update-package-xml.php