From owner-svn-src-vendor@FreeBSD.ORG Thu Oct 23 00:09:16 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6D6ADA9; Thu, 23 Oct 2014 00:09:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A91018BF; Thu, 23 Oct 2014 00:09:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N09Gx9061074; Thu, 23 Oct 2014 00:09:16 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N09Ght061073; Thu, 23 Oct 2014 00:09:16 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410230009.s9N09Ght061073@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 23 Oct 2014 00:09:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r273492 - vendor/xz/dist/po X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 00:09:16 -0000 Author: delphij Date: Thu Oct 23 00:09:16 2014 New Revision: 273492 URL: https://svnweb.freebsd.org/changeset/base/273492 Log: Remove gettext files as we don't enable NLS. Deleted: vendor/xz/dist/po/ From owner-svn-src-vendor@FreeBSD.ORG Thu Oct 23 00:33:25 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB622251; Thu, 23 Oct 2014 00:33:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B494CB0B; Thu, 23 Oct 2014 00:33:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N0XPGH074456; Thu, 23 Oct 2014 00:33:25 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N0XPT1074454; Thu, 23 Oct 2014 00:33:25 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410230033.s9N0XPT1074454@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 23 Oct 2014 00:33:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r273494 - in vendor/xz/dist: . src/liblzma/api/lzma src/liblzma/check src/liblzma/lzma src/xz X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 00:33:26 -0000 Author: delphij Date: Thu Oct 23 00:33:25 2014 New Revision: 273494 URL: https://svnweb.freebsd.org/changeset/base/273494 Log: Vendor import of xz 5.0.7. Modified: vendor/xz/dist/ChangeLog vendor/xz/dist/THANKS vendor/xz/dist/TODO vendor/xz/dist/src/liblzma/api/lzma/block.h vendor/xz/dist/src/liblzma/api/lzma/version.h vendor/xz/dist/src/liblzma/check/crc32_fast.c vendor/xz/dist/src/liblzma/check/sha256.c vendor/xz/dist/src/liblzma/lzma/lzma_encoder_presets.c vendor/xz/dist/src/xz/coder.c vendor/xz/dist/src/xz/signals.c vendor/xz/dist/src/xz/suffix.c Modified: vendor/xz/dist/ChangeLog ============================================================================== --- vendor/xz/dist/ChangeLog Thu Oct 23 00:31:26 2014 (r273493) +++ vendor/xz/dist/ChangeLog Thu Oct 23 00:33:25 2014 (r273494) @@ -1,6 +1,337 @@ +commit 495aaf3a5b7200a5d2bf449bbbcc0e18834607af +Author: Lasse Collin +Date: 2014-09-20 20:44:32 +0300 + + Bump version and soname for 5.0.7. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ac6c8921d1d8d2d749d5c97f9a0b0594cc863cea +Author: Lasse Collin +Date: 2014-09-20 20:43:29 +0300 + + Update NEWS for 5.0.7. + + NEWS | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit d1b0276aafd441a3d4db9dfd5dd9880e9f834d49 +Author: Lasse Collin +Date: 2014-09-20 20:21:18 +0300 + + liblzma: Fix invalid Libs.private value in liblzma.pc. + + src/liblzma/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cac72956b1e56788182ac14bfb25519636afd503 +Author: Lasse Collin +Date: 2014-09-20 19:42:56 +0300 + + liblzma: Fix a portability problem in Makefile.am. + + POSIX supports $< only in inference rules (suffix rules). + Using it elsewhere is a GNU make extension and doesn't + work e.g. with OpenBSD make. + + Thanks to Christian Weisgerber for the patch. + + src/liblzma/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2cdf0875dedca3e89b02ad5ac8aa1109f902ae11 +Author: Lasse Collin +Date: 2014-09-14 19:35:45 +0300 + + Bump version and soname for 5.0.6. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 0168b6c8fbc88cae61b1f5fb41d6c33c9e127967 +Author: Lasse Collin +Date: 2014-09-14 19:33:46 +0300 + + Update NEWS for 5.0.6. + + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 13337714e89d002af7af48d6853f977de985d7de +Author: Lasse Collin +Date: 2014-06-13 19:21:54 +0300 + + xzgrep: List xzgrep_expected_output in tests/Makefile.am. + + tests/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ccc728d8290c0464c7af62790b1c5528eceaae35 +Author: Lasse Collin +Date: 2014-06-13 18:58:22 +0300 + + xzgrep: Improve the test script. + + Now it should be close to the functionality of the original + version by Pavel Raiskup. + + tests/Makefile.am | 3 ++- + tests/test_scripts.sh | 24 ++++++++++++++---------- + tests/xzgrep_expected_output | 39 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 55 insertions(+), 11 deletions(-) + +commit 948f5865fe65061e215baa8ed63be570bae152ea +Author: Lasse Collin +Date: 2014-06-11 21:03:25 +0300 + + xzgrep: Add a test for the previous fix. + + This is a simplified version of Pavel Raiskup's + original patch. + + tests/test_scripts.sh | 26 ++++++++++++++++++++++---- + 1 file changed, 22 insertions(+), 4 deletions(-) + +commit 64228d0d5cd75af31e5c330cc3a792016413fabf +Author: Lasse Collin +Date: 2014-06-11 20:43:28 +0300 + + xzgrep: exit 0 when at least one file matches. + + Mimic the original grep behavior and return exit_success when + at least one xz compressed file matches given pattern. + + Original bugreport: + https://bugzilla.redhat.com/show_bug.cgi?id=1108085 + + Thanks to Pavel Raiskup for the patch. + + src/scripts/xzgrep.in | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 98d3368ef4bff0face78d6932f2156730c8cb658 +Author: Lasse Collin +Date: 2014-04-25 17:53:42 +0300 + + Build: Fix the combination of --disable-xzdec --enable-lzmadec. + + In this case "make install" could fail if the man page directory + didn't already exist at the destination. If it did exist, a + dangling symlink was created there. Now the link is omitted + instead. This isn't the best fix but it's better than the old + behavior. + + src/xzdec/Makefile.am | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit ba3b5dd082db2cb5973e877a74221d739c663fb4 +Author: Lasse Collin +Date: 2014-04-25 17:44:26 +0300 + + Build: Add --disable-doc to configure. + + INSTALL | 6 ++++++ + Makefile.am | 2 ++ + configure.ac | 6 ++++++ + 3 files changed, 14 insertions(+) + +commit 3d4575f2367fe8f1f2dcacba014e6c0aef388535 +Author: Lasse Collin +Date: 2014-04-24 18:06:24 +0300 + + Update INSTALL. + + Add a note about failing "make check". The source of + the problem should be fixed in libtool (if it really is + a libtool bug and not mine) but I'm unable to spend time + on that for now. Thanks to Nelson H. F. Beebe for reporting + the issue. + + Add a note about a possible need to run "ldconfig" after + "make install". + + INSTALL | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit b9f0584e3eff421eadbb6604de0b0b40bf87e129 +Author: Lasse Collin +Date: 2014-04-09 17:26:10 +0300 + + xz: Rename a variable to avoid a namespace collision on Solaris. + + I don't know the details but I have an impression that there's + no problem in practice if using GCC since people have built xz + with GCC (without patching xz), but renaming the variable cannot + hurt either. + + Thanks to Mark Ashley. + + src/xz/signals.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit cc41bcaf77c9c27ec09ef033fb3300e994e828e6 +Author: Lasse Collin +Date: 2014-04-26 08:45:49 +0300 + + xz: Fix a comment. + + src/xz/coder.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e34025d666852839388f997d076e3577847dd10f +Author: Lasse Collin +Date: 2014-01-12 16:44:52 +0200 + + liblzma: Avoid C99 compound literal arrays. + + MSVC 2013 doesn't like them. Maybe they aren't so good + for readability either since many aren't used to them. + + src/liblzma/lzma/lzma_encoder_presets.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 0b6168974f1fac3a06157039235b66e4161b9b42 +Author: Lasse Collin +Date: 2014-01-12 12:50:30 +0200 + + liblzma: Remove a useless C99ism from sha256.c. + + Unsurprisingly it makes no difference in compiled output. + + src/liblzma/check/sha256.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 41e436076cfdcccc7e853de73b0d56b3d6d42053 +Author: Lasse Collin +Date: 2014-01-12 12:17:08 +0200 + + xz: Fix use of wrong variable. + + Since the only call to suffix_set() uses optarg + as the argument, fixing this bug doesn't change + the behavior of the program. + + src/xz/suffix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c33efefd4ef0931e5795e13725d4bd2203571ce0 +Author: Lasse Collin +Date: 2014-04-26 08:37:00 +0300 + + Fix typos in comments. + + src/liblzma/check/crc32_fast.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e560c82f1f5693d88db9dc71f656436135f17595 +Author: Lasse Collin +Date: 2013-11-26 18:20:16 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 05192b32e553eac5dfbd646b6102d10187f29a05 +Author: Lasse Collin +Date: 2013-11-26 18:20:09 +0200 + + liblzma: Document the need for block->check for lzma_block_header_decode(). + + Thanks to Tomer Chachamu. + + src/liblzma/api/lzma/block.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0f35eafe51db7b1eb0711bc8cc829ea6896b34f4 +Author: Lasse Collin +Date: 2013-10-26 12:47:04 +0300 + + Update TODO. + + TODO | 4 ---- + 1 file changed, 4 deletions(-) + +commit fc9eaf81d718488b052e5c65f9d6f08acc858873 +Author: Lasse Collin +Date: 2013-09-11 14:40:35 +0300 + + Build: Remove a comment about Automake 1.10 from configure.ac. + + The previous commit supports silent rules and that requires + Automake 1.11. + + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +commit 090c69dda59e00fc86d0792879bd921bb1156029 +Author: Lasse Collin +Date: 2013-09-09 20:37:03 +0300 + + Build: Create liblzma.pc in a src/liblzma/Makefile.am. + + Previously it was done in configure, but doing that goes + against the Autoconf manual. Autoconf requires that it is + possible to override e.g. prefix after running configure + and that doesn't work correctly if liblzma.pc is created + by configure. + + A potential downside of this change is that now e.g. + libdir in liblzma.pc is a standalone string instead of + being defined via ${prefix}, so if one overrides prefix + when running pkg-config the libdir won't get the new value. + I don't know if this matters in practice. + + Thanks to Vincent Torri. + + configure.ac | 1 - + src/liblzma/Makefile.am | 20 ++++++++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +commit 1f35331332273de01c46897cafdb37f8e6e285db +Author: Anders F Bjorklund +Date: 2013-08-02 15:59:46 +0200 + + macosx: separate liblzma package + + macosx/build.sh | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 1415f1d94644f28e07d544bc1e06b0636081abee +Author: Anders F Bjorklund +Date: 2013-08-02 15:58:44 +0200 + + macosx: set minimum to leopard + + macosx/build.sh | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 41913949b93414a21ae9fb1a8e9b7cdde8b37f98 +Author: Anders F Bjorklund +Date: 2011-08-07 13:13:30 +0200 + + move configurables into variables + + macosx/build.sh | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +commit 3dffda33f47dc220bb1738564fe02effa9da4c8e +Author: Lasse Collin +Date: 2013-07-15 14:08:02 +0300 + + Build: Fix the detection of missing CRC32. + + Thanks to Vincent Torri. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit b69900ed0b2f914fc6c0a180dcb522dbe5b80ea7 Author: Lasse Collin -Date: Sun Jun 30 18:02:27 2013 +0300 +Date: 2013-06-30 18:02:27 +0300 Man pages: Use similar syntax for synopsis as in xz. @@ -10,38 +341,56 @@ Date: Sun Jun 30 18:02:27 2013 +0300 didn't mention these man pages in his bug report, but it's nice to be consistent. + src/lzmainfo/lzmainfo.1 | 4 ++-- + src/scripts/xzmore.1 | 6 +++--- + src/xzdec/xzdec.1 | 10 +++++----- + 3 files changed, 10 insertions(+), 10 deletions(-) + commit cf4a1e1879d89be314ef3c064bd2656ea452f87e Author: Lasse Collin -Date: Sun Jun 30 15:55:09 2013 +0300 +Date: 2013-06-30 15:55:09 +0300 Update NEWS for 5.0.5. + NEWS | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 52 insertions(+) + commit cb94bb6d1f34e1e93c2d634ea9c3b7dfb3981d05 Author: Lasse Collin -Date: Sun Jun 30 15:54:38 2013 +0300 +Date: 2013-06-30 15:54:38 +0300 Bump version and soname for 5.0.5. + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + commit b7dee202d5b041ccae028d0c5433b83cecbe9e5d Author: Lasse Collin -Date: Fri Jun 28 23:56:17 2013 +0300 +Date: 2013-06-28 23:56:17 +0300 xz: Fix return value type in io_write_buf(). It didn't affect the behavior of the code since -1 becomes true anyway. + src/xz/file_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 265e7b44d804b47373f10b7da28350db7611cea6 Author: Lasse Collin -Date: Fri Jun 28 18:46:13 2013 +0300 +Date: 2013-06-28 18:46:13 +0300 xz: Remove an outdated NetBSD-specific comment. Nowadays errno == EFTYPE is documented in open(2). + src/xz/file_io.c | 4 ---- + 1 file changed, 4 deletions(-) + commit 78c2f8db902195468b8249c432252a6b281db836 Author: Lasse Collin -Date: Fri Jun 28 18:09:47 2013 +0300 +Date: 2013-06-28 18:09:47 +0300 xz: Fix error detection of fcntl(fd, F_SETFL, flags) calls. @@ -51,9 +400,12 @@ Date: Fri Jun 28 18:09:47 2013 +0300 F_SETFL is always 0 (at least accorinding to fcntl(2) from man-pages 3.51). + src/xz/file_io.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + commit 91750dff8f2c654ff636f12a2acdffe5492374b3 Author: Lasse Collin -Date: Fri Jun 28 17:36:47 2013 +0300 +Date: 2013-06-28 17:36:47 +0300 xz: Fix use of wrong variable in a fcntl() call. @@ -69,9 +421,12 @@ Date: Fri Jun 28 17:36:47 2013 +0300 indicate when the flags should be restored instead of relying on a special value in stdout_flags. + src/xz/file_io.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + commit e11888a79a4a77a69afde60445880d44f63d01aa Author: Lasse Collin -Date: Wed Jun 26 13:30:57 2013 +0300 +Date: 2013-06-26 13:30:57 +0300 xz: Check the value of lzma_stream_flags.version in --list. @@ -80,9 +435,12 @@ Date: Wed Jun 26 13:30:57 2013 +0300 then this check becomes important and will stop the old xz from trying to parse files that it won't understand. + src/xz/list.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + commit f39ddd88f3222219ada88998cf30abfdd3e0e96c Author: Lasse Collin -Date: Wed Jun 26 12:17:00 2013 +0300 +Date: 2013-06-26 12:17:00 +0300 Build: Require Automake 1.12 and use serial-tests option. @@ -95,9 +453,12 @@ Date: Wed Jun 26 12:17:00 2013 +0300 in XZ Utils but they hide the progress output from test_compress.sh. + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + commit cb84e278027a90e9827a6f4d3bb0b4d4744a2fbb Author: Lasse Collin -Date: Sun Jun 23 17:36:47 2013 +0300 +Date: 2013-06-23 17:36:47 +0300 xz: Validate Uncompressed Size from Block Header in list.c. @@ -107,23 +468,32 @@ Date: Sun Jun 23 17:36:47 2013 +0300 show such files as corrupt instead of showing the Uncompressed Size from Index. + src/xz/list.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + commit f01780fce454c7489f7dcbf806299b50da5f51b7 Author: Lasse Collin -Date: Wed Jun 26 10:58:58 2013 +0300 +Date: 2013-06-26 10:58:58 +0300 Update THANKS. + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + commit d98ede7d700b892e32d9c2f46563b6ebc566786d Author: Lasse Collin -Date: Fri Jun 21 22:04:45 2013 +0300 +Date: 2013-06-21 22:04:45 +0300 xz: Make the man page more friendly to doclifter. Thanks to Eric S. Raymond. + src/xz/xz.1 | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + commit 19b447b64b3f520cd5b11429000b092f7c76709b Author: Lasse Collin -Date: Fri Jun 21 21:54:59 2013 +0300 +Date: 2013-06-21 21:54:59 +0300 xz: A couple of man page fixes. @@ -133,9 +503,12 @@ Date: Fri Jun 21 21:54:59 2013 +0300 Thanks to DevHC who reported these issues on IRC to me on 2012-12-14. + src/xz/xz.1 | 35 +++++++++++++++++++++++------------ + 1 file changed, 23 insertions(+), 12 deletions(-) + commit 45edf2966fc9a4d2eae8f84b2fa027fb4fa1df8b Author: Lasse Collin -Date: Fri Jun 21 21:50:26 2013 +0300 +Date: 2013-06-21 21:50:26 +0300 xz: Fix interaction between preset and custom filter chains. @@ -158,15 +531,22 @@ Date: Fri Jun 21 21:50:26 2013 +0300 Thanks to Conley Moorhous. + src/xz/coder.c | 35 +++++++++++++++++++++-------------- + 1 file changed, 21 insertions(+), 14 deletions(-) + commit b065984e5a9272eb50bc0c6d3731e6199c0ae8a8 Author: Lasse Collin -Date: Fri Apr 8 17:53:05 2011 +0300 +Date: 2011-04-08 17:53:05 +0300 xz: Change size_t to uint32_t in a few places. + src/xz/coder.c | 6 +++--- + src/xz/coder.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + commit 32be621f52f2e1686db88baa7b01dc1ae338f426 Author: Lasse Collin -Date: Sat Apr 27 22:07:46 2013 +0300 +Date: 2013-04-27 22:07:46 +0300 Build: Use -Wvla with GCC if supported. @@ -175,9 +555,12 @@ Date: Sat Apr 27 22:07:46 2013 +0300 future either to stay compatible with C11 without requiring any optional C11 features. + configure.ac | 1 + + 1 file changed, 1 insertion(+) + commit efb07cfba65e9e05984c02cd796c1b0338ce04dc Author: Lasse Collin -Date: Mon Apr 15 19:29:09 2013 +0300 +Date: 2013-04-15 19:29:09 +0300 xzdec: Improve the --help message. @@ -189,23 +572,32 @@ Date: Mon Apr 15 19:29:09 2013 +0300 because I find it easier to spot the ignored vs. non-ignored options from the list that way. + src/xzdec/xzdec.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + commit e3c8be13699e2813f5e2879d8187444b46d82d89 Author: Lasse Collin -Date: Fri Apr 5 19:25:40 2013 +0300 +Date: 2013-04-05 19:25:40 +0300 Update THANKS. + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + commit ad8282efe483612f6b5544f9a0d2e4914fb2532a Author: Jeff Bastian -Date: Wed Apr 3 13:59:17 2013 +0200 +Date: 2013-04-03 13:59:17 +0200 xzgrep: make the '-h' option to be --no-filename equivalent * src/scripts/xzgrep.in: Accept the '-h' option in argument parsing. + src/scripts/xzgrep.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 9271a3eb0e022b23e8712154be851d0afe4c02e4 Author: Lasse Collin -Date: Fri Apr 5 19:34:09 2013 +0300 +Date: 2013-04-05 19:34:09 +0300 liblzma: Be less picky in lzma_alone_decoder(). @@ -231,9 +623,14 @@ Date: Fri Apr 5 19:34:09 2013 +0300 src/liblzma/common/alone_decoder.c src/liblzma/common/alone_decoder.h + src/liblzma/common/alone_decoder.c | 22 ++++++++++++++-------- + src/liblzma/common/alone_decoder.h | 5 +++-- + src/liblzma/common/auto_decoder.c | 2 +- + 3 files changed, 18 insertions(+), 11 deletions(-) + commit 211b931cee58626c1d2e021810cb108cb5cbc10f Author: Lasse Collin -Date: Tue Mar 5 19:14:50 2013 +0200 +Date: 2013-03-05 19:14:50 +0200 Avoid unneeded use of awk in xzless. @@ -243,9 +640,12 @@ Date: Tue Mar 5 19:14:50 2013 +0200 Thanks to Ariel P for the patch. + src/scripts/xzless.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + commit 9f62fd9605eade23b62b07a235d1f02156f7a5c6 Author: Jonathan Nieder -Date: Mon Nov 19 00:10:10 2012 -0800 +Date: 2012-11-19 00:10:10 -0800 xzless: Make "less -V" parsing more robust @@ -282,46 +682,66 @@ Date: Mon Nov 19 00:10:10 2012 -0800 Reported-by: Jörg-Volker Peetz Signed-off-by: Jonathan Nieder + src/scripts/xzless.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + commit 1d05980f5b5c2c94d833001daccacce4a466876e Author: Lasse Collin -Date: Wed Oct 3 15:54:24 2012 +0300 +Date: 2012-10-03 15:54:24 +0300 xz: Fix the note about --rsyncable on the man page. + src/xz/xz.1 | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + commit fb68497333598688d309a92838d91fd560f7e9f0 Author: Lasse Collin -Date: Fri Sep 28 20:11:09 2012 +0300 +Date: 2012-09-28 20:11:09 +0300 xz: Improve handling of failed realloc in xrealloc. Thanks to Jim Meyering. + src/xz/util.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + commit 75013db6d4d63c195bd8b8d45729b4be0665a812 Author: Lasse Collin -Date: Sat Dec 15 20:01:02 2012 +0200 +Date: 2012-12-15 20:01:02 +0200 A few typo fixes to comments and the xz man page. Thanks to Jim Meyering. + configure.ac | 2 +- + src/liblzma/check/sha256.c | 1 - + src/xz/xz.1 | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) + commit e44b21839b1dcbac5097be39b87dd2ddb6e114fd Author: Lasse Collin -Date: Thu Aug 2 17:13:30 2012 +0300 +Date: 2012-08-02 17:13:30 +0300 Build: Bump gettext version requirement to 0.18. Otherwise too old version of m4/lib-link.m4 gets included when autoreconf -fi is run. + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit fd3dbb23ca7e75a7a888d7e897c381dc06308307 Author: Lasse Collin -Date: Thu Jul 5 07:36:28 2012 +0300 +Date: 2012-07-05 07:36:28 +0300 Tests: Remove tests/test_block.c that had gotten committed accidentally. + tests/test_block.c | 52 ---------------------------------------------------- + 1 file changed, 52 deletions(-) + commit 05a735d279d74af437c31f25f69aded4713c1a3d Author: Lasse Collin -Date: Thu Jul 5 07:33:35 2012 +0300 +Date: 2012-07-05 07:33:35 +0300 Build: Include macosx/build.sh in the distribution. @@ -329,55 +749,81 @@ Date: Thu Jul 5 07:33:35 2012 +0300 few people have seen it since it hasn't been included in the release tarballs. :-( + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + commit 4e6d62793b5e7b87edcc93c7ded072c1ecd94173 Author: Lasse Collin -Date: Thu Jul 5 07:24:45 2012 +0300 +Date: 2012-07-05 07:24:45 +0300 Docs: Fix the name LZMA Utils -> XZ Utils in debug/README. + debug/README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit dd95b5e7614baf1f07a1316b5106bd616a9efa79 Author: Lasse Collin -Date: Thu Jul 5 07:23:17 2012 +0300 +Date: 2012-07-05 07:23:17 +0300 Include debug/translation.bash in the distribution. Also fix the script name mentioned in README. + README | 4 ++-- + debug/Makefile.am | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + commit 20778053a07eb90c159c1377ca8dc05a90fd530b Author: Lasse Collin -Date: Fri Jun 22 14:36:16 2012 +0300 +Date: 2012-06-22 14:36:16 +0300 xz: Update man page date to match the latest update. + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 2cefa84af676da37d7e9c466d55d46c67ab00c22 Author: Lasse Collin -Date: Fri Jun 22 10:25:43 2012 +0300 +Date: 2012-06-22 10:25:43 +0300 Bump version and soname for 5.0.4. + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + commit 433fec191a17e45690809e54146ea7a773f54cff Author: Lasse Collin -Date: Fri Jun 22 10:25:09 2012 +0300 +Date: 2012-06-22 10:25:09 +0300 Update NEWS for 5.0.4. + NEWS | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + commit 711fa680f552a4003df73b37e6dc4d6e00b47bcd Author: Lasse Collin -Date: Mon Jun 18 21:27:47 2012 +0300 +Date: 2012-06-18 21:27:47 +0300 Docs: Language fix to 01_compress_easy.c. Thanks to Jonathan Nieder. + doc/examples/01_compress_easy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 3d7ab1dc61a75c560828be5df96598388b771456 Author: Lasse Collin -Date: Thu Jun 14 20:15:30 2012 +0300 +Date: 2012-06-14 20:15:30 +0300 Fix the top-level Makefile.am for the new example programs. + Makefile.am | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + commit ef8b8e5f111469b5bc005975f7abb9abbd372b25 Author: Lasse Collin -Date: Thu Jun 14 10:52:33 2012 +0300 +Date: 2012-06-14 10:52:33 +0300 Docs: Add new example programs. @@ -385,9 +831,16 @@ Date: Thu Jun 14 10:52:33 2012 +0300 human-readable error messages. More tutorial-like examples are needed but these are a start. + doc/examples/00_README.txt | 27 ++++ + doc/examples/01_compress_easy.c | 297 ++++++++++++++++++++++++++++++++++++++ + doc/examples/02_decompress.c | 287 ++++++++++++++++++++++++++++++++++++ + doc/examples/03_compress_custom.c | 193 +++++++++++++++++++++++++ + doc/examples/Makefile | 23 +++ + 5 files changed, 827 insertions(+) + commit 75c149bc8045a26f8bc719cb8ed20668dab79091 Author: Lasse Collin -Date: Thu Jun 14 10:33:27 2012 +0300 +Date: 2012-06-14 10:33:27 +0300 Docs: Move xz_pipe_comp.c and xz_pipe_decomp.c to doc/examples_old. @@ -395,49 +848,73 @@ Date: Thu Jun 14 10:33:27 2012 +0300 copied the decompressor bug from xz_pipe_decomp.c he has an example how to easily fix it. + doc/examples/xz_pipe_comp.c | 127 -------------------------------------- + doc/examples/xz_pipe_decomp.c | 123 ------------------------------------ + doc/examples_old/xz_pipe_comp.c | 127 ++++++++++++++++++++++++++++++++++++++ + doc/examples_old/xz_pipe_decomp.c | 123 ++++++++++++++++++++++++++++++++++++ + 4 files changed, 250 insertions(+), 250 deletions(-) + commit 456307ebf947a5f50bd995d617b99c1215572308 Author: Lasse Collin -Date: Thu Jun 14 10:33:01 2012 +0300 +Date: 2012-06-14 10:33:01 +0300 Docs: Fix a bug in xz_pipe_decomp.c example program. + doc/examples/xz_pipe_decomp.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + commit 4c310b8a29bc257e6ccbd2310f12f258678f3fef Author: Lasse Collin -Date: Thu May 31 15:53:25 2012 +0300 +Date: 2012-05-31 15:53:25 +0300 Translations: Update the Italian translation. Thanks to Milo Casagrande. + po/it.po | 311 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 146 insertions(+), 165 deletions(-) + commit ec32b79366dc47a55ea877589df9e8509ba113a7 Author: Lasse Collin -Date: Wed May 30 23:15:07 2012 +0300 +Date: 2012-05-30 23:15:07 +0300 Translations: Update the French translation. Thanks to Adrien Nader. + po/fr.po | 237 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 118 insertions(+), 119 deletions(-) + commit dd06f40e4dd7649525e4f28d890dc238a3aa37e5 Author: Lasse Collin -Date: Tue May 29 22:26:27 2012 +0300 +Date: 2012-05-29 22:26:27 +0300 Translations: Update the German translation. + po/de.po | 169 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 91 insertions(+), 78 deletions(-) + commit c66808d1f55d0149ed57c536cc9b52e9c8b583bc Author: Lasse Collin -Date: Tue May 29 22:12:57 2012 +0300 +Date: 2012-05-29 22:12:57 +0300 Translations: Update Polish translation. + po/pl.po | 150 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 82 insertions(+), 68 deletions(-) + commit 556c22dfed195c1466b298183b850d6c28544900 Author: Lasse Collin -Date: Tue May 29 13:10:36 2012 +0300 +Date: 2012-05-29 13:10:36 +0300 Preliminary NEWS for 5.0.4. + NEWS | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + commit dd13b66bf582f49d3aec36e3410ff8541b7506da Author: Lasse Collin -Date: Mon May 28 20:42:11 2012 +0300 +Date: 2012-05-28 20:42:11 +0300 liblzma: Fix possibility of incorrect LZMA_BUF_ERROR. @@ -465,21 +942,32 @@ Date: Mon May 28 20:42:11 2012 +0300 A similar bug was fixed in XZ Embedded on 2011-09-19. + src/liblzma/simple/simple_coder.c | 2 +- + tests/Makefile.am | 4 +- + tests/test_bcj_exact_size.c | 112 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 116 insertions(+), 2 deletions(-) + commit a0223bf796fdaad51a11ad02c4195c694849cc78 Author: Lasse Collin -Date: Mon May 28 15:38:32 2012 +0300 +Date: 2012-05-28 15:38:32 +0300 Update THANKS. + THANKS | 1 + + 1 file changed, 1 insertion(+) + commit 86e57e4bfefe3fd8e13615c41604165bb2359501 Author: Lasse Collin -Date: Mon May 28 15:37:43 2012 +0300 +Date: 2012-05-28 15:37:43 +0300 xz: Don't show a huge number in -vv when memory limit is disabled. + src/xz/message.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + commit 13e44a94da19d1ef14832ff12d3877a6fd2c54c0 Author: Lasse Collin -Date: Sun May 27 22:30:17 2012 +0300 +Date: 2012-05-27 22:30:17 +0300 xz: Document the "summary" lines of --robot -lvv. @@ -487,30 +975,43 @@ Date: Sun May 27 22:30:17 2012 +0300 The new columns added in the master branch aren't necessarily stable yet. + src/xz/xz.1 | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + commit 2f90345e13ab8fea4de45a4f1caa73ebc63a62e7 Author: Lasse Collin -Date: Sun May 27 21:53:20 2012 +0300 +Date: 2012-05-27 21:53:20 +0300 xz: Fix output of verbose --robot --list modes. It printed the filename in "filename (x/y)" format which it obviously shouldn't do in robot mode. + src/xz/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 8d4864f53ffae5d862c691a0b334a6b69bc5366e Author: Lasse Collin -Date: Thu May 10 21:15:17 2012 +0300 +Date: 2012-05-10 21:15:17 +0300 Update THANKS. + THANKS | 1 + + 1 file changed, 1 insertion(+) + commit 35e9c58abb0ce3993da844aaeaa3e7231cd2be8f Author: Lasse Collin -Date: Thu May 10 21:14:16 2012 +0300 +Date: 2012-05-10 21:14:16 +0300 Docs: Cleanup line wrapping a bit. + README | 12 ++++++------ + doc/history.txt | 49 +++++++++++++++++++++++++------------------------ + 2 files changed, 31 insertions(+), 30 deletions(-) + commit 532b3e4c568a228309b56f95c13435fd078dbe02 Author: Benno Schulenberg -Date: Tue Mar 13 22:04:04 2012 +0100 +Date: 2012-03-13 22:04:04 +0100 Fix a few typos and add some missing articles in some documents. @@ -518,42 +1019,64 @@ Date: Tue Mar 13 22:04:04 2012 +0100 Signed-off-by: Benno Schulenberg + AUTHORS | 6 +++--- + README | 42 ++++++++++++++++++++--------------------- + doc/faq.txt | 24 ++++++++++++------------ + doc/history.txt | 58 ++++++++++++++++++++++++++++----------------------------- + 4 files changed, 65 insertions(+), 65 deletions(-) + commit afb6ce8c82ffef8f2505a3759da72a733c7b0b8f Author: Lasse Collin -Date: Sun Apr 29 11:51:25 2012 +0300 +Date: 2012-04-29 11:51:25 +0300 Windows: Update notes about static linking with MSVC. + windows/README-Windows.txt | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + commit 7c3ba2ed5c3c878d4a14ca549b46dbff60c6d565 Author: Lasse Collin -Date: Thu Apr 19 15:25:26 2012 +0300 +Date: 2012-04-19 15:25:26 +0300 liblzma: Remove outdated comments. + src/liblzma/simple/simple_coder.c | 3 --- + src/liblzma/simple/simple_private.h | 3 +-- + 2 files changed, 1 insertion(+), 5 deletions(-) + commit f55db9c187651094f43881c49db2b2d9ffee6b80 Author: Lasse Collin -Date: Thu Apr 19 14:17:52 2012 +0300 +Date: 2012-04-19 14:17:52 +0300 DOS: Link against DJGPP's libemu to support FPU emulation. This way xz should work on 386SX and 486SX. Floating point only is needed for verbose output in xz. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Thu Oct 23 00:37:52 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCBF54A9; Thu, 23 Oct 2014 00:37:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F4AFB40; Thu, 23 Oct 2014 00:37:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N0bq4e075226; Thu, 23 Oct 2014 00:37:52 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N0bqNC075225; Thu, 23 Oct 2014 00:37:52 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410230037.s9N0bqNC075225@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 23 Oct 2014 00:37:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r273495 - vendor/xz/5.0.7 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 00:37:52 -0000 Author: delphij Date: Thu Oct 23 00:37:52 2014 New Revision: 273495 URL: https://svnweb.freebsd.org/changeset/base/273495 Log: Tag xz 5.0.7. Added: vendor/xz/5.0.7/ - copied from r273494, vendor/xz/dist/ From owner-svn-src-vendor@FreeBSD.ORG Thu Oct 23 06:11:17 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89FAD4F6; Thu, 23 Oct 2014 06:11:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75ED6E79; Thu, 23 Oct 2014 06:11:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N6BHim031548; Thu, 23 Oct 2014 06:11:17 GMT (envelope-from edwin@FreeBSD.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N6BGkF031543; Thu, 23 Oct 2014 06:11:16 GMT (envelope-from edwin@FreeBSD.org) Message-Id: <201410230611.s9N6BGkF031543@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: edwin set sender to edwin@FreeBSD.org using -f From: Edwin Groothuis Date: Thu, 23 Oct 2014 06:11:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r273518 - vendor/tzdata/dist X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 06:11:17 -0000 Author: edwin Date: Thu Oct 23 06:11:16 2014 New Revision: 273518 URL: https://svnweb.freebsd.org/changeset/base/273518 Log: Upgrade to 2014i Lots of historical data Pacific/Fiji will go into DST from 2014-11-02 to 2015-01-18 Pacific/Bougainville will go from UTC+10 to UTC+11. Europe/Minsk will go from FET to MSK. Obtained from: ftp://ftp.iana.org/tz/releases/ Modified: vendor/tzdata/dist/africa vendor/tzdata/dist/antarctica vendor/tzdata/dist/asia vendor/tzdata/dist/australasia vendor/tzdata/dist/backward vendor/tzdata/dist/europe vendor/tzdata/dist/northamerica vendor/tzdata/dist/southamerica vendor/tzdata/dist/zone.tab vendor/tzdata/dist/zone1970.tab Modified: vendor/tzdata/dist/africa ============================================================================== --- vendor/tzdata/dist/africa Thu Oct 23 05:58:02 2014 (r273517) +++ vendor/tzdata/dist/africa Thu Oct 23 06:11:16 2014 (r273518) @@ -1,9 +1,10 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. -# This data is by no means authoritative; if you think you know better, +# This file is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz@iana.org for general use in the future). +# tz@iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2013-02-21): # @@ -25,8 +26,8 @@ # I found in the UCLA library. # # For data circa 1899, a common source is: -# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -# . +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. +# http://www.jstor.org/stable/1774359 # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -93,9 +94,9 @@ Rule Algeria 1980 only - Oct 31 2:00 0 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's # more precise 0:09:21. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 - 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time - 0:00 Algeria WE%sT 1940 Feb 25 2:00 +Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 + 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time + 0:00 Algeria WE%sT 1940 Feb 25 2:00 1:00 Algeria CE%sT 1946 Oct 7 0:00 - WET 1956 Jan 29 1:00 - CET 1963 Apr 14 @@ -105,82 +106,57 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 M 1:00 - CET # Angola -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Luanda 0:52:56 - LMT 1892 - 0:52:04 - AOT 1911 May 26 # Angola Time - 1:00 - WAT - # Benin -# Whitman says they switched to 1:00 in 1946, not 1934; -# go with Shanks & Pottenger. -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Porto-Novo 0:10:28 - LMT 1912 - 0:00 - GMT 1934 Feb 26 - 1:00 - WAT +# See Africa/Lagos. # Botswana -# From Paul Eggert (2013-02-21): -# Milne says they were regulated by the Cape Town Signal in 1899; -# assume they switched to 2:00 when Cape Town did. -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Gaborone 1:43:40 - LMT 1885 - 1:30 - SAST 1903 Mar - 2:00 - CAT 1943 Sep 19 2:00 - 2:00 1:00 CAST 1944 Mar 19 2:00 - 2:00 - CAT +# See Africa/Maputo. # Burkina Faso # See Africa/Abidjan. # Burundi -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bujumbura 1:57:28 - LMT 1890 - 2:00 - CAT +# See Africa/Maputo. # Cameroon -# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger. -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Douala 0:38:48 - LMT 1912 - 1:00 - WAT +# See Africa/Lagos. # Cape Verde +# +# Shanks gives 1907 for the transition to CVT. +# Perhaps the 1911-05-26 Portuguese decree +# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf +# merely made it official? +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia +Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia -2:00 - CVT 1942 Sep -2:00 1:00 CVST 1945 Oct 15 - -2:00 - CVT 1975 Nov 25 2:00 + -2:00 - CVT 1975 Nov 25 2:00 -1:00 - CVT # Central African Republic -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bangui 1:14:20 - LMT 1912 - 1:00 - WAT +# See Africa/Lagos. # Chad # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena +Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena 1:00 - WAT 1979 Oct 14 1:00 1:00 WAST 1980 Mar 8 1:00 - WAT # Comoros # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro +Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro 3:00 - EAT -# Democratic Republic of Congo -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9 - 1:00 - WAT -Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9 - 2:00 - CAT +# Democratic Republic of the Congo +# See Africa/Lagos for the western part and Africa/Maputo for the eastern. # Republic of the Congo -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Brazzaville 1:01:08 - LMT 1912 - 1:00 - WAT +# See Africa/Lagos. -# Côte D'Ivoire / Ivory Coast +# Côte d'Ivoire / Ivory Coast # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Abidjan -0:16:08 - LMT 1912 0:00 - GMT @@ -327,7 +303,7 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 # Egypt is to change back to Daylight system on May 15 # http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx -# From Gunther Vermier (2015-05-13): +# From Gunther Vermier (2014-05-13): # our Egypt office confirms that the change will be at 15 May "midnight" (24:00) # From Imed Chihi (2014-06-04): @@ -408,16 +384,13 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt EE%sT # Equatorial Guinea -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Malabo 0:35:08 - LMT 1912 - 0:00 - GMT 1963 Dec 15 - 1:00 - WAT +# See Africa/Lagos. # Eritrea # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Asmara 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890 # Asmara Mean Time - 2:35:20 - ADMT 1936 May 5 # Adis Dera MT + 2:35:32 - AMT 1890 # Asmara Mean Time + 2:35:20 - ADMT 1936 May 5 # Adis Dera MT 3:00 - EAT # Ethiopia @@ -429,16 +402,15 @@ Zone Africa/Asmara 2:35:32 - LMT 1870 # Shanks & Pottenger write that Ethiopia had six narrowly-spaced time # zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in # 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50 -# was for Adis Dera. Quite likely the Shanks data are wrong anyway. +# was for Adis Dera. Quite likely the Shanks data entries are wrong +# anyway. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Addis_Ababa 2:34:48 - LMT 1870 - 2:35:20 - ADMT 1936 May 5 # Adis Dera MT + 2:35:20 - ADMT 1936 May 5 # Adis Dera MT 3:00 - EAT # Gabon -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Libreville 0:37:48 - LMT 1912 - 1:00 - WAT +# See Africa/Lagos. # Gambia # See Africa/Abidjan. @@ -461,8 +433,14 @@ Zone Africa/Accra -0:00:52 - LMT 1918 # See Africa/Abidjan. # Guinea-Bissau +# +# Shanks gives 1911-05-26 for the transition to WAT, +# evidently confusing the date of the Portuguese decree +# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf +# with the date that it took effect, namely 1912-01-01. +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bissau -1:02:20 - LMT 1911 May 26 +Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 -1:00 - WAT 1975 0:00 - GMT @@ -475,11 +453,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1928 J 3:00 - EAT # Lesotho -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Maseru 1:50:00 - LMT 1903 Mar - 2:00 - SAST 1943 Sep 19 2:00 - 2:00 1:00 SAST 1944 Mar 19 2:00 - 2:00 - SAST +# See Africa/Johannesburg. # Liberia # From Paul Eggert (2006-03-22): @@ -546,11 +520,11 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 2:00 - EET 1982 1:00 Libya CE%sT 1990 May 4 # The 1996 and 1997 entries are from Shanks & Pottenger; -# the IATA SSIM data contain some obvious errors. +# the IATA SSIM data entries contain some obvious errors. 2:00 - EET 1996 Sep 30 1:00 Libya CE%sT 1997 Oct 4 - 2:00 - EET 2012 Nov 10 2:00 - 1:00 Libya CE%sT 2013 Oct 25 2:00 + 2:00 - EET 2012 Nov 10 2:00 + 1:00 Libya CE%sT 2013 Oct 25 2:00 2:00 - EET # Madagascar @@ -561,9 +535,7 @@ Zone Indian/Antananarivo 3:10:04 - LMT 1 3:00 - EAT # Malawi -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar - 2:00 - CAT +# See Africa/Maputo. # Mali # Mauritania @@ -606,7 +578,7 @@ Zone Africa/Blantyre 2:20:00 - LMT 1903 # From Alex Krivenyshev (2008-07-11): # Seems that English language article "The revival of daylight saving -# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally +# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally # published on Monday, June 30, 2008... # # I guess that article in French "Le gouvernement avance l'introduction @@ -657,14 +629,14 @@ Rule Mauritius 1983 only - Mar 21 0:00 0 Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 S Rule Mauritius 2009 only - Mar lastSun 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis +Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis 4:00 Mauritius MU%sT # Mauritius Time # Agalega Is, Rodriguez # no information; probably like Indian/Mauritius # Mayotte # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou +Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou 3:00 - EAT # Morocco @@ -682,7 +654,8 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # http://en.afrik.com/news11892.html # From Alex Krivenyshev (2008-05-09): -# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse: +# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe +# Presse: # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view # # Morocco shifts to daylight time on June 1st through September 27, Govt. @@ -760,8 +733,8 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # From Dan Abitol (2011-03-30): # ...Rules for Africa/Casablanca are the following (24h format) -# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00 -# The 31th july 2011 at 00:59:59, [it] will be 31th July 00:00:00 +# The 3rd April 2011 at 00:00:00, [it] will be 3rd April 01:00:00 +# The 31st July 2011 at 00:59:59, [it] will be 31st July 00:00:00 # ...Official links of change in morocco # The change was broadcast on the FM Radio # I ve called ANRT (telecom regulations in Morocco) at @@ -831,7 +804,7 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced a bit in advance. On 2012-07-11 the Moroccan government # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see -# . +# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 # From Andrew Paprocki (2013-07-02): # Morocco announced that the year's Ramadan daylight-savings @@ -963,16 +936,29 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 0:00 Morocco WE%sT # Mozambique +# +# Shanks gives 1903-03-01 for the transition to CAT. +# Perhaps the 1911-05-26 Portuguese decree +# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf +# merely made it official? +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Maputo 2:10:20 - LMT 1903 Mar 2:00 - CAT +Link Africa/Maputo Africa/Blantyre # Malawi +Link Africa/Maputo Africa/Bujumbura # Burundi +Link Africa/Maputo Africa/Gaborone # Botswana +Link Africa/Maputo Africa/Harare # Zimbabwe +Link Africa/Maputo Africa/Kigali # Rwanda +Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo +Link Africa/Maputo Africa/Lusaka # Zambia # Namibia # The 1994-04-03 transition is from Shanks & Pottenger. # Shanks & Pottenger report no DST after 1998-04; go with IATA. -# From Petronella Sibeene (2007-03-30) in -# : +# From Petronella Sibeene (2007-03-30): +# http://allafrica.com/stories/200703300178.html # While the entire country changes its time, Katima Mulilo and other # settlements in Caprivi unofficially will not because the sun there # rises and sets earlier compared to other regions. Chief of @@ -989,28 +975,33 @@ Rule Namibia 1994 max - Sep Sun>=1 2:00 Rule Namibia 1995 max - Apr Sun>=1 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 - 1:30 - SWAT 1903 Mar # SW Africa Time - 2:00 - SAST 1942 Sep 20 2:00 - 2:00 1:00 SAST 1943 Mar 21 2:00 + 1:30 - SWAT 1903 Mar # SW Africa Time + 2:00 - SAST 1942 Sep 20 2:00 + 2:00 1:00 SAST 1943 Mar 21 2:00 2:00 - SAST 1990 Mar 21 # independence 2:00 - CAT 1994 Apr 3 1:00 Namibia WA%sT # Niger -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Niamey 0:08:28 - LMT 1912 - -1:00 - WAT 1934 Feb 26 - 0:00 - GMT 1960 - 1:00 - WAT +# See Africa/Lagos. # Nigeria # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Lagos 0:13:36 - LMT 1919 Sep 1:00 - WAT +Link Africa/Lagos Africa/Bangui # Central African Republic +Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo +Link Africa/Lagos Africa/Douala # Cameroon +Link Africa/Lagos Africa/Kinshasa # Dem. Rep. of the Congo (west) +Link Africa/Lagos Africa/Libreville # Gabon +Link Africa/Lagos Africa/Luanda # Angola +Link Africa/Lagos Africa/Malabo # Equatorial Guinea +Link Africa/Lagos Africa/Niamey # Niger +Link Africa/Lagos Africa/Porto-Novo # Benin # Réunion # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis +Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis 4:00 - RET # Réunion Time # # Crozet Islands also observes Réunion time; see the 'antarctica' file. @@ -1028,9 +1019,7 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 J # Tromelin - inhabited until at least 1958 # Rwanda -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Kigali 2:00:16 - LMT 1935 Jun - 2:00 - CAT +# See Africa/Maputo. # St Helena # See Africa/Abidjan. @@ -1047,7 +1036,7 @@ Zone Africa/Kigali 2:00:16 - LMT 1935 Ju # Seychelles # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria +Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria 4:00 - SCT # Seychelles Time # From Paul Eggert (2001-05-30): # Aldabra, Farquhar, and Desroches, originally dependencies of the @@ -1074,6 +1063,9 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 - Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 1:30 - SAST 1903 Mar 2:00 SA SAST +Link Africa/Johannesburg Africa/Maseru # Lesotho +Link Africa/Johannesburg Africa/Mbabane # Swaziland +# # Marion and Prince Edward Is # scientific station since 1947 # no information @@ -1101,9 +1093,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 Link Africa/Khartoum Africa/Juba # Swaziland -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar - 2:00 - SAST +# See Africa/Johannesburg. # Tanzania # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1128,7 +1118,7 @@ Zone Africa/Dar_es_Salaam 2:37:08 - LMT # # From Oscar van Vlijmen (2005-05-02): # La Presse, the first national daily newspaper ... -# +# http://www.lapresse.tn/archives/archives280405/actualites/lheure.html # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30, # 1h standard time. # @@ -1212,7 +1202,7 @@ Rule Tunisia 2006 2008 - Oct lastSun 2: # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tunis 0:40:44 - LMT 1881 May 12 - 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time + 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time 1:00 Tunisia CE%sT # Uganda @@ -1224,11 +1214,5 @@ Zone Africa/Kampala 2:09:40 - LMT 1928 J 3:00 - EAT # Zambia -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar - 2:00 - CAT - # Zimbabwe -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Harare 2:04:12 - LMT 1903 Mar - 2:00 - CAT +# See Africa/Maputo. Modified: vendor/tzdata/dist/antarctica ============================================================================== --- vendor/tzdata/dist/antarctica Thu Oct 23 05:58:02 2014 (r273517) +++ vendor/tzdata/dist/antarctica Thu Oct 23 06:11:16 2014 (r273518) @@ -4,10 +4,10 @@ # From Paul Eggert (1999-11-15): # To keep things manageable, we list only locations occupied year-round; see # COMNAP - Stations and Bases -# +# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/ # and # Summary of the Peri-Antarctic Islands (1998-07-23) -# +# http://www.spri.cam.ac.uk/bob/periant.htm # for information. # Unless otherwise specified, we have no time zone information. # @@ -63,7 +63,7 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u # Heard Island, McDonald Islands (uninhabited) # previously sealers and scientific personnel wintered # Margaret Turner reports -# +# http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html # (1999-09-30) that they're UTC+5, with no DST; # presumably this is when they have visitors. # @@ -103,32 +103,30 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Antarctica/Casey 0 - zzz 1969 - 8:00 - AWST 2009 Oct 18 2:00 + 8:00 - AWST 2009 Oct 18 2:00 # Australian Western Std Time - 11:00 - CAST 2010 Mar 5 2:00 - # Casey Time - 8:00 - AWST 2011 Oct 28 2:00 + 11:00 - CAST 2010 Mar 5 2:00 # Casey Time + 8:00 - AWST 2011 Oct 28 2:00 11:00 - CAST 2012 Feb 21 17:00u 8:00 - AWST Zone Antarctica/Davis 0 - zzz 1957 Jan 13 - 7:00 - DAVT 1964 Nov # Davis Time + 7:00 - DAVT 1964 Nov # Davis Time 0 - zzz 1969 Feb - 7:00 - DAVT 2009 Oct 18 2:00 + 7:00 - DAVT 2009 Oct 18 2:00 5:00 - DAVT 2010 Mar 10 20:00u - 7:00 - DAVT 2011 Oct 28 2:00 + 7:00 - DAVT 2011 Oct 28 2:00 5:00 - DAVT 2012 Feb 21 20:00u 7:00 - DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 - 6:00 - MAWT 2009 Oct 18 2:00 - # Mawson Time + 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time 5:00 - MAWT # References: # Casey Weather (1998-02-26) -# +# http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html # Davis Station, Antarctica (1998-02-26) -# +# http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html # Mawson Station, Antarctica (1998-02-25) -# +# http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html # Belgium - year-round base # Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007 @@ -154,7 +152,7 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb # France - year-round bases (also see "France & Italy") # # From Antoine Leca (1997-01-20): -# Time data are from Nicole Pailleau at the IFRTP +# Time data entries are from Nicole Pailleau at the IFRTP # (French Institute for Polar Research and Technology). # She confirms that French Southern Territories and Terre Adélie bases # don't observe daylight saving time, even if Terre Adélie supplies came @@ -174,7 +172,7 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb # fishing stations operated variously 1819/1931 # # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Français +Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Français 5:00 - TFT # ISO code TF Time # # year-round base in the main continent @@ -217,7 +215,7 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 3:00 - SYOT # Syowa Time # See: # NIPR Antarctic Research Activities (1999-08-17) -# +# http://www.nipr.ac.jp/english/ara01.html # S Korea - year-round base # Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014 @@ -264,7 +262,7 @@ Rule Troll 2005 max - Mar lastSun 1:00u Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Antarctica/Troll 0 - zzz 2005 Feb 12 - 0:00 Troll %s + 0:00 Troll %s # Poland - year-round base # Arctowski, King George Island, -620945-0582745, since 1977 @@ -281,8 +279,8 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 1 # year-round from 1960/61 to 1992 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 -# From Craig Mundell (1994-12-15) -# : +# From Craig Mundell (1994-12-15): +# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP # Vostok, which is one of the Russian stations, is set on the same # time as Moscow, Russia. # Modified: vendor/tzdata/dist/asia ============================================================================== --- vendor/tzdata/dist/asia Thu Oct 23 05:58:02 2014 (r273517) +++ vendor/tzdata/dist/asia Thu Oct 23 06:11:16 2014 (r273518) @@ -1,9 +1,10 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. -# This data is by no means authoritative; if you think you know better, +# This file is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz@iana.org for general use in the future). +# tz@iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2013-08-11): # @@ -25,8 +26,12 @@ # I found in the UCLA library. # # For data circa 1899, a common source is: -# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -# . +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. +# http://www.jstor.org/stable/1774359 +# +# For Russian data circa 1919, a source is: +# Byalokoz EL. New Counting of Time in Russia since July 1, 1919. +# (See the 'europe' file for a fuller citation.) # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -42,10 +47,11 @@ # 3:30 IRST IRDT Iran # 4:00 GST Gulf* # 5:30 IST India -# 7:00 ICT Indochina* +# 7:00 ICT Indochina, most times and locations* # 7:00 WIB west Indonesia (Waktu Indonesia Barat) # 8:00 WITA central Indonesia (Waktu Indonesia Tengah) # 8:00 CST China +# 8:00 IDT Indochina, 1943-45, 1947-55, 1960-75 (some locations)* # 8:00 JWST Western Standard Time (Japan, 1896/1937)* # 9:00 JCST Central Standard Time (Japan, 1896/1937) # 9:00 WIT east Indonesia (Waktu Indonesia Timur) @@ -115,11 +121,11 @@ Zone Asia/Kabul 4:36:48 - LMT 1890 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2 3:00 - YERT 1957 Mar # Yerevan Time - 4:00 RussiaAsia YER%sT 1991 Mar 31 2:00s + 4:00 RussiaAsia YER%sT 1991 Mar 31 2:00s 3:00 1:00 YERST 1991 Sep 23 # independence - 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s + 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s 4:00 - AMT 1997 - 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s + 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s 4:00 - AMT # Azerbaijan @@ -132,16 +138,16 @@ Rule Azer 1997 max - Oct lastSun 5:00 0 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Baku 3:19:24 - LMT 1924 May 2 3:00 - BAKT 1957 Mar # Baku Time - 4:00 RussiaAsia BAK%sT 1991 Mar 31 2:00s + 4:00 RussiaAsia BAK%sT 1991 Mar 31 2:00s 3:00 1:00 BAKST 1991 Aug 30 # independence 3:00 RussiaAsia AZ%sT 1992 Sep lastSat 23:00 - 4:00 - AZT 1996 # Azerbaijan time + 4:00 - AZT 1996 # Azerbaijan Time 4:00 EUAsia AZ%sT 1997 4:00 Azer AZ%sT # Bahrain # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Bahrain 3:22:20 - LMT 1920 # Manamah +Zone Asia/Bahrain 3:22:20 - LMT 1920 # Manamah 4:00 - GST 1972 Jun 3:00 - AST @@ -219,7 +225,7 @@ Zone Asia/Bahrain 3:22:20 - LMT 1920 # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Dhaka 2009 only - Jun 19 23:00 1:00 S -Rule Dhaka 2009 only - Dec 31 23:59 0 - +Rule Dhaka 2009 only - Dec 31 24:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Dhaka 6:01:40 - LMT 1890 @@ -250,7 +256,7 @@ Zone Indian/Chagos 4:49:40 - LMT 1907 # Brunei # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan +Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan 7:30 - BNT 1933 8:00 - BNT @@ -259,19 +265,15 @@ Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon - 6:24:40 - RMT 1920 # Rangoon Mean Time? - 6:30 - BURT 1942 May # Burma Time - 9:00 - JST 1945 May 3 - 6:30 - MMT # Myanmar Time +Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon + 6:24:40 - RMT 1920 # Rangoon Mean Time? + 6:30 - BURT 1942 May # Burma Time + 9:00 - JST 1945 May 3 + 6:30 - MMT # Myanmar Time # Cambodia -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Phnom_Penh 6:59:40 - LMT 1906 Jun 9 - 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT? - 7:00 - ICT 1912 May - 8:00 - ICT 1931 May - 7:00 - ICT +# See Asia/Bangkok. + # China @@ -356,8 +358,8 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # * The Republic of China instituted Beijing mean solar time effective # the official calendar book of 1914. # * The French Concession in Shanghai set up signal stations in -# French docks in the 1890s, controled by Xujiahui (Zikawei) -# Obervatory and set to local mean time. +# French docks in the 1890s, controlled by Xujiahui (Zikawei) +# Observatory and set to local mean time. # * "From the end of the 19th century" it changed to UT+8. # * Chinese Customs (by then reduced to a tool of foreign powers) # eventually standardized on this time for all ports, and it @@ -381,7 +383,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # Xujiahui Observatory was under French control and stuck with UT+8. # # In earlier versions of this file, China had many separate Zone entries, but -# this was based on what was apparently incorrect data in Shanks & Pottenger. +# this was based on what were apparently incorrect data in Shanks & Pottenger. # This has now been simplified to the two entries Asia/Shanghai and # Asia/Urumqi, with the others being links for backward compatibility. # Proposed in 1918 and theoretically in effect until 1949 (although in practice @@ -501,7 +503,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # "The Working-Calendar for The Xinjiang Uygur Autonomous Region Government" # (2014-04-22). # Unfortunately, we have no good records of time in Xinjiang before 1986. -# During the 20th century parts of Xinjiang were ruled by the Qing dyansty, +# During the 20th century parts of Xinjiang were ruled by the Qing dynasty, # the Republic of China, various warlords, the First and Second East Turkestan # Republics, the Soviet Union, the Kuomintang, and the People's Republic of # China, and tracking down all these organizations' timekeeping rules would be @@ -698,19 +700,19 @@ Zone Asia/Hong_Kong 7:36:42 - LMT 1904 O # Central Weather Bureau website was not correct. # # Original Bulletin: -# -# (cont.) +# http://subtpg.tpg.gov.tw/og/image2.asp?f=03502F0AKM1AF +# http://subtpg.tpg.gov.tw/og/image2.asp?f=0350300AKM1B0 (cont.) # # In 1947, DST in Taiwan was expanded to Oct 31. There is a backup of that # telegram announcement from Taiwan Province Government: # -# +# http://subtpg.tpg.gov.tw/og/image2.asp?f=0360310AKZ431 # # Here is a brief translation: # # The Summer Time this year is adopted from midnight Apr 15 until Sep 20 # midnight. To save (energy?) consumption, we're expanding Summer Time -# adption till Oct 31 midnight. +# adoption till Oct 31 midnight. # # The Central Weather Bureau website didn't mention that, however it can # be found from historical government announcement database. @@ -741,7 +743,7 @@ Rule Taiwan 1979 only - Oct 1 0:00 0 S # Taipei or Taibei or T'ai-pei Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1 8:00 - JWST 1937 Oct 1 - 9:00 - JST 1945 Sep 21 01:00 + 9:00 - JST 1945 Sep 21 1:00 8:00 Taiwan C%sT # Macau (Macao, Aomen) @@ -761,7 +763,7 @@ Rule Macau 1975 1977 - Apr Sun>=15 3:30 Rule Macau 1978 1980 - Apr Sun>=15 0:00 1:00 S Rule Macau 1978 1980 - Oct Sun>=15 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Macau 7:34:20 - LMT 1912 +Zone Asia/Macau 7:34:20 - LMT 1912 Jan 1 8:00 Macau MO%sT 1999 Dec 20 # return to China 8:00 PRC C%sT @@ -823,20 +825,22 @@ Link Asia/Nicosia Europe/Nicosia # I don't know what can be done, especially knowing that some years ago our # DST rules where changed THREE TIMES during one month. -# Milne says Tbilisi (Tiflis) time was 2:59:05.7; round to nearest.) +# Milne 1899 says Tbilisi (Tiflis) time was 2:59:05.7. +# Byalokoz 1919 says Georgia was 2:59:11. +# Go with Byalokoz. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Tbilisi 2:59:06 - LMT 1880 - 2:59:06 - TBMT 1924 May 2 # Tbilisi Mean Time +Zone Asia/Tbilisi 2:59:11 - LMT 1880 + 2:59:11 - TBMT 1924 May 2 # Tbilisi Mean Time 3:00 - TBIT 1957 Mar # Tbilisi Time - 4:00 RussiaAsia TBI%sT 1991 Mar 31 2:00s + 4:00 RussiaAsia TBI%sT 1991 Mar 31 2:00s 3:00 1:00 TBIST 1991 Apr 9 # independence - 3:00 RussiaAsia GE%sT 1992 # Georgia Time + 3:00 RussiaAsia GE%sT 1992 # Georgia Time 3:00 E-EurAsia GE%sT 1994 Sep lastSun 4:00 E-EurAsia GE%sT 1996 Oct lastSun 4:00 1:00 GEST 1997 Mar lastSun 4:00 E-EurAsia GE%sT 2004 Jun 27 - 3:00 RussiaAsia GE%sT 2005 Mar lastSun 2:00 + 3:00 RussiaAsia GE%sT 2005 Mar lastSun 2:00 4:00 - GET # East Timor @@ -864,16 +868,16 @@ Zone Asia/Tbilisi 2:59:06 - LMT 1880 # midnight on Saturday, September 16. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Dili 8:22:20 - LMT 1912 +Zone Asia/Dili 8:22:20 - LMT 1912 Jan 1 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time 9:00 - JST 1945 Sep 23 9:00 - TLT 1976 May 3 - 8:00 - WITA 2000 Sep 17 00:00 + 8:00 - WITA 2000 Sep 17 0:00 9:00 - TLT # India # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata +Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata 5:53:20 - HMT 1941 Oct # Howrah Mean Time? 6:30 - BURT 1942 May 15 # Burma Time 5:30 - IST 1942 Sep @@ -886,8 +890,12 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # K # Indonesia # +# From Paul Eggert (2014-09-06): +# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia +# civil time was 7:07:12.5; round to even for Jakarta. +# # From Gwillim Law (2001-05-28), overriding Shanks & Pottenger: -# +# http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime # says that Indonesia's time zones changed on 1988-01-01. Looking at some # time zone maps, I think that must refer to Western Borneo (Kalimantan Barat # and Kalimantan Tengah) switching from UTC+8 to UTC+7. @@ -924,7 +932,7 @@ Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13, # but this must be a typo. 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia - 7:20 - JAVT 1932 Nov # Java Time + 7:20 - JAVT 1932 Nov # Java Time 7:30 - WIB 1942 Mar 23 9:00 - JST 1945 Sep 23 7:30 - WIB 1948 May @@ -1082,7 +1090,7 @@ Rule Iran 2036 2037 - Mar 21 0:00 1:00 D Rule Iran 2036 2037 - Sep 21 0:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Tehran 3:25:44 - LMT 1916 - 3:25:44 - TMT 1946 # Tehran Mean Time + 3:25:44 - TMT 1946 # Tehran Mean Time 3:30 - IRST 1977 Nov 4:00 Iran IR%sT 1979 3:30 Iran IR%sT @@ -1127,7 +1135,7 @@ Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 Rule Iraq 1991 2007 - Oct 1 3:00s 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Baghdad 2:57:40 - LMT 1890 - 2:57:36 - BMT 1918 # Baghdad Mean Time? + 2:57:36 - BMT 1918 # Baghdad Mean Time? 3:00 - AST 1982 May 3:00 Iraq A%sT @@ -1355,7 +1363,7 @@ Rule Zion 2013 max - Oct lastSun 2:00 0 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Jerusalem 2:20:54 - LMT 1880 - 2:20:40 - JMT 1918 # Jerusalem Mean Time? + 2:20:40 - JMT 1918 # Jerusalem Mean Time? 2:00 Zion I%sT @@ -1371,8 +1379,8 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880 # daylight saving between 1948 and 1951, but "the system was discontinued # because the public believed it would lead to longer working hours." -# From Mayumi Negishi in the 2005-08-10 Japan Times -# : +# From Mayumi Negishi in the 2005-08-10 Japan Times: +# http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm # Occupation authorities imposed daylight-saving time on Japan on # [1948-05-01].... But lack of prior debate and the execution of # daylight-saving time just three days after the bill was passed generated @@ -1396,7 +1404,8 @@ Rule Japan 1950 1951 - May Sun>=1 2:00 1 # From Hideyuki Suzuki (1998-11-09): # 'Tokyo' usually stands for the former location of Tokyo Astronomical -# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s), 35 degrees 39' 16.0" N. +# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s), +# 35 degrees 39' 16.0" N. # This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996' # edited by National Astronomical Observatory of Japan.... # JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST). @@ -1586,10 +1595,10 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 M 6:00 - KIZT 1982 Apr 1 5:00 RussiaAsia KIZ%sT 1991 5:00 - KIZT 1991 Dec 16 # independence - 5:00 - QYZT 1992 Jan 19 2:00 + 5:00 - QYZT 1992 Jan 19 2:00 6:00 RussiaAsia QYZ%sT 2005 Mar 15 6:00 - QYZT -# Aqtobe (aka Aktobe, formerly Akt'ubinsk) +# Aqtobe (aka Aktobe, formerly Aktyubinsk) Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 4:00 - AKTT 1930 Jun 21 # Aktyubinsk Time 5:00 - AKTT 1981 Apr 1 @@ -1609,7 +1618,7 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 6:00 - SHET 1982 Apr 1 5:00 RussiaAsia SHE%sT 1991 5:00 - SHET 1991 Dec 16 # independence - 5:00 RussiaAsia AQT%sT 1995 Mar lastSun 2:00 # Aqtau Time + 5:00 RussiaAsia AQT%sT 1995 Mar lastSun 2:00 # Aqtau Time 4:00 RussiaAsia AQT%sT 2005 Mar 15 5:00 - AQTT # West Kazakhstan @@ -1618,7 +1627,7 @@ Zone Asia/Oral 3:25:24 - LMT 1924 May 2 5:00 - URAT 1981 Apr 1 5:00 1:00 URAST 1981 Oct 1 6:00 - URAT 1982 Apr 1 - 5:00 RussiaAsia URA%sT 1989 Mar 26 2:00 + 5:00 RussiaAsia URA%sT 1989 Mar 26 2:00 4:00 RussiaAsia URA%sT 1991 4:00 - URAT 1991 Dec 16 # independence 4:00 RussiaAsia ORA%sT 2005 Mar 15 # Oral Time @@ -1629,7 +1638,7 @@ Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # From Paul Eggert (2005-08-15): # According to an article dated today in the Kyrgyzstan Development Gateway -# +# http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml # Kyrgyzstan is canceling the daylight saving time system. I take the article # to mean that they will leave their clocks at 6 hours ahead of UTC. # From Malik Abdugaliev (2005-09-21): @@ -1644,17 +1653,17 @@ Rule Kyrgyz 1997 2004 - Oct lastSun 2:30 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Bishkek 4:58:24 - LMT 1924 May 2 5:00 - FRUT 1930 Jun 21 # Frunze Time - 6:00 RussiaAsia FRU%sT 1991 Mar 31 2:00s - 5:00 1:00 FRUST 1991 Aug 31 2:00 # independence - 5:00 Kyrgyz KG%sT 2005 Aug 12 # Kyrgyzstan Time + 6:00 RussiaAsia FRU%sT 1991 Mar 31 2:00s + 5:00 1:00 FRUST 1991 Aug 31 2:00 # independence + 5:00 Kyrgyz KG%sT 2005 Aug 12 # Kyrgyzstan Time 6:00 - KGT ############################################################################### # Korea (North and South) -# From Annie I. Bang (2006-07-10) in -# : +# From Annie I. Bang (2006-07-10): +# http://www.koreaherald.co.kr/SITE/data/html_dir/2006/07/10/200607100012.asp # The Ministry of Commerce, Industry and Energy has already # commissioned a research project [to reintroduce DST] and has said # the system may begin as early as 2008.... Korea ran a daylight @@ -1702,12 +1711,8 @@ Zone Asia/Kuwait 3:11:56 - LMT 1950 3:00 - AST # Laos -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Vientiane 6:50:24 - LMT 1906 Jun 9 # or Viangchan - 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT? - 7:00 - ICT 1912 May - 8:00 - ICT 1931 May - 7:00 - ICT +# See Asia/Bangkok. + # Lebanon # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1745,8 +1750,8 @@ Rule NBorneo 1935 1941 - Sep 14 0:00 0:2 Rule NBorneo 1935 1941 - Dec 14 0:00 0 - # # peninsular Malaysia -# The data here are taken from Mok Ly Yng (2003-10-30) -# . +# taken from Mok Ly Yng (2003-10-30) +# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kuala_Lumpur 6:46:46 - LMT 1901 Jan 1 6:55:25 - SMT 1905 Jun 1 # Singapore M.T. @@ -1758,12 +1763,12 @@ Zone Asia/Kuala_Lumpur 6:46:46 - LMT 190 7:30 - MALT 1982 Jan 1 8:00 - MYT # Malaysia Time # Sabah & Sarawak -# From Paul Eggert (2006-03-22): -# The data here are mostly from Shanks & Pottenger, but the 1942, 1945 and 1982 -# transition dates are from Mok Ly Yng. +# From Paul Eggert (2014-08-12): +# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945 +# and 1982 transition dates are from Mok Ly Yng. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kuching 7:21:20 - LMT 1926 Mar - 7:30 - BORT 1933 # Borneo Time + 7:30 - BORT 1933 # Borneo Time 8:00 NBorneo BOR%sT 1942 Feb 16 9:00 - JST 1945 Sep 12 8:00 - BORT 1982 Jan 1 @@ -1771,9 +1776,9 @@ Zone Asia/Kuching 7:21:20 - LMT 1926 Mar # Maldives # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Maldives 4:54:00 - LMT 1880 # Male - 4:54:00 - MMT 1960 # Male Mean Time - 5:00 - MVT # Maldives Time +Zone Indian/Maldives 4:54:00 - LMT 1880 # Male + 4:54:00 - MMT 1960 # Male Mean Time + 5:00 - MVT # Maldives Time # Mongolia @@ -1835,7 +1840,7 @@ Zone Indian/Maldives 4:54:00 - LMT 1880 # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in # Washington, DC says there are two time zones, with DST observed. # He also found *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Thu Oct 23 06:13:43 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2456973F; Thu, 23 Oct 2014 06:13:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EB6EAEAD; Thu, 23 Oct 2014 06:13:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N6Dg6g034323; Thu, 23 Oct 2014 06:13:42 GMT (envelope-from edwin@FreeBSD.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N6DgIM034322; Thu, 23 Oct 2014 06:13:42 GMT (envelope-from edwin@FreeBSD.org) Message-Id: <201410230613.s9N6DgIM034322@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: edwin set sender to edwin@FreeBSD.org using -f From: Edwin Groothuis Date: Thu, 23 Oct 2014 06:13:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r273519 - vendor/tzdata/tzdata2014i X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 06:13:43 -0000 Author: edwin Date: Thu Oct 23 06:13:42 2014 New Revision: 273519 URL: https://svnweb.freebsd.org/changeset/base/273519 Log: Tag of tzdata2014i sources Added: vendor/tzdata/tzdata2014i/ - copied from r273518, vendor/tzdata/dist/ From owner-svn-src-vendor@FreeBSD.ORG Sat Oct 25 00:32:06 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE0ECBA0; Sat, 25 Oct 2014 00:32:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 811A43FB; Sat, 25 Oct 2014 00:32:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9P0W6Bd047324; Sat, 25 Oct 2014 00:32:06 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9P0W6gu047323; Sat, 25 Oct 2014 00:32:06 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410250032.s9P0W6gu047323@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sat, 25 Oct 2014 00:32:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r273617 - vendor/netcat/dist X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Oct 2014 00:32:06 -0000 Author: delphij Date: Sat Oct 25 00:32:05 2014 New Revision: 273617 URL: https://svnweb.freebsd.org/changeset/base/273617 Log: Vendor import nc(1) from OPENBSD_5_6. Modified: vendor/netcat/dist/netcat.c Modified: vendor/netcat/dist/netcat.c ============================================================================== --- vendor/netcat/dist/netcat.c Sat Oct 25 00:16:36 2014 (r273616) +++ vendor/netcat/dist/netcat.c Sat Oct 25 00:32:05 2014 (r273617) @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.117 2013/10/26 21:33:29 sthen Exp $ */ +/* $OpenBSD: netcat.c,v 1.122 2014/07/20 01:38:40 guenther Exp $ */ /* * Copyright (c) 2001 Eric Jackson * @@ -133,7 +133,6 @@ main(int argc, char *argv[]) host = NULL; uport = NULL; sv = NULL; - rtableid = getrtable(); while ((ch = getopt(argc, argv, "46DdFhI:i:klNnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) { @@ -609,7 +608,7 @@ remote_connect(const char *host, const c if (bind(s, (struct sockaddr *)ares->ai_addr, ares->ai_addrlen) < 0) - errx(1, "bind failed: %s", strerror(errno)); + err(1, "bind failed"); freeaddrinfo(ares); } @@ -698,7 +697,7 @@ local_listen(char *host, char *port, str res0->ai_protocol)) < 0) continue; - if (rtableid >= 0 && (setsockopt(s, IPPROTO_IP, SO_RTABLE, + if (rtableid >= 0 && (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid, sizeof(rtableid)) == -1)) err(1, "setsockopt SO_RTABLE"); @@ -734,12 +733,12 @@ void readwrite(int nfd) { struct pollfd pfd[2]; - unsigned char buf[16384]; + unsigned char buf[16 * 1024]; int n, wfd = fileno(stdin); int lfd = fileno(stdout); int plen; - plen = 2048; + plen = sizeof(buf); /* Setup Network FD */ pfd[0].fd = nfd; @@ -754,8 +753,9 @@ readwrite(int nfd) sleep(iflag); if ((n = poll(pfd, 2 - dflag, timeout)) < 0) { + int saved_errno = errno; close(nfd); - err(1, "Polling Error"); + errc(1, saved_errno, "Polling Error"); } if (n == 0) From owner-svn-src-vendor@FreeBSD.ORG Sat Oct 25 00:32:31 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C6C1CC5; Sat, 25 Oct 2014 00:32:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F1A93FE; Sat, 25 Oct 2014 00:32:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9P0WVTR047416; Sat, 25 Oct 2014 00:32:31 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9P0WV40047415; Sat, 25 Oct 2014 00:32:31 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410250032.s9P0WV40047415@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sat, 25 Oct 2014 00:32:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r273618 - vendor/netcat/5.6 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Oct 2014 00:32:31 -0000 Author: delphij Date: Sat Oct 25 00:32:30 2014 New Revision: 273618 URL: https://svnweb.freebsd.org/changeset/base/273618 Log: Tag netcat from OpenBSD 5.6. Added: vendor/netcat/5.6/ - copied from r273617, vendor/netcat/dist/