CVS commit: src/doc
Module Name:src Committed By: apb Date: Tue Aug 11 18:11:11 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: Update for tzdata2015f To generate a diff of this commit: cvs rdiff -u -r1.1241 -r1.1242 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1241 src/doc/3RDPARTY:1.1242 --- src/doc/3RDPARTY:1.1241 Sun Aug 9 05:45:42 2015 +++ src/doc/3RDPARTY Tue Aug 11 18:11:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1241 2015/08/09 05:45:42 szptvlfn Exp $ +# $NetBSD: 3RDPARTY,v 1.1242 2015/08/11 18:11:11 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1338,8 +1338,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2015d / tzdata2015e -Current Vers: tzcode2015e / tzdata2015e +Version: tzcode2015d / tzdata2015f +Current Vers: tzcode2015f / tzdata2015f Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/doc
Module Name:src Committed By: apb Date: Tue Aug 11 18:11:11 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: Update for tzdata2015f To generate a diff of this commit: cvs rdiff -u -r1.1241 -r1.1242 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Tue Aug 11 18:07:13 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27174 Log Message: Import tzdata2015f from ftp://ftp.iana.org/tz/releases/tzdata2015f.tar.gz Summary of changes in tzdata2015f (2015-08-10 18:06:56 -0700): * North Korea switches to +0830 on 2015-08-15. * Uruguay no longer observes DST. * Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC. * The two characters '%z' in a zone format now stand for the UTC offset, e.g., '-07' for seven hours behind UTC and '+0530' for five hours and thirty minutes ahead. * Comments for America/Halifax and America/Glace_Bay have been improved. * Data entries have been simplified for Atlantic/Canary, Europe/Simferopol, Europe/Sofia, and Europe/Tallinn. * Changes affecting documentation. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015F U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Tue Aug 11 18:07:13 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27174 Log Message: Import tzdata2015f from ftp://ftp.iana.org/tz/releases/tzdata2015f.tar.gz Summary of changes in tzdata2015f (2015-08-10 18:06:56 -0700): * North Korea switches to +0830 on 2015-08-15. * Uruguay no longer observes DST. * Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC. * The two characters '%z' in a zone format now stand for the UTC offset, e.g., '-07' for seven hours behind UTC and '+0530' for five hours and thirty minutes ahead. * Comments for America/Halifax and America/Glace_Bay have been improved. * Data entries have been simplified for Atlantic/Canary, Europe/Simferopol, Europe/Sofia, and Europe/Tallinn. * Changes affecting documentation. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015F U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: apb Date: Tue Aug 11 18:12:21 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015f. [apb 20150811] To generate a diff of this commit: cvs rdiff -u -r1.2089 -r1.2090 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2089 src/doc/CHANGES:1.2090 --- src/doc/CHANGES:1.2089 Sat Aug 8 16:11:15 2015 +++ src/doc/CHANGES Tue Aug 11 18:12:21 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2089 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2090 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -182,3 +182,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: [jmcneill 20150808] amlogicsdhc(4): Add support for UHS-I and MMC HS200 transfer modes. [jmcneill 20150808] + zoneinfo: Import tzdata2015f. [apb 20150811]
CVS commit: src/doc
Module Name:src Committed By: apb Date: Tue Aug 11 18:12:21 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015f. [apb 20150811] To generate a diff of this commit: cvs rdiff -u -r1.2089 -r1.2090 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Tue Aug 11 18:10:13 UTC 2015
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Update for tzdata2015f:
* Fix numbering in a comment;
* Update version numbers;
* Adjust a regex to recognise Changes affecting.*data without
the word format.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.6 src/external/public-domain/tz/tzdata2netbsd:1.7
--- src/external/public-domain/tz/tzdata2netbsd:1.6 Sat Mar 21 16:42:17 2015
+++ src/external/public-domain/tz/tzdata2netbsd Tue Aug 11 18:10:13 2015
@@ -1,20 +1,20 @@
-# $NetBSD: tzdata2netbsd,v 1.6 2015/03/21 16:42:17 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.7 2015/08/11 18:10:13 apb Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
# 0. Be in an up-to-date checkout of src/external/public-domain/tz
#from NetBSD-current.
# 1. Edit OLDVER and NEWVER below.
-# 3. Run this script. You will be prompted for confirmation before
+# 2. Run this script. You will be prompted for confirmation before
#anything major (such as a cvs operation).
-# 4. If something fails, abort the script and fix it.
-# 5. Re-run this script until you are happy. It's designed to
+# 3. If something fails, abort the script and fix it.
+# 4. Re-run this script until you are happy. It's designed to
#be re-run over and over, and later runs will try not to
#redo non-trivial work done by earlier runs.
#
-OLDVER=2015a
-NEWVER=2015b
+OLDVER=2015e
+NEWVER=2015f
# Uppercase variants of OLDVER and NEWVER
OLDVER_UC=$( echo ${OLDVER} | tr '[a-z]' '[A-Z]' )
@@ -232,7 +232,7 @@ EOF
/^$/ { blankline = 1; havesentence = 0; }
/^ Changes affecting/ { goodsection = 0; }
/^ Changes affecting.*time/ { goodsection = 1; }
- /^ Changes affecting.*data format/ { goodsection = 1; }
+ /^ Changes affecting.*data/ { goodsection = 1; }
/^ Changes affecting.*documentation/ || \
/^ Changes affecting.*commentary/ {
t = gensub(^ *, , 1, $0);
CVS commit: src/external/public-domain/tz
Module Name:src Committed By: apb Date: Tue Aug 11 18:10:13 UTC 2015 Modified Files: src/external/public-domain/tz: tzdata2netbsd Log Message: Update for tzdata2015f: * Fix numbering in a comment; * Update version numbers; * Adjust a regex to recognise Changes affecting.*data without the word format. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/tz/tzdata2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/gpl3
On Tue, 11 Aug 2015, David Laight wrote: The system should probably clean 'turds' from both /tmp and /var/tmp. That would be surprising, at least to me. I rely on /var/tmp/vi.recover being persistent, and I often use /var/tmp as a place to stash work in progress that should survive a reboot. --apb (Alan Barrett)
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Jun 21 15:30:13 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: tzcode2015e/tzdata2015e were released. We have tzdata2015e. To generate a diff of this commit: cvs rdiff -u -r1.1228 -r1.1229 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Jun 21 15:30:13 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: tzcode2015e/tzdata2015e were released. We have tzdata2015e. To generate a diff of this commit: cvs rdiff -u -r1.1228 -r1.1229 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1228 src/doc/3RDPARTY:1.1229 --- src/doc/3RDPARTY:1.1228 Tue Jun 16 20:01:20 2015 +++ src/doc/3RDPARTY Sun Jun 21 15:30:13 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1228 2015/06/16 20:01:20 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1229 2015/06/21 15:30:13 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1337,8 +1337,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2015d / tzdata2015b -Current Vers: tzcode2015d / tzdata2015d +Version: tzcode2015d / tzdata2015e +Current Vers: tzcode2015e / tzdata2015e Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Jun 21 15:32:52 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015e. [apb 20150621] To generate a diff of this commit: cvs rdiff -u -r1.2078 -r1.2079 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Jun 21 15:32:52 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015e. [apb 20150621] To generate a diff of this commit: cvs rdiff -u -r1.2078 -r1.2079 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2078 src/doc/CHANGES:1.2079 --- src/doc/CHANGES:1.2078 Tue Jun 16 20:01:20 2015 +++ src/doc/CHANGES Sun Jun 21 15:32:52 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2078 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2079 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -162,3 +162,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: dhcpcd(8): Import dhcpcd-6.9.0. [roy 20150517] openssl: Import openssl 1.0.1n [christos 20150612] openssl: Import openssl 1.0.1o [christos 20150616] + zoneinfo: Import tzdata2015e. [apb 20150621]
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sun Jun 21 15:18:59 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15189 Log Message: Import tzdata2015e from http://www.iana.org/time-zones/repository/releases/tzdata2015e.tar.gz Summary of changes in tzdata2015e (2015-06-13 10:56:02 -0700): * Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00, not 06-13 and 07-18 as we had guessed. * Assume Cayman Islands will observe DST starting next year, using US rules. * The file 'iso3166.tab' now uses UTF-8, so that its entries can better spell the names of Åland Islands, Côte d'Ivoire, and Réunion. Summary of changes in tzdata2015d (2015-04-24 08:09:46 -0700): * Egypt will not observe DST in 2015 and will consider canceling it permanently. For now, assume no DST indefinitely. * America/Whitehorse switched from UTC-9 to UTC-8 on 1967-05-28, not 1966-07-01. * The abbreviations for Hawaii-Aleutian standard and daylight times have been changed from HAST/HADT to HST/HDT, as per US Government Printing Office style. Summary of changes in tzdata2015c (2015-04-11 08:55:55 -0700): * Egypt's spring-forward transition is at 24:00 on April's last Thursday, not 00:00 on April's last Friday. This affects 2015, 2026, 2037, 2043, etc. * Changes to pre-1991 Chile-related time stamps in America/Santiago, Antarctica/Palmer, and Pacific/Easter. * The America/Montreal zone has been turned into a link, as it differed from an existing zone only for pre-1970 time stamps. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015E U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sun Jun 21 15:18:59 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15189 Log Message: Import tzdata2015e from http://www.iana.org/time-zones/repository/releases/tzdata2015e.tar.gz Summary of changes in tzdata2015e (2015-06-13 10:56:02 -0700): * Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00, not 06-13 and 07-18 as we had guessed. * Assume Cayman Islands will observe DST starting next year, using US rules. * The file 'iso3166.tab' now uses UTF-8, so that its entries can better spell the names of Åland Islands, Côte d'Ivoire, and Réunion. Summary of changes in tzdata2015d (2015-04-24 08:09:46 -0700): * Egypt will not observe DST in 2015 and will consider canceling it permanently. For now, assume no DST indefinitely. * America/Whitehorse switched from UTC-9 to UTC-8 on 1967-05-28, not 1966-07-01. * The abbreviations for Hawaii-Aleutian standard and daylight times have been changed from HAST/HADT to HST/HDT, as per US Government Printing Office style. Summary of changes in tzdata2015c (2015-04-11 08:55:55 -0700): * Egypt's spring-forward transition is at 24:00 on April's last Thursday, not 00:00 on April's last Friday. This affects 2015, 2026, 2037, 2043, etc. * Changes to pre-1991 Chile-related time stamps in America/Santiago, Antarctica/Palmer, and Pacific/Easter. * The America/Montreal zone has been turned into a link, as it differed from an existing zone only for pre-1970 time stamps. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015E U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
Re: CVS commit: src/share/misc
On Fri, 24 Apr 2015, Taylor R Campbell wrote: Modified Files: src/share/misc: acronyms acronyms-o.real Log Message: Per discussion with board@, remove inappropriate, hostile acronyms. Thank you. --apb (Alan Barrett)
Re: CVS commit: src/share/misc
On Sat, 25 Apr 2015, rod...@netbsd.org wrote: I'm responding to the recent posts ITT, because it seems there's some misunderstanding: I had no idea what ITT meant, until I looked it up. (ITT = in this thread, apparently). 1) What has been committed is no more offensive than the existing material in wtf and fortune. Please, review fortune's data files if any doubts exist; 2) wtf and fortune have existed in source since $TIME without any uproar; 3) There aren't any rules documenting appending entries to either; 4) We don't tend to make up rules as we go along committing; We have a rule or at least a convention that things that are likely to be controversial should be discussed first. If you don't realise that something is controversial, and commit without discussion, then the appropriate response is to engage in discussion as soon as you learn that the issue was controversial. Continuing without discussion is not appropriate. I think that NetBSD's acronyms file should be for acronyms that ordinary people are likely to encounter in ordinary situations; not for acronyms used in some small subculture. --apb (Alan Barrett)
Re: CVS commit: src/external/cddl/osnet
On Sat, 11 Apr 2015, Taylor R Campbell wrote: Date: Sat, 11 Apr 2015 15:12:01 +1000 from: matthew green m...@eterna.com.au Taylor R Campbell writes: When modifying, double-check that libnvpair.so defines no xdr_* symbols, only _solaris_xdr_*. (XXX Put this note somewhere...) somewhere == doc/HACKS. It's not really a hack, though. This is just the way we have to make colliding symbols not collide. What we don't have is a way to automate it so you don't have to write `#define xdr_foo _solaris_xdr_foo', or so the toolchain will notify you if you forgot to. You could write a test that uses nm|awk to check that all externally visible symbols have some desired prefix. --apb (Alan Barrett)
Re: CVS commit: src/lib/libc/time
On Mon, 06 Apr 2015, Brian Ginsbach wrote: Module Name:src Committed By: ginsbach Date: Mon Apr 6 14:38:22 UTC 2015 Modified Files: src/lib/libc/time: strptime.3 strptime.c Log Message: Add UTC as a synonym for GMT (%Z). [from FreeBSD] The %z format (which is distinct from %Z) already accepts GMT and UT. If we are going to accept UTC as well, which I think is a good idea, then please allow both %z and %Z to accept all three of UT, UTC, and GMT. --apb (Alan Barrett)
CVS commit: src/usr.sbin/service
Module Name:src
Committed By: apb
Date: Sun Apr 5 11:33:15 UTC 2015
Modified Files:
src/usr.sbin/service: service
Log Message:
More shell quoting. /etc/rc.d/* file names with embedded spaces are
not expected to work, but let's quote them anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/service/service
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/service/service
diff -u src/usr.sbin/service/service:1.6 src/usr.sbin/service/service:1.7
--- src/usr.sbin/service/service:1.6 Thu Apr 2 18:41:22 2015
+++ src/usr.sbin/service/service Sun Apr 5 11:33:15 2015
@@ -1,5 +1,5 @@
#!/bin/sh
-#$NetBSD: service,v 1.6 2015/04/02 18:41:22 ast Exp $
+#$NetBSD: service,v 1.7 2015/04/05 11:33:15 apb Exp $
#service -- run or list system services
#
# Taken from FreeBSD: releng/10.1/usr.sbin/service/service.sh 268098
@@ -33,7 +33,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bi
usage ()
{
-local me=${0##*/}
+local me=${0##*/}
echo usage: ${me} [-elv]
echo${me} [-ev] rc_script_name [rc_script_name2 [...]]
echo${me} [-v] rc_script_name action
@@ -60,7 +60,7 @@ _rc_files()
}
while getopts elv o; do
-case $o in
+case $o in
e) ENABLED=1 ;;
l) LIST=1 ;;
v) VERBOSE=1 ;;
@@ -83,9 +83,9 @@ if [ -n ${ENABLED} ]; then
fi
_rc_files | $flt | while read file
do
-if grep -q ^rcvar $file; then
-eval $( grep ^name= $file )
-eval $( grep ^rcvar $file )
+if grep -q ^rcvar $file; then
+eval $( grep ^name= $file )
+eval $( grep ^rcvar $file )
if [ -n ${rcvar} ]; then
load_rc_config ${rcvar}
checkyesno ${rcvar} 2/dev/null echo ${file}
@@ -116,7 +116,7 @@ for dir in ${rc_directories}; do
umask 022
exec env -i \
HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin \
-${dir}/${script} ${arg}
+${dir}/${script} ${arg}
echo Failed to exec ${dir}/${script} ${arg} 2
exit 255
fi
CVS commit: src/usr.sbin/service
Module Name:src Committed By: apb Date: Sun Apr 5 11:33:15 UTC 2015 Modified Files: src/usr.sbin/service: service Log Message: More shell quoting. /etc/rc.d/* file names with embedded spaces are not expected to work, but let's quote them anyway. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/service/service Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.sbin/service
On Wed, 01 Apr 2015, Adrian Steinmann wrote: Please could this be fixed to use shell quoting in a safe way. OK, if that'll unstall the pullup-7. I don't know. Are you implying that the /etc/rc.d/ system supports space in filenames? No, I am implying that somebody could create a file whose name contains a space. Whether or not it's supported is separate from whether or not the service(8) script does strange things when it happens. --apb (Alan Barrett)
CVS commit: src/external/bsd/ipf/dist/man
Module Name:src Committed By: apb Date: Tue Mar 24 19:46:58 UTC 2015 Modified Files: src/external/bsd/ipf/dist/man: ipf.5 Log Message: Fix the description of x and x y for port numbers. Patch for x from Timo Buhrmester, and for x y from me. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/man/ipf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/man/ipf.5 diff -u src/external/bsd/ipf/dist/man/ipf.5:1.3 src/external/bsd/ipf/dist/man/ipf.5:1.4 --- src/external/bsd/ipf/dist/man/ipf.5:1.3 Sun Jul 22 14:27:50 2012 +++ src/external/bsd/ipf/dist/man/ipf.5 Tue Mar 24 19:46:58 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: ipf.5,v 1.3 2012/07/22 14:27:50 darrenr Exp $ +.\ $NetBSD: ipf.5,v 1.4 2015/03/24 19:46:58 apb Exp $ .\ .TH IPF 5 .SH NAME @@ -326,8 +326,6 @@ Due to port numbers being used different possible to match on them in different ways. IPFilter allows you to use the following logical operations: .IP x -is true if the port number is greater than or equal to x and less than or -equal to y is true if the port number in the packet is less than x .IP = x is true if the port number in the packet is less than or equal to x @@ -342,7 +340,7 @@ is true if the port number in the packet .PP Additionally, there are a number of ways to specify a range of ports: .IP x y -is true if the port number is less than a and greater than y +is true if the port number is less than x and greater than y .IP x y is true if the port number is greater than x and less than y .IP x:y
CVS commit: src/external/bsd/ipf/dist/man
Module Name:src Committed By: apb Date: Tue Mar 24 19:46:58 UTC 2015 Modified Files: src/external/bsd/ipf/dist/man: ipf.5 Log Message: Fix the description of x and x y for port numbers. Patch for x from Timo Buhrmester, and for x y from me. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/man/ipf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/string
Module Name:src Committed By: apb Date: Mon Mar 23 07:41:16 UTC 2015 Modified Files: src/lib/libc/string: consttime_memequal.3 Log Message: Explain why there is no consttime_memcmp(). Inspired by a patch from Kamil Rytarowski. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/string/consttime_memequal.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/string/consttime_memequal.3 diff -u src/lib/libc/string/consttime_memequal.3:1.4 src/lib/libc/string/consttime_memequal.3:1.5 --- src/lib/libc/string/consttime_memequal.3:1.4 Fri Nov 14 22:46:34 2014 +++ src/lib/libc/string/consttime_memequal.3 Mon Mar 23 07:41:16 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: consttime_memequal.3,v 1.4 2014/11/14 22:46:34 wiz Exp $ +.\ $NetBSD: consttime_memequal.3,v 1.5 2015/03/23 07:41:16 apb Exp $ .\ .\ Copyright (c) 2013 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 14, 2014 +.Dd March 23, 2015 .Dt CONSTTIME_MEMEQUAL 3 .Os .Sh NAME @@ -78,6 +78,13 @@ does not return a lexicographic ordering and .Fa b2 ; it tells only whether they are equal. +.Nx +does not provide a +.Fn consttime_memcmp +function, because all known use cases that require +.Sq constant time +memory comparison also require only comparison for equality, +not lexicographic ordering. .Sh SEE ALSO .Xr explicit_memset 3 , .Xr memcmp 3
CVS commit: src/lib/libc/string
Module Name:src Committed By: apb Date: Mon Mar 23 07:41:16 UTC 2015 Modified Files: src/lib/libc/string: consttime_memequal.3 Log Message: Explain why there is no consttime_memcmp(). Inspired by a patch from Kamil Rytarowski. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/string/consttime_memequal.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Sat Mar 21 16:42:17 UTC 2015
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Actually create the done files, and test them for existence.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.5 src/external/public-domain/tz/tzdata2netbsd:1.6
--- src/external/public-domain/tz/tzdata2netbsd:1.5 Sat Mar 21 15:51:20 2015
+++ src/external/public-domain/tz/tzdata2netbsd Sat Mar 21 16:42:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.5 2015/03/21 15:51:20 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.6 2015/03/21 16:42:17 apb Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -271,7 +271,7 @@ editimportmsg()
cvsimport()
{
- if [ -s ${IMPORTDONEFILE} ]; then
+ if [ -e ${IMPORTDONEFILE} ]; then
cat 2 EOF
The CVS import has already been performed.
EOF
@@ -290,20 +290,21 @@ EOF
( cd ${EXTRACTDIR}
DOIT cvs -d ${CVSROOT} import -m $(cat ${IMPORTMSGFILE}) \
${REPODIR} ${CVSBRANCHTAG} ${CVSNEWTAG}
- )
+ ) touch ${IMPORTDONEFILE}
}
cvsmerge()
{
cd ${TZDISTDIR} || exit 1
- if [ -s ${MERGEDONEFILE} ]; then
+ if [ -e ${MERGEDONEFILE} ]; then
cat 2 EOF
The CVS merge has already been performed.
EOF
return 0
fi
- DOIT cvs -d ${CVSROOT} update -j${CVSOLDTAG} -j${CVSNEWTAG}
+ DOIT cvs -d ${CVSROOT} update -j${CVSOLDTAG} -j${CVSNEWTAG} \
+ touch ${MERGEDONEFILE}
}
resolveconflicts()
@@ -330,13 +331,14 @@ Not performing cvs commit.
EOF
return 1
fi
- if [ -s ${COMMITMERGEDONEFILE} ]; then
+ if [ -e ${COMMITMERGEDONEFILE} ]; then
cat 2 EOF
The CVS commmit (of the merge result) has already been performed.
EOF
return 0
fi
- DOIT cvs -d ${CVSROOT} commit -m Merge tzdata${NEWVER}
+ DOIT cvs -d ${CVSROOT} commit -m Merge tzdata${NEWVER} \
+ touch ${COMMITMERGEDONEFILE}
}
extra()
CVS commit: src/external/public-domain/tz
Module Name:src Committed By: apb Date: Sat Mar 21 16:42:17 UTC 2015 Modified Files: src/external/public-domain/tz: tzdata2netbsd Log Message: Actually create the done files, and test them for existence. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/tz/tzdata2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sat Mar 21 15:45:38 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19405 Log Message: Import tzdata2015b from ftp://ftp.iana.org/tz/releases/tzdata2015b.tar.gz Summary of changes in tzdata2015b (2015-03-19 23:28:11 -0700): * Mongolia will start observing DST again in 2015, from the last Saturday in March at 02:00 to the last Saturday in September at 00:00. * Palestine will start DST on March 28, not March 27, in 2015. * The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a regression. * Some more zones have been turned into links, when they differed from existing zones only for older time stamps. * Correct the 1992-2010 DST abbreviation in Volgograd from MSK to MSD. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015B U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sat Mar 21 15:45:38 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19405 Log Message: Import tzdata2015b from ftp://ftp.iana.org/tz/releases/tzdata2015b.tar.gz Summary of changes in tzdata2015b (2015-03-19 23:28:11 -0700): * Mongolia will start observing DST again in 2015, from the last Saturday in March at 02:00 to the last Saturday in September at 00:00. * Palestine will start DST on March 28, not March 27, in 2015. * The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a regression. * Some more zones have been turned into links, when they differed from existing zones only for older time stamps. * Correct the 1992-2010 DST abbreviation in Volgograd from MSK to MSD. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015B U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Sat Mar 21 15:51:21 UTC 2015
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Update tzdata2netbsd for tzdata2015b.
* Edit version numbers.
* Make the script deal better with being re-run multiple times. It
now keeps a status file for each non-trivial step, and doesn't repeat
the step if the sttaus file exists.
* Instead of spawning a subshell to resolve merge conflicts, print a message
and exit, with a suggestion to rte-run the script after conflicts
are resolved.
* Check whether there are any conflicts before trying to do anything
about conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.4 src/external/public-domain/tz/tzdata2netbsd:1.5
--- src/external/public-domain/tz/tzdata2netbsd:1.4 Thu Oct 23 03:42:09 2014
+++ src/external/public-domain/tz/tzdata2netbsd Sat Mar 21 15:51:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.4 2014/10/23 03:42:09 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.5 2015/03/21 15:51:20 apb Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -13,8 +13,8 @@
#redo non-trivial work done by earlier runs.
#
-OLDVER=2014h
-NEWVER=2014i
+OLDVER=2015a
+NEWVER=2015b
# Uppercase variants of OLDVER and NEWVER
OLDVER_UC=$( echo ${OLDVER} | tr '[a-z]' '[A-Z]' )
@@ -40,11 +40,14 @@ EXTRACTDIR=${WORKDIR}/extract
# Files in the work directory
DISTFILE=${WORKDIR}/${DISTURL##*/}
SIGFILE=${DISTFILE}.sig
+PGPVERIFYLOG=${WORKDIR}/pgpverify.log
NEWSFILE=${WORKDIR}/NEWS
NEWSTRIMFILE=${WORKDIR}/NEWS.trimmed
IMPORTMSGFILE=${WORKDIR}/import.msg
+IMPORTDONEFILE=${WORKDIR}/import.done
MERGSMSGFILE=${WORKDIR}/merge.msg
-PGPVERIFYLOG=${WORKDIR}/pgpverify.log
+MERGEDONEFILE=${WORKDIR}/merge.done
+COMMITMERGEDONEFILE=${WORKDIR}/commitmerge.done
DOIT()
{
@@ -268,6 +271,12 @@ editimportmsg()
cvsimport()
{
+ if [ -s ${IMPORTDONEFILE} ]; then
+ cat 2 EOF
+The CVS import has already been performed.
+EOF
+ return 0
+ fi
if ! [ -s ${IMPORTMSGFILE} ] \
|| grep -q '^EDIT' ${IMPORTMSGFILE}
then
@@ -285,25 +294,33 @@ EOF
}
cvsmerge()
-{(
+{
cd ${TZDISTDIR} || exit 1
+ if [ -s ${MERGEDONEFILE} ]; then
+ cat 2 EOF
+The CVS merge has already been performed.
+EOF
+ return 0
+ fi
DOIT cvs -d ${CVSROOT} update -j${CVSOLDTAG} -j${CVSNEWTAG}
-)}
+}
resolveconflicts()
{
- cat EOF
-Resolve conflicts resulting from the cvs merge.
-exit 0 when done. exit 1 to abort.
+ cd ${TZDISTDIR} || exit 1
+ if grep -l '^[=][=][=]' *
+ then
+ cat EOF
+There appear to be conflicts in the files listed above.
+Resolve conflicts, then re-run this script.
EOF
- nl='
-'
- PS1=[inside ${0##*/}]${nl}${PS1} sh -i
+ return 1
+ fi
}
cvscommitmerge()
-{(
+{
cd ${TZDISTDIR} || exit 1
if grep -l '^[=][=][=]' *
then
@@ -313,8 +330,14 @@ Not performing cvs commit.
EOF
return 1
fi
+ if [ -s ${COMMITMERGEDONEFILE} ]; then
+ cat 2 EOF
+The CVS commmit (of the merge result) has already been performed.
+EOF
+ return 0
+ fi
DOIT cvs -d ${CVSROOT} commit -m Merge tzdata${NEWVER}
-)}
+}
extra()
{
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Mar 21 15:52:19 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: We have tzdata2015b. To generate a diff of this commit: cvs rdiff -u -r1.1209 -r1.1210 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1209 src/doc/3RDPARTY:1.1210 --- src/doc/3RDPARTY:1.1209 Fri Mar 13 13:48:18 2015 +++ src/doc/3RDPARTY Sat Mar 21 15:52:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1209 2015/03/13 13:48:18 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1210 2015/03/21 15:52:19 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1338,8 +1338,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2015a / tzdata2015a -Current Vers: tzcode2015a / tzdata2015a +Version: tzcode2015a / tzdata2015b +Current Vers: tzcode2015b / tzdata2015b Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Mar 21 15:52:19 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: We have tzdata2015b. To generate a diff of this commit: cvs rdiff -u -r1.1209 -r1.1210 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/tz
Module Name:src Committed By: apb Date: Sat Mar 21 15:51:21 UTC 2015 Modified Files: src/external/public-domain/tz: tzdata2netbsd Log Message: Update tzdata2netbsd for tzdata2015b. * Edit version numbers. * Make the script deal better with being re-run multiple times. It now keeps a status file for each non-trivial step, and doesn't repeat the step if the sttaus file exists. * Instead of spawning a subshell to resolve merge conflicts, print a message and exit, with a suggestion to rte-run the script after conflicts are resolved. * Check whether there are any conflicts before trying to do anything about conflicts. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/tz/tzdata2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Mar 21 15:54:11 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015b. [apb 20150321] Also s/tzdata/tzcode in another line. To generate a diff of this commit: cvs rdiff -u -r1.2054 -r1.2055 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2054 src/doc/CHANGES:1.2055 --- src/doc/CHANGES:1.2054 Mon Mar 9 02:03:19 2015 +++ src/doc/CHANGES Sat Mar 21 15:54:11 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2054 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2055 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -132,10 +132,11 @@ Changes from NetBSD 7.0 to NetBSD 8.0: libevent: Import libevent 2.0.22 [spz 20150129] dhcpcd(8): Import dhcpcd-6.7.1. [roy 20150130] zoneinfo: Import tzdata2015a. [apb 20150131] - libc: Import tzdata2015a. [christos 20150131] + libc: Import tzcode2015a. [christos 20150131] bind: patch to version 9.10.1-P2. [spz 20150221] network: introduce RTF_LOCAL for local address routes. [roy 20150226] evbarm: Add support for RPI2. [skrll 20150304] evbarm: Add support for ODROID-C1. [jmcneill 20150304] dtrace: Add syscall support [christos 20150307] dtrace: Add lockstat support [riastradh, christos 20150308] + zoneinfo: Import tzdata2015b. [apb 20150321]
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Mar 21 15:54:11 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015b. [apb 20150321] Also s/tzdata/tzcode in another line. To generate a diff of this commit: cvs rdiff -u -r1.2054 -r1.2055 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Jan 31 18:27:28 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015a. [apb 20150131] To generate a diff of this commit: cvs rdiff -u -r1.2043 -r1.2044 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2043 src/doc/CHANGES:1.2044 --- src/doc/CHANGES:1.2043 Fri Jan 30 23:00:06 2015 +++ src/doc/CHANGES Sat Jan 31 18:27:28 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2043 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2044 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -129,3 +129,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: blacklist: Added daemon and library [christos 20150125] libevent: Import libevent 2.0.22 [spz 20150129] dhcpcd(8): Import dhcpcd-6.7.1. [roy 20150130] + zoneinfo: Import tzdata2015a. [apb 20150131]
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Jan 31 18:27:28 UTC 2015 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2015a. [apb 20150131] To generate a diff of this commit: cvs rdiff -u -r1.2043 -r1.2044 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Jan 31 18:27:02 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: tzcode2015a/tzdata2015a have been released. We have updated tzdata. To generate a diff of this commit: cvs rdiff -u -r1.1199 -r1.1200 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1199 src/doc/3RDPARTY:1.1200 --- src/doc/3RDPARTY:1.1199 Fri Jan 30 23:00:06 2015 +++ src/doc/3RDPARTY Sat Jan 31 18:27:02 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1199 2015/01/30 23:00:06 spz Exp $ +# $NetBSD: 3RDPARTY,v 1.1200 2015/01/31 18:27:02 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1313,8 +1313,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2014j / tzdata2014j -Current Vers: tzcode2014j / tzdata2014j +Version: tzcode2014j / tzdata2015a +Current Vers: tzcode2015a / tzdata2015a Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Jan 31 18:27:02 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: tzcode2015a/tzdata2015a have been released. We have updated tzdata. To generate a diff of this commit: cvs rdiff -u -r1.1199 -r1.1200 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sat Jan 31 18:23:15 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5876 Log Message: Import tzdata2015a from ftp://ftp.iana.org/tz/releases/tzdata2015a.tar.gz Summary of changes in tzdata2015a (2015-01-29 22:35:20 -0800): * The Mexican state of Quintana Roo, represented by America/Cancun, will shift from Central Time with DST to Eastern Time without DST on 2015-02-01 at 02:00. * Chile will not change clocks in April or thereafter; its new standard time will be its old daylight saving time. This affects America/Santiago, Pacific/Easter, and Antarctica/Palmer. (Thanks to Juan Correa.) * New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. * Iceland observed DST in 1919 and 1921, and its 1939 fallback transition was Oct. * Some more zones have been turned into links, when they differed from existing zones only for older time stamps. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015A U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh N src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sat Jan 31 18:23:15 UTC 2015 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5876 Log Message: Import tzdata2015a from ftp://ftp.iana.org/tz/releases/tzdata2015a.tar.gz Summary of changes in tzdata2015a (2015-01-29 22:35:20 -0800): * The Mexican state of Quintana Roo, represented by America/Cancun, will shift from Central Time with DST to Eastern Time without DST on 2015-02-01 at 02:00. * Chile will not change clocks in April or thereafter; its new standard time will be its old daylight saving time. This affects America/Santiago, Pacific/Easter, and Antarctica/Palmer. (Thanks to Juan Correa.) * New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49. * Iceland observed DST in 1919 and 1921, and its 1939 fallback transition was Oct. * Some more zones have been turned into links, when they differed from existing zones only for older time stamps. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2015A U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh N src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/tools
Module Name:src Committed By: apb Date: Sat Jan 3 13:20:11 UTC 2015 Modified Files: src/tools: README Log Message: Update documentation about tools being restricted to C89 (or not). It's not practical for the C89 restriction to be maintained for compilers, but it is still desirable for most tools. The long long data type is in wide use despite not being in C89. C99 library features (as opposed to language features) can often be added to the compat framework when the need becomes apparent. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tools/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/README diff -u src/tools/README:1.3 src/tools/README:1.4 --- src/tools/README:1.3 Tue Sep 30 07:34:50 2014 +++ src/tools/README Sat Jan 3 13:20:11 2015 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.3 2014/09/30 07:34:50 apb Exp $ +$NetBSD: README,v 1.4 2015/01/03 13:20:11 apb Exp $ Notes for NetBSD src/tools @@ -28,12 +28,20 @@ Portability Programs that are built as tools need to be more portable than other parts of NetBSD, because they will need to run on the host platform. -Tools should restrict themselves to C language features that are defined -in C89 (ISO 9899-1989); they should avoid using C99 features. - -Tools may library features defined in C89 and in POSIX (IEEE Std 1003.1) -(XXX year?), and features that are provided by the src/tools/compat -framework described below. +Most tools should restrict themselves to C language features that are +defined in C89 (ISO 9899-1989); they should avoid using C99 language +features. There are a few tools, such as compilers, where it is not +practical for the C89 restriction to be maintained. There are also a +few features, such as the long long data type, that are used by many +tools despite not being defined in C89. + +Tools may use library features such as functions, macros, and +types, that are defined in C89 and in POSIX (IEEE Std 1003.1) (XXX +year?), and features that are provided by the compatibility framework +(src/tools/compat) described in a separate section below. This is +usually not an onerous burden, because many C99 library features, and +NetBSD-specific features, are already provided by src/tools/compat, or +can be added when the need for them becomes apparent. If a tool attempts to use a feature that is not available on the host platform, then the tools build will fail. This can be addressed by @@ -137,4 +145,3 @@ the program can use code like this: ... code to be used when FEATURE X is not desired, ... e.g. when being built as a tool. #endif -
CVS commit: src/tools
Module Name:src Committed By: apb Date: Sat Jan 3 13:20:11 UTC 2015 Modified Files: src/tools: README Log Message: Update documentation about tools being restricted to C89 (or not). It's not practical for the C89 restriction to be maintained for compilers, but it is still desirable for most tools. The long long data type is in wide use despite not being in C89. C99 library features (as opposed to language features) can often be added to the compat framework when the need becomes apparent. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tools/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Fri, 02 Jan 2015, Christos Zoulas wrote: Log Message: Implement DIOCGMEDIASIZE and DIOCGSECTORSIZE from FreeBSD. This needs compat32 handling, at least for the u_int arg to DIOCGSECTORSIZE. Why not make it a fixed size, like uint32_t, so compat32 handling will not be needed? I think it was made u_int to match previous art by FreeBSD. Can you please explain why it needs compat32 handling? Sorry, it doesn't need compat32 handling, because all existing NetBSD platforms have 32-bit int, and all exiting NetBSD platforms have 64-bit off_t. --apb (Alan Barrett)
Re: CVS commit: src
On Mon, 29 Dec 2014, Michael van Elst wrote: Log Message: Implement DIOCGMEDIASIZE and DIOCGSECTORSIZE from FreeBSD. This needs compat32 handling, at least for the u_int arg to DIOCGSECTORSIZE. Why not make it a fixed size, like uint32_t, so compat32 handling will not be needed? --apb (Alan Barrett)
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Tue Dec 30 07:02:29 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: rc_obsolete_vars is a list of pairs, so format it with one pair per line. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.187 src/usr.sbin/postinstall/postinstall:1.188 --- src/usr.sbin/postinstall/postinstall:1.187 Tue Dec 16 05:30:40 2014 +++ src/usr.sbin/postinstall/postinstall Tue Dec 30 07:02:29 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.187 2014/12/16 05:30:40 jnemeth Exp $ +# $NetBSD: postinstall,v 1.188 2014/12/30 07:02:29 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1451,26 +1451,16 @@ systemfs xntpd rc_obsolete_vars= -amd -amd_master -btcontrol -btcontrol_devices -critical_filesystems -critical_filesystems_beforenet -mountcritlocal -mountcritremote -network -ip6forwarding -network -nfsiod_flags -sdpd -sdpd_control -sdpd -sdpd_groupname -sdpd -sdpd_username -sysctl -defcorename +amd amd_master +btcontrol btcontrol_devices +critical_filesystems critical_filesystems_beforenet +mountcritlocal mountcritremote +network ip6forwarding +network nfsiod_flags +sdpd sdpd_control +sdpd sdpd_groupname +sdpd sdpd_username +sysctl defcorename additem rc /etc/rc* and /etc/rc.d/ being up to date
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Tue Dec 30 07:02:29 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: rc_obsolete_vars is a list of pairs, so format it with one pair per line. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Mon, 17 Nov 2014, Masao Uebayashi wrote: How about adding a new make variable CONFIGOPTS, which is passed to config(1)? This name is similar to COPTS and works similarly too. Yes, that could work. --apb (Alan Barrett)
Re: CVS commit: src
On Mon, 17 Nov 2014, Martin Husemann wrote: On Sun, Nov 16, 2014 at 06:08:13AM +, Masao Uebayashi wrote: Modified Files: src: build.sh Log Message: build.sh mkernels: Build all kernels in modular build Sorry to be slow here, but: this modular obviously differs from modular kernels (as in: have options MODULAR) - so I guess the name is not a good one. I actually have no clue what it is supposed to mean. Also, why does it need a new build.sh action? Why can't the choice of how to build kernels be triggered by a variable in a Makefile or in the environment or in the kernel configuration? Was this discussed anywhere? --apb (Alan Barrett)
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sun Nov 16 07:08:12 UTC 2014 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20806 Log Message: Import tzdata2014j from ftp://ftp.iana.org/tz/releases/tzdata2014j.tar.gz Summary of changes in tzdata2014j (2014-11-10 17:37:11 -0800): * Turks Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. * Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. * Some more zones have been turned into links, when they differed from existing zones only for older (pre-1970) time stamps. * Changes affecting commentary. Summary of changes in tzdata2014i (2014-10-21 22:04:57 -0700): * Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00. * A new Zone Pacific/Bougainville, for the part of Papua New Guinea that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00. * Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET to its more-traditional value MSK on 2014-10-26 at 01:00. * The new abbreviation IDT stands for the pre-1976 use of UT+8 in Indochina, to distinguish it better from ICT (UT+7). * Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976. Asia/Ho_Chi_Minh has been added to zone1970.tab, to give tzselect users in Vietnam two choices, since north and south Vietnam disagreed after our 1970 cutoff. * Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as they differed from existing zones only for older (pre-1970) time stamps. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2014J U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Nov 16 07:17:10 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: Updated tzdata to 2014j. tzcode2014j is also available. To generate a diff of this commit: cvs rdiff -u -r1.1172 -r1.1173 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1172 src/doc/3RDPARTY:1.1173 --- src/doc/3RDPARTY:1.1172 Fri Nov 14 12:02:20 2014 +++ src/doc/3RDPARTY Sun Nov 16 07:17:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1172 2014/11/14 12:02:20 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1173 2014/11/16 07:17:10 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1311,8 +1311,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2014i / tzdata2014i -Current Vers: tzcode2014i / tzdata2014i +Version: tzcode2014j / tzdata2014j +Current Vers: tzcode2014i / tzdata2014j Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Nov 16 07:17:50 UTC 2014 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2014j. [apb 20141116] To generate a diff of this commit: cvs rdiff -u -r1.2017 -r1.2018 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2017 src/doc/CHANGES:1.2018 --- src/doc/CHANGES:1.2017 Fri Nov 14 12:02:20 2014 +++ src/doc/CHANGES Sun Nov 16 07:17:50 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2017 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2018 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -102,3 +102,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: awinhdmiaudio(4): Add support for Allwinner A20/A31 HDMI audio controller. [jmcneill 2014] dhcpcd(8): Import dhcpcd-6.6.2. [roy 20141114] + zoneinfo: Import tzdata2014j. [apb 20141116]
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sun Nov 16 07:08:12 UTC 2014 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20806 Log Message: Import tzdata2014j from ftp://ftp.iana.org/tz/releases/tzdata2014j.tar.gz Summary of changes in tzdata2014j (2014-11-10 17:37:11 -0800): * Turks Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. * Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. * Some more zones have been turned into links, when they differed from existing zones only for older (pre-1970) time stamps. * Changes affecting commentary. Summary of changes in tzdata2014i (2014-10-21 22:04:57 -0700): * Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00. * A new Zone Pacific/Bougainville, for the part of Papua New Guinea that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00. * Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET to its more-traditional value MSK on 2014-10-26 at 01:00. * The new abbreviation IDT stands for the pre-1976 use of UT+8 in Indochina, to distinguish it better from ICT (UT+7). * Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976. Asia/Ho_Chi_Minh has been added to zone1970.tab, to give tzselect users in Vietnam two choices, since north and south Vietnam disagreed after our 1970 cutoff. * Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as they differed from existing zones only for older (pre-1970) time stamps. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2014J U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Nov 16 07:17:10 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: Updated tzdata to 2014j. tzcode2014j is also available. To generate a diff of this commit: cvs rdiff -u -r1.1172 -r1.1173 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Nov 16 07:17:50 UTC 2014 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2014j. [apb 20141116] To generate a diff of this commit: cvs rdiff -u -r1.2017 -r1.2018 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Thu Nov 13 08:25:32 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: Document extsrc. This was added to src/BUILDING in revision 1.90 dated 2009-11-30, but was not added to src/doc/BUILDING.mdoc, so the changes were lost. The original log message was: - - - - revision 1.90 date: 2009-11-30 16:13:22 +; author: uebayasi; state: Exp; lines: +22 -0; Support extsrc, externally added programs and libraries. Users can write their own reach-overs, cross-build, install, and get set files just like base and X11 / X.org. (These sets are not included as TNF releases.) - - - - To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.106 src/doc/BUILDING.mdoc:1.107 --- src/doc/BUILDING.mdoc:1.106 Thu Nov 6 06:41:23 2014 +++ src/doc/BUILDING.mdoc Thu Nov 13 08:25:31 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.106 2014/11/06 06:41:23 uebayasi Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.107 2014/11/13 08:25:31 apb Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -155,6 +155,11 @@ If any of these directories are missing, .Dq Reachover build structure for X11R6; the source is in .Sy X11SRCDIR . +.It Pa extsrc/ +.Dq Reachover +build structure for externally added programs and libraries; +the source is in +.Sy EXTSRCSRCDIR . .El . .Ss Build tree layout @@ -416,6 +421,15 @@ unless run in .Sq expert mode. . +.It Sy EXTSRCSRCDIR +Directory containing sources of externally added programs +and libraries. +If specified, must be an absolute path. +.DFLT +.Sy NETBSDRCDIR Ns Pa /../extsrc , +if that exists; otherwise +.Pa /usr/extsrc . +. .It Sy MAKECONF The name of the .Xr make 1 @@ -507,6 +521,12 @@ Indicates whether system documentation d will be installed during a build. .DFLTy . +.It Sy MKEXTSRC +.YorN +Indicates whether extsrc is built from +.Sy EXTSRCSRCDIR . +.DFLTn +. .It Sy MKHTML .YorN Indicates whether preformatted HTML manual pages will be built @@ -1943,6 +1963,18 @@ absolute path before being used. Set .Sy MKX11=yes . . +.It Fl Y Ar extsrcdir +Set the value of +.Sy EXTSRCSRCDIR +to +.Ar extsrcdir . +If a relative path is specified, it will be converted to an +absolute path before being used. +. +.It Fl y +Set +.Sy MKEXTSRC=yes . +. .It Fl Z Ar var Unset (zap) the environment variable .Ar var .
CVS commit: src
Module Name:src Committed By: apb Date: Thu Nov 13 08:42:35 UTC 2014 Modified Files: src: BUILDING Log Message: regen from doc/BUILDING.mdoc revision 1.107. This reinstates documentation for extsrc which was lost in 2009. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.114 src/BUILDING:1.115 --- src/BUILDING:1.114 Sat Nov 8 04:23:00 2014 +++ src/BUILDING Thu Nov 13 08:42:35 2014 @@ -80,6 +80,9 @@ FILES x11/ ``Reachover'' build structure for X11R6; the source is in X11SRCDIR. + extsrc/``Reachover'' build structure for externally added +programs and libraries; the source is in EXTSRCSRCDIR. + Build tree layout The NetBSD build tree is described in hier(7), and the release layout is described in release(7). @@ -197,6 +200,13 @@ CONFIGURATION Note: build.sh will provide a default of destdir.MACHINE (in the top-level .OBJDIR) unless run in `expert' mode. + EXTSRCSRCDIR + Directory containing sources of externally added programs and + libraries. If specified, must be an absolute path. + + Default: NETBSDRCDIR/../extsrc, if that exists; otherwise + /usr/extsrc. + MAKECONFThe name of the make(1) configuration file. Only settable in the process environment. @@ -264,6 +274,11 @@ CONFIGURATION Default: ``yes'' + MKEXTSRCCan be set to ``yes'' or ``no''. Indicates whether extsrc is + built from EXTSRCSRCDIR. + + Default: ``no'' + MKHTML Can be set to ``yes'' or ``no''. Indicates whether preformatted HTML manual pages will be built and installed @@ -1022,6 +1037,13 @@ BUILDING -xSet MKX11=yes. + -Y extsrcdir + Set the value of EXTSRCSRCDIR to extsrcdir. If a relative path + is specified, it will be converted to an absolute path before + being used. + + -ySet MKEXTSRC=yes. + -Z varUnset (zap) the environment variable var. This is propagated to the nbmake wrapper.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Thu Nov 13 08:25:32 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: Document extsrc. This was added to src/BUILDING in revision 1.90 dated 2009-11-30, but was not added to src/doc/BUILDING.mdoc, so the changes were lost. The original log message was: - - - - revision 1.90 date: 2009-11-30 16:13:22 +; author: uebayasi; state: Exp; lines: +22 -0; Support extsrc, externally added programs and libraries. Users can write their own reach-overs, cross-build, install, and get set files just like base and X11 / X.org. (These sets are not included as TNF releases.) - - - - To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: apb Date: Thu Nov 13 08:42:35 UTC 2014 Modified Files: src: BUILDING Log Message: regen from doc/BUILDING.mdoc revision 1.107. This reinstates documentation for extsrc which was lost in 2009. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: apb
Date: Wed Nov 12 19:31:05 UTC 2014
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Change the order of arguments to check_ids, placing the two file names
adjacent to each other. Also add a comment explaining the start
argument and the SKIP special value.
To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.181 src/usr.sbin/postinstall/postinstall:1.182
--- src/usr.sbin/postinstall/postinstall:1.181 Tue Nov 11 19:41:38 2014
+++ src/usr.sbin/postinstall/postinstall Wed Nov 12 19:31:05 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.181 2014/11/11 19:41:38 martin Exp $
+# $NetBSD: postinstall,v 1.182 2014/11/12 19:31:05 apb Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -223,8 +223,13 @@ check_dir()
return 0
}
-# check_ids op type file start id [...]
-# Check if file of type users or groups contains the relevant IDs
+# check_ids op type file srcfile start id [...]
+# Check if file of type users or groups contains the relevant IDs.
+# Use srcfile as a reference for the expected contents.
+# The specified id names should be given in numerical order,
+# with the first name corresponding to numerical value start,
+# and with the special name SKIP being used to mark gaps in the
+# sequence.
# Returns 0 if ok, 1 otherwise.
#
check_ids()
@@ -233,8 +238,8 @@ check_ids()
_op=$1
_type=$2
_file=$3
- _start=$4
- _srcfile=$5
+ _srcfile=$4
+ _start=$5
shift 5
#_ids=$@
@@ -1027,8 +1032,8 @@ do_gid()
{
[ -n $1 ] || err 3 USAGE: do_gid fix|check
- check_ids $1 groups ${DEST_DIR}/etc/group 14 \
- ${SRC_DIR}/etc/group \
+ check_ids $1 groups ${DEST_DIR}/etc/group \
+ ${SRC_DIR}/etc/group 14 \
named ntpd sshd SKIP _pflogd _rwhod staff _proxy _timedc \
_sdpd _httpd _mdnsd _tests _tcpdump _tss _gpio _rtadvd
}
@@ -1706,8 +1711,8 @@ do_uid()
{
[ -n $1 ] || err 3 USAGE: do_uid fix|check
- check_ids $1 users ${DEST_DIR}/etc/master.passwd 12 \
- ${SRC_DIR}/etc/master.passwd \
+ check_ids $1 users ${DEST_DIR}/etc/master.passwd \
+ ${SRC_DIR}/etc/master.passwd 12 \
postfix SKIP named ntpd sshd SKIP _pflogd _rwhod SKIP _proxy \
_timedc _sdpd _httpd _mdnsd _tests _tcpdump _tss SKIP _rtadvd
}
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Wed Nov 12 19:41:24 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Fix tab/space inconsistency in comment. To generate a diff of this commit: cvs rdiff -u -r1.182 -r1.183 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.182 src/usr.sbin/postinstall/postinstall:1.183 --- src/usr.sbin/postinstall/postinstall:1.182 Wed Nov 12 19:31:05 2014 +++ src/usr.sbin/postinstall/postinstall Wed Nov 12 19:41:24 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.182 2014/11/12 19:31:05 apb Exp $ +# $NetBSD: postinstall,v 1.183 2014/11/12 19:41:24 apb Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -226,7 +226,7 @@ check_dir() # check_ids op type file srcfile start id [...] # Check if file of type users or groups contains the relevant IDs. # Use srcfile as a reference for the expected contents. -# The specified id names should be given in numerical order, +# The specified id names should be given in numerical order, # with the first name corresponding to numerical value start, # and with the special name SKIP being used to mark gaps in the # sequence.
CVS commit: src/usr.sbin/etcupdate
Module Name:src Committed By: apb Date: Thu Nov 13 07:11:06 UTC 2014 Modified Files: src/usr.sbin/etcupdate: etcupdate Log Message: Synchronise the -s part of the usage message with postinstall. A colon-separated list of tgz files is no longer accepted; you must use multiple -s options instead. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/etcupdate/etcupdate Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/etcupdate/etcupdate diff -u src/usr.sbin/etcupdate/etcupdate:1.58 src/usr.sbin/etcupdate/etcupdate:1.59 --- src/usr.sbin/etcupdate/etcupdate:1.58 Mon Aug 4 21:56:30 2014 +++ src/usr.sbin/etcupdate/etcupdate Thu Nov 13 07:11:06 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: etcupdate,v 1.58 2014/08/04 21:56:30 apb Exp $ +# $NetBSD: etcupdate,v 1.59 2014/11/13 07:11:06 apb Exp $ # # Copyright (c) 2001-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -93,9 +93,10 @@ Options: following: * A directory that contains a NetBSD source tree; * A distribution set file such as etc.tgz or - xetc.tgz, or a colon-separated list of such files; - * A temporary directory in which one or both of etc.tgz - and xetc.tgz have been extracted. + xetc.tgz. Pass multiple -s options to specify + multiple such files; + * A temporary directory in which one or both of + etc.tgz and xetc.tgz have been extracted. -t temproot Where to store temporary files (default: /tmp/temproot) -d destdir Destination directory to check. (default: /) -w width Screen width(default: 80)
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Wed Nov 12 19:31:05 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Change the order of arguments to check_ids, placing the two file names adjacent to each other. Also add a comment explaining the start argument and the SKIP special value. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: apb Date: Wed Nov 12 19:41:24 UTC 2014 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Fix tab/space inconsistency in comment. To generate a diff of this commit: cvs rdiff -u -r1.182 -r1.183 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: apb
Date: Mon Nov 10 09:59:33 UTC 2014
Modified Files:
src: build.sh
Log Message:
Replace '.' and '-' in ${op} with '_', before setting d_${op}=true.
Also remove or simplify older code that did the same thing in a
different way. The old code handled most cases, but did not change
op=kernel.gdb to op=kernel_gdb.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.300 src/build.sh:1.301
--- src/build.sh:1.300 Thu Nov 6 02:02:48 2014
+++ src/build.sh Mon Nov 10 09:59:33 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.300 2014/11/06 02:02:48 uebayasi Exp $
+# $NetBSD: build.sh,v 1.301 2014/11/10 09:59:33 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1319,25 +1319,6 @@ parseoptions()
exit $?
;;
- makewrapper|cleandir|obj|tools|build|distribution|release|sets|sourcesets|syspkgs|params)
- ;;
-
- iso-image)
- op=iso_image # used as part of a variable name
- ;;
-
- iso-image-source)
- op=iso_image_source # used as part of a variable name
- ;;
-
- live-image)
- op=live_image # used as part of a variable name
- ;;
-
- install-image)
- op=install_image # used as part of a variable name
- ;;
-
kernel=*|releasekernel=*|kernel.gdb=*)
arg=${op#*=}
op=${op%%=*}
@@ -1345,10 +1326,6 @@ parseoptions()
bomb Must supply a kernel name with \`${op}=...'
;;
- kernels)
- op=kernels
- ;;
-
disk-image=*)
arg=${op#*=}
op=disk_image
@@ -1357,10 +1334,6 @@ parseoptions()
;;
- modules)
- op=modules
- ;;
-
install=*|installmodules=*)
arg=${op#*=}
op=${op%%=*}
@@ -1368,8 +1341,25 @@ parseoptions()
bomb Must supply a directory with \`install=...'
;;
- rump|rumptest)
- op=${op}
+ build|\
+ cleandir|\
+ distribution|\
+ install-image|\
+ iso-image-source|\
+ iso-image|\
+ kernels|\
+ live-image|\
+ makewrapper|\
+ modules|\
+ obj|\
+ params|\
+ release|\
+ rump|\
+ rumptest|\
+ sets|\
+ sourcesets|\
+ syspkgs|\
+ tools)
;;
*)
@@ -1377,6 +1367,9 @@ parseoptions()
;;
esac
+ # ${op} may contain chars that are not allowed in variable
+ # names. Replace them with '_' before setting do_${op}.
+ op=$( echo $op | tr -s '.-' '__')
eval do_${op}=true
done
[ -n ${operations} ] || usage Missing operation to perform.
@@ -1876,7 +1869,7 @@ createmakewrapper()
eval cat EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy make building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.300 2014/11/06 02:02:48 uebayasi Exp $
+# Generated from: \$NetBSD: build.sh,v 1.301 2014/11/10 09:59:33 apb Exp $
# with these arguments: ${_args}
#
CVS commit: src
Module Name:src
Committed By: apb
Date: Mon Nov 10 09:59:33 UTC 2014
Modified Files:
src: build.sh
Log Message:
Replace '.' and '-' in ${op} with '_', before setting d_${op}=true.
Also remove or simplify older code that did the same thing in a
different way. The old code handled most cases, but did not change
op=kernel.gdb to op=kernel_gdb.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Re: CVS commit: src/usr.bin/config
On Thu, 30 Oct 2014, Taylor R Campbell wrote: It seems to me that while depending on ordering for definitions, files, c., may be no good, for selections the language of include GENERIC no options DIAGNOSTIC no agp* is still valuable. I don't mind how it's implemented, but my main concern is that I want an example like the above to work. I want it to mean: my kernel should be based on GENERIC with some changes; whether or not options DIAGNOSTIC is present in GENERIC, my kernel should not have options DIAGNOSTIC; and whether or not anything related to agp is present in GENERIC, my kernel should not have any agp devices (and should not have anything that depends on agp). I do not want error messages like options DIAGNOSTIC was already off, so you are not allowed to try to turn it off again or there were no agp devices, so you are not allowed to try to remove agp devices. So config(1) ought to choose whatever is the last yes/no answer for a selection in order to decide what things are really enabled or disabled, and then process dependencies recursively from there, rather than incrementally processing dependencies as the parser makes progress. That sounds as though it would do what I want. --apb (Alan Barrett)
Re: CVS commit: src/usr.bin/config
On Thu, 30 Oct 2014, Masao Uebayashi wrote: What do you expect by doing: options FOO no options FOO options FOO I expect it to be equivalent to just one options FOO. The no options FOO in line 2 should cancel the options FOO in line 1, and then the options FOO in line 3 should put it back. In the cases that I care about, the options and no options lines will be in different files, referenced via include directives. --apb (Alan Barrett)
Re: CVS commit: othersrc/external/bsd/multigest
On Tue, 28 Oct 2014, Alistair Crooks wrote:
+.ifndef PRINTOBJDIR
+PRINTOBJDIR=${MAKE} -V .OBJDIR
+.endif
At least for NetBSD's make(1), you need ${MAKE} -V '${.OBJDIR}' to
get the recursively-expanded value of .OBJDIR. ${MAKE} -V .OBJDIR
would print the unexpanded value.
Oh, you'd better fix it in NetBSD's bsd.own.mk then, which was where I took
the definition above from.
It probably works because .OBJDIR is magic, and is unlikely to need
recursive expansion.
--apb (Alan Barrett)
Re: CVS commit: othersrc/external/bsd/multigest
On Tue, 28 Oct 2014, Alistair G. Crooks wrote:
Modified Files:
othersrc/external/bsd/multigest/bin: Makefile
othersrc/external/bsd/multigest/lib: Makefile
+.ifndef PRINTOBJDIR
+PRINTOBJDIR=${MAKE} -V .OBJDIR
+.endif
At least for NetBSD's make(1), you need ${MAKE} -V '${.OBJDIR}' to
get the recursively-expanded value of .OBJDIR. ${MAKE} -V .OBJDIR
would print the unexpanded value.
--apb (Alan Barrett)
Re: CVS commit: src/distrib/sets
On Fri, 24 Oct 2014, Jeff Rizzo wrote: Modified Files: src/distrib/sets: join.awk Log Message: Back out previous until it can be fixed - it was causing all sets to contain all files, which made a full build of all arches over 150GB! Sorry, I'll try to fix it soon, but it may have to wait a few days. Meanwhile, backing out the problematic revision should be fine. --apb (Alan Barrett)
CVS commit: src/distrib/sets
Module Name:src
Committed By: apb
Date: Thu Oct 23 14:19:33 UTC 2014
Modified Files:
src/distrib/sets: join.awk
Log Message:
Add vis() function, and canonicalise file names via vis(unvis($1)).
XXX: The vis() function is very limited, due to the absence of ord()
in NetBSD's awk.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/join.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/join.awk
diff -u src/distrib/sets/join.awk:1.4 src/distrib/sets/join.awk:1.5
--- src/distrib/sets/join.awk:1.4 Tue Oct 21 23:15:38 2014
+++ src/distrib/sets/join.awk Thu Oct 23 14:19:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: join.awk,v 1.4 2014/10/21 23:15:38 apb Exp $
+# $NetBSD: join.awk,v 1.5 2014/10/23 14:19:33 apb Exp $
#
# Copyright (c) 2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,8 @@
# join.awk F1 F2
# Similar to join(1), this reads a list of words from F1
# and outputs lines in F2 with a first word that is in F1.
-# Neither file needs to be sorted
+# The first word is canonicalised via vis(unvis(word))).
+# Neither file needs to be sorted.
function unvis(s) \
{
@@ -53,7 +54,7 @@ function unvis(s) \
s = substr(s, 3)
} else if (match(s, [0-7][0-7][0-7]) == 1) {
# \ooo with three octal digits.
- # XXX: use strnum() is that is available
+ # XXX: use strtonum() when that is available
unvis_result = unvis_result sprintf(%c, \
0+substr(s, 2, 1) * 64 + \
0+substr(s, 3, 1) * 8 + \
@@ -72,6 +73,60 @@ function unvis(s) \
return unvis_result
}
+function vis(s) \
+{
+ # We need to encode backslash, space, and tab, because they
+ # would interfere with scripts that attempt to manipulate
+ # the set files.
+ #
+ # We make no attempt to encode shell special characters
+ # such as ' $ ( ) { } [ ] * ?, because nothing that
+ # parses set files would need that.
+ #
+ # We would like to handle other white space or non-graph
+ # characters, because they may be confusing for human readers,
+ # but they are too difficult to handle in awk without the ord()
+ # function, so we print an error message.
+ #
+ # As of October 2014, no files in the set lists contain
+ # characters that would need any kind of encoding.
+ #
+ vis_result =
+ while (length(s) 0) {
+ vis_pos = match(s, (|[[:space:]]|[^[:graph:]]))
+ if (vis_pos == 0) {
+ vis_result = vis_result s
+ s =
+ break
+ }
+ # copy the part before the next special char
+ vis_result = vis_result substr(s, 1, vis_pos - 1)
+ vis_char = substr(s, vis_pos, 1)
+ s = substr(s, vis_pos + 1)
+ # process the special char
+ if (vis_char == \\) {
+ # backslash - double backslash
+ vis_result = vis_result
+ } else if (vis_char == ) {
+ # space - \040
+ vis_result = vis_result \\040
+ } else if (vis_char == \t) {
+ # tab - \011
+ vis_result = vis_result \\011
+ } else {
+ # generalised \ooo with three octal digits.
+ # XXX: I don't know how to do this in awk without ord()
+ printf %s: %s:%s: cannot perform vis encoding\n, \
+ARGV[0], (FILENAME ? FILENAME : stdin), FNR \
+/dev/stderr
+ vis_result = vis_result vis_char
+ }
+ }
+ return vis_result
+}
+
+// { $1 = vis(unvis($1)); print }
+
BEGIN \
{
if (ARGC != 3) {
@@ -79,13 +134,13 @@ BEGIN \
exit 1
}
while ( (getline ARGV[1]) 0) {
- $1 = unvis($1)
+ $1 = vis(unvis($1))
words[$1] = $0
}
delete ARGV[1]
}
-// { $1 = unvis($1) }
+// { $1 = vis(unvis($1)) }
$1 in words \
{
CVS commit: src/distrib/sets
Module Name:src Committed By: apb Date: Thu Oct 23 14:19:33 UTC 2014 Modified Files: src/distrib/sets: join.awk Log Message: Add vis() function, and canonicalise file names via vis(unvis($1)). XXX: The vis() function is very limited, due to the absence of ord() in NetBSD's awk. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/join.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Thu Oct 23 03:37:23 UTC 2014 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22200 Log Message: Import tzdata2014i from ftp://ftp.iana.org/tz/releases/tzdata2014i.tar.gz Summary of changes in tzdata2014i (2014-10-21 22:04:57 -0700): * Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00. Guess that future years will use a similar pattern. * A new Zone Pacific/Bougainville, for the part of Papua New Guinea that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00. * Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET to its more-traditional value MSK on 2014-10-26 at 01:00. * The new abbreviation IDT stands for the pre-1976 use of UT+8 in Indochina, to distinguish it better from ICT (UT+7). * Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976. Asia/Ho_Chi_Minh has been added to zone1970.tab, since north and south Vietnam disagreed after our 1970 cutoff. * Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as they differed from existing zones only for pre-1970 time stamps. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2014I U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Thu Oct 23 03:42:09 UTC 2014
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Update tzdata2netbsd for 2014i.
The NEWS file has been included in the tzdata tarball since 2014g, so
don't mention the separate NEWS URL in the prototype CVS log message.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.3 src/external/public-domain/tz/tzdata2netbsd:1.4
--- src/external/public-domain/tz/tzdata2netbsd:1.3 Sun Aug 31 07:04:07 2014
+++ src/external/public-domain/tz/tzdata2netbsd Thu Oct 23 03:42:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.3 2014/08/31 07:04:07 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.4 2014/10/23 03:42:09 apb Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -13,8 +13,8 @@
#redo non-trivial work done by earlier runs.
#
-OLDVER=2014f
-NEWVER=2014g
+OLDVER=2014h
+NEWVER=2014i
# Uppercase variants of OLDVER and NEWVER
OLDVER_UC=$( echo ${OLDVER} | tr '[a-z]' '[A-Z]' )
@@ -216,7 +216,7 @@ EOF
goodsection = 0;
havesentence = 0;
print Import tzdatanewver from disturl;
- print and NEWS file from newsurl;
+ #print and NEWS file from newsurl;
}
/^Release/ {
# Release version - date
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: apb Date: Thu Oct 23 03:45:46 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add ./usr/share/zoneinfo/Pacific/Bougainville for tzdata2014i To generate a diff of this commit: cvs rdiff -u -r1.1089 -r1.1090 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1089 src/distrib/sets/lists/base/mi:1.1090 --- src/distrib/sets/lists/base/mi:1.1089 Thu Sep 11 13:10:03 2014 +++ src/distrib/sets/lists/base/mi Thu Oct 23 03:45:46 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1089 2014/09/11 13:10:03 roy Exp $ +# $NetBSD: mi,v 1.1090 2014/10/23 03:45:46 apb Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -5562,6 +5562,7 @@ ./usr/share/zoneinfo/Pacific base-sys-share ./usr/share/zoneinfo/Pacific/Apia base-sys-share share ./usr/share/zoneinfo/Pacific/Auckland base-sys-share share +./usr/share/zoneinfo/Pacific/Bougainville base-sys-share share ./usr/share/zoneinfo/Pacific/Chatham base-sys-share share ./usr/share/zoneinfo/Pacific/Chuuk base-sys-share share ./usr/share/zoneinfo/Pacific/Easter base-sys-share share
CVS commit: src/doc
Module Name:src Committed By: apb Date: Thu Oct 23 03:47:59 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note update to tzdata2014i, To generate a diff of this commit: cvs rdiff -u -r1.1161 -r1.1162 src/doc/3RDPARTY cvs rdiff -u -r1.1998 -r1.1999 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1161 src/doc/3RDPARTY:1.1162 --- src/doc/3RDPARTY:1.1161 Mon Oct 20 09:13:07 2014 +++ src/doc/3RDPARTY Thu Oct 23 03:47:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1161 2014/10/20 09:13:07 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1162 2014/10/23 03:47:58 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1312,8 +1312,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2014h / tzdata2014h -Current Vers: tzcode2014h / tzdata2014h +Version: tzcode2014h / tzdata2014i +Current Vers: tzcode2014i / tzdata2014i Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1998 src/doc/CHANGES:1.1999 --- src/doc/CHANGES:1.1998 Wed Oct 22 16:54:13 2014 +++ src/doc/CHANGES Thu Oct 23 03:47:58 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1998 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1999 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -78,3 +78,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: OpenSSH: Imported 6.7. [christos 20141018] resolvconf(8): Import openresolv-3.6.0 [roy 20141020] gcc: Support -fsanitize=address + zoneinfo: Import tzdata2014i. [apb 20141023]
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Thu Oct 23 03:37:23 UTC 2014 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22200 Log Message: Import tzdata2014i from ftp://ftp.iana.org/tz/releases/tzdata2014i.tar.gz Summary of changes in tzdata2014i (2014-10-21 22:04:57 -0700): * Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00. Guess that future years will use a similar pattern. * A new Zone Pacific/Bougainville, for the part of Papua New Guinea that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00. * Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET to its more-traditional value MSK on 2014-10-26 at 01:00. * The new abbreviation IDT stands for the pre-1976 use of UT+8 in Indochina, to distinguish it better from ICT (UT+7). * Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976. Asia/Ho_Chi_Minh has been added to zone1970.tab, since north and south Vietnam disagreed after our 1970 cutoff. * Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as they differed from existing zones only for pre-1970 time stamps. * Changes affecting commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2014I U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/external/public-domain/tz
Module Name:src Committed By: apb Date: Thu Oct 23 03:42:09 UTC 2014 Modified Files: src/external/public-domain/tz: tzdata2netbsd Log Message: Update tzdata2netbsd for 2014i. The NEWS file has been included in the tzdata tarball since 2014g, so don't mention the separate NEWS URL in the prototype CVS log message. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/tz/tzdata2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: apb Date: Thu Oct 23 03:45:46 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add ./usr/share/zoneinfo/Pacific/Bougainville for tzdata2014i To generate a diff of this commit: cvs rdiff -u -r1.1089 -r1.1090 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Thu Oct 23 03:47:59 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note update to tzdata2014i, To generate a diff of this commit: cvs rdiff -u -r1.1161 -r1.1162 src/doc/3RDPARTY cvs rdiff -u -r1.1998 -r1.1999 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src
Committed By: apb
Date: Tue Oct 21 23:15:38 UTC 2014
Modified Files:
src/distrib/sets: join.awk
Log Message:
Add an unvis function and use it on file names in mtree specs.
This should correct the problem that ./bin/[ was missing from the
base.tgz set, despite being listed in src/distrib/sets/base/mi
and being present in METALOG. The corresponding entry in
METALOG.sanitised has ./bin/\133 instead of ./bin/[, and that made
join.awk omit it.
XXX: The unvis() implementation in join.awk handles only a subset
of the syntax, but it's probably good enough for now.
XXX: The file names should probably be canonicalised by
vis(unvis(name)), but at present none of the file names in the set
lists really need it.
XXX: It may be a bug that entries in the set lists without
corresponding entries in METALOG are silently ignored by join.awk.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/join.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/join.awk
diff -u src/distrib/sets/join.awk:1.3 src/distrib/sets/join.awk:1.4
--- src/distrib/sets/join.awk:1.3 Wed Apr 30 13:10:49 2008
+++ src/distrib/sets/join.awk Tue Oct 21 23:15:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: join.awk,v 1.3 2008/04/30 13:10:49 martin Exp $
+# $NetBSD: join.awk,v 1.4 2014/10/21 23:15:38 apb Exp $
#
# Copyright (c) 2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,17 +32,61 @@
# and outputs lines in F2 with a first word that is in F1.
# Neither file needs to be sorted
+function unvis(s) \
+{
+ # XXX: We don't handle the complete range of vis encodings
+ unvis_result =
+ while (length(s) 0) {
+ unvis_pos = match(s, .)
+ if (unvis_pos == 0) {
+ unvis_result = unvis_result s
+ s =
+ break
+ }
+ # copy the part before the next backslash
+ unvis_result = unvis_result substr(s, 1, unvis_pos - 1)
+ s = substr(s, unvis_pos)
+ # process the backslash and next few chars
+ if (substr(s, 1, 2) == ) {
+ # double backslash - single backslash
+ unvis_result = unvis_result \\
+ s = substr(s, 3)
+ } else if (match(s, [0-7][0-7][0-7]) == 1) {
+ # \ooo with three octal digits.
+ # XXX: use strnum() is that is available
+ unvis_result = unvis_result sprintf(%c, \
+0+substr(s, 2, 1) * 64 + \
+0+substr(s, 3, 1) * 8 + \
+0+substr(s, 4, 1))
+ s = substr(s, 5)
+ } else {
+ # unrecognised escape: keep the literal backslash
+ printf %s: %s:%s: unrecognised escape %s\n, \
+ARGV[0], (FILENAME ? FILENAME : stdin), FNR, \
+substr(s, 1, 2) \
+/dev/stderr
+ unvis_result = unvis_result substr(s, 1, 1)
+ s = substr(s, 2)
+ }
+ }
+ return unvis_result
+}
+
BEGIN \
{
if (ARGC != 3) {
printf(Usage: join file1 file2\n) /dev/stderr
exit 1
}
- while ( (getline ARGV[1]) 0)
+ while ( (getline ARGV[1]) 0) {
+ $1 = unvis($1)
words[$1] = $0
+ }
delete ARGV[1]
}
+// { $1 = unvis($1) }
+
$1 in words \
{
f1=$1
CVS commit: src/distrib/sets
Module Name:src Committed By: apb Date: Tue Oct 21 23:15:38 UTC 2014 Modified Files: src/distrib/sets: join.awk Log Message: Add an unvis function and use it on file names in mtree specs. This should correct the problem that ./bin/[ was missing from the base.tgz set, despite being listed in src/distrib/sets/base/mi and being present in METALOG. The corresponding entry in METALOG.sanitised has ./bin/\133 instead of ./bin/[, and that made join.awk omit it. XXX: The unvis() implementation in join.awk handles only a subset of the syntax, but it's probably good enough for now. XXX: The file names should probably be canonicalised by vis(unvis(name)), but at present none of the file names in the set lists really need it. XXX: It may be a bug that entries in the set lists without corresponding entries in METALOG are silently ignored by join.awk. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/join.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/bin/sh
On Wed, 15 Oct 2014, Christos Zoulas wrote: Modified Files: src/bin/sh: redir.c Log Message: PR/48201: Miwa Susumu: Fix set -C (no clobber) for POSIX; from FreeBSD Can't use O_EXCL because of device nodes; also truncate. There are some TOCTOU races in this code, where something about the file could change in between the stat() and the open(). Some ideas: 1. Keep the new code, with its races, but also verify that st_dev and st_ino values remain unchanged between the stat() before opening the file, and fstat() after opening the file. 2. Try open() with O_EXCL first, and fall back to racy code with stat() only if the first open(O_EXCL) fails. Also use fstat() to check that st_dev/st_ino do not change. 3. Invent one or more open(2) flags, such as O_SPECIAL for must be a device or other special file, must not be a plain file or a directory. First try open(O_EXCL), and if that fails then try open(O_SPECIAL). --apb (Alan Barrett)
Re: CVS commit: src/sys/fs/puffs
On Wed, 15 Oct 2014, David Laight wrote:
Consider what happens if you write:
if (error)
DPRINTF((...));
else
fubar();
When DPRINTF() expands 'if (xxx) yyy' it all goes horribly wrong.
That's why I changed it to
do { if (xxx) yyy; } while (0)
a week or two ago. (That change was not pulled up to netbsd-7,
although other changes made around the same time were pulled up.)
Do we need to support any compilers that don't support __VA_ARGS__ ?
Even microsoft's compiler almost supports it.
I don't know.
--apb (Alan Barrett)
CVS commit: src/usr.bin/config
Module Name:src Committed By: apb Date: Sun Oct 12 15:54:19 UTC 2014 Modified Files: src/usr.bin/config: TODO Log Message: Allow easier adding/removing of options without regard to whether or not they were already defined. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/config/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/config/TODO diff -u src/usr.bin/config/TODO:1.3 src/usr.bin/config/TODO:1.4 --- src/usr.bin/config/TODO:1.3 Sun Oct 12 08:04:30 2014 +++ src/usr.bin/config/TODO Sun Oct 12 15:54:19 2014 @@ -62,3 +62,19 @@ o Split cfdata. cfdata is pattern matching rules to enable devices at runtime device auto-configuration. It is pure data and can (should) be generated separately from the code. + +o Allow easier adding and removing of options. + + It should be possible to add or remove options, flags, etc., + without regard to whether or not they are already defined. + For example, a configuration like this: + + include GENERIC + options FOO + no options BAR + + should work regardless of whether or not options FOO and/or + options BAR were defined in GENERIC. It should not give + errors like options BAR was already defined or options FOO + was not defined. +
CVS commit: src/usr.bin/config
Module Name:src Committed By: apb Date: Sun Oct 12 15:54:19 UTC 2014 Modified Files: src/usr.bin/config: TODO Log Message: Allow easier adding/removing of options without regard to whether or not they were already defined. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/config/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: apb
Date: Thu Oct 9 06:52:37 UTC 2014
Modified Files:
src/tests/lib/librumphijack: t_tcpip.sh
Log Message:
Avoid literal CR in sed regular expression.
Instead, use printf(1) to save the regexp in a shell variable,
taking advantage of the fact that printf understands \r.
This should fix a complaint from subversion, reported in PR 49249.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/lib/librumphijack/t_tcpip.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/t_tcpip.sh
diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.13 src/tests/lib/librumphijack/t_tcpip.sh:1.14
--- src/tests/lib/librumphijack/t_tcpip.sh:1.13 Fri Jan 3 13:18:00 2014
+++ src/tests/lib/librumphijack/t_tcpip.sh Thu Oct 9 06:52:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_tcpip.sh,v 1.13 2014/01/03 13:18:00 pooka Exp $
+# $NetBSD: t_tcpip.sh,v 1.14 2014/10/09 06:52:37 apb Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -53,8 +53,9 @@ http_body()
# check that we got what we wanted
atf_check -o match:'HTTP/1.0 200 OK' cat webfile
atf_check -o match:'Content-Length: 95' cat webfile
+ blank_line_re=$(printf '^\r$') # matches a line with only CRLF
atf_check -o file:$(atf_get_srcdir)/index.html \
- sed -n '1,/^$/!p' webfile
+ sed -n 1,/${blank_line_re}/!p webfile
}
http_cleanup()
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: apb Date: Thu Oct 9 06:52:37 UTC 2014 Modified Files: src/tests/lib/librumphijack: t_tcpip.sh Log Message: Avoid literal CR in sed regular expression. Instead, use printf(1) to save the regexp in a shell variable, taking advantage of the fact that printf understands \r. This should fix a complaint from subversion, reported in PR 49249. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/tests/lib/librumphijack/t_tcpip.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libutil
Module Name:src
Committed By: apb
Date: Wed Oct 8 13:26:47 UTC 2014
Modified Files:
src/tests/lib/libutil: t_parsedate.c
Log Message:
Add tests for PR lib/47916. Some of these fail.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libutil/t_parsedate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libutil/t_parsedate.c
diff -u src/tests/lib/libutil/t_parsedate.c:1.10 src/tests/lib/libutil/t_parsedate.c:1.11
--- src/tests/lib/libutil/t_parsedate.c:1.10 Tue Oct 7 22:33:52 2014
+++ src/tests/lib/libutil/t_parsedate.c Wed Oct 8 13:26:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_parsedate.c,v 1.10 2014/10/07 22:33:52 apb Exp $ */
+/* $NetBSD: t_parsedate.c,v 1.11 2014/10/08 13:26:47 apb Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_parsedate.c,v 1.10 2014/10/07 22:33:52 apb Exp $);
+__RCSID($NetBSD: t_parsedate.c,v 1.11 2014/10/08 13:26:47 apb Exp $);
#include atf-c.h
#include errno.h
@@ -147,6 +147,49 @@ ATF_TC_BODY(times, tc)
ANY, ANY, ANY, 12+5, 21, 0);
}
+ATF_TC(dsttimes);
+
+ATF_TC_HEAD(dsttimes, tc)
+{
+ atf_tc_set_md_var(tc, descr, Test DST transition times
+ (PR lib/47916));
+}
+
+ATF_TC_BODY(dsttimes, tc)
+{
+ struct tm tm;
+ time_t t;
+ int tzoff;
+
+ putenv(__UNCONST(TZ=EST));
+ tzset();
+ parsecheck(12:0, NULL, NULL, localtime_r,
+ ANY, ANY, ANY, 12, 0, 0);
+
+ putenv(__UNCONST(TZ=Japan));
+ tzset();
+ parsecheck(12:0, NULL, NULL, localtime_r,
+ ANY, ANY, ANY, 12, 0, 0);
+
+ /*
+ * When the effective local time is Tue Jul 9 13:21:53 BST 2013,
+ * check mktime(14:00)
+ */
+ putenv(__UNCONST(TZ=Europe/London));
+ tzset();
+ tm = (struct tm){
+ .tm_year = 2013-1900, .tm_mon = 7-1, .tm_mday = 9,
+ .tm_hour = 13, .tm_min = 21, .tm_sec = 53,
+ .tm_isdst = 0 };
+ t = mktime(tm);
+ ATF_CHECK(t != (time_t)-1);
+ parsecheck(14:00, t, NULL, localtime_r,
+ 2013, 7, 9, 14, 0, 0);
+ tzoff = 0;
+ parsecheck(14:00, t, tzoff, localtime_r,
+ 2013, 7, 9, 14, 0, 0);
+}
+
ATF_TC(relative);
ATF_TC_HEAD(relative, tc)
@@ -206,6 +249,7 @@ ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, dates);
ATF_TP_ADD_TC(tp, times);
+ ATF_TP_ADD_TC(tp, dsttimes);
ATF_TP_ADD_TC(tp, relative);
ATF_TP_ADD_TC(tp, atsecs);
CVS commit: src/lib/libutil
Module Name:src
Committed By: apb
Date: Wed Oct 8 14:32:29 UTC 2014
Modified Files:
src/lib/libutil: parsedate.y
Log Message:
A time like HH:MM:SS.sss says nothing about whether DST is on or off.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libutil/parsedate.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libutil/parsedate.y
diff -u src/lib/libutil/parsedate.y:1.17 src/lib/libutil/parsedate.y:1.18
--- src/lib/libutil/parsedate.y:1.17 Tue Oct 7 22:27:14 2014
+++ src/lib/libutil/parsedate.y Wed Oct 8 14:32:29 2014
@@ -14,7 +14,7 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: parsedate.y,v 1.17 2014/10/07 22:27:14 apb Exp $);
+__RCSID($NetBSD: parsedate.y,v 1.18 2014/10/08 14:32:29 apb Exp $);
#endif
#include stdio.h
@@ -223,9 +223,7 @@ time : tUNUMBER tMERIDIAN {
param-yyMinutes = $3;
param-yySeconds = $5;
param-yyMeridian = MER24;
- param-yyDSTmode = DSToff;
/* XXX: Do nothing with millis */
-/* param-yyTimezone = ($7 % 100 + ($7 / 100) * 60); */
}
;
CVS commit: src/lib/libutil
Module Name:src
Committed By: apb
Date: Wed Oct 8 14:43:48 UTC 2014
Modified Files:
src/lib/libutil: parsedate.y
Log Message:
Add a new non-terminal time_numericzone for a time with
a numeric timezone. Move some productions from time to time_numericzone.
Increment yyHaveZone when encountering one of these.
Previously, input of the form HH:MM:SS + would not have set the
yyhaveZone flag.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libutil/parsedate.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libutil/parsedate.y
diff -u src/lib/libutil/parsedate.y:1.18 src/lib/libutil/parsedate.y:1.19
--- src/lib/libutil/parsedate.y:1.18 Wed Oct 8 14:32:29 2014
+++ src/lib/libutil/parsedate.y Wed Oct 8 14:43:48 2014
@@ -14,7 +14,7 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: parsedate.y,v 1.18 2014/10/08 14:32:29 apb Exp $);
+__RCSID($NetBSD: parsedate.y,v 1.19 2014/10/08 14:43:48 apb Exp $);
#endif
#include stdio.h
@@ -118,6 +118,10 @@ spec : /* NULL */
item : time {
param-yyHaveTime++;
}
+ | time_numericzone {
+ param-yyHaveTime++;
+ param-yyHaveZone++;
+ }
| zone {
param-yyHaveZone++;
}
@@ -197,33 +201,35 @@ time : tUNUMBER tMERIDIAN {
param-yySeconds = 0;
param-yyMeridian = $4;
}
- | tUNUMBER ':' tUNUMBER tSNUMBER {
- param-yyHour = $1;
- param-yyMinutes = $3;
- param-yyMeridian = MER24;
- param-yyDSTmode = DSToff;
- param-yyTimezone = - ($4 % 100 + ($4 / 100) * 60);
- }
| tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {
param-yyHour = $1;
param-yyMinutes = $3;
param-yySeconds = $5;
param-yyMeridian = $6;
}
- | tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
+ | tUNUMBER ':' tUNUMBER ':' tUNUMBER '.' tUNUMBER {
param-yyHour = $1;
param-yyMinutes = $3;
param-yySeconds = $5;
param-yyMeridian = MER24;
+/* XXX: Do nothing with millis */
+ }
+ ;
+
+time_numericzone : tUNUMBER ':' tUNUMBER tSNUMBER {
+ param-yyHour = $1;
+ param-yyMinutes = $3;
+ param-yyMeridian = MER24;
param-yyDSTmode = DSToff;
- param-yyTimezone = - ($6 % 100 + ($6 / 100) * 60);
+ param-yyTimezone = - ($4 % 100 + ($4 / 100) * 60);
}
- | tUNUMBER ':' tUNUMBER ':' tUNUMBER '.' tUNUMBER {
+ | tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
param-yyHour = $1;
param-yyMinutes = $3;
param-yySeconds = $5;
param-yyMeridian = MER24;
-/* XXX: Do nothing with millis */
+ param-yyDSTmode = DSToff;
+ param-yyTimezone = - ($6 % 100 + ($6 / 100) * 60);
}
;
CVS commit: src/lib/libutil
Module Name:src Committed By: apb Date: Wed Oct 8 17:06:18 UTC 2014 Modified Files: src/lib/libutil: parsedate.3 Log Message: The tzoff argument is in minutes (behind/west of UTC), not seconds. While here, also say that time = NULL and tzoff = NULL are independent. The code doesn't yet implement that, but it will soon. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libutil/parsedate.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/parsedate.3 diff -u src/lib/libutil/parsedate.3:1.13 src/lib/libutil/parsedate.3:1.14 --- src/lib/libutil/parsedate.3:1.13 Tue Oct 7 22:39:32 2014 +++ src/lib/libutil/parsedate.3 Wed Oct 8 17:06:18 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: parsedate.3,v 1.13 2014/10/07 22:39:32 apb Exp $ +.\ $NetBSD: parsedate.3,v 1.14 2014/10/08 17:06:18 apb Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 7, 2014 +.Dd October 8, 2014 .Dt PARSEDATE 3 .Os .Sh NAME @@ -46,15 +46,20 @@ function parses a datetime from .Ar datestr described in English relative to an optional .Ar time -point and an optional timezone offset in seconds specified in +point, +and an optional timezone offset (in minutes behind/west of UTC) +specified in .Ar tzoff . -If either +If .Ar time -or +is +.Dv NULL +then the current time is used. +If .Ar tzoff -are +is .Dv NULL , -then the current time and timezone offset are used. +then the current time zone is used. .Pp The .Ar datestr
CVS commit: src/tests/lib/libutil
Module Name:src
Committed By: apb
Date: Wed Oct 8 17:21:40 UTC 2014
Modified Files:
src/tests/lib/libutil: t_parsedate.c
Log Message:
When tests fail, print all args, notjust the date string.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libutil/t_parsedate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libutil/t_parsedate.c
diff -u src/tests/lib/libutil/t_parsedate.c:1.11 src/tests/lib/libutil/t_parsedate.c:1.12
--- src/tests/lib/libutil/t_parsedate.c:1.11 Wed Oct 8 13:26:47 2014
+++ src/tests/lib/libutil/t_parsedate.c Wed Oct 8 17:21:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_parsedate.c,v 1.11 2014/10/08 13:26:47 apb Exp $ */
+/* $NetBSD: t_parsedate.c,v 1.12 2014/10/08 17:21:40 apb Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,10 +29,11 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_parsedate.c,v 1.11 2014/10/08 13:26:47 apb Exp $);
+__RCSID($NetBSD: t_parsedate.c,v 1.12 2014/10/08 17:21:40 apb Exp $);
#include atf-c.h
#include errno.h
+#include stdio.h
#include stdlib.h
#include time.h
#include util.h
@@ -59,34 +60,55 @@ parsecheck(const char *datestr, const ti
{
time_t t;
struct tm tm;
+ char argstr[128];
+
+ /*
+ * printable version of the args.
+ *
+ * Note that printf(%.*d, 0, 0)) prints nothing at all,
+ * while printf(%.*d, 1, val) prints the value as usual.
+ */
+ snprintf(argstr, sizeof(argstr), %s%s%s, %s%.*jd, %s%.*d,
+ /* NULL or \datestr\ */
+ (datestr ? \ : ),
+ (datestr ? datestr : NULL),
+ (datestr ? \ : ),
+ /* NULL or *reftime */
+ (reftime ? : NULL),
+ (reftime ? 1 : 0),
+ (reftime ? (intmax_t)*reftime : (intmax_t)0),
+ /* NULL or *zoff */
+ (zoff ? : NULL),
+ (zoff ? 1 : 0),
+ (zoff ? *zoff : 0));
ATF_CHECK_MSG((t = parsedate(datestr, reftime, zoff)) != -1,
- parsedate(\%s\,,) returned -1\n, datestr);
+ parsedate(%s) returned -1\n, argstr);
ATF_CHECK(time_to_tm(t, tm) != NULL);
if (year != ANY)
ATF_CHECK_MSG(tm.tm_year + 1900 == year,
- parsedate(\%s\,,) expected year %d got %d (+1900)\n,
- datestr, year, (int)tm.tm_year);
+ parsedate(%s) expected year %d got %d (+1900)\n,
+ argstr, year, (int)tm.tm_year);
if (month != ANY)
ATF_CHECK_MSG(tm.tm_mon + 1 == month,
- parsedate(\%s\,,) expected month %d got %d (+1)\n,
- datestr, month, (int)tm.tm_mon);
+ parsedate(%s) expected month %d got %d (+1)\n,
+ argstr, month, (int)tm.tm_mon);
if (day != ANY)
ATF_CHECK_MSG(tm.tm_mday == day,
- parsedate(\%s\,,) expected day %d got %d\n,
- datestr, day, (int)tm.tm_mday);
+ parsedate(%s) expected day %d got %d\n,
+ argstr, day, (int)tm.tm_mday);
if (hour != ANY)
ATF_CHECK_MSG(tm.tm_hour == hour,
- parsedate(\%s\,,) expected hour %d got %d\n,
- datestr, hour, (int)tm.tm_hour);
+ parsedate(%s) expected hour %d got %d\n,
+ argstr, hour, (int)tm.tm_hour);
if (minute != ANY)
ATF_CHECK_MSG(tm.tm_min == minute,
- parsedate(\%s\,,) expected minute %d got %d\n,
- datestr, minute, (int)tm.tm_min);
+ parsedate(%s) expected minute %d got %d\n,
+ argstr, minute, (int)tm.tm_min);
if (second != ANY)
ATF_CHECK_MSG(tm.tm_sec == second,
- parsedate(\%s\,,) expected second %d got %d\n,
- datestr, second, (int)tm.tm_sec);
+ parsedate(%s) expected second %d got %d\n,
+ argstr, second, (int)tm.tm_sec);
}
ATF_TC(dates);
CVS commit: src/tests/lib/libutil
Module Name:src Committed By: apb Date: Wed Oct 8 17:23:03 UTC 2014 Modified Files: src/tests/lib/libutil: t_parsedate.c Log Message: 2013-07-09 was in British Summer TIme, so use tzoff=-60, not 0. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libutil/t_parsedate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libutil/t_parsedate.c diff -u src/tests/lib/libutil/t_parsedate.c:1.12 src/tests/lib/libutil/t_parsedate.c:1.13 --- src/tests/lib/libutil/t_parsedate.c:1.12 Wed Oct 8 17:21:40 2014 +++ src/tests/lib/libutil/t_parsedate.c Wed Oct 8 17:23:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: t_parsedate.c,v 1.12 2014/10/08 17:21:40 apb Exp $ */ +/* $NetBSD: t_parsedate.c,v 1.13 2014/10/08 17:23:03 apb Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: t_parsedate.c,v 1.12 2014/10/08 17:21:40 apb Exp $); +__RCSID($NetBSD: t_parsedate.c,v 1.13 2014/10/08 17:23:03 apb Exp $); #include atf-c.h #include errno.h @@ -207,7 +207,7 @@ ATF_TC_BODY(dsttimes, tc) ATF_CHECK(t != (time_t)-1); parsecheck(14:00, t, NULL, localtime_r, 2013, 7, 9, 14, 0, 0); - tzoff = 0; + tzoff = -60; /* British Summer Time */ parsecheck(14:00, t, tzoff, localtime_r, 2013, 7, 9, 14, 0, 0); }
CVS commit: src/lib/libutil
Module Name:src
Committed By: apb
Date: Wed Oct 8 17:38:28 UTC 2014
Modified Files:
src/lib/libutil: parsedate.y
Log Message:
Improved handling of local times.
* A magic value USE_LOCAL_TIME (defined as 9) may be passed as the
Timezone to Convert(), instructing it to use mktime() to work
in the local time zone, instead of using mktime_z to work in UTC
(and then adding the specified timezone offset).
* Some old code is removed now that there's no need to find the local
timezone offset.
* Allow either one or both of the now and zone arguments to
parsedate() to be NULL, treating them independently. Previously,
if either one was NULL, the other was ignored.
* If the zone argument is specified, then the current date is calculated
in the specified zone, not in local time.
Also add some disabled debug code.
This should fix PR lib/47916.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libutil/parsedate.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libutil/parsedate.y
diff -u src/lib/libutil/parsedate.y:1.19 src/lib/libutil/parsedate.y:1.20
--- src/lib/libutil/parsedate.y:1.19 Wed Oct 8 14:43:48 2014
+++ src/lib/libutil/parsedate.y Wed Oct 8 17:38:28 2014
@@ -14,7 +14,7 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: parsedate.y,v 1.19 2014/10/08 14:43:48 apb Exp $);
+__RCSID($NetBSD: parsedate.y,v 1.20 2014/10/08 17:38:28 apb Exp $);
#endif
#include stdio.h
@@ -42,6 +42,7 @@ __RCSID($NetBSD: parsedate.y,v 1.19 201
#define HOUR(x) ((time_t)(x) * 60)
#define SECSPERDAY (24L * 60L * 60L)
+#define USE_LOCAL_TIME 9 /* special case for Convert() and yyTimezone */
/*
** An entry in the lexical lookup table.
@@ -618,7 +619,8 @@ Convert(
time_t Hours, /* Hour of day [0-24] */
time_t Minutes, /* Minute of hour [0-59] */
time_t Seconds, /* Second of minute [0-60] */
-time_t Timezone, /* Timezone as minutes east of UTC */
+time_t Timezone, /* Timezone as minutes east of UTC,
+ * or USE_LOCAL_TIME special case */
MERIDIAN Meridian, /* Hours are am/pm/24 hour clock */
DSTMODE DSTmode /* DST on/off/maybe */
)
@@ -638,9 +640,25 @@ Convert(
default: tm.tm_isdst = -1; break;
}
-/* We rely on mktime_z(NULL, ...) working in UTC, not in local time. */
-result = mktime_z(NULL, tm);
-result += Timezone * 60;
+if (Timezone == USE_LOCAL_TIME) {
+ result = mktime(tm);
+} else {
+ /* We rely on mktime_z(NULL, ...) working in UTC */
+ result = mktime_z(NULL, tm);
+ result += Timezone * 60;
+}
+
+#if PARSEDATE_DEBUG
+fprintf(stderr, %s(M=%jd D=%jd Y=%jd H=%jd M=%jd S=%jd Z=%jd
+ mer=%d DST=%d),
+ __func__,
+ (intmax_t)Month, (intmax_t)Day, (intmax_t)Year,
+ (intmax_t)Hours, (intmax_t)Minutes, (intmax_t)Seconds,
+ (intmax_t)Timezone, (int)Meridian, (int)DSTmode);
+fprintf(stderr, - %jd, (intmax_t)result);
+fprintf(stderr, %s, ctime(result));
+#endif
+
return result;
}
@@ -878,31 +896,10 @@ yylex(YYSTYPE *yylval, const char **yyIn
#define TM_YEAR_ORIGIN 1900
-/* Yield A - B, measured in seconds. */
-static time_t
-difftm (struct tm *a, struct tm *b)
-{
- int ay = a-tm_year + (TM_YEAR_ORIGIN - 1);
- int by = b-tm_year + (TM_YEAR_ORIGIN - 1);
- int days = (
- /* difference in day of year */
- a-tm_yday - b-tm_yday
- /* + intervening leap days */
- + ((ay 2) - (by 2))
- - (ay/100 - by/100)
- + ((ay/100 2) - (by/100 2))
- /* + difference in years * 365 */
- + (long)(ay-by) * 365
- );
- return ((time_t)60*(60*(24*days + (a-tm_hour - b-tm_hour))
- + (a-tm_min - b-tm_min))
- + (a-tm_sec - b-tm_sec));
-}
-
time_t
parsedate(const char *p, const time_t *now, const int *zone)
{
-struct tm gmt, local, *gmt_ptr, *tm;
+struct tm local, *tm;
time_t nowt;
int zonet;
time_t Start;
@@ -913,29 +910,24 @@ parsedate(const char *p, const time_t *n
saved_errno = errno;
errno = 0;
-if (now == NULL || zone == NULL) {
+if (now == NULL) {
now = nowt;
- zone = zonet;
(void)time(nowt);
-
- gmt_ptr = gmtime_r(now, gmt);
+}
+if (zone == NULL) {
+ zone = zonet;
+ zonet = USE_LOCAL_TIME;
if ((tm = localtime_r(now, local)) == NULL)
return -1;
-
- if (gmt_ptr != NULL)
- zonet = difftm(gmt, local) / 60;
- else
- /* We are on a system like VMS, where the system clock is
- in local time and the system has no concept of timezones.
- Hopefully we can fake this out (for the case in which the
- user specifies no timezone) by just saying the timezone
- is zero. */
- zonet = 0;
-
- if (local.tm_isdst)
- zonet += 60;
} else {
- if ((tm = localtime_r(now, local)) == NULL)
+ /*
+ * Should use the specified zone, not localtime.
+ * Fake it using gmtime and
CVS commit: src/tests/lib/libutil
Module Name:src Committed By: apb Date: Wed Oct 8 13:26:47 UTC 2014 Modified Files: src/tests/lib/libutil: t_parsedate.c Log Message: Add tests for PR lib/47916. Some of these fail. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libutil/t_parsedate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libutil
Module Name:src Committed By: apb Date: Wed Oct 8 14:32:29 UTC 2014 Modified Files: src/lib/libutil: parsedate.y Log Message: A time like HH:MM:SS.sss says nothing about whether DST is on or off. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/lib/libutil/parsedate.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libutil
Module Name:src Committed By: apb Date: Wed Oct 8 14:43:48 UTC 2014 Modified Files: src/lib/libutil: parsedate.y Log Message: Add a new non-terminal time_numericzone for a time with a numeric timezone. Move some productions from time to time_numericzone. Increment yyHaveZone when encountering one of these. Previously, input of the form HH:MM:SS + would not have set the yyhaveZone flag. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/lib/libutil/parsedate.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
