svn commit: r267549 - in user/attilio/rm_vmobj_cache: . bin/chio bin/rm cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt contrib/gcc contrib/openbsm/libbsm contrib/tzdata etc gnu/usr.bin gn...
Attilio Rao
attilio at FreeBSD.org
Mon Jun 16 18:29:10 UTC 2014
Author: attilio
Date: Mon Jun 16 18:29:05 2014
New Revision: 267549
URL: http://svnweb.freebsd.org/changeset/base/267549
Log:
Merge from head.
Added:
user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
- copied unchanged from r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out
- copied unchanged from r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out
user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
- copied unchanged from r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
user/attilio/rm_vmobj_cache/sys/arm/freescale/vybrid/vf_adc.c
- copied unchanged from r267548, head/sys/arm/freescale/vybrid/vf_adc.c
user/attilio/rm_vmobj_cache/sys/arm/freescale/vybrid/vf_adc.h
- copied unchanged from r267548, head/sys/arm/freescale/vybrid/vf_adc.h
user/attilio/rm_vmobj_cache/sys/dev/xen/pvcpu/
- copied from r267548, head/sys/dev/xen/pvcpu/
user/attilio/rm_vmobj_cache/sys/x86/xen/xen_apic.c
- copied unchanged from r267548, head/sys/x86/xen/xen_apic.c
user/attilio/rm_vmobj_cache/sys/x86/xen/xen_nexus.c
- copied unchanged from r267548, head/sys/x86/xen/xen_nexus.c
user/attilio/rm_vmobj_cache/sys/x86/xen/xenpv.c
- copied unchanged from r267548, head/sys/x86/xen/xenpv.c
user/attilio/rm_vmobj_cache/sys/xen/xen_pv.h
- copied unchanged from r267548, head/sys/xen/xen_pv.h
Deleted:
user/attilio/rm_vmobj_cache/gnu/usr.bin/send-pr/
Modified:
user/attilio/rm_vmobj_cache/MAINTAINERS (contents, props changed)
user/attilio/rm_vmobj_cache/ObsoleteFiles.inc
user/attilio/rm_vmobj_cache/bin/chio/chio.1
user/attilio/rm_vmobj_cache/bin/rm/rm.1
user/attilio/rm_vmobj_cache/contrib/gcc/version.c
user/attilio/rm_vmobj_cache/contrib/openbsm/libbsm/bsm_io.c
user/attilio/rm_vmobj_cache/contrib/tzdata/africa
user/attilio/rm_vmobj_cache/contrib/tzdata/australasia
user/attilio/rm_vmobj_cache/contrib/tzdata/europe
user/attilio/rm_vmobj_cache/contrib/tzdata/northamerica
user/attilio/rm_vmobj_cache/etc/Makefile
user/attilio/rm_vmobj_cache/gnu/usr.bin/Makefile
user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/libbfd/Makefile
user/attilio/rm_vmobj_cache/lib/Makefile
user/attilio/rm_vmobj_cache/lib/libc/stdtime/strptime.c
user/attilio/rm_vmobj_cache/lib/libcuse/cuse_lib.c
user/attilio/rm_vmobj_cache/share/man/man4/mrsas.4
user/attilio/rm_vmobj_cache/share/man/man4/proto.4
user/attilio/rm_vmobj_cache/share/man/man5/pf.conf.5
user/attilio/rm_vmobj_cache/share/man/man5/rc.conf.5
user/attilio/rm_vmobj_cache/share/man/man7/hier.7
user/attilio/rm_vmobj_cache/share/man/man7/tests.7
user/attilio/rm_vmobj_cache/share/mk/bsd.subdir.mk
user/attilio/rm_vmobj_cache/share/termcap/termcap.src
user/attilio/rm_vmobj_cache/sys/amd64/amd64/mp_machdep.c
user/attilio/rm_vmobj_cache/sys/amd64/amd64/pmap.c
user/attilio/rm_vmobj_cache/sys/amd64/include/cpu.h
user/attilio/rm_vmobj_cache/sys/arm/arm/pmap-v6.c
user/attilio/rm_vmobj_cache/sys/arm/freescale/vybrid/files.vybrid
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl.c
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl.h
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend.c
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend.h
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend_block.c
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend_ramdisk.c
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_cmd_table.c
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_frontend_iscsi.c
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_io.h
user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_private.h
user/attilio/rm_vmobj_cache/sys/cam/scsi/scsi_all.c
user/attilio/rm_vmobj_cache/sys/cam/scsi/scsi_all.h
user/attilio/rm_vmobj_cache/sys/cam/scsi/scsi_da.h
user/attilio/rm_vmobj_cache/sys/conf/files
user/attilio/rm_vmobj_cache/sys/conf/files.amd64
user/attilio/rm_vmobj_cache/sys/conf/files.i386
user/attilio/rm_vmobj_cache/sys/dev/drm2/i915/i915_gem_gtt.c
user/attilio/rm_vmobj_cache/sys/dev/drm2/ttm/ttm_page_alloc.c
user/attilio/rm_vmobj_cache/sys/dev/ti/if_ti.c
user/attilio/rm_vmobj_cache/sys/dev/virtio/balloon/virtio_balloon.c
user/attilio/rm_vmobj_cache/sys/dev/virtio/network/if_vtnet.c
user/attilio/rm_vmobj_cache/sys/dev/virtio/network/if_vtnetvar.h
user/attilio/rm_vmobj_cache/sys/dev/virtio/pci/virtio_pci.c
user/attilio/rm_vmobj_cache/sys/dev/virtio/pci/virtio_pci.h
user/attilio/rm_vmobj_cache/sys/dev/virtio/virtio.h
user/attilio/rm_vmobj_cache/sys/dev/virtio/virtio_config.h
user/attilio/rm_vmobj_cache/sys/dev/virtio/virtqueue.c
user/attilio/rm_vmobj_cache/sys/dev/virtio/virtqueue.h
user/attilio/rm_vmobj_cache/sys/dev/vmware/vmxnet3/if_vmx.c
user/attilio/rm_vmobj_cache/sys/dev/xen/balloon/balloon.c
user/attilio/rm_vmobj_cache/sys/dev/xen/console/console.c
user/attilio/rm_vmobj_cache/sys/dev/xen/control/control.c
user/attilio/rm_vmobj_cache/sys/dev/xen/timer/timer.c
user/attilio/rm_vmobj_cache/sys/dev/xen/xenpci/xenpci.c
user/attilio/rm_vmobj_cache/sys/dev/xen/xenpci/xenpcivar.h
user/attilio/rm_vmobj_cache/sys/i386/i386/mp_machdep.c
user/attilio/rm_vmobj_cache/sys/i386/i386/pmap.c
user/attilio/rm_vmobj_cache/sys/i386/i386/sys_machdep.c
user/attilio/rm_vmobj_cache/sys/i386/include/cpu.h
user/attilio/rm_vmobj_cache/sys/i386/xen/pmap.c
user/attilio/rm_vmobj_cache/sys/ia64/ia64/pmap.c
user/attilio/rm_vmobj_cache/sys/kern/vfs_vnops.c
user/attilio/rm_vmobj_cache/sys/mips/mips/pmap.c
user/attilio/rm_vmobj_cache/sys/modules/svr4/README
user/attilio/rm_vmobj_cache/sys/nfs/nfs_fha.c
user/attilio/rm_vmobj_cache/sys/vm/uma_core.c
user/attilio/rm_vmobj_cache/sys/vm/vm_kern.c
user/attilio/rm_vmobj_cache/sys/vm/vm_map.c
user/attilio/rm_vmobj_cache/sys/vm/vm_page.c
user/attilio/rm_vmobj_cache/sys/vm/vm_page.h
user/attilio/rm_vmobj_cache/sys/x86/include/apicvar.h
user/attilio/rm_vmobj_cache/sys/x86/isa/isa.c
user/attilio/rm_vmobj_cache/sys/x86/x86/local_apic.c
user/attilio/rm_vmobj_cache/sys/x86/xen/hvm.c
user/attilio/rm_vmobj_cache/sys/x86/xen/pv.c
user/attilio/rm_vmobj_cache/sys/xen/gnttab.c
user/attilio/rm_vmobj_cache/sys/xen/gnttab.h
user/attilio/rm_vmobj_cache/sys/xen/xenstore/xenstore.c
user/attilio/rm_vmobj_cache/usr.bin/patch/patch.1
user/attilio/rm_vmobj_cache/usr.bin/patch/patch.c
user/attilio/rm_vmobj_cache/usr.bin/patch/pch.c
user/attilio/rm_vmobj_cache/usr.bin/patch/pch.h
user/attilio/rm_vmobj_cache/usr.bin/ssh-copy-id/ssh-copy-id.1
user/attilio/rm_vmobj_cache/usr.sbin/binmiscctl/binmiscctl.8
user/attilio/rm_vmobj_cache/usr.sbin/ctladm/ctladm.8
user/attilio/rm_vmobj_cache/usr.sbin/service/service.sh
Directory Properties:
user/attilio/rm_vmobj_cache/ (props changed)
user/attilio/rm_vmobj_cache/cddl/ (props changed)
user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/ (props changed)
user/attilio/rm_vmobj_cache/contrib/gcc/ (props changed)
user/attilio/rm_vmobj_cache/contrib/openbsm/ (props changed)
user/attilio/rm_vmobj_cache/contrib/tzdata/ (props changed)
user/attilio/rm_vmobj_cache/etc/ (props changed)
user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/ (props changed)
user/attilio/rm_vmobj_cache/lib/libc/ (props changed)
user/attilio/rm_vmobj_cache/lib/libc/stdtime/ (props changed)
user/attilio/rm_vmobj_cache/share/ (props changed)
user/attilio/rm_vmobj_cache/share/man/man4/ (props changed)
user/attilio/rm_vmobj_cache/sys/ (props changed)
user/attilio/rm_vmobj_cache/sys/conf/ (props changed)
Modified: user/attilio/rm_vmobj_cache/MAINTAINERS
==============================================================================
--- user/attilio/rm_vmobj_cache/MAINTAINERS Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/MAINTAINERS Mon Jun 16 18:29:05 2014 (r267549)
@@ -108,7 +108,6 @@ lib/libbluetooth emax Pre-commit review
lib/libsdp emax Pre-commit review preferred.
usr.bin/bluetooth emax Pre-commit review preferred.
usr.sbin/bluetooth emax Pre-commit review preferred.
-gnu/usr.bin/send-pr bugmaster Pre-commit review requested.
*env(3) secteam Due to the problematic security history of this
code, please have patches reviewed by secteam.
share/zoneinfo edwin Heads-up appreciated, since our data is coming
Modified: user/attilio/rm_vmobj_cache/ObsoleteFiles.inc
==============================================================================
--- user/attilio/rm_vmobj_cache/ObsoleteFiles.inc Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/ObsoleteFiles.inc Mon Jun 16 18:29:05 2014 (r267549)
@@ -38,6 +38,11 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20140614: send-pr removal
+OLD_FILES+=usr/bin/send-pr
+OLD_FILES+=usr/share/man/man1/send-pr.1.gz
+OLD_FILES+=etc/gnats/freefall
+OLD_DIRS+=etc/gnats
# 20140512: new clang import which bumps version from 3.4 to 3.4.1.
OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h
Modified: user/attilio/rm_vmobj_cache/bin/chio/chio.1
==============================================================================
--- user/attilio/rm_vmobj_cache/bin/chio/chio.1 Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/bin/chio/chio.1 Mon Jun 16 18:29:05 2014 (r267549)
@@ -151,7 +151,6 @@ This command will query the status of th
will move it to the element specified in its source attribute.
This is a convenient way to return media from a drive or portal
to its previous element in the changer.
-.Pp
.It Ic position Xo
.Ar <to ET> <to EU>
.Op Cm inv
@@ -173,7 +172,6 @@ Report which picker unit the changer is
.Xc
Configure the changer to use picker
.Ar <unit> .
-.Pp
.It Ic ielem Xo
.Op Ar <timeout>
.Xc
Modified: user/attilio/rm_vmobj_cache/bin/rm/rm.1
==============================================================================
--- user/attilio/rm_vmobj_cache/bin/rm/rm.1 Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/bin/rm/rm.1 Mon Jun 16 18:29:05 2014 (r267549)
@@ -121,7 +121,6 @@ each directory's contents are processed
is made to remove the directory).
If the user does not respond affirmatively, the file hierarchy rooted in
that directory is skipped.
-.Pp
.It Fl r
Equivalent to
.Fl R .
Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh (from r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Mon Jun 16 18:29:05 2014 (r267549, copy of r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh)
@@ -0,0 +1,106 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2013, Joyent, Inc. All rights reserved.
+#
+
+if [ $# != 1 ]; then
+ echo expected one argument: '<'dtrace-path'>'
+ exit 2
+fi
+
+dtrace=$1
+DIR=/var/tmp/dtest.$$
+
+mkdir $DIR
+cd $DIR
+
+echo '#pragma D option quiet' > test.d
+echo '#pragma D option aggsortkey' >> test.d
+
+cat > test.c <<EOF
+#include <unistd.h>
+
+void
+main()
+{
+EOF
+
+objs=
+
+for oogle in doogle bagnoogle; do
+ cat > $oogle.c <<EOF
+#include <sys/sdt.h>
+
+void
+$oogle()
+{
+ DTRACE_PROBE($oogle, knows);
+}
+EOF
+
+ cat > $oogle.d <<EOF
+provider $oogle {
+ probe knows();
+};
+EOF
+
+ cc -c $oogle.c
+
+ if [ $? -ne 0 ]; then
+ print -u2 "failed to compile $oogle.c"
+ exit 1
+ fi
+
+ $dtrace -G -32 -s $oogle.d $oogle.o -o $oogle.d.o
+
+ if [ $? -ne 0 ]; then
+ print -u2 "failed to process $oogle.d"
+ exit 1
+ fi
+
+ objs="$objs $oogle.o $oogle.d.o"
+ echo $oogle'();' >> test.c
+ echo $oogle'$target:::{@[probefunc] = count()}' >> test.d
+done
+
+echo "}" >> test.c
+
+echo 'END{printa("%-10s %@d\\n", @)}' >> test.d
+
+cc -o test test.c $objs
+
+if [ $? -ne 0 ]; then
+ print -u2 "failed to compile test.c"
+ exit 1
+fi
+
+$dtrace -s ./test.d -Zc ./test
+
+if [ $? -ne 0 ]; then
+ print -u2 "failed to execute test"
+ exit 1
+fi
+
+cd /
+/usr/bin/rm -rf $DIR
+exit 0
Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out (from r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out Mon Jun 16 18:29:05 2014 (r267549, copy of r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out)
@@ -0,0 +1,3 @@
+bagnoogle 1
+doogle 1
+
Copied: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh (from r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Mon Jun 16 18:29:05 2014 (r267549, copy of r267548, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh)
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2013, Joyent, Inc. All rights reserved.
+#
+
+if [ $# != 1 ]; then
+ echo expected one argument: '<'dtrace-path'>'
+ exit 2
+fi
+
+dtrace=$1
+DIR=/var/tmp/dtest.$$
+
+mkdir $DIR
+cd $DIR
+
+cat > test.c <<EOF
+void
+foo()
+{}
+EOF
+
+cat > doogle.d <<EOF
+provider doogle {
+ probe bagnoogle();
+};
+EOF
+
+cc -c test.c
+$dtrace -G -32 -s doogle.d test.o -o doogle.d.o
+
+if [ $? -eq 0 ]; then
+ print -u2 "dtrace succeeded despite having no probe sites"
+ exit 1
+fi
+
+cd /
+/usr/bin/rm -rf $DIR
+exit 0
Modified: user/attilio/rm_vmobj_cache/contrib/gcc/version.c
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/gcc/version.c Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/contrib/gcc/version.c Mon Jun 16 18:29:05 2014 (r267549)
@@ -18,7 +18,7 @@
forward us bugs reported to you, if you determine that they are
not bugs in your modifications.) */
-const char bug_report_url[] = "<URL:http://www.freebsd.org/send-pr.html>";
+const char bug_report_url[] = "<URL:http://www.freebsd.org/support.html>";
/* The complete version string, assembled from several pieces.
BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile. */
Modified: user/attilio/rm_vmobj_cache/contrib/openbsm/libbsm/bsm_io.c
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/openbsm/libbsm/bsm_io.c Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/contrib/openbsm/libbsm/bsm_io.c Mon Jun 16 18:29:05 2014 (r267549)
@@ -949,7 +949,7 @@ print_header32_tok(FILE *fp, tokenstr_t
{
print_tok_type(fp, tok->id, "header", oflags);
- if (oflags & AU_OFLAG_RAW) {
+ if (oflags & AU_OFLAG_XML) {
open_attr(fp, "version");
print_1_byte(fp, tok->tt.hdr32.version, "%u");
close_attr(fp);
Modified: user/attilio/rm_vmobj_cache/contrib/tzdata/africa
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/tzdata/africa Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/contrib/tzdata/africa Mon Jun 16 18:29:05 2014 (r267549)
@@ -239,13 +239,13 @@ Rule Egypt 1990 1994 - May 1 1:00 1:00
# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
# </a>
Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S
-Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 -
+Rule Egypt 1995 2005 - Sep lastThu 24:00 0 -
# From Steffen Thorsen (2006-09-19):
# The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
# Egypt will turn back clocks by one hour at the midnight of Thursday
# 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 2006 only - Sep 21 24:00 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.
@@ -254,7 +254,7 @@ Rule Egypt 2006 only - Sep 21 23:00s 0 -
# http://www.timeanddate.com/worldclock/city.html?n=53
# From Steffen Thorsen (2007-09-04): The official information...:
# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
-Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 -
+Rule Egypt 2007 only - Sep Thu>=1 24:00 0 -
# From Abdelrahman Hassan (2007-09-06):
# Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
# than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s
# From Gunther Vermier (2015-05-13):
# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally "located" a precise official reference about the DST changes
+# in Egypt. The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: "With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014." This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
# the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption. The AP story says
-# DST will not be observed during Ramadan. There is no information about when
-# DST will end. See:
+# above) says DST had no affect on electricity consumption. There is
+# no information about when DST will end this fall. See:
# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
#
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time. In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time. Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
-Rule Egypt 2009 only - Aug 20 23:00s 0 -
-Rule Egypt 2010 only - Aug 11 0:00 0 -
-Rule Egypt 2010 only - Sep 10 0:00 1:00 S
-Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
+# For now, guess that later spring and fall transitions will use
+# 2010's rules, and guess that Egypt will switch to standard time at
+# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
+# first Friday after Ramadan. To implement this,
+# transition dates for 2015 through 2037 were determined by running
+# the following program under GNU Emacs 24.3, with the results integrated
+# by hand into the table below. Ramadan again intrudes on the guessed
+# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
+# (let ((islamic-year 1436))
+# (while (< islamic-year 1460)
+# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+# (friday 5))
+# (while (/= friday (mod a 7))
+# (setq a (1- a)))
+# (while (/= friday (mod b 7))
+# (setq b (1+ b)))
+# (setq a (1- a))
+# (setq b (1- b))
+# (setq a (calendar-gregorian-from-absolute a))
+# (setq b (calendar-gregorian-from-absolute b))
+# (insert
+# (format
+# (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
+# "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
+# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+# (setq islamic-year (+ 1 islamic-year))))
+Rule Egypt 2008 only - Aug lastThu 24:00 0 -
+Rule Egypt 2009 only - Aug 20 24:00 0 -
+Rule Egypt 2010 only - Aug 10 24:00 0 -
+Rule Egypt 2010 only - Sep 9 24:00 1:00 S
+Rule Egypt 2010 only - Sep lastThu 24:00 0 -
Rule Egypt 2014 only - May 15 24:00 1:00 S
-Rule Egypt 2014 only - Jun 29 0:00s 0 -
-Rule Egypt 2014 only - Jul 29 0:00s 1:00 S
-Rule Egypt 2014 max - Sep lastThu 23:00s 0 -
+Rule Egypt 2014 only - Jun 26 24:00 0 -
+Rule Egypt 2014 only - Jul 31 24:00 1:00 S
+Rule Egypt 2014 max - Sep lastThu 24:00 0 -
Rule Egypt 2015 2019 - Apr lastFri 0:00s 1:00 S
-Rule Egypt 2015 only - Jun 18 0:00s 0 -
-Rule Egypt 2015 only - Jul 18 0:00s 1:00 S
-Rule Egypt 2016 only - Jun 7 0:00s 0 -
-Rule Egypt 2016 only - Jul 7 0:00s 1:00 S
-Rule Egypt 2017 only - May 27 0:00s 0 -
-Rule Egypt 2017 only - Jun 26 0:00s 1:00 S
-Rule Egypt 2018 only - May 16 0:00s 0 -
-Rule Egypt 2018 only - Jun 15 0:00s 1:00 S
-Rule Egypt 2019 only - May 6 0:00s 0 -
-Rule Egypt 2019 only - Jun 5 0:00s 1:00 S
-Rule Egypt 2020 only - May 24 0:00s 1:00 S
-Rule Egypt 2021 only - May 13 0:00s 1:00 S
-Rule Egypt 2022 only - May 3 0:00s 1:00 S
+Rule Egypt 2015 only - Jun 11 24:00 0 -
+Rule Egypt 2015 only - Jul 23 24:00 1:00 S
+Rule Egypt 2016 only - Jun 2 24:00 0 -
+Rule Egypt 2016 only - Jul 7 24:00 1:00 S
+Rule Egypt 2017 only - May 25 24:00 0 -
+Rule Egypt 2017 only - Jun 29 24:00 1:00 S
+Rule Egypt 2018 only - May 10 24:00 0 -
+Rule Egypt 2018 only - Jun 14 24:00 1:00 S
+Rule Egypt 2019 only - May 2 24:00 0 -
+Rule Egypt 2019 only - Jun 6 24:00 1:00 S
+Rule Egypt 2020 only - May 28 24:00 1:00 S
+Rule Egypt 2021 only - May 13 24:00 1:00 S
+Rule Egypt 2022 only - May 5 24:00 1:00 S
Rule Egypt 2023 max - Apr lastFri 0:00s 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -914,39 +945,36 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J
# From Sebastien Willemijns (2014-03-18):
# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
-# From Paul Eggert (2014-03-19):
-# To estimate what the Moroccan government will do in future years,
-# 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 1461)
-# (let ((a
-# (calendar-gregorian-from-absolute
-# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
-# (b
-# (calendar-gregorian-from-absolute
-# (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
-# (insert
-# (format
-# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
-# "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
-# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+# From Milamber Space Network (2014-06-05):
+# The Moroccan government has recently announced that the country will return
+# to standard time at 03:00 on Saturday, June 28, 2014 local time.... DST
+# will resume again at 02:00 on Saturday, August 2, 2014....
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
+
+# From Paul Eggert (2014-06-05):
+# For now, guess that later spring and fall transitions will use 2014's rules,
+# and guess that Morocco will switch to standard time at 03:00 the last
+# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
+# Ramadan. To implement this, transition dates for 2015 through 2037 were
+# determined by running the following program under GNU Emacs 24.3, with the
+# results integrated by hand into the table below.
+# (let ((islamic-year 1436))
+# (while (< islamic-year 1460)
+# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+# (saturday 6))
+# (while (/= saturday (mod (setq a (1- a)) 7)))
+# (while (/= saturday (mod b 7))
+# (setq b (1+ b)))
+# (setq a (calendar-gregorian-from-absolute a))
+# (setq b (calendar-gregorian-from-absolute b))
+# (insert
+# (format
+# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
+# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
+# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
# (setq islamic-year (+ 1 islamic-year))))
-#
-# 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
@@ -968,46 +996,44 @@ Rule Morocco 1978 only - Aug 4 0:00 0
Rule Morocco 2008 only - Jun 1 0:00 1:00 S
Rule Morocco 2008 only - Sep 1 0:00 0 -
Rule Morocco 2009 only - Jun 1 0:00 1:00 S
-Rule Morocco 2009 only - Aug 21 0:00 0 -
+Rule Morocco 2009 only - Aug 21 0:00 0 -
Rule Morocco 2010 only - May 2 0:00 1:00 S
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 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 -
-Rule Morocco 2015 only - Jul 18 2:00 1:00 S
-Rule Morocco 2016 only - Jun 7 3:00 0 -
-Rule Morocco 2016 only - Jul 7 2:00 1:00 S
-Rule Morocco 2017 only - May 27 3:00 0 -
-Rule Morocco 2017 only - Jun 26 2:00 1:00 S
-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 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 -
+Rule Morocco 2011 only - Jul 31 0 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 max - Oct lastSun 3:00 0 -
+Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
+Rule Morocco 2014 only - Jun 28 3:00 0 -
+Rule Morocco 2014 only - Aug 2 2:00 1:00 S
+Rule Morocco 2015 only - Jun 13 3:00 0 -
+Rule Morocco 2015 only - Jul 18 2:00 1:00 S
+Rule Morocco 2016 only - Jun 4 3:00 0 -
+Rule Morocco 2016 only - Jul 9 2:00 1:00 S
+Rule Morocco 2017 only - May 20 3:00 0 -
+Rule Morocco 2017 only - Jul 1 2:00 1:00 S
+Rule Morocco 2018 only - May 12 3:00 0 -
+Rule Morocco 2018 only - Jun 16 2:00 1:00 S
+Rule Morocco 2019 only - May 4 3:00 0 -
+Rule Morocco 2019 only - Jun 8 2:00 1:00 S
+Rule Morocco 2020 only - Apr 18 3:00 0 -
+Rule Morocco 2020 only - May 30 2:00 1:00 S
+Rule Morocco 2021 only - Apr 10 3:00 0 -
+Rule Morocco 2021 only - May 15 2:00 1:00 S
+Rule Morocco 2022 only - Apr 2 3:00 0 -
+Rule Morocco 2022 only - May 7 2:00 1:00 S
+Rule Morocco 2023 only - Apr 22 2:00 1:00 S
+Rule Morocco 2024 only - Apr 13 2:00 1:00 S
+Rule Morocco 2025 only - Apr 5 2:00 1:00 S
+Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
+Rule Morocco 2035 only - Oct 27 3:00 0 -
+Rule Morocco 2036 only - Oct 18 3:00 0 -
+Rule Morocco 2037 only - Oct 10 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
Modified: user/attilio/rm_vmobj_cache/contrib/tzdata/australasia
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/tzdata/australasia Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/contrib/tzdata/australasia Mon Jun 16 18:29:05 2014 (r267549)
@@ -250,24 +250,14 @@ Zone Antarctica/Macquarie 0 - zzz 1899 N
Zone Indian/Christmas 7:02:52 - LMT 1895 Feb
7:00 - CXT # Christmas Island Time
-# Cook Is
-# From Shanks & Pottenger:
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Cook 1978 only - Nov 12 0:00 0:30 HS
-Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
-Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 HS
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Pacific/Rarotonga -10:39:04 - LMT 1901 # Avarua
- -10:30 - CKT 1978 Nov 12 # Cook Is Time
- -10:00 Cook CK%sT
-
-# Cocos
+# Cocos (Keeling) Is
# These islands were ruled by the Ross family from about 1830 to 1978.
# We don't know when standard time was introduced; for now, we guess 1900.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Indian/Cocos 6:27:40 - LMT 1900
6:30 - CCT # Cocos Islands Time
+
# Fiji
# Milne gives 11:55:44 for Suva.
@@ -473,7 +463,8 @@ Rule NZ 1934 1940 - Apr lastSun 2:00 0 M
Rule NZ 1934 1940 - Sep lastSun 2:00 0:30 S
Rule NZ 1946 only - Jan 1 0:00 0 S
# Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no
-# convenient notation for this so we must duplicate the Rule lines.
+# convenient single notation for the date and time of this transition
+# so we must duplicate the Rule lines.
Rule NZ 1974 only - Nov Sun>=1 2:00s 1:00 D
Rule Chatham 1974 only - Nov Sun>=1 2:45s 1:00 D
Rule NZ 1975 only - Feb lastSun 2:00s 0 S
@@ -511,6 +502,17 @@ Link Pacific/Auckland Antarctica/McMurdo
# previously whalers, sealers, pastoralists, and scientific personnel wintered
# was probably like Pacific/Auckland
+# Cook Is
+# From Shanks & Pottenger:
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Cook 1978 only - Nov 12 0:00 0:30 HS
+Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
+Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 HS
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Pacific/Rarotonga -10:39:04 - LMT 1901 # Avarua
+ -10:30 - CKT 1978 Nov 12 # Cook Is Time
+ -10:00 Cook CK%sT
+
###############################################################################
Modified: user/attilio/rm_vmobj_cache/contrib/tzdata/europe
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/tzdata/europe Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/contrib/tzdata/europe Mon Jun 16 18:29:05 2014 (r267549)
@@ -6,7 +6,7 @@
# go ahead and edit the file (and please send any changes to
# tz at iana.org for general use in the future).
-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2014-05-31):
# A good source for time zone historical data outside the U.S. is
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
@@ -17,6 +17,9 @@
# published semiannually. Law sent in several helpful summaries
# of the IATA's data after 1990.
#
+# A reliable and entertaining source about time zones is
+# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+#
# Except where otherwise noted, Shanks & Pottenger is the source for
# entries through 1991, and IATA SSIM is the source for entries afterwards.
#
@@ -26,9 +29,9 @@
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
# which I found in the UCLA library.
#
-# <a href="http://www.pettswoodvillage.co.uk/Daylight_Savings_William_Willett.pdf">
# William Willett, The Waste of Daylight, 19th edition
-# </a> (1914-03)
+# <http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
+# [PDF] (1914-03)
#
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
# <http://www.jstor.org/stable/1774359>. He writes:
@@ -58,10 +61,7 @@
# 1:00 CET CEST CEMT Central Europe
# 1:00:14 SET Swedish (1879-1899)*
# 2:00 EET EEST Eastern Europe
-# 3:00 MSK MSD Moscow
-#
-# A reliable and entertaining source about time zones, especially in Britain,
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+# 3:00 MSK MSD MSM* Moscow
# From Peter Ilieve (1994-12-04),
# The original six [EU members]: Belgium, France, (West) Germany, Italy,
@@ -558,11 +558,11 @@ Rule Russia 1917 only - Dec 28 0:00 0 M
Rule Russia 1918 only - May 31 22:00 2:00 MDST # Moscow Double Summer Time
Rule Russia 1918 only - Sep 16 1:00 1:00 MST
Rule Russia 1919 only - May 31 23:00 2:00 MDST
-Rule Russia 1919 only - Jul 1 2:00 1:00 S
-Rule Russia 1919 only - Aug 16 0:00 0 -
-Rule Russia 1921 only - Feb 14 23:00 1:00 S
-Rule Russia 1921 only - Mar 20 23:00 2:00 M # Midsummer
-Rule Russia 1921 only - Sep 1 0:00 1:00 S
+Rule Russia 1919 only - Jul 1 2:00 1:00 MSD
+Rule Russia 1919 only - Aug 16 0:00 0 MSK
+Rule Russia 1921 only - Feb 14 23:00 1:00 MSD
+Rule Russia 1921 only - Mar 20 23:00 2:00 MSM # Midsummer
+Rule Russia 1921 only - Sep 1 0:00 1:00 MSD
Rule Russia 1921 only - Oct 1 0:00 0 -
# Act No.925 of the Council of Ministers of the USSR (1980-10-24):
Rule Russia 1981 1984 - Apr 1 0:00 1:00 S
@@ -2217,6 +2217,7 @@ Zone Europe/Kaliningrad 1:22:00 - LMT 1
Zone Europe/Moscow 2:30:20 - LMT 1880
2:30 - MMT 1916 Jul 3 # Moscow Mean Time
2:30:48 Russia %s 1919 Jul 1 2:00
+ 3:00 Russia %s 1921 Oct
3:00 Russia MSK/MSD 1922 Oct
2:00 - EET 1930 Jun 21
3:00 Russia MSK/MSD 1991 Mar 31 2:00s
@@ -2375,7 +2376,7 @@ Zone Asia/Yakutsk 8:38:40 - LMT 1919 De
Zone Asia/Vladivostok 8:47:44 - LMT 1922 Nov 15
9:00 - VLAT 1930 Jun 21 # Vladivostok Time
10:00 Russia VLA%sT 1991 Mar 31 2:00s
- 9:00 Russia VLA%sST 1992 Jan 19 2:00s
+ 9:00 Russia VLA%sT 1992 Jan 19 2:00s
10:00 Russia VLA%sT 2011 Mar 27 2:00s
11:00 - VLAT
Modified: user/attilio/rm_vmobj_cache/contrib/tzdata/northamerica
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/tzdata/northamerica Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/contrib/tzdata/northamerica Mon Jun 16 18:29:05 2014 (r267549)
@@ -1019,9 +1019,9 @@ Zone America/Menominee -5:50:27 - LMT 18
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
# which I found in the UCLA library.
#
-# <a href="http://www.pettswoodvillage.co.uk/Daylight_Savings_William_Willett.pdf">
# William Willett, The Waste of Daylight, 19th edition
-# </a> (1914-03)
+# <http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
+# [PDF] (1914-03)
#
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
# <http://www.jstor.org/stable/1774359>.
Modified: user/attilio/rm_vmobj_cache/etc/Makefile
==============================================================================
--- user/attilio/rm_vmobj_cache/etc/Makefile Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/etc/Makefile Mon Jun 16 18:29:05 2014 (r267549)
@@ -240,7 +240,6 @@ distribution:
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
- ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
Modified: user/attilio/rm_vmobj_cache/gnu/usr.bin/Makefile
==============================================================================
--- user/attilio/rm_vmobj_cache/gnu/usr.bin/Makefile Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/gnu/usr.bin/Makefile Mon Jun 16 18:29:05 2014 (r267549)
@@ -14,7 +14,6 @@ SUBDIR= ${_binutils} \
${_groff} \
${_rcs} \
sdiff \
- send-pr \
${_tests} \
${_texinfo}
Modified: user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/libbfd/Makefile
==============================================================================
--- user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/libbfd/Makefile Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/libbfd/Makefile Mon Jun 16 18:29:05 2014 (r267549)
@@ -84,7 +84,7 @@ bfdver.h: Makefile
echo '#define BFD_VERSION 217500000' > ${.TARGET}
echo '#define BFD_VERSION_DATE 20070703' >> ${.TARGET}
echo '#define BFD_VERSION_STRING ${VERSION}' >> ${.TARGET}
- echo '#define REPORT_BUGS_TO "<http://www.freebsd.org/send-pr.html>"' >> ${.TARGET}
+ echo '#define REPORT_BUGS_TO "<http://www.freebsd.org/support.html>"' >> ${.TARGET}
targmatch.h: targmatch.sed config.bfd
sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
Modified: user/attilio/rm_vmobj_cache/lib/Makefile
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/Makefile Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/lib/Makefile Mon Jun 16 18:29:05 2014 (r267549)
@@ -3,82 +3,43 @@
.include <src.opts.mk>
-# To satisfy shared library or ELF linkage when only the libraries being
-# built are visible:
-#
-# csu must be built before all shared libaries for ELF.
-# libc must be built before all other shared libraries.
-# libbsm must be built before libauditd.
-# libcom_err must be built before libpam.
-# libcrypt must be built before libpam.
-# libkvm must be built before libdevstat.
-# libldns must be built before libunbound.
-# msun must be built before libg++ and libstdc++.
-# libmd must be built before libatm, libopie, libradius, and libtacplus.
-# ncurses must be built before libdialog, libedit and libreadline.
-# libnetgraph must be built before libbsnmp/modules/snmp_netgraph.
-# libopie must be built before libpam.
-# libradius must be built before libpam.
-# librpcsvc must be built before libpam.
-# libsbuf must be built before libcam.
-# libtacplus must be built before libpam.
-# libutil must be built before libpam.
-# libypclnt must be built before libpam.
-# libgssapi must be built before librpcsec_gss
-#
-# Otherwise, the SUBDIR list should be in alphabetical order.
-#
-# Except it appears bind needs to be compiled last
+# The SUBDIR_ORDERED list is a small set of libraries which are used by many
+# of the other libraries. These are built first with a .WAIT between them
+# and the main list to avoid needing a SUBDIR_DEPEND line on every library
+# naming just these few items.
SUBDIR_ORDERED= ${_csu} \
.WAIT \
libc \
libc_nonshared \
- .WAIT \
- msun \
- .WAIT \
- libbsm \
- libauditd \
- libutil \
- libpjdlog \
- libnv \
- ${_libcapsicum} \
libcompiler_rt \
- libcrypt \
- libelf \
- ${_libiconv_modules} \
- libkvm \
- ${_libldns} \
- libmd \
- ncurses \
- ${_libnetgraph} \
- libradius \
- librpcsvc \
- libsbuf \
- libtacplus \
- ${_libypclnt} \
+ ${_libcplusplus} \
${_libcxxrt} \
- ${_libcplusplus}
+ libelf \
+ msun
-.if ${MK_KERBEROS_SUPPORT} != "no"
-SUBDIR_ORDERED+= libcom_err
-.endif
+# The main list; please keep these sorted alphabetically.
SUBDIR= ${SUBDIR_ORDERED} \
.WAIT \
libalias \
libarchive \
${_libatm} \
+ libauditd \
libbegemot \
libblocksruntime \
${_libbluetooth} \
${_libbsnmp} \
libbsdstat \
+ libbsm \
libbz2 \
libcalendar \
libcam \
+ ${_libcapsicum} \
${_libcasper} \
+ ${_libcom_err} \
libcompat \
+ libcrypt \
libdevinfo \
libdevstat \
libdwarf \
@@ -91,26 +52,36 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libgpib} \
${_libgssapi} \
${_librpcsec_gss} \
+ ${_libiconv_modules} \
libipsec \
libjail \
libkiconv \
+ libkvm \
+ ${_libldns} \
liblzma \
libmagic \
libmandoc \
libmemstat \
+ libmd \
${_libmilter} \
${_libmp} \
${_libnandfs} \
libnetbsd \
+ ${_libnetgraph} \
${_libngatm} \
+ libnv \
libopie \
libpam \
libpcap \
+ libpjdlog \
${_libpmc} \
${_libproc} \
libprocstat \
+ libradius \
+ librpcsvc \
librt \
${_librtld_db} \
+ libsbuf \
${_libsdp} \
${_libsm} \
${_libsmb} \
@@ -119,6 +90,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
libstand \
libstdbuf \
libstdthreads \
+ libtacplus \
${_libtelnet} \
${_libthr} \
libthread_db \
@@ -129,16 +101,51 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libunbound} \
${_libusbhid} \
${_libusb} \
+ libutil \
${_libvgl} \
${_libvmmapi} \
libwrap \
liby \
+ ${_libypclnt} \
libz \
+ ncurses \
${_atf} \
${_clang} \
${_cuse} \
${_tests}
+# Inter-library dependencies. When the makefile for a library contains LDADD
+# libraries, those libraries should be listed as build order dependencies here.
+
+SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd
+SUBDIR_DEPEND_libatm= libmd
+SUBDIR_DEPEND_libauditdm= libbsm
+SUBDIR_DEPEND_libbsnmp= ${_libnetgraph}
+SUBDIR_DEPEND_libc++= libcxxrt
+SUBDIR_DEPEND_libc= libcompiler_rt
+SUBDIR_DEPEND_libcam= libsbuf
+SUBDIR_DEPEND_libcapsicum= libnv
+SUBDIR_DEPEND_libcasper= libcapsicum libnv libpjdlog
+SUBDIR_DEPEND_libdevstat= libkvm
+SUBDIR_DEPEND_libdiaglog= ncurses
+SUBDIR_DEPEND_libedit= ncurses
+SUBDIR_DEPEND_libg++= msun
+SUBDIR_DEPEND_libgeom= libexpat libsbuf
+SUBDIR_DEPEND_liblibrpcsec_gss= libgssapi
+SUBDIR_DEPEND_libmagic= libz
+SUBDIR_DEPEND_libmemstat= libkvm
+SUBDIR_DEPEND_libopie= libmd
+SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err}
+SUBDIR_DEPEND_libpjdlog= libutil
+SUBDIR_DEPEND_libprocstat= libkvm libutil
+SUBDIR_DEPEND_libradius= libmd
+SUBDIR_DEPEND_libreadline= ncurses
+SUBDIR_DEPEND_libsmb= libkiconv
+SUBDIR_DEPEND_libstdc++= msun
+SUBDIR_DEPEND_libtacplus= libmd
+SUBDIR_DEPEND_libulog= libmd
+SUBDIR_DEPEND_libunbound= ${_libldns}
+
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
_csu=csu/${MACHINE_ARCH}-elf
.elif exists(${.CURDIR}/csu/${MACHINE_ARCH})
@@ -190,6 +197,10 @@ _librpcsec_gss= librpcsec_gss
_libiconv_modules= libiconv_modules
.endif
+.if ${MK_KERBEROS_SUPPORT} != "no"
+_libcom_err= libcom_err
+.endif
+
.if ${MK_LDNS} != "no"
_libldns= libldns
.endif
Modified: user/attilio/rm_vmobj_cache/lib/libc/stdtime/strptime.c
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libc/stdtime/strptime.c Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/lib/libc/stdtime/strptime.c Mon Jun 16 18:29:05 2014 (r267549)
@@ -1,25 +1,4 @@
-/*
- * Powerdog Industries kindly requests feedback from anyone modifying
- * this function:
- *
- * Date: Thu, 05 Jun 1997 23:17:17 -0400
- * From: Kevin Ruddy <kevin.ruddy at powerdog.com>
- * To: James FitzGibbon <james at nexis.net>
- * Subject: Re: Use of your strptime(3) code (fwd)
- *
- * The reason for the "no mod" clause was so that modifications would
- * come back and we could integrate them and reissue so that a wider
- * audience could use it (thereby spreading the wealth). This has
- * made it possible to get strptime to work on many operating systems.
- * I'm not sure why that's "plain unacceptable" to the FreeBSD team.
- *
- * Anyway, you can change it to "with or without modification" as
- * you see fit. Enjoy.
- *
- * Kevin Ruddy
- * Powerdog Industries, Inc.
- */
-/*
+/*-
* Copyright (c) 1994 Powerdog Industries. All rights reserved.
*
* Copyright (c) 2011 The FreeBSD Foundation
@@ -36,12 +15,6 @@
* notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgement:
- * This product includes software developed by Powerdog Industries.
- * 4. The name of Powerdog Industries may not be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
*
* THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -54,6 +27,10 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * official policies, either expressed or implied, of Powerdog Industries.
*/
#include <sys/cdefs.h>
Modified: user/attilio/rm_vmobj_cache/lib/libcuse/cuse_lib.c
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libcuse/cuse_lib.c Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/lib/libcuse/cuse_lib.c Mon Jun 16 18:29:05 2014 (r267549)
@@ -425,7 +425,7 @@ cuse_dev_destroy(struct cuse_dev *cdev)
TAILQ_REMOVE(&h_cuse, cdev, entry);
cuse_unlock();
- error = ioctl(f_cuse, CUSE_IOCTL_DESTROY_DEV, cdev);
+ error = ioctl(f_cuse, CUSE_IOCTL_DESTROY_DEV, &cdev);
if (error)
return;
Modified: user/attilio/rm_vmobj_cache/share/man/man4/mrsas.4
==============================================================================
--- user/attilio/rm_vmobj_cache/share/man/man4/mrsas.4 Mon Jun 16 18:15:27 2014 (r267548)
+++ user/attilio/rm_vmobj_cache/share/man/man4/mrsas.4 Mon Jun 16 18:29:05 2014 (r267549)
@@ -207,7 +207,7 @@ variable, where X is the adapter number,
or via
.Xr sysctl 8 .
The following bits have the described effects:
-.Bl -tag -offset indent
+.Bl -tag -width indent -offset indent
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list