SERVER-31104: Update timelib to version beta10

39 files changed, 12 insertions, 9 deletions

diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index e53d11497fd..35ee5367ecd 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -13,7 +13,7 @@ mozjsSuffix = '-45'
 yamlSuffix = '-0.5.3'
 icuSuffix = '-57.1'
 gperftoolsSuffix = '-2.5'
-timelibSuffix = '-2017.05beta9'
+timelibSuffix = '-2017.05beta10'
 tomcryptSuffix = '-1.18.0-rc2'
 
 thirdPartyIncludePathList = [
diff --git a/src/third_party/scripts/timelib_get_sources.sh b/src/third_party/scripts/timelib_get_sources.sh
index c4e7721f7a9..8493ac438c2 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=2017.05beta9
+VERSION=2017.05beta10
 NAME=timelib
 TARBALL=$VERSION.tar.gz
 TARBALL_DIR=$NAME-$VERSION
diff --git a/src/third_party/timelib-2017.05beta9/LICENSE.rst b/src/third_party/timelib-2017.05beta10/LICENSE.rst
index 70bf7b00bde..70bf7b00bde 100644
--- a/src/third_party/timelib-2017.05beta9/LICENSE.rst
+++ b/src/third_party/timelib-2017.05beta10/LICENSE.rst
diff --git a/src/third_party/timelib-2017.05beta9/Makefile b/src/third_party/timelib-2017.05beta10/Makefile
index d1b5eafb852..d1b5eafb852 100644
--- a/src/third_party/timelib-2017.05beta9/Makefile
+++ b/src/third_party/timelib-2017.05beta10/Makefile
diff --git a/src/third_party/timelib-2017.05beta9/README.rst b/src/third_party/timelib-2017.05beta10/README.rst
index 23faac381fe..23faac381fe 100644
--- a/src/third_party/timelib-2017.05beta9/README.rst
+++ b/src/third_party/timelib-2017.05beta10/README.rst
diff --git a/src/third_party/timelib-2017.05beta9/SConscript b/src/third_party/timelib-2017.05beta10/SConscript
index c7c51ab862e..c7c51ab862e 100644
--- a/src/third_party/timelib-2017.05beta9/SConscript
+++ b/src/third_party/timelib-2017.05beta10/SConscript
diff --git a/src/third_party/timelib-2017.05beta9/astro.c b/src/third_party/timelib-2017.05beta10/astro.c
index bae96e20574..bae96e20574 100644
--- a/src/third_party/timelib-2017.05beta9/astro.c
+++ b/src/third_party/timelib-2017.05beta10/astro.c
diff --git a/src/third_party/timelib-2017.05beta9/astro.h b/src/third_party/timelib-2017.05beta10/astro.h
index 8b2b800b526..8b2b800b526 100644
--- a/src/third_party/timelib-2017.05beta9/astro.h
+++ b/src/third_party/timelib-2017.05beta10/astro.h
diff --git a/src/third_party/timelib-2017.05beta9/docs/date-from-iso-parts.c b/src/third_party/timelib-2017.05beta10/docs/date-from-iso-parts.c
index a4855e4f043..a4855e4f043 100644
--- a/src/third_party/timelib-2017.05beta9/docs/date-from-iso-parts.c
+++ b/src/third_party/timelib-2017.05beta10/docs/date-from-iso-parts.c
diff --git a/src/third_party/timelib-2017.05beta9/docs/date-from-parts.c b/src/third_party/timelib-2017.05beta10/docs/date-from-parts.c
index d4985dd1cb0..d4985dd1cb0 100644
--- a/src/third_party/timelib-2017.05beta9/docs/date-from-parts.c
+++ b/src/third_party/timelib-2017.05beta10/docs/date-from-parts.c
diff --git a/src/third_party/timelib-2017.05beta9/docs/date-from-string.c b/src/third_party/timelib-2017.05beta10/docs/date-from-string.c
index 612beb966fa..612beb966fa 100644
--- a/src/third_party/timelib-2017.05beta9/docs/date-from-string.c
+++ b/src/third_party/timelib-2017.05beta10/docs/date-from-string.c
diff --git a/src/third_party/timelib-2017.05beta9/docs/date-to-parts.c b/src/third_party/timelib-2017.05beta10/docs/date-to-parts.c
index 3bc889315a9..3bc889315a9 100644
--- a/src/third_party/timelib-2017.05beta9/docs/date-to-parts.c
+++ b/src/third_party/timelib-2017.05beta10/docs/date-to-parts.c
diff --git a/src/third_party/timelib-2017.05beta9/dow.c b/src/third_party/timelib-2017.05beta10/dow.c
index 33553e7806f..33553e7806f 100644
--- a/src/third_party/timelib-2017.05beta9/dow.c
+++ b/src/third_party/timelib-2017.05beta10/dow.c
diff --git a/src/third_party/timelib-2017.05beta9/fallbackmap.h b/src/third_party/timelib-2017.05beta10/fallbackmap.h
index 5a4c6123c3a..5a4c6123c3a 100644
--- a/src/third_party/timelib-2017.05beta9/fallbackmap.h
+++ b/src/third_party/timelib-2017.05beta10/fallbackmap.h
diff --git a/src/third_party/timelib-2017.05beta9/gettzmapping.php b/src/third_party/timelib-2017.05beta10/gettzmapping.php
index 3a94791b7fe..3a94791b7fe 100644
--- a/src/third_party/timelib-2017.05beta9/gettzmapping.php
+++ b/src/third_party/timelib-2017.05beta10/gettzmapping.php
diff --git a/src/third_party/timelib-2017.05beta9/interval.c b/src/third_party/timelib-2017.05beta10/interval.c
index e9fa2745638..e9fa2745638 100644
--- a/src/third_party/timelib-2017.05beta9/interval.c
+++ b/src/third_party/timelib-2017.05beta10/interval.c
diff --git a/src/third_party/timelib-2017.05beta9/parse_date.c b/src/third_party/timelib-2017.05beta10/parse_date.c
index 7adccd681f9..efb3880ac40 100644
--- a/src/third_party/timelib-2017.05beta9/parse_date.c
+++ b/src/third_party/timelib-2017.05beta10/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Wed Sep 13 14:05:33 2017 */
+/* Generated by re2c 0.15.3 on Wed Sep 20 10:05:44 2017 */
 #line 1 "parse_date.re"
 /*
  * The MIT License (MIT)
diff --git a/src/third_party/timelib-2017.05beta9/parse_date.re b/src/third_party/timelib-2017.05beta10/parse_date.re
index 06b860ce1a6..06b860ce1a6 100644
--- a/src/third_party/timelib-2017.05beta9/parse_date.re
+++ b/src/third_party/timelib-2017.05beta10/parse_date.re
diff --git a/src/third_party/timelib-2017.05beta9/parse_iso_intervals.c b/src/third_party/timelib-2017.05beta10/parse_iso_intervals.c
index 51a8a501c6d..d8592f9829f 100644
--- a/src/third_party/timelib-2017.05beta9/parse_iso_intervals.c
+++ b/src/third_party/timelib-2017.05beta10/parse_iso_intervals.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Wed Sep 13 14:05:33 2017 */
+/* Generated by re2c 0.15.3 on Wed Sep 20 10:05:44 2017 */
 #line 1 "parse_iso_intervals.re"
 /*
  * The MIT License (MIT)
diff --git a/src/third_party/timelib-2017.05beta9/parse_iso_intervals.re b/src/third_party/timelib-2017.05beta10/parse_iso_intervals.re
index 95d8abf9ea6..95d8abf9ea6 100644
--- a/src/third_party/timelib-2017.05beta9/parse_iso_intervals.re
+++ b/src/third_party/timelib-2017.05beta10/parse_iso_intervals.re
diff --git a/src/third_party/timelib-2017.05beta9/parse_tz.c b/src/third_party/timelib-2017.05beta10/parse_tz.c
index 3b68549c320..3b68549c320 100644
--- a/src/third_party/timelib-2017.05beta9/parse_tz.c
+++ b/src/third_party/timelib-2017.05beta10/parse_tz.c
diff --git a/src/third_party/timelib-2017.05beta9/parse_zoneinfo.c b/src/third_party/timelib-2017.05beta10/parse_zoneinfo.c
index 7ff88fbb766..7ff88fbb766 100644
--- a/src/third_party/timelib-2017.05beta9/parse_zoneinfo.c
+++ b/src/third_party/timelib-2017.05beta10/parse_zoneinfo.c
diff --git a/src/third_party/timelib-2017.05beta9/timelib.c b/src/third_party/timelib-2017.05beta10/timelib.c
index ee52de77cbe..ee52de77cbe 100644
--- a/src/third_party/timelib-2017.05beta9/timelib.c
+++ b/src/third_party/timelib-2017.05beta10/timelib.c
diff --git a/src/third_party/timelib-2017.05beta9/timelib.h b/src/third_party/timelib-2017.05beta10/timelib.h
index fb2fd34dc86..a7e1401de65 100644
--- a/src/third_party/timelib-2017.05beta9/timelib.h
+++ b/src/third_party/timelib-2017.05beta10/timelib.h
@@ -311,8 +311,8 @@ typedef struct _timelib_tzdb {
 #endif
 
 #define TIMELIB_VERSION 201705
-#define TIMELIB_EXTENDED_VERSION 20170509
-#define TIMELIB_ASCII_VERSION "2017.05beta9"
+#define TIMELIB_EXTENDED_VERSION 20170510
+#define TIMELIB_ASCII_VERSION "2017.05beta10"
 
 #define TIMELIB_NONE             0x00
 #define TIMELIB_OVERRIDE_TIME    0x01
diff --git a/src/third_party/timelib-2017.05beta9/timelib.m4 b/src/third_party/timelib-2017.05beta10/timelib.m4
index e112380da05..e112380da05 100644
--- a/src/third_party/timelib-2017.05beta9/timelib.m4
+++ b/src/third_party/timelib-2017.05beta10/timelib.m4
diff --git a/src/third_party/timelib-2017.05beta9/timelib_private.h b/src/third_party/timelib-2017.05beta10/timelib_private.h
index c6156ad8571..c6156ad8571 100644
--- a/src/third_party/timelib-2017.05beta9/timelib_private.h
+++ b/src/third_party/timelib-2017.05beta10/timelib_private.h
diff --git a/src/third_party/timelib-2017.05beta9/timezonedb.h b/src/third_party/timelib-2017.05beta10/timezonedb.h
index 2c63fb1d945..2c63fb1d945 100644
--- a/src/third_party/timelib-2017.05beta9/timezonedb.h
+++ b/src/third_party/timelib-2017.05beta10/timezonedb.h
diff --git a/src/third_party/timelib-2017.05beta9/timezonemap.h b/src/third_party/timelib-2017.05beta10/timezonemap.h
index 5859d22f66a..5859d22f66a 100644
--- a/src/third_party/timelib-2017.05beta9/timezonemap.h
+++ b/src/third_party/timelib-2017.05beta10/timezonemap.h
diff --git a/src/third_party/timelib-2017.05beta9/tm2unixtime.c b/src/third_party/timelib-2017.05beta10/tm2unixtime.c
index 42a59cfaa65..42a59cfaa65 100644
--- a/src/third_party/timelib-2017.05beta9/tm2unixtime.c
+++ b/src/third_party/timelib-2017.05beta10/tm2unixtime.c
diff --git a/src/third_party/timelib-2017.05beta9/unixtime2tm.c b/src/third_party/timelib-2017.05beta10/unixtime2tm.c
index a88b3a6f170..a88b3a6f170 100644
--- a/src/third_party/timelib-2017.05beta9/unixtime2tm.c
+++ b/src/third_party/timelib-2017.05beta10/unixtime2tm.c
diff --git a/src/third_party/timelib-2017.05beta9/win_dirent.h b/src/third_party/timelib-2017.05beta10/win_dirent.h
index ad9d2b359d0..ad9d2b359d0 100644
--- a/src/third_party/timelib-2017.05beta9/win_dirent.h
+++ b/src/third_party/timelib-2017.05beta10/win_dirent.h
diff --git a/src/third_party/timelib-2017.05beta9/zones/Makefile b/src/third_party/timelib-2017.05beta10/zones/Makefile
index b423269eaba..b444c134efd 100644
--- a/src/third_party/timelib-2017.05beta9/zones/Makefile
+++ b/src/third_party/timelib-2017.05beta10/zones/Makefile
@@ -7,6 +7,7 @@ download:
 	$(eval VERSION := $(shell curl -s -o - https://www.iana.org/time-zones | grep \"version\" | sed 's/.*version">//' | sed 's/<\/span.*//'))
 	curl -s -o tzdata$(VERSION).tar.gz https://www.iana.org/time-zones/repository/releases/tzdata$(VERSION).tar.gz
 	curl -s -o tzcode$(VERSION).tar.gz https://www.iana.org/time-zones/repository/releases/tzcode$(VERSION).tar.gz
+	@echo " done"
 
 clean: release-php-clean
 	-rm -rf code
@@ -35,15 +36,17 @@ timezonedb.dta: code/zone.tab
 
 timezonedb.idx: timezonedb.idx.php timezonedb.dta
 
-version-info.txt:
+version-info.txt: download
 	find . -name tzdata*.tar.gz | sed 's/.*20/20/' | sed 's/\.tar.*//' > version-info.txt
-	find . -name tzdata*.tar.gz | php -r "preg_match('@([0-9]{4})([a-z])@', file_get_contents('php://stdin'), \$$a); echo \$$a[1], '.', ord(\$$a[2]) - ord('a') + 1;" >> version-info.txt
+	find . -name tzdata*.tar.gz | sed -E "s/^.*(20[0-9]{2}).*$$/\1/" | tr -d '\n' >> version-info.txt
+	echo -n "." >> version-info.txt
+	find . -name tzdata*.tar.gz | sed -E "s/^.*20[0-9]{2}(\w).*$$/\1/" | sed "s/\\n//" | od -A n -t d1 -N 1 | awk '{printf "%s", $$1 - 96}' >> version-info.txt
 
 timezonedb.zip: code/zone.tab version-info.txt
 	@echo -n "Making archive..."
 	-@mkdir code/timezonedb-$(VERSION); cp -r code/data/. code/timezonedb-$(VERSION)/; cp version-info.txt code/timezonedb-$(VERSION)/
 	-@cd code; zip --quiet -r ../timezonedb.zip timezonedb-$(VERSION)
-	cp timezonedb.zip timezonedb-$(VERSION).zip
+	@cp timezonedb.zip timezonedb-$(VERSION).zip
 	@echo " done"
 
 timezonedb.h: timezonedb.idx version-info.txt create_dot_h_file.php
diff --git a/src/third_party/timelib-2017.05beta9/zones/README.rst b/src/third_party/timelib-2017.05beta10/zones/README.rst
index a192b0b2a8e..a192b0b2a8e 100644
--- a/src/third_party/timelib-2017.05beta9/zones/README.rst
+++ b/src/third_party/timelib-2017.05beta10/zones/README.rst
diff --git a/src/third_party/timelib-2017.05beta9/zones/build-idx.php b/src/third_party/timelib-2017.05beta10/zones/build-idx.php
index e5953a1c8cd..e5953a1c8cd 100644
--- a/src/third_party/timelib-2017.05beta9/zones/build-idx.php
+++ b/src/third_party/timelib-2017.05beta10/zones/build-idx.php
diff --git a/src/third_party/timelib-2017.05beta9/zones/create-entry.php b/src/third_party/timelib-2017.05beta10/zones/create-entry.php
index b0e9c478222..b0e9c478222 100644
--- a/src/third_party/timelib-2017.05beta9/zones/create-entry.php
+++ b/src/third_party/timelib-2017.05beta10/zones/create-entry.php
diff --git a/src/third_party/timelib-2017.05beta9/zones/create_dot_h_file.php b/src/third_party/timelib-2017.05beta10/zones/create_dot_h_file.php
index e25cd68f96b..e25cd68f96b 100644
--- a/src/third_party/timelib-2017.05beta9/zones/create_dot_h_file.php
+++ b/src/third_party/timelib-2017.05beta10/zones/create_dot_h_file.php
diff --git a/src/third_party/timelib-2017.05beta9/zones/sort-index.php b/src/third_party/timelib-2017.05beta10/zones/sort-index.php
index d6f9496e2f2..d6f9496e2f2 100644
--- a/src/third_party/timelib-2017.05beta9/zones/sort-index.php
+++ b/src/third_party/timelib-2017.05beta10/zones/sort-index.php
diff --git a/src/third_party/timelib-2017.05beta9/zones/update-package-version.php b/src/third_party/timelib-2017.05beta10/zones/update-package-version.php
index 6fb25521586..6fb25521586 100644
--- a/src/third_party/timelib-2017.05beta9/zones/update-package-version.php
+++ b/src/third_party/timelib-2017.05beta10/zones/update-package-version.php
diff --git a/src/third_party/timelib-2017.05beta9/zones/update-package-xml.php b/src/third_party/timelib-2017.05beta10/zones/update-package-xml.php
index ce5c774a7cc..ce5c774a7cc 100644
--- a/src/third_party/timelib-2017.05beta9/zones/update-package-xml.php
+++ b/src/third_party/timelib-2017.05beta10/zones/update-package-xml.php