From owner-p4-projects@FreeBSD.ORG Wed Aug 29 20:15:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0745116A41A; Wed, 29 Aug 2007 20:15:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D797716A417 for ; Wed, 29 Aug 2007 20:15:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C52C713C45A for ; Wed, 29 Aug 2007 20:15:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7TKF4J5009497 for ; Wed, 29 Aug 2007 20:15:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7TKEp15009454 for perforce@freebsd.org; Wed, 29 Aug 2007 20:14:51 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 29 Aug 2007 20:14:51 GMT Message-Id: <200708292014.l7TKEp15009454@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 125827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Aug 2007 20:15:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=125827 Change 125827 by kmacy@kmacy_home:opentoe on 2007/08/29 20:14:00 IFC 4-port update Affected files ... .. //depot/projects/opentoe/etc/rc.d/mdconfig#2 integrate .. //depot/projects/opentoe/gnu/lib/libdialog/dialog.h#2 integrate .. //depot/projects/opentoe/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/opentoe/include/arpa/inet.h#3 integrate .. //depot/projects/opentoe/lib/libc/gen/fts-compat.c#1 branch .. //depot/projects/opentoe/lib/libc/gen/fts-compat.h#1 branch .. //depot/projects/opentoe/lib/libc/sys/Symbol.map#5 integrate .. //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate .. //depot/projects/opentoe/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/opentoe/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/opentoe/share/man/man4/Makefile#10 integrate .. //depot/projects/opentoe/share/man/man4/aac.4#2 integrate .. //depot/projects/opentoe/share/man/man4/coretemp.4#1 branch .. //depot/projects/opentoe/share/man/man4/ichwd.4#1 branch .. //depot/projects/opentoe/share/man/man4/nfe.4#4 integrate .. //depot/projects/opentoe/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/opentoe/share/man/man5/src.conf.5#6 integrate .. //depot/projects/opentoe/share/man/man7/ports.7#3 integrate .. //depot/projects/opentoe/share/zoneinfo/africa#3 integrate .. //depot/projects/opentoe/share/zoneinfo/antarctica#3 integrate .. //depot/projects/opentoe/share/zoneinfo/australasia#3 integrate .. //depot/projects/opentoe/share/zoneinfo/europe#3 integrate .. //depot/projects/opentoe/share/zoneinfo/leapseconds#4 integrate .. //depot/projects/opentoe/share/zoneinfo/northamerica#3 integrate .. //depot/projects/opentoe/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/opentoe/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/opentoe/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/opentoe/sys/amd64/include/asm.h#2 integrate .. //depot/projects/opentoe/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/opentoe/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/opentoe/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/opentoe/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#24 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_lro.c#8 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#29 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/opentoe/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/opentoe/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/opentoe/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/opentoe/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/opentoe/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/opentoe/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/opentoe/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/opentoe/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/opentoe/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/opentoe/sys/i386/i386/support.s#4 integrate .. //depot/projects/opentoe/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/opentoe/sys/i386/include/asm.h#2 integrate .. //depot/projects/opentoe/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/opentoe/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/opentoe/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/opentoe/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/opentoe/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/opentoe/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/opentoe/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/opentoe/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/opentoe/sys/netinet/sctp.h#7 integrate .. //depot/projects/opentoe/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/opentoe/sys/netinet/sctp_asconf.h#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_constants.h#10 integrate .. //depot/projects/opentoe/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.c#15 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.c#16 integrate .. //depot/projects/opentoe/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_os_bsd.h#11 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.c#15 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.h#11 integrate .. //depot/projects/opentoe/sys/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/opentoe/sys/netinet/sctp_structs.h#12 integrate .. //depot/projects/opentoe/sys/netinet/sctp_sysctl.c#8 integrate .. //depot/projects/opentoe/sys/netinet/sctp_sysctl.h#7 integrate .. //depot/projects/opentoe/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/opentoe/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/opentoe/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/opentoe/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#17 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.h#11 integrate .. //depot/projects/opentoe/sys/netinet6/sctp6_usrreq.c#13 integrate .. //depot/projects/opentoe/sys/sys/mbuf.h#10 integrate .. //depot/projects/opentoe/sys/sys/mount.h#6 integrate .. //depot/projects/opentoe/tools/build/options/WITHOUT_ZONEINFO#1 branch .. //depot/projects/opentoe/tools/tools/tinybsd/conf/bridge/TINYBSD#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/default/TINYBSD#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/firewall/TINYBSD#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/minimal/TINYBSD#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/vpn/TINYBSD#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/wireless/TINYBSD#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/wrap/TINYBSD#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/opentoe/usr.bin/netstat/sctp.c#3 integrate .. //depot/projects/opentoe/usr.bin/rpcgen/rpc_main.c#2 integrate .. //depot/projects/opentoe/usr.bin/rpcgen/rpc_svcout.c#3 integrate .. //depot/projects/opentoe/usr.sbin/kbdmap/kbdmap.c#2 integrate .. //depot/projects/opentoe/usr.sbin/pkg_install/add/extract.c#2 integrate Differences ... ==== //depot/projects/opentoe/etc/rc.d/mdconfig#2 (text) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mdconfig,v 1.4 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/mdconfig,v 1.5 2007/08/25 00:19:17 matteo Exp $ # # PROVIDE: mdconfig @@ -115,6 +115,8 @@ fi if [ "${_file}" != "${_file%.uzip}" ]; then load_kld -m g_uzip geom_uzip || return 3 + # sleep a bit to allow creation of /dev/mdX.uzip + sleep 2 fi fi if mdconfig -l -u ${_md} >/dev/null 2>&1; then ==== //depot/projects/opentoe/gnu/lib/libdialog/dialog.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $FreeBSD: src/gnu/lib/libdialog/dialog.h,v 1.22 2000/12/14 02:35:22 jkh Exp $ + * $FreeBSD: src/gnu/lib/libdialog/dialog.h,v 1.23 2007/08/24 16:26:24 ache Exp $ * */ @@ -74,7 +74,7 @@ } dialogMenuItem; #define VERSION "0.4" -#define MAX_LEN 2048 +#define MAX_LEN 4096 #ifndef TRUE #define TRUE (1) ==== //depot/projects/opentoe/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c,v 1.7 2006/08/23 19:16:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c,v 1.8 2007/08/22 20:28:13 jhb Exp $"); #include #include @@ -178,6 +178,7 @@ if (pname == NULL) return (NULL); if (strcmp(pname, "calltrap") == 0 || + strcmp(pname, "nmi_calltrap") == 0 || (pname[0] == 'X' && pname[1] != '_')) return (&kgdb_trgt_trapframe_unwind); /* printf("%s: %lx =%s\n", __func__, pc, pname); */ ==== //depot/projects/opentoe/include/arpa/inet.h#3 (text+ko) ==== @@ -56,7 +56,7 @@ /*% * @(#)inet.h 8.1 (Berkeley) 6/2/93 * $Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.29 2007/06/14 07:13:28 delphij Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.30 2007/08/24 20:25:52 bms Exp $ */ #ifndef _ARPA_INET_H_ @@ -154,8 +154,6 @@ int inet_pton(int, const char * __restrict, void * __restrict); #if __BSD_VISIBLE -int ascii2addr(int, const char *, void *); -char *addr2ascii(int, const void *, int, char *); int inet_aton(const char *, struct in_addr *); in_addr_t inet_lnaof(struct in_addr); struct in_addr inet_makeaddr(in_addr_t, in_addr_t); ==== //depot/projects/opentoe/lib/libc/sys/Symbol.map#5 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.8 2007/06/05 08:24:34 des Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.9 2007/08/22 01:56:35 davidxu Exp $ */ /* @@ -303,6 +303,7 @@ thr_create; thr_exit; thr_kill; + thr_kill2; thr_new; thr_self; thr_set_name; @@ -917,6 +918,8 @@ __sys_thr_exit; _thr_kill; __sys_thr_kill; + _thr_kill2; + __sys_thr_kill2; _thr_new; __sys_thr_new; _thr_self; ==== //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1060 2007/08/18 16:40:37 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1061 2007/08/24 15:18:42 bmah Exp $ 2000 @@ -588,6 +588,10 @@ which supports Cronyx Tau-PCI/32 adapters, has been added. &merged; + [&arch.i386;, &arch.amd64;] The &man.coretemp.4; driver + has been added to provide temperature readings on &intel; + &core; processors. + The est &man.cpufreq.4; driver now supports frequency control for the VIA C7-M family of processors. @@ -2301,7 +2305,7 @@ The timezone database has been updated from the tzdata2005l release to the - tzdata2006n release. &merged; + tzdata2007g release. &merged; tip has been updated to a snapshot from OpenBSD as of 20060831. ==== //depot/projects/opentoe/sbin/ipfw/ipfw2.c#5 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.106 2007/06/18 17:52:37 maxim Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.107 2007/08/26 18:38:31 maxim Exp $ */ #include @@ -2575,7 +2575,7 @@ for (n = 0, d = dynrules; n < ndyn; n++, d++) { if (use_set) { /* skip rules from another set */ - bcopy(&d->rule + sizeof(uint16_t), + bcopy((char *)&d->rule + sizeof(uint16_t), &set, sizeof(uint8_t)); if (set != use_set - 1) continue; @@ -2603,7 +2603,7 @@ printf("## Dynamic rules (%d):\n", ndyn); for (n = 0, d = dynrules; n < ndyn; n++, d++) { if (use_set) { - bcopy(&d->rule + sizeof(uint16_t), + bcopy((char *)&d->rule + sizeof(uint16_t), &set, sizeof(uint8_t)); if (set != use_set - 1) continue; @@ -2660,7 +2660,7 @@ if (rulenum > rnum) break; if (use_set) { - bcopy(&d->rule + sizeof(uint16_t), + bcopy((char *)&d->rule + sizeof(uint16_t), &set, sizeof(uint8_t)); if (set != use_set - 1) continue; ==== //depot/projects/opentoe/sbin/sysctl/sysctl.8#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.60 2005/11/18 10:32:12 ru Exp $ +.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.61 2007/08/24 20:38:09 danger Exp $ .\" .Dd September 15, 2005 .Dt SYSCTL 8 @@ -214,6 +214,7 @@ .It "hw.pagesize integer no .It "hw.floatingpoint integer no .It "hw.machine_arch string no +.It "hw.realmem integer no .It "machdep.console_device dev_t no .It "machdep.adjkerntz integer yes .It "machdep.disable_rtc_set integer yes ==== //depot/projects/opentoe/share/man/man4/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.391 2007/08/02 08:04:48 bz Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.392 2007/08/23 20:05:09 des Exp $ MAN= aac.4 \ acpi.4 \ @@ -49,6 +49,7 @@ ciss.4 \ cm.4 \ cnw.4 \ + ${_coretemp.4} \ cpufreq.4 \ crypto.4 \ cue.4 \ @@ -103,6 +104,7 @@ ${_hptmv.4} \ hwpmc.4 \ ichsmb.4 \ + ${_ichwd.4} \ icmp.4 \ icmp6.4 \ ida.4 \ @@ -537,8 +539,10 @@ .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _acpi_dock.4= acpi_dock.4 _amdsmb.4= amdsmb.4 +_coretemp.4= coretemp.4 _hptiop.4= hptiop.4 _hptmv.4= hptmv.4 +_ichwd.4= ichwd.4 _if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 _if_nxge.4= if_nxge.4 ==== //depot/projects/opentoe/share/man/man4/aac.4#2 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aac.4,v 1.35 2006/12/14 11:57:39 mpp Exp $ -.Dd November 3, 2006 +.\" $FreeBSD: src/share/man/man4/aac.4,v 1.36 2007/08/23 20:12:40 emaste Exp $ +.Dd August 23, 2007 .Dt AAC 4 .Os .Sh NAME @@ -113,6 +113,10 @@ .It Adaptec AAC-364 .It +Adaptec SAS RAID 3405 +.It +Adaptec SAS RAID 3805 +.It Adaptec SAS RAID 4000SAS .It Adaptec SAS RAID 4005SAS ==== //depot/projects/opentoe/share/man/man4/nfe.4#4 (text+ko) ==== @@ -14,9 +14,9 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/nfe.4,v 1.7 2007/06/14 05:32:23 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/nfe.4,v 1.8 2007/08/22 18:02:01 gabor Exp $ .\" -.Dd June 13, 2007 +.Dd Aug 22, 2007 .Dt NFE 4 .Os .Sh NAME @@ -106,7 +106,7 @@ .It NVIDIA nForce 430 MCP13 Networking Adapter .It -NVIDIA nForce MCP55 Networking Adapter +NVIDIA nForce MCP51 Networking Adapter .It NVIDIA nForce MCP55 Networking Adapter .It ==== //depot/projects/opentoe/share/man/man5/msdosfs.5#2 (text+ko) ==== @@ -1,8 +1,8 @@ -.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.5 2005/09/14 16:32:21 joel Exp $ +.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.6 2007/08/22 18:04:08 gabor Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd December 26, 2002 +.Dd Aug 22, 2007 .Dt MSDOSFS 5 .Os .Sh NAME @@ -21,7 +21,7 @@ .Pp The most common usage follows: .Pp -.Dl "mount_msdosfs /dev/ad0sN /mnt" +.Dl "mount -t msdosfs /dev/ad0sN /mnt" .Pp where .Ar N ==== //depot/projects/opentoe/share/man/man5/src.conf.5#6 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: src/tools/build/options/makeman,v 1.6 2006/09/11 13:39:44 ru Exp -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.13 2007/07/19 17:02:24 bz Exp $ -.Dd July 19, 2007 +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.15 2007/08/27 20:22:59 remko Exp $ +.Dd August 27, 2007 .Dt SRC.CONF 5 .Os .Sh NAME @@ -564,6 +564,9 @@ .It Va WITHOUT_ZFS .\" from FreeBSD: src/tools/build/options/WITHOUT_ZFS,v 1.1 2007/04/06 02:13:30 pjd Exp Set to not build ZFS file system. +.It Va WITHOUT_ZONEINFO +.\" from FreeBSD: src/tools/build/options/WITHOUT_ZONEINFO,v 1.1 2007/08/27 20:01:08 remko Exp +Set to not build the timezone database .El .Sh FILES .Bl -tag -compact ==== //depot/projects/opentoe/share/man/man7/ports.7#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/ports.7,v 1.60 2007/07/24 06:41:06 delphij Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.61 2007/08/22 18:07:41 gabor Exp $ .\" -.Dd July 16, 2007 +.Dd Aug 22, 2007 .Dt PORTS 7 .Os .Sh NAME @@ -66,7 +66,7 @@ .Pa http://www.FreeBSD.org/ports/ first! The -.Xr portcheckout 1 Pq Pa ports/devel/portcheckout +.Xr portcheckout 1 Pq Pa ports/ports-mgmt/portcheckout script (also a port, of course!) will help to download new ports. .Pp For more information about using ports, see ==== //depot/projects/opentoe/share/zoneinfo/africa#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)africa 8.8 +# @(#)africa 8.9 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -218,7 +218,15 @@
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
 Rule	Egypt	2006	only	-	Sep	21	23:00s	0	-
-Rule	Egypt	2007	max	-	Sep	lastThu	23:00s	0	-
+# From Dirk Losch (2007-08-14):
+# I received a mail from an airline which says that the daylight
+# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
+# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# http://www.nentjes.info/Bill/bill5.htm 
+# http://www.timeanddate.com/worldclock/city.html?n=53
+# From Paul Eggert (2007-08-17):
+# For lack of better info, assume the new rule is first Thursday.
+Rule	Egypt	2007	max	-	Sep	Thu>=1	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

==== //depot/projects/opentoe/share/zoneinfo/antarctica#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)antarctica	8.3
+# @(#)antarctica	8.4
 # 
 
 # From Paul Eggert (1999-11-15):
@@ -191,10 +191,12 @@
 Rule	NZAQ	1974	only	-	Nov	 3	2:00s	1:00	D
 Rule	NZAQ	1975	1988	-	Oct	lastSun	2:00s	1:00	D
 Rule	NZAQ	1989	only	-	Oct	 8	2:00s	1:00	D
-Rule	NZAQ	1990	max	-	Oct	Sun>=1	2:00s	1:00	D
+Rule	NZAQ	1990	2006	-	Oct	Sun>=1	2:00s	1:00	D
 Rule	NZAQ	1975	only	-	Feb	23	2:00s	0	S
 Rule	NZAQ	1976	1989	-	Mar	Sun>=1	2:00s	0	S
-Rule	NZAQ	1990	max	-	Mar	Sun>=15	2:00s	0	S
+Rule	NZAQ	1990	2007	-	Mar	Sun>=15	2:00s	0	S
+Rule	NZAQ	2007	max	-	Sep	lastSun	2:00s	1:00	D
+Rule	NZAQ	2008	max	-	Apr	Sun>=1	2:00s	0	S
 
 # Norway - territories
 # Bouvet (never inhabited)

==== //depot/projects/opentoe/share/zoneinfo/australasia#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)australasia	8.7
+# @(#)australasia	8.8
 # 
 
 # This file also includes Pacific islands.
@@ -79,7 +79,7 @@
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AS	1971	1985	-	Oct	lastSun	2:00s	1:00	-
 Rule	AS	1986	only	-	Oct	19	2:00s	1:00	-
-Rule	AS	1987	max	-	Oct	lastSun	2:00s	1:00	-
+Rule	AS	1987	2007	-	Oct	lastSun	2:00s	1:00	-
 Rule	AS	1972	only	-	Feb	27	2:00s	0	-
 Rule	AS	1973	1985	-	Mar	Sun>=1	2:00s	0	-
 Rule	AS	1986	1989	-	Mar	Sun>=15	2:00s	0	-
@@ -90,7 +90,9 @@
 Rule	AS	1994	only	-	Mar	Sun>=18	2:00s	0	-
 Rule	AS	1995	2005	-	Mar	lastSun	2:00s	0	-
 Rule	AS	2006	only	-	Apr	Sun>=1	2:00s	0	-
-Rule	AS	2007	max	-	Mar	lastSun	2:00s	0	-
+Rule	AS	2007	only	-	Mar	lastSun	2:00s	0	-
+Rule	AS	2008	max	-	Apr	Sun>=1	2:00s	0	-
+Rule	AS	2008	max	-	Oct	Sun>=1	2:00s	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Adelaide	9:14:20 -	LMT	1895 Feb
 			9:00	-	CST	1899 May
@@ -121,7 +123,8 @@
 Rule	AT	2000	only	-	Aug	lastSun	2:00s	1:00	-
 Rule	AT	2001	max	-	Oct	Sun>=1	2:00s	1:00	-
 Rule	AT	2006	only	-	Apr	Sun>=1	2:00s	0	-
-Rule	AT	2007	max	-	Mar	lastSun	2:00s	0	-
+Rule	AT	2007	only	-	Mar	lastSun	2:00s	0	-
+Rule	AT	2008	max	-	Apr	Sun>=1	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
 			10:00	-	EST	1916 Oct 1 2:00
@@ -145,9 +148,11 @@
 Rule	AV	1991	1994	-	Mar	Sun>=1	2:00s	0	-
 Rule	AV	1995	2005	-	Mar	lastSun	2:00s	0	-
 Rule	AV	2000	only	-	Aug	lastSun	2:00s	1:00	-
-Rule	AV	2001	max	-	Oct	lastSun	2:00s	1:00	-
+Rule	AV	2001	2007	-	Oct	lastSun	2:00s	1:00	-
 Rule	AV	2006	only	-	Apr	Sun>=1	2:00s	0	-
-Rule	AV	2007	max	-	Mar	lastSun	2:00s	0	-
+Rule	AV	2007	only	-	Mar	lastSun	2:00s	0	-
+Rule	AV	2008	max	-	Apr	Sun>=1	2:00s	0	-
+Rule	AV	2008	max	-	Oct	Sun>=1	2:00s	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Melbourne 9:39:52 -	LMT	1895 Feb
 			10:00	Aus	EST	1971
@@ -166,9 +171,11 @@
 Rule	AN	1990	1995	-	Mar	Sun>=1	2:00s	0	-
 Rule	AN	1996	2005	-	Mar	lastSun	2:00s	0	-
 Rule	AN	2000	only	-	Aug	lastSun	2:00s	1:00	-
-Rule	AN	2001	max	-	Oct	lastSun	2:00s	1:00	-
+Rule	AN	2001	2007	-	Oct	lastSun	2:00s	1:00	-
 Rule	AN	2006	only	-	Apr	Sun>=1	2:00s	0	-
-Rule	AN	2007	max	-	Mar	lastSun	2:00s	0	-
+Rule	AN	2007	only	-	Mar	lastSun	2:00s	0	-
+Rule	AN	2008	max	-	Apr	Sun>=1	2:00s	0	-
+Rule	AN	2008	max	-	Oct	Sun>=1	2:00s	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Sydney	10:04:52 -	LMT	1895 Feb
 			10:00	Aus	EST	1971
@@ -191,9 +198,11 @@
 Rule	LH	1990	1995	-	Mar	Sun>=1	2:00	0	-
 Rule	LH	1996	2005	-	Mar	lastSun	2:00	0	-
 Rule	LH	2000	only	-	Aug	lastSun	2:00	0:30	-
-Rule	LH	2001	max	-	Oct	lastSun	2:00	0:30	-
+Rule	LH	2001	2007	-	Oct	lastSun	2:00	0:30	-
 Rule	LH	2006	only	-	Apr	Sun>=1	2:00	0	-
-Rule	LH	2007	max	-	Mar	lastSun	2:00	0	-
+Rule	LH	2007	only	-	Mar	lastSun	2:00	0	-
+Rule	LH	2008	max	-	Apr	Sun>=1	2:00	0	-
+Rule	LH	2008	max	-	Oct	Sun>=1	2:00	0:30	-
 Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 			10:00	-	EST	1981 Mar
 			10:30	LH	LHST
@@ -453,11 +462,20 @@
 # US minor outlying islands
 
 # Howland, Baker
-# uninhabited since World War II
-# no information; was probably like Pacific/Pago_Pago
+# Howland was mined for guano by American companies 1857-1878 and British
+# 1886-1891; Baker was similar but exact dates are not known.
+# Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
+# uninhabited thereafter.
+# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
+# see page 206 of Elgen M. Long and Marie K. Long,
+# Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
+# So most likely Howland and Baker observed Hawaii Time from 1935
+# until they were abandoned after the war.
 
 # Jarvis
-# uninhabited since 1958
+# Mined for guano by American companies 1857-1879 and British 1883?-1891?.
+# Inhabited by civilians 1935-1942; IGY scientific base 1957-1958;
+# uninhabited thereafter.
 # no information; was probably like Pacific/Kiritimati
 
 # Johnston
@@ -866,33 +884,13 @@
 # introduction of standard time in 1895.
 
 
-# South Australia, Tasmania, Victoria
-
-# From Arthur David Olson (1992-03-08):
-# The rules from version 7.1 follow.
-# There are lots of differences between these rules and
-# the Shepherd et al. rules.  Since the Shepherd et al. rules
-# and Bradley White's newspaper article are in agreement on
-# current DST ending dates, no worries.
+# southeast Australia
 #
-# Rule	Oz	1971	1985	-	Oct	lastSun	2:00	1:00	-
-# Rule	Oz	1986	max	-	Oct	Sun>=18	2:00	1:00	-
-# Rule	Oz	1972	only	-	Feb	27	3:00	0	-
-# Rule	Oz	1973	1986	-	Mar	Sun>=1	3:00	0	-
-# Rule	Oz	1987	max	-	Mar	Sun>=15	3:00	0	-
-# Zone	Australia/Tasmania	10:00	Oz	EST
-# Zone	Australia/South		9:30	Oz	CST
-# Zone	Australia/Victoria	10:00	Oz	EST	1985 Oct lastSun 2:00
-#				10:00	1:00	EST	1986 Mar Sun>=15 3:00
-#				10:00	Oz	EST
+# From Paul Eggert (2007-07-23):
+# Starting autumn 2008 Victoria, NSW, South Australia, Tasmania and the ACT
+# end DST the first Sunday in April and start DST the first Sunday in October.
+# http://www.theage.com.au/news/national/daylight-savings-to-span-six-months/2007/06/27/1182623966703.html
 
-# From Robert Elz (1991-03-06):
-# I believe that the current start date for DST is "lastSun" in Oct...
-# that changed Oct 89.  That is, we're back to the
-# original rule, and that rule currently applies in all the states
-# that have dst, incl Qld.  (Certainly it was true in Vic).
-# The file I'm including says that happened in 1988, I think
-# that's incorrect, but I'm not 100% certain.
 
 # South Australia
 
@@ -938,6 +936,9 @@
 # was gazetted in the Government Hansard on Sep 26 1994....
 # start on last Sunday in October and end in last sunday in March.
 
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
 # Tasmania
 
 # The rules for 1967 through 1991 were reported by George Shepherd
@@ -960,6 +961,9 @@
 # Sim Alam (2000-07-03) reported a legal citation for the 2000/2001 rules:
 # http://www.thelaw.tas.gov.au/fragview/42++1968+GS3A@EN+2000070300
 
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
 # Victoria
 
 # The rules for 1971 through 1991 were reported by George Shepherd
@@ -989,6 +993,9 @@
 # [1] http://www.hup.harvard.edu/catalog/HEISUN.html
 # [2] http://www.shrine.org.au
 
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
 # New South Wales
 
 # From Arthur David Olson:
@@ -1055,6 +1062,9 @@
 # The Queensland Premier Peter Beattie is encouraging northern NSW
 # towns to use Queensland time.
 
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
 # Yancowinna
 
 # From John Mackin (1989-01-04):
@@ -1106,6 +1116,9 @@
 # For Lord Howe dates we use Shanks & Pottenger through 1989, and
 # Lonergan thereafter.  For times we use Lonergan.
 
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
 ###############################################################################
 
 # New Zealand

==== //depot/projects/opentoe/share/zoneinfo/europe#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)europe	8.10
+# @(#)europe	8.11
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -444,7 +444,7 @@
 
 ###############################################################################
 
-# Continental Europe
+# Europe
 
 # EU rules are for the European Union, previously known as the EC, EEC,
 # Common Market, etc.
@@ -2386,6 +2386,8 @@
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Most of Ukraine since 1970 has been like Kiev.
+# "Kyiv" is the transliteration of the Ukrainian name, but
+# "Kiev" is more common in English.
 Zone Europe/Kiev	2:02:04 -	LMT	1880
 			2:02:04	-	KMT	1924 May  2 # Kiev Mean Time
 			2:00	-	EET	1930 Jun 21
@@ -2397,6 +2399,8 @@
 			2:00	E-Eur	EE%sT	1995
 			2:00	EU	EE%sT
 # Ruthenia used CET 1990/1991.
+# "Uzhhorod" is the transliteration of the Ukrainian name, but
+# "Uzhgorod" is more common in English.
 Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
 			1:00	-	CET	1940
 			1:00	C-Eur	CE%sT	1944 Oct
@@ -2409,7 +2413,10 @@
 			2:00	E-Eur	EE%sT	1995
 			2:00	EU	EE%sT
 # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
-# Zaporozh'ye has an apostrophe, but Posix file names can't have apostrophes.
+# "Zaporizhia" is the transliteration of the Ukrainian name, but
+# "Zaporozh'ye" is more common in English.  Use the common English
+# spelling, except omit the apostrophe as it is not allowed in
+# portable Posix file names.
 Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
 			2:20	-	CUT	1924 May  2 # Central Ukraine T
 			2:00	-	EET	1930 Jun 21

==== //depot/projects/opentoe/share/zoneinfo/leapseconds#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)leapseconds	8.3
+# @(#)leapseconds	8.4
 
 # Allowance for leapseconds added to each timezone file.
 
@@ -45,39 +45,38 @@
 Leap	1998	Dec	31	23:59:60	+	S
 Leap	2005	Dec	31	23:59:60	+	S
 
-# ...
-# Date: Thu, 28 Jun 2007 14:36:55 +0200
-# Message-Id: <200706281236.l5SCatpA020400@callisto.obspm.fr>
-# ...
-# Subject: Bulletin C number 34
-# ...
-# 	INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
-#
+# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
 # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
 #
 # SERVICE DE LA ROTATION TERRESTRE
 # OBSERVATOIRE DE PARIS
 # 61, Av. de l'Observatoire 75014 PARIS (France)
-# ...
+# Tel.      : 33 (0) 1 40 51 22 26
+# FAX       : 33 (0) 1 40 51 22 91
+# Internet  : services.iers@obspm.fr
+#
+# Paris, 28 June 2007
+#
+# Bulletin C 34
 #
-#                                                Paris, 28 June 2007
-#                                                Bulletin C 34
-#                                                To authorities responsible
-#                                                for the measurement and
-#                                                distribution of time
+# To authorities responsible
+# for the measurement and
+# distribution of time
 #
-#                           INFORMATION ON UTC - TAI
+# INFORMATION ON UTC - TAI
 #
 # NO positive leap second will be introduced at the end of December 2007.
 # The difference between Coordinated Universal Time UTC and the
-# International Atomic Time TAI is:
-#      from 2006 January 1, 0h UTC, until further notice : UTC-TAI = -33 s
-# Leap seconds can be introduced in UTC at the end of the months of
-# December  or June,  depending on the evolution of UT1-TAI. Bulletin C is
-# mailed every  six months, either to announce a time step in UTC, or to
-# confirm that there  will be no time step at the next possible date.
+# International Atomic Time TAI is :		
+#
+# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = -33 s
+#
+# Leap seconds can be introduced in UTC at the end of the months of December
+# or June,  depending on the evolution of UT1-TAI. Bulletin C is mailed every
+# six months, either to announce a time step in UTC, or to confirm that there
+# will be no time step at the next possible date.
 #
-# 				Daniel GAMBIS
-# 				Director
-# 				Earth Orientation Center of IERS
-# 				Observatoire de Paris, France
+# Daniel GAMBIS
+# Director			
+# Earth Orientation Center of IERS
+# Observatoire de Paris, France

==== //depot/projects/opentoe/share/zoneinfo/northamerica#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)northamerica	8.17
+# @(#)northamerica	8.18
 # 
 
 # also includes Central America and the Caribbean
@@ -348,7 +348,7 @@
 #
 # Colorado, far western Kansas, Montana, western
 # Nebraska, Nevada border (Jackpot, Owyhee, and Mountain City),
-# New Mexico, southwestern North Dakota, far eastern Oregon,
+# New Mexico, southwestern North Dakota,
 # western South Dakota, far western Texas (El Paso County, Hudspeth County,
 # and Pine Springs and Nickel Creek in Culberson County), Utah, Wyoming
 #
@@ -369,7 +369,8 @@
 # US Pacific time, represented by Los Angeles
 #
 # California, northern Idaho (Benewah, Bonner, Boundary, Clearwater,
-# Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties),
+# Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties,
+# and the northern three-quarters of Idaho county),
 # most of Nevada, most of Oregon, and Washington
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
@@ -527,7 +528,8 @@
 # Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
 # Custer, Elmore, Franklin, Fremont, Gem, Gooding, Jefferson, Jerome,
 # Lemhi, Lincoln, Madison, Minidoka, Oneida, Owyhee, Payette, Power,
-# Teton, Twin Falls, Valley, Washington counties) and eastern Oregon
+# Teton, Twin Falls, Valley, Washington counties, and the southern
+# quarter of Idaho county) and eastern Oregon (most of Malheur County)
 # switched four weeks late in 1974.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -544,7 +546,7 @@
 # What time is it in Indiana?
 #  (2006-03-01)
 #
-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2007-08-17):
 # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
 # with the following exceptions:
 #
@@ -556,11 +558,8 @@
 # - Clark, Floyd, and Harrison counties have been like
 #   America/Kentucky/Louisville.
 #
-# - Daviess, Dubois, Knox, Martin, Perry, and Pulaski counties
-#   have been like America/Indiana/Vincennes.
-#
-# - Crawford, Pike, Starke, and Switzerland counties have their own time zone
-#   histories as noted below.
+# - Crawford, Daviess, Dubois, Knox, Martin, Perry, Pike, Pulaski, Starke,
+#   and Switzerland counties have their own time zone histories as noted below.
 #
 # Shanks partitioned Indiana into 345 regions, each with its own time history,
 # and wrote ``Even newspaper reports present contradictory information.''
@@ -628,8 +627,9 @@
 			-5:00	-	EST	2006
 			-5:00	US	E%sT
 #
-# Daviess, Dubois, Knox, Martin, and Perry Counties, Indiana,
-# switched from eastern to central time in April 2006.
+# Daviess, Dubois, Knox, and Martin Counties, Indiana,
+# switched from eastern to central time in April 2006, then switched back
+# in November 2007.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule Vincennes	1946	only	-	Apr	lastSun	2:00	1:00	D
 Rule Vincennes	1946	only	-	Sep	lastSun	2:00	0	S
@@ -647,10 +647,31 @@
 			-5:00	-	EST	1969
 			-5:00	US	E%sT	1971
 			-5:00	-	EST	2006 Apr  2 2:00
+			-6:00	US	C%sT	2007 Nov  4 2:00
+			-5:00	US	E%sT
+#
+# Perry County, Indiana, switched from eastern to central time in April 2006.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule Perry	1946	only	-	Apr	lastSun	2:00	1:00	D
+Rule Perry	1946	only	-	Sep	lastSun	2:00	0	S
+Rule Perry	1953	1954	-	Apr	lastSun	2:00	1:00	D
+Rule Perry	1953	1959	-	Sep	lastSun	2:00	0	S
+Rule Perry	1955	only	-	May	 1	0:00	1:00	D
+Rule Perry	1956	1963	-	Apr	lastSun	2:00	1:00	D
+Rule Perry	1960	only	-	Oct	lastSun	2:00	0	S
+Rule Perry	1961	only	-	Sep	lastSun	2:00	0	S
+Rule Perry	1962	1963	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 12:12:57
+			-6:00	US	C%sT	1946
+			-6:00 Perry	C%sT	1964 Apr 26 2:00
+			-5:00	-	EST	1969
+			-5:00	US	E%sT	1971
+			-5:00	-	EST	2006 Apr  2 2:00
 			-6:00	US	C%sT
 #
 # Pike County, Indiana moved from central to eastern time in 1977,
-# then switched back in 2006.
+# then switched back in 2006, then switched back again in 2007.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	Pike	1955	only	-	May	 1	0:00	1:00	D
 Rule	Pike	1955	1960	-	Sep	lastSun	2:00	0	S
@@ -663,7 +684,8 @@
 			-5:00	-	EST	1966 Oct 30 2:00
 			-6:00	US	C%sT	1977 Oct 30 2:00
 			-5:00	-	EST	2006 Apr  2 2:00
-			-6:00	US	C%sT
+			-6:00	US	C%sT	2007 Nov  4 2:00
+			-5:00	US	E%sT
 #
 # Starke County, Indiana moved from central to eastern time in 1991,
 # then switched back in 2006.

==== //depot/projects/opentoe/share/zoneinfo/zone.tab#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.10
+# @(#)zone.tab	8.11
 #
 # TZ zone descriptions
 #
@@ -39,7 +39,7 @@
 AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
 AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
 AQ	-7824+10654	Antarctica/Vostok	Vostok Station, S Magnetic Pole
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Base, Terre Adelie
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
 AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
@@ -65,7 +65,7 @@
 AU	-1228+13050	Australia/Darwin	Northern Territory
 AU	-3157+11551	Australia/Perth	Western Australia - most locations
 AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
-AW	+1230-06858	America/Aruba
+AW	+1230-06958	America/Aruba
 AX	+6006+01957	Europe/Mariehamn
 AZ	+4023+04951	Asia/Baku
 BA	+4352+01825	Europe/Sarajevo
@@ -117,10 +117,10 @@
 CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
 CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
 CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
-CA	+6903-10505	America/Cambridge_Bay	Central Time - west Nunavut
 CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
 CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
 CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
 CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
 CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
 CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
@@ -175,7 +175,7 @@
 FO	+6201-00646	Atlantic/Faroe
 FR	+4852+00220	Europe/Paris
 GA	+0023+00927	Africa/Libreville

>>> TRUNCATED FOR MAIL (1000 lines) <<<