Date: Tue, 5 Nov 2013 11:19:35 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257698 - in projects/ifnet: . bin/sh cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/lib/libnvpair cddl/lib/libnvpair contrib/libreadline contrib/libreadline/support contr... Message-ID: <201311051119.rA5BJZ6V034633@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Nov 5 11:19:34 2013 New Revision: 257698 URL: http://svnweb.freebsd.org/changeset/base/257698 Log: Merge head r256150 through r257697. Added: projects/ifnet/contrib/tzdata/leap-seconds.list - copied unchanged from r257697, head/contrib/tzdata/leap-seconds.list projects/ifnet/lib/libc/capability/cap_rights_init.3 - copied unchanged from r257697, head/lib/libc/capability/cap_rights_init.3 projects/ifnet/lib/libc/gen/cap_rights_get.3 - copied unchanged from r257697, head/lib/libc/gen/cap_rights_get.3 projects/ifnet/share/man/man4/rights.4 - copied unchanged from r257697, head/share/man/man4/rights.4 projects/ifnet/sys/arm/arm/devmap.c - copied unchanged from r257697, head/sys/arm/arm/devmap.c projects/ifnet/sys/arm/conf/WANDBOARD.common - copied unchanged from r257697, head/sys/arm/conf/WANDBOARD.common projects/ifnet/sys/arm/include/devmap.h - copied unchanged from r257697, head/sys/arm/include/devmap.h projects/ifnet/sys/dev/netmap/netmap_mem2.h - copied unchanged from r257697, head/sys/dev/netmap/netmap_mem2.h projects/ifnet/sys/x86/iommu/intel_qi.c - copied unchanged from r257697, head/sys/x86/iommu/intel_qi.c Deleted: projects/ifnet/etc/namedb/ projects/ifnet/etc/periodic/daily/470.status-named projects/ifnet/etc/rc.d/named projects/ifnet/lib/libiconv_compat/ projects/ifnet/sys/amd64/vmm/io/vdev.c projects/ifnet/sys/amd64/vmm/io/vdev.h projects/ifnet/sys/arm/conf/WANDBOARD-COMMON Modified: projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/bin/sh/nodetypes projects/ifnet/bin/sh/sh.1 projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/ifnet/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c projects/ifnet/cddl/lib/libnvpair/Makefile projects/ifnet/contrib/libreadline/display.c projects/ifnet/contrib/libreadline/input.c projects/ifnet/contrib/libreadline/search.c projects/ifnet/contrib/libreadline/support/shobj-conf projects/ifnet/contrib/tzdata/africa projects/ifnet/contrib/tzdata/antarctica projects/ifnet/contrib/tzdata/asia projects/ifnet/contrib/tzdata/australasia projects/ifnet/contrib/tzdata/backward projects/ifnet/contrib/tzdata/etcetera projects/ifnet/contrib/tzdata/europe projects/ifnet/contrib/tzdata/northamerica projects/ifnet/contrib/tzdata/southamerica projects/ifnet/contrib/tzdata/zone.tab projects/ifnet/etc/defaults/periodic.conf projects/ifnet/etc/defaults/rc.conf projects/ifnet/etc/freebsd-update.conf projects/ifnet/etc/pkg/FreeBSD.conf projects/ifnet/etc/rc.d/Makefile projects/ifnet/etc/rc.d/ntpdate projects/ifnet/etc/rc.d/rpcbind projects/ifnet/etc/rc.d/syslogd projects/ifnet/gnu/lib/libgcc/Makefile projects/ifnet/gnu/usr.bin/binutils/ld/Makefile projects/ifnet/include/Makefile projects/ifnet/include/iconv.h projects/ifnet/lib/Makefile projects/ifnet/lib/libc/capability/Makefile.inc projects/ifnet/lib/libc/gen/Makefile.inc projects/ifnet/lib/libc/iconv/Symbol.map projects/ifnet/lib/libc/iconv/iconv.c projects/ifnet/lib/libc/string/strlcpy.3 projects/ifnet/lib/libc/sys/cap_ioctls_limit.2 projects/ifnet/lib/libc/sys/cap_rights_limit.2 projects/ifnet/lib/libc/sys/kqueue.2 projects/ifnet/lib/libproc/proc_bkpt.c projects/ifnet/libexec/rbootd/bpf.c projects/ifnet/release/picobsd/build/picobsd projects/ifnet/release/release.sh projects/ifnet/sbin/hastd/hastd.8 projects/ifnet/sbin/nvmecontrol/perftest.c projects/ifnet/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src projects/ifnet/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src projects/ifnet/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src projects/ifnet/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src projects/ifnet/share/i18n/csmapper/JIS/charset.pivot.JIS.src projects/ifnet/share/i18n/csmapper/JIS/mapper.dir.JIS.src projects/ifnet/share/i18n/esdb/EUC/EUC-JP.src projects/ifnet/share/man/man3/tree.3 projects/ifnet/share/man/man4/Makefile projects/ifnet/share/man/man4/altera_atse.4 projects/ifnet/share/man/man4/capsicum.4 projects/ifnet/share/man/man4/natm.4 projects/ifnet/share/man/man4/netmap.4 projects/ifnet/share/man/man9/ifnet.9 projects/ifnet/share/misc/bsd-family-tree projects/ifnet/share/misc/committers-src.dot projects/ifnet/share/mk/bsd.own.mk projects/ifnet/share/mk/bsd.prog.mk projects/ifnet/sys/amd64/vmm/io/vlapic.c projects/ifnet/sys/amd64/vmm/io/vlapic.h projects/ifnet/sys/amd64/vmm/vmm_lapic.c projects/ifnet/sys/arm/allwinner/a10_machdep.c projects/ifnet/sys/arm/arm/bus_space_generic.c projects/ifnet/sys/arm/arm/machdep.c projects/ifnet/sys/arm/arm/pmap-v6.c projects/ifnet/sys/arm/arm/pmap.c projects/ifnet/sys/arm/at91/at91.c projects/ifnet/sys/arm/at91/at91_machdep.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/ifnet/sys/arm/conf/WANDBOARD-DUAL projects/ifnet/sys/arm/conf/WANDBOARD-QUAD projects/ifnet/sys/arm/conf/WANDBOARD-SOLO projects/ifnet/sys/arm/econa/econa_machdep.c projects/ifnet/sys/arm/freescale/imx/imx51_machdep.c projects/ifnet/sys/arm/freescale/imx/imx53_machdep.c projects/ifnet/sys/arm/freescale/imx/imx6_anatopreg.h projects/ifnet/sys/arm/freescale/imx/imx6_machdep.c projects/ifnet/sys/arm/freescale/imx/imx_machdep.c projects/ifnet/sys/arm/freescale/imx/imx_sdhci.c projects/ifnet/sys/arm/include/fdt.h projects/ifnet/sys/arm/include/machdep.h projects/ifnet/sys/arm/include/pmap.h projects/ifnet/sys/arm/include/vmparam.h projects/ifnet/sys/arm/lpc/lpc_machdep.c projects/ifnet/sys/arm/mv/mv_localbus.c projects/ifnet/sys/arm/mv/mv_machdep.c projects/ifnet/sys/arm/mv/mvvar.h projects/ifnet/sys/arm/rockchip/rk30xx_machdep.c projects/ifnet/sys/arm/s3c2xx0/files.s3c2xx0 projects/ifnet/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/ifnet/sys/arm/s3c2xx0/s3c2xx0_space.c projects/ifnet/sys/arm/sa11x0/assabet_machdep.c projects/ifnet/sys/arm/samsung/exynos/exynos5_machdep.c projects/ifnet/sys/arm/tegra/tegra2_machdep.c projects/ifnet/sys/arm/ti/ti_machdep.c projects/ifnet/sys/arm/ti/ti_sdhci.c projects/ifnet/sys/arm/versatile/versatile_machdep.c projects/ifnet/sys/arm/xilinx/zy7_machdep.c projects/ifnet/sys/arm/xscale/i80321/ep80219_machdep.c projects/ifnet/sys/arm/xscale/i80321/iq31244_machdep.c projects/ifnet/sys/arm/xscale/i8134x/crb_machdep.c projects/ifnet/sys/arm/xscale/ixp425/avila_machdep.c projects/ifnet/sys/arm/xscale/pxa/pxa_machdep.c projects/ifnet/sys/boot/fdt/dts/am335x.dtsi projects/ifnet/sys/boot/fdt/dts/beaglebone-black.dts projects/ifnet/sys/boot/forth/beastie.4th projects/ifnet/sys/boot/forth/loader.4th projects/ifnet/sys/boot/forth/loader.4th.8 projects/ifnet/sys/boot/forth/loader.conf projects/ifnet/sys/boot/forth/loader.conf.5 projects/ifnet/sys/boot/forth/loader.rc projects/ifnet/sys/boot/forth/menu-commands.4th projects/ifnet/sys/boot/forth/menu.4th projects/ifnet/sys/boot/forth/menu.rc projects/ifnet/sys/boot/forth/menusets.4th projects/ifnet/sys/boot/i386/loader/loader.rc projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h projects/ifnet/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/ifnet/sys/compat/svr4/svr4_sockio.c projects/ifnet/sys/conf/files projects/ifnet/sys/conf/files.amd64 projects/ifnet/sys/conf/files.arm projects/ifnet/sys/conf/files.i386 projects/ifnet/sys/dev/aic7xxx/aicasm/Makefile projects/ifnet/sys/dev/cxgbe/t4_main.c projects/ifnet/sys/dev/e1000/if_em.c projects/ifnet/sys/dev/e1000/if_igb.c projects/ifnet/sys/dev/e1000/if_lem.c projects/ifnet/sys/dev/e1000/if_lem.h projects/ifnet/sys/dev/fdt/fdt_pci.c projects/ifnet/sys/dev/iwn/if_iwn_debug.h projects/ifnet/sys/dev/iwn/if_iwn_devid.h projects/ifnet/sys/dev/iwn/if_iwnreg.h projects/ifnet/sys/dev/ixgbe/ixgbe.c projects/ifnet/sys/dev/netmap/if_em_netmap.h projects/ifnet/sys/dev/netmap/if_igb_netmap.h projects/ifnet/sys/dev/netmap/if_lem_netmap.h projects/ifnet/sys/dev/netmap/if_re_netmap.h projects/ifnet/sys/dev/netmap/ixgbe_netmap.h projects/ifnet/sys/dev/netmap/netmap.c projects/ifnet/sys/dev/netmap/netmap_kern.h projects/ifnet/sys/dev/netmap/netmap_mem2.c projects/ifnet/sys/dev/nvme/nvme_ctrlr.c projects/ifnet/sys/dev/nvme/nvme_ns.c projects/ifnet/sys/dev/random/harvest.c projects/ifnet/sys/dev/re/if_re.c projects/ifnet/sys/dev/uart/uart.h projects/ifnet/sys/dev/uart/uart_bus_fdt.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.c projects/ifnet/sys/dev/usb/controller/ehci_pci.c projects/ifnet/sys/dev/usb/wlan/if_urtwn.c projects/ifnet/sys/dev/xen/netback/netback.c projects/ifnet/sys/dev/xen/netback/netback_unit_tests.c projects/ifnet/sys/dev/xen/netfront/netfront.c projects/ifnet/sys/fs/nfs/nfs_commonkrpc.c projects/ifnet/sys/geom/eli/g_eli_ctl.c projects/ifnet/sys/kern/kern_event.c projects/ifnet/sys/modules/aic7xxx/Makefile projects/ifnet/sys/modules/aic7xxx/ahc/Makefile projects/ifnet/sys/modules/aic7xxx/ahd/Makefile projects/ifnet/sys/modules/vmm/Makefile projects/ifnet/sys/net/bpf.c projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if.h projects/ifnet/sys/net/if_tap.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/net/netmap.h projects/ifnet/sys/netinet/if_ether.c projects/ifnet/sys/netinet/in.c projects/ifnet/sys/netinet/raw_ip.c projects/ifnet/sys/netinet/sctp_asconf.c projects/ifnet/sys/netinet/sctp_output.c projects/ifnet/sys/netinet/sctp_pcb.c projects/ifnet/sys/netinet/sctp_usrreq.c projects/ifnet/sys/netinet/sctputil.c projects/ifnet/sys/netinet6/sctp6_usrreq.c projects/ifnet/sys/netpfil/ipfw/ip_fw2.c projects/ifnet/sys/netpfil/pf/pf.c projects/ifnet/sys/netpfil/pf/pf.h projects/ifnet/sys/netpfil/pf/pf_ioctl.c projects/ifnet/sys/ofed/drivers/net/mlx4/en_netdev.c projects/ifnet/sys/sys/param.h projects/ifnet/sys/sys/random.h projects/ifnet/sys/sys/sockio.h projects/ifnet/sys/vm/vm_object.c projects/ifnet/sys/x86/iommu/intel_ctx.c projects/ifnet/sys/x86/iommu/intel_dmar.h projects/ifnet/sys/x86/iommu/intel_drv.c projects/ifnet/sys/x86/iommu/intel_fault.c projects/ifnet/sys/x86/iommu/intel_gas.c projects/ifnet/sys/x86/iommu/intel_idpgtbl.c projects/ifnet/sys/x86/iommu/intel_reg.h projects/ifnet/sys/x86/iommu/intel_utils.c projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc projects/ifnet/tools/tools/ath/athstats/Makefile projects/ifnet/tools/tools/netmap/nm_util.c projects/ifnet/tools/tools/netmap/pkt-gen.c projects/ifnet/usr.bin/calendar/calendars/calendar.freebsd projects/ifnet/usr.bin/limits/limits.1 projects/ifnet/usr.sbin/arp/arp.4 projects/ifnet/usr.sbin/newsyslog/newsyslog.c projects/ifnet/usr.sbin/pkg/pkg.7 projects/ifnet/usr.sbin/pkg/pkg.c projects/ifnet/usr.sbin/utx/Makefile projects/ifnet/usr.sbin/utx/utx.8 projects/ifnet/usr.sbin/utx/utx.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/contrib/tzdata/ (props changed) projects/ifnet/gnu/lib/ (props changed) projects/ifnet/gnu/usr.bin/binutils/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/amd64/vmm/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/modules/vmm/ (props changed) projects/ifnet/usr.bin/calendar/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/Makefile.inc1 Tue Nov 5 11:19:34 2013 (r257698) @@ -1019,20 +1019,7 @@ buildkernel: @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; \ - PATH=${BPATH}:${PATH} \ - MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \ - -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile -# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. -.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) -.for target in obj depend all - cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ - PATH=${BPATH}:${PATH} \ - MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target} -.endfor -.endif + @# Currently no special kernel tools to build. .if !defined(NO_KERNELDEPEND) @echo @echo "--------------------------------------------------------------" @@ -1319,10 +1306,6 @@ bootstrap-tools: .MAKE # # build-tools: Build special purpose build tools # -.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules) -_aicasm= sys/modules/aic7xxx/aicasm -.endif - .if !defined(NO_SHARE) _share= share/syscons/scrnmaps .endif @@ -1344,7 +1327,6 @@ build-tools: .MAKE lib/ncurses/ncurses \ lib/ncurses/ncursesw \ ${_share} \ - ${_aicasm} \ usr.bin/awk \ lib/libmagic \ usr.bin/mkesdb_static \ @@ -1410,7 +1392,8 @@ cross-tools: .MAKE usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ - ${_kgzip} + ${_kgzip} \ + sys/dev/aic7xxx/aicasm ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/ObsoleteFiles.inc Tue Nov 5 11:19:34 2013 (r257698) @@ -38,6 +38,15 @@ # xargs -n1 | sort | uniq -d; # done +# 20131103: WITH_LIBICONV_COMPAT removal +OLD_FILES+=usr/include/_libiconv_compat.h +OLD_FILES+=usr/lib/libiconv.a +OLD_FILES+=usr/lib/libiconv.so +OLD_FILES+=usr/lib/libiconv.so.3 +OLD_FILES+=usr/lib/libiconv_p.a +# 20131103: removal of utxrm(8), use 'utx rm' instead. +OLD_FILES+=usr/sbin/utxrm +OLD_FILES+=usr/share/man/man8/utxrm.8.gz # 20131031: pkg_install has been removed OLD_FILES+=etc/periodic/daily/220.backup-pkgdb OLD_FILES+=etc/periodic/daily/490.status-pkg-changes Modified: projects/ifnet/bin/sh/nodetypes ============================================================================== --- projects/ifnet/bin/sh/nodetypes Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/bin/sh/nodetypes Tue Nov 5 11:19:34 2013 (r257698) @@ -118,16 +118,16 @@ NFROMTO nfile # fd<> fname NAPPEND nfile # fd>> fname NCLOBBER nfile # fd>| fname type int - next nodeptr # next redirection in list fd int # file descriptor being redirected + next nodeptr # next redirection in list fname nodeptr # file name, in a NARG node expfname temp char *expfname # actual file name NTOFD ndup # fd<&dupfd NFROMFD ndup # fd>&dupfd type int - next nodeptr # next redirection in list fd int # file descriptor being redirected + next nodeptr # next redirection in list dupfd int # file descriptor to duplicate vname nodeptr # file name if fd>&$var @@ -135,8 +135,8 @@ NFROMFD ndup # fd>&dupfd NHERE nhere # fd<<\! NXHERE nhere # fd<<! type int - next nodeptr # next redirection in list fd int # file descriptor being redirected + next nodeptr # next redirection in list doc nodeptr # input to command (NARG node) expdoc temp char *expdoc # actual document (for NXHERE) Modified: projects/ifnet/bin/sh/sh.1 ============================================================================== --- projects/ifnet/bin/sh/sh.1 Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/bin/sh/sh.1 Tue Nov 5 11:19:34 2013 (r257698) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd June 14, 2013 +.Dd November 1, 2013 .Dt SH 1 .Os .Sh NAME @@ -2551,7 +2551,7 @@ and not found. For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdflmnpstuvw Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdfklmnpstuvw Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2598,6 +2598,11 @@ The maximal size of core dump files, in The maximal size of the data segment of a process, in kilobytes. .It Fl f Ar filesize The maximal size of a file, in 512-byte blocks. +.It Fl k Ar kqueues +The maximal number of kqueues +(see +.Xr kqueue 2 ) +for this user ID. .It Fl l Ar lockedmem The maximal size of memory that can be locked by a process, in kilobytes. Modified: projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c Tue Nov 5 11:19:34 2013 (r257698) @@ -65,7 +65,7 @@ ctf_create(int *errp) cts.cts_name = _CTF_SECTION; cts.cts_type = SHT_PROGBITS; cts.cts_flags = 0; - cts.cts_data = &hdr; + cts.cts_data = (void *)&hdr; cts.cts_size = sizeof (hdr); cts.cts_entsize = 1; cts.cts_offset = 0; Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Tue Nov 5 11:19:34 2013 (r257698) @@ -210,7 +210,7 @@ NVLIST_PRTFUNC(int32, int32_t, int32_t, NVLIST_PRTFUNC(uint32, uint32_t, uint32_t, "0x%x") NVLIST_PRTFUNC(int64, int64_t, longlong_t, "%lld") NVLIST_PRTFUNC(uint64, uint64_t, u_longlong_t, "0x%llx") -NVLIST_PRTFUNC(double, double, double, "0x%llf") +NVLIST_PRTFUNC(double, double, double, "0x%f") NVLIST_PRTFUNC(string, char *, char *, "%s") NVLIST_PRTFUNC(hrtime, hrtime_t, hrtime_t, "0x%llx") Modified: projects/ifnet/cddl/lib/libnvpair/Makefile ============================================================================== --- projects/ifnet/cddl/lib/libnvpair/Makefile Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/cddl/lib/libnvpair/Makefile Tue Nov 5 11:19:34 2013 (r257698) @@ -21,4 +21,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +# This library uses macros to define fprintf behavior for several object types +# The compiler will see the non-string literal arguments to the fprintf calls and +# omit warnings for them. Quiesce these warnings in contrib code: +# +# cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format +# string is not a string literal (potentially insecure) [-Wformat-security] +# ARENDER(pctl, nvlist_array, nvl, name, val, nelem); +# +CFLAGS+= -Wno-format-security .include <bsd.lib.mk> Modified: projects/ifnet/contrib/libreadline/display.c ============================================================================== --- projects/ifnet/contrib/libreadline/display.c Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/libreadline/display.c Tue Nov 5 11:19:34 2013 (r257698) @@ -392,14 +392,14 @@ rl_expand_prompt (prompt) t = ++p; local_prompt = expand_prompt (p, &prompt_visible_length, &prompt_last_invisible, - (int *)NULL, + &prompt_invis_chars_first_line, &prompt_physical_chars); c = *t; *t = '\0'; /* The portion of the prompt string up to and including the final newline is now null-terminated. */ local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length, (int *)NULL, - &prompt_invis_chars_first_line, + (int *)NULL, (int *)NULL); *t = c; local_prompt_len = local_prompt ? strlen (local_prompt) : 0; @@ -911,6 +911,10 @@ rl_redisplay () second and subsequent lines start at inv_lbreaks[N], offset by OFFSET (which has already been calculated above). */ +#define INVIS_FIRST() (prompt_physical_chars > _rl_screenwidth ? prompt_invis_chars_first_line : wrap_offset) +#define WRAP_OFFSET(line, offset) ((line == 0) \ + ? (offset ? INVIS_FIRST() : 0) \ + : ((line == prompt_last_screen_line) ? wrap_offset-prompt_invis_chars_first_line : 0)) #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0) #define VIS_LLEN(l) ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l])) #define INV_LLEN(l) (inv_lbreaks[l+1] - inv_lbreaks[l]) @@ -945,7 +949,13 @@ rl_redisplay () _rl_last_c_pos != o_cpos && _rl_last_c_pos > wrap_offset && o_cpos < prompt_last_invisible) - _rl_last_c_pos -= wrap_offset; + _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */ + else if (linenum == prompt_last_screen_line && prompt_physical_chars > _rl_screenwidth && + (MB_CUR_MAX > 1 && rl_byte_oriented == 0) && + cpos_adjusted == 0 && + _rl_last_c_pos != o_cpos && + _rl_last_c_pos > (prompt_last_invisible - _rl_screenwidth - prompt_invis_chars_first_line)) + _rl_last_c_pos -= (wrap_offset-prompt_invis_chars_first_line); /* If this is the line with the prompt, we might need to compensate for invisible characters in the new line. Do @@ -1049,7 +1059,7 @@ rl_redisplay () tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset; else tx = nleft; - if (_rl_last_c_pos > tx) + if (tx >= 0 && _rl_last_c_pos > tx) { _rl_backspace (_rl_last_c_pos - tx); /* XXX */ _rl_last_c_pos = tx; @@ -1205,7 +1215,7 @@ update_line (old, new, current_line, oma int current_line, omax, nmax, inv_botlin; { register char *ofd, *ols, *oe, *nfd, *nls, *ne; - int temp, lendiff, wsatend, od, nd; + int temp, lendiff, wsatend, od, nd, twidth, o_cpos; int current_invis_chars; int col_lendiff, col_temp; #if defined (HANDLE_MULTIBYTE) @@ -1221,7 +1231,7 @@ update_line (old, new, current_line, oma if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) temp = _rl_last_c_pos; else - temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset); + temp = _rl_last_c_pos - WRAP_OFFSET (_rl_last_v_pos, visible_wrap_offset); if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode && _rl_last_v_pos == current_line - 1) { @@ -1466,6 +1476,8 @@ update_line (old, new, current_line, oma _rl_last_c_pos = lendiff; } + o_cpos = _rl_last_c_pos; + /* When this function returns, _rl_last_c_pos is correct, and an absolute cursor postion in multibyte mode, but a buffer index when not in a multibyte locale. */ @@ -1475,7 +1487,9 @@ update_line (old, new, current_line, oma /* We need to indicate that the cursor position is correct in the presence of invisible characters in the prompt string. Let's see if setting this when we make sure we're at the end of the drawn prompt string works. */ - if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars) + if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && + (_rl_last_c_pos > 0 || o_cpos > 0) && + _rl_last_c_pos == prompt_physical_chars) cpos_adjusted = 1; #endif #endif @@ -1566,11 +1580,16 @@ update_line (old, new, current_line, oma } else { - /* We have horizontal scrolling and we are not inserting at - the end. We have invisible characters in this line. This - is a dumb update. */ _rl_output_some_chars (nfd, temp); _rl_last_c_pos += col_temp; + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } return; } /* Copy (new) chars to screen from first diff to last match. */ @@ -1578,15 +1597,15 @@ update_line (old, new, current_line, oma if ((temp - lendiff) > 0) { _rl_output_some_chars (nfd + lendiff, temp - lendiff); -#if 1 /* XXX -- this bears closer inspection. Fixes a redisplay bug reported against bash-3.0-alpha by Andreas Schwab involving multibyte characters and prompt strings with invisible characters, but was previously disabled. */ - _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff); -#else - _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff); -#endif + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + twidth = _rl_col_width (nfd+lendiff, 0, temp-col_lendiff); + else + twidth = temp - lendiff; + _rl_last_c_pos += twidth; } } else @@ -1780,7 +1799,7 @@ _rl_move_cursor_relative (new, data) int woff; /* number of invisible chars on current line */ int cpos, dpos; /* current and desired cursor positions */ - woff = W_OFFSET (_rl_last_v_pos, wrap_offset); + woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset); cpos = _rl_last_c_pos; #if defined (HANDLE_MULTIBYTE) /* If we have multibyte characters, NEW is indexed by the buffer point in @@ -1794,7 +1813,11 @@ _rl_move_cursor_relative (new, data) /* Use NEW when comparing against the last invisible character in the prompt string, since they're both buffer indices and DPOS is a desired display position. */ - if (new > prompt_last_invisible) /* XXX - don't use woff here */ + if ((new > prompt_last_invisible) || /* XXX - don't use woff here */ + (prompt_physical_chars > _rl_screenwidth && + _rl_last_v_pos == prompt_last_screen_line && + wrap_offset != woff && + new > (prompt_last_invisible-_rl_screenwidth-wrap_offset))) { dpos -= woff; /* Since this will be assigned to _rl_last_c_pos at the end (more Modified: projects/ifnet/contrib/libreadline/input.c ============================================================================== --- projects/ifnet/contrib/libreadline/input.c Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/libreadline/input.c Tue Nov 5 11:19:34 2013 (r257698) @@ -154,7 +154,7 @@ _rl_unget_char (key) { pop_index--; if (pop_index < 0) - pop_index = ibuffer_len - 1; + pop_index = ibuffer_len; ibuffer[pop_index] = key; return (1); } Modified: projects/ifnet/contrib/libreadline/search.c ============================================================================== --- projects/ifnet/contrib/libreadline/search.c Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/libreadline/search.c Tue Nov 5 11:19:34 2013 (r257698) @@ -211,7 +211,11 @@ _rl_nsearch_init (dir, pchar) rl_end = rl_point = 0; p = _rl_make_prompt_for_search (pchar ? pchar : ':'); +#if defined (PREFER_STDARG) + rl_message ("%s", p); +#else rl_message ("%s", p, 0); +#endif free (p); RL_SETSTATE(RL_STATE_NSEARCH); Modified: projects/ifnet/contrib/libreadline/support/shobj-conf ============================================================================== --- projects/ifnet/contrib/libreadline/support/shobj-conf Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/libreadline/support/shobj-conf Tue Nov 5 11:19:34 2013 (r257698) @@ -10,7 +10,7 @@ # Chet Ramey # chet@po.cwru.edu -# Copyright (C) 1996-2002 Free Software Foundation, Inc. +# Copyright (C) 1996-2007 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -114,7 +114,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*) SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' ;; -freebsd2* | netbsd*) +freebsd2*) SHOBJ_CFLAGS=-fpic SHOBJ_LD=ld SHOBJ_LDFLAGS='-x -Bshareable' @@ -125,7 +125,7 @@ freebsd2* | netbsd*) # FreeBSD-3.x ELF freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*) - SHOBJ_CFLAGS=-fpic + SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then @@ -142,7 +142,7 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdao ;; # Darwin/MacOS X -darwin8*) +darwin[89]*) SHOBJ_STATUS=supported SHLIB_STATUS=supported @@ -153,7 +153,7 @@ darwin8*) SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' SHLIB_LIBSUFF='dylib' - SHOBJ_LDFLAGS='-undefined dynamic_lookup' + SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 @@ -171,7 +171,7 @@ darwin*|macosx*) SHLIB_LIBSUFF='dylib' case "${host_os}" in - darwin[78]*) SHOBJ_LDFLAGS='' + darwin[789]*) SHOBJ_LDFLAGS='' SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' ;; *) SHOBJ_LDFLAGS='-dynamic' @@ -182,7 +182,7 @@ darwin*|macosx*) SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 ;; -openbsd*) +openbsd*|netbsd*) SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' SHOBJ_LDFLAGS='-shared' @@ -247,7 +247,7 @@ osf*) SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; -aix4.[2-9]*-*gcc*) # lightly tested by jik@cisco.com +aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*) # lightly tested by jik@cisco.com SHOBJ_CFLAGS=-fpic SHOBJ_LD='ld' SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' @@ -258,7 +258,7 @@ aix4.[2-9]*-*gcc*) # lightly tested by SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' ;; -aix4.[2-9]*) +aix4.[2-9]*|aix[5-9].*) SHOBJ_CFLAGS=-K SHOBJ_LD='ld' SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' @@ -329,7 +329,7 @@ hpux10*-*gcc*) SHOBJ_LD='${CC}' # if you have problems linking here, moving the `-Wl,+h,$@' from # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work - SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s' + SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s' SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)' SHLIB_LIBSUFF='sl' Modified: projects/ifnet/contrib/tzdata/africa ============================================================================== --- projects/ifnet/contrib/tzdata/africa Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/africa Tue Nov 5 11:19:34 2013 (r257698) @@ -451,6 +451,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # (either two days before them or five days after them, so as to fall on # lastFri instead of lastSun). +# From Even Scharning (2013-10-25): +# The scheduled end of DST in Libya on Friday, October 25, 2013 was +# cancelled yesterday.... +# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# +# From Paul Eggert (2013-10-25): +# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -467,8 +475,8 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 Rule Libya 1987 1989 - Oct 1 0:00 0 - Rule Libya 1997 only - Apr 4 0:00 1:00 S Rule Libya 1997 only - Oct 4 0:00 0 - -Rule Libya 2013 max - Mar lastFri 1:00 1:00 S -Rule Libya 2013 max - Oct lastFri 2:00 0 - +Rule Libya 2013 only - Mar lastFri 1:00 1:00 S +Rule Libya 2013 only - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 @@ -479,7 +487,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 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 + 1:00 Libya CE%sT 2013 Oct 25 2:00 + 2:00 - EET # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -684,15 +693,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # </a> -# From Alex Krivenyshev (2008-05-09): -# Is Western Sahara (part which administrated by Morocco) going to follow -# Morocco DST changes? Any information? What about other part of -# Western Sahara - under administration of POLISARIO Front (also named -# SADR Saharawi Arab Democratic Republic)? - -# From Arthur David Olson (2008-05-09): -# XXX--guess that it is only Morocco for now; guess only 2008 for now. - # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 # and September 1. They originally planned to observe DST to near the end @@ -858,13 +858,23 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # transitions would be 2013-07-07 and 2013-08-10; see: # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 -# From Paul Eggert (2013-07-03): +# From Steffen Thorsen (2013-09-28): +# Morocco extends DST by one month, on very short notice, just 1 day +# before it was going to end. There is a new decree (2.13.781) for +# this, where DST from now on goes from last Sunday of March at 02:00 +# to last Sunday of October at 03:00, similar to EU rules. Official +# source (French): +# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013 +# Another source (specifying the time for start and end in the decree): +# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html + +# From Paul Eggert (2013-10-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2014 through 2021 were determined by running +# transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: # # (let ((islamic-year 1435)) -# (while (< islamic-year 1444) +# (while (< islamic-year 1461) # (let ((a # (calendar-gregorian-from-absolute # (calendar-islamic-to-absolute (list 9 1 islamic-year)))) @@ -879,13 +889,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) # -# with the results hand-edited for 2020-2022, when the normal spring-forward -# date falls during the estimated Ramadan. -# -# From 2023 through 2038 Ramadan is not predicted to overlap with -# daylight saving time. Starting in 2039 there will be overlap again, -# but 32-bit time_t values roll around in 2038 so for now do not worry -# about dates after 2038. +# with spring-forward transitions removed for 2023-2025, when the +# normal spring-forward date falls during the estimated Ramadan; with +# all transitions removed for 2026-2035, where the estimated Ramadan +# falls entirely outside daylight-saving time; and with fall-back +# transitions removed for 2036-2037, where the normal fall-back +# date falls during the estimated Ramadan. Normally, the table would +# stop after 2037 because 32-bit time_t values roll around early in 2038, +# but that would imply a prediction of perpetual DST after March 2038 +# due to the year-2037 glitches. So, this table instead stops after +# 2038, the first non-glitchy year after the 32-bit rollover. +# An advantage of stopping after 2038 is that it lets zic guess +# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future. # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -912,12 +927,14 @@ Rule Morocco 2010 only - May 2 0:00 1: Rule Morocco 2010 only - Aug 8 0:00 0 - Rule Morocco 2011 only - Apr 3 0:00 1:00 S Rule Morocco 2011 only - Jul 31 0 0 - -Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S -Rule Morocco 2012 max - Sep lastSun 3:00 0 - +Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S +Rule Morocco 2012 only - Sep 30 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Aug 10 2:00 1:00 S +Rule Morocco 2013 2035 - Oct lastSun 3:00 0 - +Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S Rule Morocco 2014 only - Jun 29 3:00 0 - Rule Morocco 2014 only - Jul 29 2:00 1:00 S Rule Morocco 2015 only - Jun 18 3:00 0 - @@ -930,20 +947,42 @@ Rule Morocco 2018 only - May 16 3:00 0 Rule Morocco 2018 only - Jun 15 2:00 1:00 S Rule Morocco 2019 only - May 6 3:00 0 - Rule Morocco 2019 only - Jun 5 2:00 1:00 S +Rule Morocco 2020 only - Apr 24 3:00 0 - Rule Morocco 2020 only - May 24 2:00 1:00 S +Rule Morocco 2021 only - Apr 13 3:00 0 - Rule Morocco 2021 only - May 13 2:00 1:00 S +Rule Morocco 2022 only - Apr 3 3:00 0 - Rule Morocco 2022 only - May 3 2:00 1:00 S -Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S +Rule Morocco 2023 only - Apr 22 2:00 1:00 S +Rule Morocco 2024 only - Apr 10 2:00 1:00 S +Rule Morocco 2025 only - Mar 31 2:00 1:00 S +Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S +Rule Morocco 2036 only - Oct 21 3:00 0 - +Rule Morocco 2037 only - Oct 11 3:00 0 - +Rule Morocco 2038 only - Sep 30 3:00 0 - +Rule Morocco 2038 only - Oct 30 2:00 1:00 S +Rule Morocco 2038 max - Oct lastSun 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 0:00 Morocco WE%sT 1984 Mar 16 1:00 - CET 1986 0:00 Morocco WE%sT + # Western Sahara +# +# From Gwillim Law (2013-10-22): +# A correspondent who is usually well informed about time zone matters +# ... says that Western Sahara observes daylight saving time, just as +# Morocco does. +# +# From Paul Eggert (2013-10-23): +# Assume that this has been true since Western Sahara switched to GMT, +# since most of it was then controlled by Morocco. + Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan -1:00 - WAT 1976 Apr 14 - 0:00 - WET + 0:00 Morocco WE%sT # Mozambique # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1100,9 +1139,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 3:00 - EAT # South Sudan -Zone Africa/Juba 2:06:24 - LMT 1931 - 2:00 Sudan CA%sT 2000 Jan 15 12:00 - 3:00 - EAT +Link Africa/Khartoum Africa/Juba # Swaziland # Zone NAME GMTOFF RULES FORMAT [UNTIL] Modified: projects/ifnet/contrib/tzdata/antarctica ============================================================================== --- projects/ifnet/contrib/tzdata/antarctica Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/antarctica Tue Nov 5 11:19:34 2013 (r257698) @@ -16,9 +16,9 @@ # # Except for the French entries, # I made up all time zone abbreviations mentioned here; corrections welcome! -# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited. +# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. -# These rules are stolen from the `southamerica' file. +# These rules are stolen from the 'southamerica' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule ArgAQ 1964 1966 - Mar 1 0:00 0 - Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S @@ -228,9 +228,10 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 # Scott Island (never inhabited) # # year-round base -# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo. +# Scott Base, Ross Island, since 1957-01. +# See Pacific/Auckland. # -# These rules for New Zealand are stolen from the `australasia' file. +# These rules for New Zealand are stolen from the 'australasia' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D @@ -268,11 +269,11 @@ Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 # From Lee Hotz (2001-03-08): # I queried the folks at Columbia who spent the summer at Vostok and this is # what they had to say about time there: -# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo) +# "in the US Camp (East Camp) we have been on New Zealand (McMurdo) # time, which is 12 hours ahead of GMT. The Russian Station Vostok was # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead # of GMT). This is a time zone I think two hours east of Moscow. The -# natural time zone is in between the two: 8 hours ahead of GMT.'' +# natural time zone is in between the two: 8 hours ahead of GMT." # # From Paul Eggert (2001-05-04): # This seems to be hopelessly confusing, so I asked Lee Hotz about it @@ -337,16 +338,8 @@ Zone Antarctica/Palmer 0 - zzz 1965 -4:00 ChileAQ CL%sT # # -# McMurdo, Ross Island, since 1955-12 -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/McMurdo 0 - zzz 1956 - 12:00 NZAQ NZ%sT -# -# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20 -# -# From Paul Eggert (1996-09-03): -# Normally it wouldn't have a separate entry, since it's like the -# larger Antarctica/McMurdo since 1970, but it's too famous to omit. +# McMurdo Station, Ross Island, since 1955-12 +# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20 # # From Chris Carrier (1996-06-27): # Siple, the first commander of the South Pole station, @@ -368,4 +361,4 @@ Zone Antarctica/McMurdo 0 - zzz 1956 # we have to go around and set them back 5 minutes or so. # Maybe if we let them run fast all of the time, we'd get to leave here sooner!! # -Link Antarctica/McMurdo Antarctica/South_Pole +# See 'australasia' for Antarctica/McMurdo. Modified: projects/ifnet/contrib/tzdata/asia ============================================================================== --- projects/ifnet/contrib/tzdata/asia Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/asia Tue Nov 5 11:19:34 2013 (r257698) @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # tz@iana.org for general use in the future). -# From Paul Eggert (2013-02-21): +# From Paul Eggert (2013-08-11): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -44,11 +44,11 @@ # 4:00 GST Gulf* # 5:30 IST India # 7:00 ICT Indochina* -# 7:00 WIT west Indonesia -# 8:00 CIT central Indonesia +# 7:00 WIB west Indonesia (Waktu Indonesia Barat) +# 8:00 WITA central Indonesia (Waktu Indonesia Tengah) # 8:00 CST China # 9:00 CJT Central Japanese Time (1896/1937)* -# 9:00 EIT east Indonesia +# 9:00 WIT east Indonesia (Waktu Indonesia Timur) # 9:00 JST JDT Japan # 9:00 KST KDT Korea # 9:30 CST (Australian) Central Standard Time @@ -756,7 +756,7 @@ Zone Asia/Dili 8:22:20 - LMT 1912 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 - CIT 2000 Sep 17 00:00 + 8:00 - WITA 2000 Sep 17 00:00 9:00 - TLT # India @@ -793,36 +793,53 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # K # (Hollandia). For now, assume all Indonesian locations other than Jayapura # switched on 1945-09-23. # +# From Paul Eggert (2013-08-11): +# Normally the tz database uses English-language abbreviations, but in +# Indonesia it's typical to use Indonesian-language abbreviations even +# when writing in English. For example, see the English-language +# summary published by the Time and Frequency Laboratory of the +# Research Center for Calibration, Instrumentation and Metrology, +# Indonesia, <http://time.kim.lipi.go.id/time-eng.php>; (2006-09-29). +# The abbreviations are: +# +# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time) +# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time) +# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time) +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] +# Java, Sumatra Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13, # but this must be a typo. - 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta + 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia 7:20 - JAVT 1932 Nov # Java Time - 7:30 - WIT 1942 Mar 23 + 7:30 - WIB 1942 Mar 23 9:00 - JST 1945 Sep 23 - 7:30 - WIT 1948 May - 8:00 - WIT 1950 May - 7:30 - WIT 1964 - 7:00 - WIT + 7:30 - WIB 1948 May + 8:00 - WIB 1950 May + 7:30 - WIB 1964 + 7:00 - WIB +# west and central Borneo Zone Asia/Pontianak 7:17:20 - LMT 1908 May 7:17:20 - PMT 1932 Nov # Pontianak MT - 7:30 - WIT 1942 Jan 29 + 7:30 - WIB 1942 Jan 29 9:00 - JST 1945 Sep 23 - 7:30 - WIT 1948 May - 8:00 - WIT 1950 May - 7:30 - WIT 1964 - 8:00 - CIT 1988 Jan 1 - 7:00 - WIT + 7:30 - WIB 1948 May + 8:00 - WIB 1950 May + 7:30 - WIB 1964 + 8:00 - WITA 1988 Jan 1 + 7:00 - WIB +# Sulawesi, Lesser Sundas, east and south Borneo Zone Asia/Makassar 7:57:36 - LMT 1920 7:57:36 - MMT 1932 Nov # Macassar MT - 8:00 - CIT 1942 Feb 9 + 8:00 - WITA 1942 Feb 9 9:00 - JST 1945 Sep 23 - 8:00 - CIT + 8:00 - WITA +# Maluku Islands, West Papua, Papua Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov - 9:00 - EIT 1944 Sep 1 + 9:00 - WIT 1944 Sep 1 9:30 - CST 1964 - 9:00 - EIT + 9:00 - WIT # Iran @@ -1364,9 +1381,11 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # until about the same time next year (at least). # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 # -# From Paul Eggert (2012-10-25): -# For now, assume this is just a one-year measure. If it becomes -# permanent, we should move Jordan from EET to AST effective tomorrow. +# From Paul Eggert (2013-09-21): +# It's looking like this change will be permanent; see +# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20) +# <http://www.albawaba.com/business/jordan-winter-electricity--472005>. +# So move Jordan to UTC+3 as of the abovementioned date. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S @@ -1392,15 +1411,15 @@ Rule Jordan 1995 1998 - Sep Fri>=15 0:00 Rule Jordan 1999 only - Jul 1 0:00s 1:00 S Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S -Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S +Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S Rule Jordan 2003 only - Oct 24 0:00s 0 - Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - -Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - -Rule Jordan 2013 max - Oct lastFri 0:00s 0 - +Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 - 2:00 Jordan EE%sT + 2:00 Jordan EE%sT 2012 Oct 26 0:00s + 3:00 - AST # Kazakhstan @@ -2280,9 +2299,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # http://www.samanews.com/index.php?act=Show&id=154120 # http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html -# From Paul Eggert (2013-04-15): +# From Steffen Thorsen (2013-09-24): +# The Gaza and West Bank are ending DST Thursday at midnight +# (2013-09-27 00:00:00) (one hour earlier than last year...). +# This source in English, says "that winter time will go into effect +# at midnight on Thursday in the West Bank and Gaza Strip": +# http://english.wafa.ps/index.php?action=detail&id=23246 +# official source...: +# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252 + +# From Paul Eggert (2013-09-24): # For future dates, guess the last Thursday in March at 24:00 through -# the first Friday on or after September 21 at 01:00. This is consistent with +# the first Friday on or after September 21 at 00:00. This is consistent with # the predictions in today's editions of the following URLs, # which are for Gaza and Hebron respectively: # http://www.timeanddate.com/worldclock/timezone.html?n=702 @@ -2313,7 +2341,8 @@ Rule Palestine 2011 only - Aug 1 0:00 0 Rule Palestine 2011 only - Aug 30 0:00 1:00 S Rule Palestine 2011 only - Sep 30 0:00 0 - Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S -Rule Palestine 2012 max - Sep Fri>=21 1:00 0 - +Rule Palestine 2012 only - Sep 21 1:00 0 - +Rule Palestine 2013 max - Sep Fri>=21 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct Modified: projects/ifnet/contrib/tzdata/australasia ============================================================================== --- projects/ifnet/contrib/tzdata/australasia Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/australasia Tue Nov 5 11:19:34 2013 (r257698) @@ -352,16 +352,25 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st # October 2012 and end at 3 am on Sunday 20th January 2013. # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -# -# From Paul Eggert (2012-08-31): -# For now, guess a pattern of the penultimate Sundays in October and January. + +# From the Fijian Government Media Center (2013-08-30) via David Wheeler: +# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am +# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx +# +# From Paul Eggert (2013-09-09): +# For now, guess that Fiji springs forward the Sunday before the fourth +# Monday in October. This matches both recent practice and +# timeanddate.com's current spring-forward prediction. +# For the January 2014 transition we guessed right while timeanddate.com +# guessed wrong, so leave the fall-back prediction alone. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - -Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S +Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -487,6 +496,7 @@ Zone Pacific/Auckland 11:39:04 - LMT 186 Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1 12:45 Chatham CHA%sT +Link Pacific/Auckland Antarctica/McMurdo # Auckland Is # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers, @@ -736,7 +746,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # 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; +# Howland observed Hawaii Standard Time (UT-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 @@ -749,8 +759,17 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # no information; was probably like Pacific/Kiritimati # Johnston -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Johnston -10:00 - HST +# +# From Paul Eggert (2013-09-03): +# In his memoirs of June 6th to October 4, 1945 +# <http://www.315bw.org/Herb_Bach.htm>; (2005), Herbert C. Bach writes, +# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM +# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and +# confirms that Johnston kept the same time as Honolulu in summer 1945. +# We have no better information, so for now, assume this has been true +# indefinitely into the past. +# +# See 'northamerica' for Pacific/Johnston. # Kingman # uninhabited Modified: projects/ifnet/contrib/tzdata/backward ============================================================================== --- projects/ifnet/contrib/tzdata/backward Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/backward Tue Nov 5 11:19:34 2013 (r257698) @@ -22,15 +22,17 @@ Link America/Kentucky/Louisville America Link America/Argentina/Mendoza America/Mendoza Link America/Rio_Branco America/Porto_Acre Link America/Argentina/Cordoba America/Rosario -Link America/St_Thomas America/Virgin +Link America/Denver America/Shiprock +Link America/Port_of_Spain America/Virgin +Link Pacific/Auckland Antarctica/South_Pole Link Asia/Ashgabat Asia/Ashkhabad +Link Asia/Kolkata Asia/Calcutta Link Asia/Chongqing Asia/Chungking Link Asia/Dhaka Asia/Dacca Link Asia/Kathmandu Asia/Katmandu -Link Asia/Kolkata Asia/Calcutta Link Asia/Macau Asia/Macao -Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Ho_Chi_Minh Asia/Saigon +Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Thimphu Asia/Thimbu Link Asia/Makassar Asia/Ujung_Pandang Link Asia/Ulaanbaatar Asia/Ulan_Bator @@ -88,10 +90,10 @@ Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo Link Asia/Shanghai PRC +Link Pacific/Pohnpei Pacific/Ponape Link Pacific/Pago_Pago Pacific/Samoa -Link Pacific/Chuuk Pacific/Yap Link Pacific/Chuuk Pacific/Truk -Link Pacific/Pohnpei Pacific/Ponape +Link Pacific/Chuuk Pacific/Yap Link Europe/Warsaw Poland Link Europe/Lisbon Portugal Link Asia/Taipei ROC Modified: projects/ifnet/contrib/tzdata/etcetera ============================================================================== --- projects/ifnet/contrib/tzdata/etcetera Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/etcetera Tue Nov 5 11:19:34 2013 (r257698) @@ -31,9 +31,9 @@ Link Etc/GMT Etc/GMT0 # even though this is the opposite of what many people expect. # POSIX has positive signs west of Greenwich, but many people expect # positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses -# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC +# the abbreviation "GMT+4" and corresponds to 4 hours behind UT # (i.e. west of Greenwich) even though many people would expect it to -# mean 4 hours ahead of UTC (i.e. east of Greenwich). +# mean 4 hours ahead of UT (i.e. east of Greenwich). # # In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for # TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to Modified: projects/ifnet/contrib/tzdata/europe ============================================================================== --- projects/ifnet/contrib/tzdata/europe Tue Nov 5 10:58:38 2013 (r257697) +++ projects/ifnet/contrib/tzdata/europe Tue Nov 5 11:19:34 2013 (r257698) @@ -42,7 +42,7 @@ # </a> (1998-09-21, in Portuguese) # -# I invented the abbreviations marked `*' in the following table; +# I invented the abbreviations marked '*' in the following table; # the rest are from earlier versions of this file, or from other sources. # Corrections are welcome! # std dst 2dst @@ -96,7 +96,7 @@ # and a sketch map showing some of the sightlines involved. One paragraph # of the text said: # -# `An old stone obelisk marking a forgotten terrestrial meridian stands +# 'An old stone obelisk marking a forgotten terrestrial meridian stands # beside the river at Kew. In the 18th century, before time and longitude # was standardised by the Royal Observatory in Greenwich, scholars observed # this stone and the movement of stars from Kew Observatory nearby. They *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311051119.rA5BJZ6V034633>