src/6/share/zoneinfo/asia	290702	[ +8 -6 ]	diff (colored)
src/6/share/zoneinfo/australasia	290702	[ +29 -5 ]	diff (colored)
src/6/share/zoneinfo/europe	290702	[ +7 -0 ]	diff (colored)
src/6/share/zoneinfo/northamerica	290702	[ +22 -0 ]	diff (colored)
src/6/share/zoneinfo/zone.tab	290702	[ +1 -0 ]	diff (colored)
src/6/share/zoneinfo/zone1970.tab	290702	[ +1 -0 ]	diff (colored)

MFC of 290697,tzdata6:

Update to tzdata2015g:

Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.

Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.

Fiji's 2016 fall-back transition is scheduled for January 17, not 24.

Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
New zone America/Fort_Nelson.

src/6/share/zoneinfo/africa	283087	[ +15 -45 ]	diff (colored)
src/6/share/zoneinfo/northamerica	283087	[ +115 -12 ]	diff (colored)

MFC of 283079,tzdata6:

Update to tzdata2015d:

Release 2015d - 2015-04-24 08:09:46 -0700

  Changes affecting future time stamps

    Egypt will not observe DST in 2015 and will consider canceling it
    permanently.  For now, assume no DST indefinitely.
    (Thanks to Ahmed Nazmy and Tim Parenti.)

  Change affecting past and future time zone abbreviations

    The abbreviations for Hawaii-Aleutian standard and daylight times
    have been changed from HAST/HADT to HST/HDT, as per US Government
    Printing Office style.  This affects only America/Adak since 1983,
    as America/Honolulu was already using the new style.

src/6/share/zoneinfo/africa		[ +22 -57 ]	diff (colored)
src/6/share/zoneinfo/asia		[ +59 -34 ]	diff (colored)
src/6/share/zoneinfo/australasia		[ +6 -6 ]	diff (colored)
src/6/share/zoneinfo/europe		[ +15 -3 ]	diff (colored)
src/6/share/zoneinfo/northamerica		[ +12 -8 ]	diff (colored)
src/6/share/zoneinfo/southamerica		[ +9 -9 ]	diff (colored)

MFC of 274559,tzdata6:

Release 2014j - 2014-11-10 17:37:11 -0800

  Changes affecting current and future time stamps

    Turks & Caicos' switch from US eastern time to UTC-4 year-round
    did not occur on 2014-11-02 at 02:00.  It's currently scheduled
    for 2015-11-01 at 02:00.  (Thanks to Chris Walton.)

  Changes affecting past time stamps

    Many pre-1989 time stamps have been corrected for Asia/Seoul and
    Asia/Pyongyang, based on sources for the Korean-language Wikipedia
    entry for time in Korea.  (Thanks to Sanghyuk Jung.)  Also, no
    longer guess that Pyongyang mimicked Seoul time after World War II,
    as this is politically implausible.

    Some more zones have been turned into links, when they differed
    from existing zones only for older time stamps.  As usual,
    these changes affect UTC offsets in pre-1970 time stamps only.
    Their old contents have been moved to the 'backzone' file.
    The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
    Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
    Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
    Indian/Mayotte.

  Changes affecting commentary

    The commentary is less enthusiastic about Shanks as a source,
    and is more careful to distinguish UT from UTC.

src/6/share/zoneinfo/africa	267474	[ +132 -106 ]	diff (colored)
src/6/share/zoneinfo/australasia	267474	[ +15 -13 ]	diff (colored)
src/6/share/zoneinfo/europe	267474	[ +14 -13 ]	diff (colored)
src/6/share/zoneinfo/northamerica	267474	[ +2 -2 ]	diff (colored)

MFC of i267473,tzdata2013b

Fix historical data for Egypt.
Better prediction for future Egypt / Morocco changes.
Update to Cocos / Cook islands.
Fix historical data for Russia.

src/6/share/zoneinfo/africa	265979	[ +43 -0 ]	diff (colored)
src/6/share/zoneinfo/asia	265979	[ +0 -16 ]	diff (colored)
src/6/share/zoneinfo/europe	265979	[ +4 -0 ]	diff (colored)

MFC of 265978, tzdata2014c

- Egypt will go into DST on 15 May 2014

src/6/share/zoneinfo/africa	263902	[ +4 -1 ]	diff (colored)
src/6/share/zoneinfo/antarctica	263902	[ +29 -12 ]	diff (colored)
src/6/share/zoneinfo/australasia	263902	[ +18 -3 ]	diff (colored)
src/6/share/zoneinfo/europe	263902	[ +5 -1 ]	diff (colored)
src/6/share/zoneinfo/zone.tab	263902	[ +2 -1 ]	diff (colored)

MFC of 263901, tzdata2014b

 - Update antartica.
 - Comments about historical data for Hawaii.
 - Update details for Crimea on 30 March
 - Move location data Simferopol.

src/6/share/zoneinfo/asia	263045	[ +7 -2 ]	diff (colored)
src/6/share/zoneinfo/australasia	263045	[ +12 -9 ]	diff (colored)
src/6/share/zoneinfo/europe	263045	[ +40 -20 ]	diff (colored)
src/6/share/zoneinfo/northamerica	263045	[ +4 -3 ]	diff (colored)
src/6/share/zoneinfo/southamerica	263045	[ +15 -4 ]	diff (colored)

MFC of 263041, tzdata2014a:

- Fix historical info about asia/Zion, Ukraine
- Fiji starts DST at 02:00 instead of 03:00
- Turkey will move to DST at 31 March this year.

src/6/usr.bin/uname/uname.1	261777	[ +27 -1 ]	diff (colored)
src/6/usr.bin/uname/uname.c	261777	[ +38 -3 ]	diff (colored)

MFC r256557 - kernel and userland osreldate helpers.

src/6/sys/netinet/tcp_input.c

260438

[ +2 -4 ]

diff (colored)

Revert MFC of r258821 - it was already handled by MFC of r239672.

Pointy hat to: peter

src/6/sys/netinet/tcp_input.c

260422

[ +4 -2 ]

diff (colored)

MFC r258821 - fix tcp simultaneous close

PR:             kern/99188

src/6/share/zoneinfo/asia	259627	[ +21 -9 ]	diff (colored)
src/6/share/zoneinfo/northamerica	259627	[ +7 -1 ]	diff (colored)

MFC of 259626, tzdata2013i:

Removed support for solar-time-based time zones
Jordan stays at summer time this year.
Fix historical data for Cuba

src/6/share/zoneinfo/africa	257685	[ +66 -29 ]	diff (colored)
src/6/share/zoneinfo/antarctica	257685	[ +10 -17 ]	diff (colored)
src/6/share/zoneinfo/asia	257685	[ +60 -31 ]	diff (colored)
src/6/share/zoneinfo/australasia	257685	[ +26 -7 ]	diff (colored)
src/6/share/zoneinfo/backward	257685	[ +7 -5 ]	diff (colored)
src/6/share/zoneinfo/etcetera	257685	[ +2 -2 ]	diff (colored)
src/6/share/zoneinfo/europe	257685	[ +88 -38 ]	diff (colored)
src/6/share/zoneinfo/leap-seconds.list	257685	[ +133 -0 ]	diff (colored)

MFC of 257681

tzdata2013f
- Jordan goes to winter time on the last Friday in October.
- Tocantins in Brazil will not go into summer time in October.
- Indonesian time zones renames.
- Lots of cleanups in with regarding to links and historical data.

tzdata2013h
- Libya didn't go back to DST.
- Fix Morocco 2038 issue.
- Brazil/Acre and ?Western Amazonas are chaning timezones.

src/6/share/zoneinfo/africa	253012	[ +11 -5 ]	diff (colored)
src/6/share/zoneinfo/asia	253012	[ +12 -30 ]	diff (colored)
src/6/share/zoneinfo/australasia	253012	[ +13 -7 ]	diff (colored)
src/6/share/zoneinfo/europe	253012	[ +4 -4 ]	diff (colored)
src/6/share/zoneinfo/southamerica	253012	[ +2 -2 ]	diff (colored)
src/6/share/zoneinfo/zone.tab	253012	[ +12 -5 ]	diff (colored)

MFC of tzdata2013d, 253009

- Morocco:
  announced that the year's Ramadan daylight-savings transitions
  would be 2013-07-07 and 2013-08-10.

- Israel:
  As of 2013, DST starts at 02:00 on the Friday before the last
  Sunday in March.  DST ends at 02:00 on the first Sunday after
  October 1, unless it occurs on the second day of the Jewish Rosh
  Hashana holiday, in which case DST ends a day later (i.e. at 02:00
  the first Monday after October 2).  [Rosh Hashana holidays are
  factored in until 2100.]

src/6/usr.sbin/pkg_install/add/extract.c	252642	[ +2 -1 ]	diff (colored)
src/6/usr.sbin/pkg_install/create/pl.c	252642	[ +2 -1 ]	diff (colored)
src/6/usr.sbin/pkg_install/lib/exec.c	252642	[ +3 -2 ]	diff (colored)

MF7: r252640
     MF8: r252639
     MF9: r252635, r252638:
     MFC: r252348, r252363: sysconf(3) returns a long, not an int.

src/6/sys/boot/i386/btx/btx/btx.S	250151	[ +1 -1 ]	diff (colored)
src/6/sys/boot/pc98/btx/btx/btx.S	250151	[ +1 -1 ]	diff (colored)

MFC r249846:

When rebooting (exiting) from the BTX loader, make sure to restore the
GDT from the correct segment, otherwise a triple fault would be caused.
In some virtual environments (VMware, VirtualBox, etc) this could lead
to a unhandled error or hang in the guest emulation software.

Thanks to avg and jhb for a few hints in the right direction.

Noticed by:	Jeremy Chadwick <jdc@koitsu.org> (and many others)

src/6/share/zoneinfo/antarctica	249693	[ +1 -41 ]	diff (colored)
src/6/share/zoneinfo/asia	249693	[ +33 -29 ]	diff (colored)
src/6/share/zoneinfo/australasia	249693	[ +20 -3 ]	diff (colored)
src/6/share/zoneinfo/southamerica	249693	[ +5 -5 ]	diff (colored)
src/6/share/zoneinfo/zone.tab	249693	[ +1 -1 ]	diff (colored)

Merge of current from 249692, tzdata2013c:

- antarctica: AusAQ and ATAQ have been removed.
- Antarctica/Macquarie has been moved to australasia file and AU.
- Asia/Hebron, Palestine updated for 2013.
- Paraguay stays with DST for the whole year.

src/6/share/zoneinfo/africa		[ +69 -3 ]	diff (colored)
src/6/share/zoneinfo/antarctica		[ +2 -4 ]	diff (colored)
src/6/share/zoneinfo/asia		[ +41 -7 ]	diff (colored)
src/6/share/zoneinfo/australasia		[ +9 -2 ]	diff (colored)
src/6/share/zoneinfo/europe		[ +122 -5 ]	diff (colored)
src/6/share/zoneinfo/northamerica		[ +36 -20 ]	diff (colored)
src/6/share/zoneinfo/southamerica		[ +41 -25 ]	diff (colored)
src/6/share/zoneinfo/zone.tab		[ +4 -1 ]	diff (colored)

Merge of current of tzdata2013b

Lots of historical data added.

Morocco: add DST rules for the coming years
Cuba: Doing DST in 2013.
Chili: Will do DST in 2013 as it seems.

src/6/sys/dev/random/randomdev_soft.c

247511

[ +1 -1 ]

diff (colored)

MFC r247334:

Correct a typo introduced in r153575, which gives inverted logic when
handling blocking semantics when seeding.

PR:		kern/143298
Submitted by:	James Juran <james juran baesystems com>
Reviewed by:	markm

src/6/sys/netinet/tcp_input.c

247136

[ +30 -0 ]

diff (colored)

MFC r239672 (by rrs):
  This small change takes care of a race condition
  that can occur when both sides close at the same time.
  If that occurs, without this fix the connection enters
  FIN1 on both sides and they will forever send FIN|ACK at
  each other until the connection times out. This is because
  we stopped processing the FIN|ACK and thus did not advance
  the sequence and so never ACK'd each others FIN. This
  fix adjusts it so we *do* process the FIN properly and
  the race goes away ;-)

Approved by:	emaste (co-mentor)

src/6/lib/libc/gen/glob.c

247126

[ +104 -89 ]

diff (colored)

MFC:

r158812 (ache):

Reflect size_t changes in glob.h

Obtained from: NetBSD (mostly)

r159294:

 - ANSIfy.
 - Remove two unnecessary casts.

r243779 (marcel):

Protect against DoS attacks, such as being described in CVE-2010-2632.
The changes were derived from what has been committed to NetBSD, with
modifications.

This fixes FreeBSD-SA-13:02.libc for stable/6.

src/6/etc/sendmail/freefall.mc

245111

[ +1 -1 ]

diff (colored)

MFC 245107: use full domain name

src/6/COPYRIGHT	244917	[ +1 -1 ]	diff (colored)
src/6/sys/sys/copyright.h	244917	[ +2 -2 ]	diff (colored)

MFC 244900: Happy New Year 2013!
            (and we're still making commits to 6.x!)

src/6/share/zoneinfo/africa	243004	[ +23 -5 ]	diff (colored)
src/6/share/zoneinfo/asia	243004	[ +6 -4 ]	diff (colored)
src/6/share/zoneinfo/australasia	243004	[ +1 -1 ]	diff (colored)
src/6/share/zoneinfo/europe	243004	[ +1 -1 ]	diff (colored)
src/6/share/zoneinfo/northamerica	243004	[ +1 -1 ]	diff (colored)
src/6/share/zoneinfo/southamerica	243004	[ +1 -1 ]	diff (colored)

Merge of current of tzdata2012j

- Libya went to Standard Time on 10 November 2012

src/6/share/zoneinfo/asia	242928	[ +1 -1 ]	diff (colored)
src/6/share/zoneinfo/northamerica	242928	[ +8 -1 ]	diff (colored)

Merge of current of 242925, tzdata2012i

- Cuba is changing back to Standard Time on 4 November 2012.

src/6/share/zoneinfo/asia	242209	[ +45 -37 ]	diff (colored)
src/6/share/zoneinfo/southamerica	242209	[ +13 -2 ]	diff (colored)

Merge of current of tzdata2012h, r242208

- Bahia no longer has DST.
- Tocantins has DST.
- Israel has new DST rules next year.
- Jordan stays on DST this winter.

src/6/share/zoneinfo/asia	241870	[ +4 -2 ]	diff (colored)
src/6/share/zoneinfo/australasia	241870	[ +19 -2 ]	diff (colored)

Merge of 241869

Import of tzdata2012g

 - Fix end of DST in Gaza and Hebron
 - Western Samoa: DST start at 30 Septembet 2012 and finished at 7 April 2013.

src/6/etc/sendmail/freefall.mc

241587

[ +1 -1 ]

diff (colored)

mx1 -> smarthost.ysv

src/6/etc/sendmail/freefall.mc

241461

[ +1 -1 ]

diff (colored)

Switch freebsd.org nullhost cluster machines from hub to mx1

src/6/share/zoneinfo/africa	240458	[ +68 -16 ]	diff (colored)
src/6/share/zoneinfo/antarctica	240458	[ +0 -1 ]	diff (colored)
src/6/share/zoneinfo/asia	240458	[ +90 -45 ]	diff (colored)
src/6/share/zoneinfo/australasia	240458	[ +40 -33 ]	diff (colored)
src/6/share/zoneinfo/backward	240458	[ +0 -1 ]	diff (colored)
src/6/share/zoneinfo/etcetera	240458	[ +0 -1 ]	diff (colored)
src/6/share/zoneinfo/europe	240458	[ +7 -8 ]	diff (colored)
src/6/share/zoneinfo/factory	240458	[ +0 -1 ]	diff (colored)
src/6/share/zoneinfo/leapseconds	240458	[ +3 -4 ]	diff (colored)
src/6/share/zoneinfo/northamerica	240458	[ +50 -11 ]	diff (colored)
src/6/share/zoneinfo/southamerica	240458	[ +9 -10 ]	diff (colored)
src/6/share/zoneinfo/systemv	240458	[ +0 -1 ]	diff (colored)
src/6/share/zoneinfo/yearistype.sh	240458	[ +0 -2 ]	diff (colored)
src/6/share/zoneinfo/zone.tab	240458	[ +1 -2 ]	diff (colored)

MFC of 240457, tzdata2012f

- Pacific/Fiji will go into DST from 21 October 2012 till 20 January 2013.
- Fix offset for Pacific/Tokelau.
- Gaza and West Bank had DST from 29 March to 28 September 2012.
- Syria has DST from April till October
- Morocco had DST from April to September 2012 except for 20 July to 20 August.
- Cuba changed to DST from 1 April 2012 only.
- Haiti has DST between 8 March and 1 November in 2012.

Obtained from:  ftp://ftp.iana.org/tz/releases/

src/6/share/zoneinfo/antarctica	233450	[ +18 -3 ]	diff (colored)
src/6/share/zoneinfo/asia	233450	[ +18 -6 ]	diff (colored)
src/6/share/zoneinfo/australasia	233450	[ +26 -2 ]	diff (colored)
src/6/share/zoneinfo/europe	233450	[ +10 -4 ]	diff (colored)
src/6/share/zoneinfo/leapseconds	233450	[ +28 -14 ]	diff (colored)
src/6/share/zoneinfo/northamerica	233450	[ +86 -7 ]	diff (colored)
src/6/share/zoneinfo/southamerica	233450	[ +46 -7 ]	diff (colored)
src/6/share/zoneinfo/zone.tab	233450	[ +3 -2 ]	diff (colored)

MFC of r233445, tzdata2012a

- Updates to various locations in Antarctica.
- Armenia will abolish DST this year.
- Not only Samoa has moved to UTC+14, also Fakaofo did.
- There will be a leap second in 30 June 2012.
- Historical updates of 1918 to Canada, Winn, Regina, Edm, Vanc, Creston.
- Chili stays on DST until 28 April 2012
- The Falkland islands will stay on DST this year.