Re: CVS commit: src/tools/host-mkdep
On Thu, Mar 14, 2013 at 21:02:06 -0700, Tom Spindler (moof) wrote: Log Message: Revert 1.25 and 1.26: Breaks build on !NetBSD Can you explain how? The shell does not work? E.g. util.h not found in binstall and a lot of other header issues. On what os? I've seen it on OSX ( 10.5 PowerPC if it matters ). And I've seen it on Debian. That begins to sound like I've got it on MacOS, err, sorry, I've got it from Agnes song. :) Was there an error message, perhaps? -uwe
Re: CVS commit: src/tools/host-mkdep
On Fri, Mar 15, 2013 at 16:56:53 +0400, Valery Ushakov wrote: On Thu, Mar 14, 2013 at 21:02:06 -0700, Tom Spindler (moof) wrote: Log Message: Revert 1.25 and 1.26: Breaks build on !NetBSD Can you explain how? The shell does not work? E.g. util.h not found in binstall and a lot of other header issues. On what os? I've seen it on OSX ( 10.5 PowerPC if it matters ). And I've seen it on Debian. That begins to sound like I've got it on MacOS, err, sorry, I've got it from Agnes song. :) Was there an error message, perhaps? Ah, as Martin pointed out privately, the problem is not some bug in the change (Can you explain how? The shell does not work?), but the fact that a missing include is now fatal, which is a wrong thing to do for mkdep. -uwe
Re: CVS commit: src/tools/host-mkdep
In article 20130315130901.gd...@pony.stderr.spb.ru, Valery Ushakov u...@stderr.spb.ru wrote: On Fri, Mar 15, 2013 at 16:56:53 +0400, Valery Ushakov wrote: On Thu, Mar 14, 2013 at 21:02:06 -0700, Tom Spindler (moof) wrote: Log Message: Revert 1.25 and 1.26: Breaks build on !NetBSD Can you explain how? The shell does not work? E.g. util.h not found in binstall and a lot of other header issues. On what os? I've seen it on OSX ( 10.5 PowerPC if it matters ). And I've seen it on Debian. That begins to sound like I've got it on MacOS, err, sorry, I've got it from Agnes song. :) Was there an error message, perhaps? Ah, as Martin pointed out privately, the problem is not some bug in the change (Can you explain how? The shell does not work?), but the fact that a missing include is now fatal, which is a wrong thing to do for mkdep. I still don't understand how a missing include does not cause an error in the compilation phase, but it can be ignore in the dependency generation. christos
Re: CVS commit: src/tools/host-mkdep
On Fri, 15 Mar 2013, Christos Zoulas wrote: I still don't understand how a missing include does not cause an error in the compilation phase, but it can be ignore in the dependency generation. tools/compat creates a dummy include file, if necessary. This is good enough for the compilation phase. I am not sure why it's not good enough for host-mkdep, but two ideas spring to mind: perhaps host-mkdep is run before the dummy include file is created, or perhaps host-mkdep is run without the -I flags that would allow it to find the dummy include file. --apb (Alan Barrett)
Re: CVS commit: src/tools/host-mkdep
In article 20130315185454.gb22...@apb-laptoy.apb.alt.za, Alan Barrett a...@cequrux.com wrote: On Fri, 15 Mar 2013, Christos Zoulas wrote: I still don't understand how a missing include does not cause an error in the compilation phase, but it can be ignore in the dependency generation. tools/compat creates a dummy include file, if necessary. This is good enough for the compilation phase. I am not sure why it's not good enough for host-mkdep, but two ideas spring to mind: perhaps host-mkdep is run before the dummy include file is created, or perhaps host-mkdep is run without the -I flags that would allow it to find the dummy include file. So, let's put back the changes reverted and find and fix the real problem. I'll try my cross-build on windows tonight. christos
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Fri Mar 15 06:18:14 UTC 2013
Modified Files:
src/sys/dev/mii: brgphy.c miivar.h
Log Message:
Add BCM5756, BCM5717C, BCM5719C, BCM5720C and BCM57780.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/mii/brgphy.c src/sys/dev/mii/miivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.60 src/sys/dev/mii/brgphy.c:1.61
--- src/sys/dev/mii/brgphy.c:1.60 Mon Sep 17 11:45:56 2012
+++ src/sys/dev/mii/brgphy.c Fri Mar 15 06:18:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.60 2012/09/17 11:45:56 tsutsui Exp $ */
+/* $NetBSD: brgphy.c,v 1.61 2013/03/15 06:18:13 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.60 2012/09/17 11:45:56 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.61 2013/03/15 06:18:13 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -196,6 +196,9 @@ static const struct mii_phydesc brgphys[
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5755,
MII_STR_BROADCOM2_BCM5755 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5756,
+ MII_STR_BROADCOM2_BCM5756 },
+
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5761,
MII_STR_BROADCOM2_BCM5761 },
@@ -205,9 +208,21 @@ static const struct mii_phydesc brgphys[
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5785,
MII_STR_BROADCOM2_BCM5785 },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5717C,
+ MII_STR_BROADCOM3_BCM5717C },
+
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5719C,
+ MII_STR_BROADCOM3_BCM5719C },
+
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5720C,
+ MII_STR_BROADCOM3_BCM5720C },
+
{ MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM57765,
MII_STR_BROADCOM3_BCM57765 },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM57780,
+ MII_STR_BROADCOM3_BCM57780 },
+
{ MII_OUI_xxBROADCOM_ALT1, MII_MODEL_xxBROADCOM_ALT1_BCM5906,
MII_STR_xxBROADCOM_ALT1_BCM5906 },
@@ -243,6 +258,7 @@ brgphyattach(device_t parent, device_t s
sc-mii_dev = self;
sc-mii_inst = mii-mii_instance;
sc-mii_phy = ma-mii_phyno;
+ sc-mii_mpd_oui = MII_OUI(ma-mii_id1, ma-mii_id2);
sc-mii_mpd_model = MII_MODEL(ma-mii_id2);
sc-mii_mpd_rev = MII_REV(ma-mii_id2);
sc-mii_pdata = mii;
@@ -376,7 +392,8 @@ setit:
PHY_WRITE(sc, MII_BMCR,
speed|BMCR_AUTOEN|BMCR_STARTNEG);
- if (sc-mii_mpd_model != MII_MODEL_BROADCOM_BCM5701)
+ if ((sc-mii_mpd_oui != MII_OUI_BROADCOM)
+ || (sc-mii_mpd_model != MII_MODEL_BROADCOM_BCM5701))
break;
if (mii-mii_media.ifm_media IFM_ETH_MASTER)
@@ -414,16 +431,20 @@ setit:
if (sc-mii_media_active != mii-mii_media_active ||
sc-mii_media_status != mii-mii_media_status ||
cmd == MII_MEDIACHG) {
- switch (sc-mii_mpd_model) {
- case MII_MODEL_BROADCOM_BCM5400:
- brgphy_bcm5401_dspcode(sc);
- break;
- case MII_MODEL_BROADCOM_BCM5401:
- if (sc-mii_mpd_rev == 1 || sc-mii_mpd_rev == 3)
+ switch (sc-mii_mpd_oui) {
+ case MII_OUI_BROADCOM:
+ switch (sc-mii_mpd_model) {
+ case MII_MODEL_BROADCOM_BCM5400:
brgphy_bcm5401_dspcode(sc);
- break;
- case MII_MODEL_BROADCOM_BCM5411:
- brgphy_bcm5411_dspcode(sc);
+break;
+ case MII_MODEL_BROADCOM_BCM5401:
+if (sc-mii_mpd_rev == 1 || sc-mii_mpd_rev == 3)
+ brgphy_bcm5401_dspcode(sc);
+break;
+ case MII_MODEL_BROADCOM_BCM5411:
+brgphy_bcm5411_dspcode(sc);
+break;
+ }
break;
}
}
@@ -468,10 +489,11 @@ brgphy_status(struct mii_softc *sc)
return;
}
- if (sc-mii_mpd_model == MII_MODEL_BROADCOM2_BCM5709S) {
-
- /* 5709S has its own general purpose status registers */
-
+ if ((sc-mii_mpd_oui == MII_OUI_BROADCOM2)
+ (sc-mii_mpd_model == MII_MODEL_BROADCOM2_BCM5709S)) {
+ /*
+ * 5709S has its own general purpose status registers
+ */
PHY_WRITE(sc, BRGPHY_BLOCK_ADDR,
BRGPHY_BLOCK_ADDR_GP_STATUS);
@@ -564,7 +586,8 @@ brgphy_mii_phy_auto(struct mii_softc *sc
PHY_RESET(sc);
ktcr = GTCR_ADV_1000TFDX|GTCR_ADV_1000THDX;
- if (sc-mii_mpd_model == MII_MODEL_BROADCOM_BCM5701)
+ if ((sc-mii_mpd_oui == MII_OUI_BROADCOM)
+ (sc-mii_mpd_model == MII_MODEL_BROADCOM_BCM5701))
ktcr |= GTCR_MAN_MS|GTCR_ADV_MS;
PHY_WRITE(sc, MII_100T2CR, ktcr);
ktcr = PHY_READ(sc, MII_100T2CR);
@@ -611,23 +634,37 @@ brgphy_reset(struct mii_softc *sc)
struct brgphy_softc *bsc = device_private(sc-mii_dev);
mii_phy_reset(sc);
-
- switch (sc-mii_mpd_model) {
- case MII_MODEL_BROADCOM_BCM5400:
- brgphy_bcm5401_dspcode(sc);
- break;
- case MII_MODEL_BROADCOM_BCM5401:
- if (sc-mii_mpd_rev == 1 || sc-mii_mpd_rev == 3)
+ switch (sc-mii_mpd_oui) {
+ case MII_OUI_BROADCOM:
+ switch (sc-mii_mpd_model) {
+ case MII_MODEL_BROADCOM_BCM5400:
brgphy_bcm5401_dspcode(sc);
+
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 15 11:15:23 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Use -isysroot ${DESTDIR} for RUMPCOMP_USER when run as part of build.sh
so as to catch the necessary headers, which, unlike in the buildrump.sh
case, are not supposed to be intermingled with the ones provided by
the host.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.70 src/sys/rump/Makefile.rump:1.71
--- src/sys/rump/Makefile.rump:1.70 Fri Mar 1 18:11:11 2013
+++ src/sys/rump/Makefile.rump Fri Mar 15 11:15:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.70 2013/03/01 18:11:11 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.71 2013/03/15 11:15:22 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -79,19 +79,19 @@ DPSRCS+= ${RUMPTOP}/Makefile.rump
.ifdef RUMPCOMP_USER
rumpcomp_user.d: rumpcomp_user.c
${_MKTARGET_CREATE}
- ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${.CURDIR}/rumpcomp_user.c
+ ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS:U-isysroot ${DESTDIR}} ${RUMPCOMP_USER_CPPFLAGS} ${.CURDIR}/rumpcomp_user.c
rumpcomp_user.o: rumpcomp_user.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
+ ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS:U-isysroot ${DESTDIR}} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
rumpcomp_user.pico: rumpcomp_user.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
+ ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS:U-isysroot ${DESTDIR}} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
rumpcomp_user.po: rumpcomp_user.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
+ ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS:U-isysroot ${DESTDIR}} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
RUMPCOMP_USEROBJ=rumpcomp_user.*o
SRCS+=rumpcomp_user.c
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src
Committed By: pooka
Date: Fri Mar 15 11:30:23 UTC 2013
Modified Files:
src/sys/rump/net/lib/libvirtif: Makefile if_virt.c
Log Message:
Rerevert to preprevious now that this builds with build.sh
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libvirtif/Makefile
cvs rdiff -u -r1.29 -r1.30 src/sys/rump/net/lib/libvirtif/if_virt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libvirtif/Makefile
diff -u src/sys/rump/net/lib/libvirtif/Makefile:1.5 src/sys/rump/net/lib/libvirtif/Makefile:1.6
--- src/sys/rump/net/lib/libvirtif/Makefile:1.5 Thu Mar 14 01:23:34 2013
+++ src/sys/rump/net/lib/libvirtif/Makefile Fri Mar 15 11:30:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/03/14 01:23:34 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2013/03/15 11:30:23 pooka Exp $
#
LIB= rumpnet_virtif
@@ -6,7 +6,9 @@ LIB= rumpnet_virtif
SRCS= if_virt.c
SRCS+= component.c
-CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpkern
+CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpkern -I${.CURDIR}
+
+RUMPCOMP_USER= #defined
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.29 src/sys/rump/net/lib/libvirtif/if_virt.c:1.30
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.29 Thu Mar 14 01:23:34 2013
+++ src/sys/rump/net/lib/libvirtif/if_virt.c Fri Mar 15 11:30:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_virt.c,v 1.29 2013/03/14 01:23:34 pooka Exp $ */
+/* $NetBSD: if_virt.c,v 1.30 2013/03/15 11:30:23 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.29 2013/03/14 01:23:34 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.30 2013/03/15 11:30:23 pooka Exp $);
#include sys/param.h
#include sys/condvar.h
@@ -49,11 +49,12 @@ __KERNEL_RCSID(0, $NetBSD: if_virt.c,v
#include netinet/in_var.h
#include rump/rump.h
-#include rump/rumpuser.h
#include rump_private.h
#include rump_net_private.h
+#include rumpcomp_user.h
+
/*
* Virtual interface for userspace purposes. Uses tap(4) to
* interface with the kernel and just simply shovels data
@@ -69,7 +70,7 @@ static void virtif_stop(struct ifnet *,
struct virtif_sc {
struct ethercom sc_ec;
- int sc_tapfd;
+ struct virtif_user *sc_viu;
bool sc_dying;
struct lwp *sc_l_snd, *sc_l_rcv;
kmutex_t sc_mtx;
@@ -88,27 +89,23 @@ int
rump_virtif_create(int num)
{
struct virtif_sc *sc;
+ struct virtif_user *viu;
struct ifnet *ifp;
uint8_t enaddr[ETHER_ADDR_LEN] = { 0xb2, 0x0a, 0x00, 0x0b, 0x0e, 0x01 };
- char tapdev[16];
- int fd, error = 0;
+ int error = 0;
if (num = 0x100)
return E2BIG;
- snprintf(tapdev, sizeof(tapdev), /dev/tap%d, num);
- fd = rumpuser_open(tapdev, RUMPUSER_OPEN_RDWR, error);
- if (fd == -1) {
- printf(virtif_create: can't open /dev/tap%d: %d\n,
- num, error);
- return error;
- }
+ if ((viu = rumpcomp_virtif_create(num)) == NULL)
+ return ENXIO;
+
enaddr[2] = cprng_fast32() 0xff;
enaddr[5] = num;
sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
sc-sc_dying = false;
- sc-sc_tapfd = fd;
+ sc-sc_viu = viu;
mutex_init(sc-sc_mtx, MUTEX_DEFAULT, IPL_NONE);
cv_init(sc-sc_cv, virtsnd);
@@ -168,6 +165,8 @@ virtif_unclone(struct ifnet *ifp)
cv_broadcast(sc-sc_cv);
mutex_exit(sc-sc_mtx);
+ rumpcomp_virtif_dying(sc-sc_viu);
+
virtif_stop(ifp, 1);
if_down(ifp);
@@ -180,7 +179,7 @@ virtif_unclone(struct ifnet *ifp)
sc-sc_l_rcv = NULL;
}
- rumpuser_close(sc-sc_tapfd, NULL);
+ rumpcomp_virtif_destroy(sc-sc_viu);
mutex_destroy(sc-sc_mtx);
cv_destroy(sc-sc_cv);
@@ -220,7 +219,6 @@ virtif_ioctl(struct ifnet *ifp, u_long c
return rv;
}
-/* just send everything in-context */
static void
virtif_start(struct ifnet *ifp)
{
@@ -252,35 +250,21 @@ virtif_receiver(void *arg)
struct virtif_sc *sc = ifp-if_softc;
struct mbuf *m;
size_t plen = ETHER_MAX_LEN_JUMBO+1;
- struct pollfd pfd;
ssize_t n;
- int error, rv;
-
- pfd.fd = sc-sc_tapfd;
- pfd.events = POLLIN;
for (;;) {
m = m_gethdr(M_WAIT, MT_DATA);
MEXTMALLOC(m, plen, M_WAIT);
again:
- /* poll, but periodically check if we should die */
- rv = rumpuser_poll(pfd, 1, POLLTIMO_MS, error);
if (sc-sc_dying) {
m_freem(m);
break;
}
- if (rv == 0)
- goto again;
-
- n = rumpuser_read(sc-sc_tapfd, mtod(m, void *), plen, error);
- KASSERT(n ETHER_MAX_LEN_JUMBO);
- if (__predict_false(n 0)) {
- if (n == -1 error == EAGAIN) {
-goto again;
- }
-
- printf(%s: read from /dev/tap failed. host is down?\n,
+
+ n = rumpcomp_virtif_recv(sc-sc_viu, mtod(m, void *), plen);
+ if (n 0) {
+ printf(%s: read hypercall failed. host if down?\n,
ifp-if_xname);
mutex_enter(sc-sc_mtx);
/* could check if need go, done soon anyway */
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Fri Mar 15 12:09:59 UTC 2013
Modified Files:
src/sys/rump/librump/rumpdev: Makefile.rumpdev
src/sys/rump/librump/rumpkern: Makefile.rumpkern
src/sys/rump/librump/rumpnet: Makefile.rumpnet
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Log Message:
Allow Makefile.rump to append to SRCS.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpdev/Makefile.rumpdev
cvs rdiff -u -r1.123 -r1.124 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/librump/rumpnet/Makefile.rumpnet
cvs rdiff -u -r1.35 -r1.36 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpdev/Makefile.rumpdev
diff -u src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.5 src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.6
--- src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.5 Tue Feb 16 20:42:47 2010
+++ src/sys/rump/librump/rumpdev/Makefile.rumpdev Fri Mar 15 12:09:58 2013
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.rumpdev,v 1.5 2010/02/16 20:42:47 pooka Exp $
+# $NetBSD: Makefile.rumpdev,v 1.6 2013/03/15 12:09:58 pooka Exp $
#
-.include ${RUMPTOP}/Makefile.rump
-
LIB= rumpdev
.PATH: ${RUMPTOP}/librump/rumpdev\
@@ -19,5 +17,7 @@ SHLIB_MINOR=0
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev/opt
+.include ${RUMPTOP}/Makefile.rump
+
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.123 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.124
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.123 Sun Mar 10 17:05:12 2013
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Fri Mar 15 12:09:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.123 2013/03/10 17:05:12 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.124 2013/03/15 12:09:58 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -19,7 +19,7 @@ LIB= rump
#
# Source modules, first the ones specifically implemented for librump.
#
-SRCS= rump.c rumpcopy.c emul.c intr.c lwproc.c klock.c \
+SRCS+= rump.c rumpcopy.c emul.c intr.c lwproc.c klock.c \
kobj_rename.c ltsleep.c scheduler.c \
signals.c sleepq.c threads.c vm.c cprng_stub.c
Index: src/sys/rump/librump/rumpnet/Makefile.rumpnet
diff -u src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.12 src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.13
--- src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.12 Thu Mar 31 19:40:53 2011
+++ src/sys/rump/librump/rumpnet/Makefile.rumpnet Fri Mar 15 12:09:59 2013
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.rumpnet,v 1.12 2011/03/31 19:40:53 dyoung Exp $
+# $NetBSD: Makefile.rumpnet,v 1.13 2013/03/15 12:09:59 pooka Exp $
#
-.include ${RUMPTOP}/Makefile.rump
-
LIB= rumpnet
.PATH: ${RUMPTOP}/librump/rumpnet\
@@ -34,5 +32,7 @@ SHLIB_MINOR=0
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet/opt
+.include ${RUMPTOP}/Makefile.rump
+
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.35 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.36
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.35 Sun May 13 09:42:36 2012
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Fri Mar 15 12:09:59 2013
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.rumpvfs,v 1.35 2012/05/13 09:42:36 dholland Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.36 2013/03/15 12:09:59 pooka Exp $
#
-.include ${RUMPTOP}/Makefile.rump
-
LIB= rumpvfs
.PATH: ${RUMPTOP}/librump/rumpvfs ${RUMPTOP}/librump \
@@ -69,5 +67,7 @@ SHLIB_MINOR=0
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+.include ${RUMPTOP}/Makefile.rump
+
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 15 12:12:16 UTC 2013
Added Files:
src/sys/rump: sunldgen.sh
Log Message:
Support generating support for Sun ld.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/sunldgen.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/sunldgen.sh
diff -u /dev/null src/sys/rump/sunldgen.sh:1.1
--- /dev/null Fri Mar 15 12:12:16 2013
+++ src/sys/rump/sunldgen.sh Fri Mar 15 12:12:16 2013
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# $NetBSD: sunldgen.sh,v 1.1 2013/03/15 12:12:16 pooka Exp $
+#
+
+# To support the Sun linker we need to make it behave like the GNU linker
+# for orphaned sections. That means generating __start/__stop symbols
+# for them and that means some nopoly-atheist-withoutfood level trickery.
+# We enumerate all the section names we wish to generate symbols for.
+# The good news is that it's unlikely for NetBSD to grow any more
+# link sets, and even if it does, it'll be a build-time failure
+# on Sun platforms so it's easy to catch and mend the list below.
+
+LINKSETS='rump_components evcnts prop_linkpools modules sysctl_funcs
+ bufq_strats domains dkwedge_methods ieee80211_funcs'
+
+exec 1 ldscript_sun.rump
+printf '# $NetBSD: sunldgen.sh,v 1.1 2013/03/15 12:12:16 pooka Exp $\n\n$mapfile_version 2\nLOAD_SEGMENT rumpkern_linksets {'
+for lset in ${LINKSETS}; do
+ printf '\n\tASSIGN_SECTION { IS_NAME= link_set_start_%s };\n' $lset
+ printf '\tASSIGN_SECTION { IS_NAME= link_set_%s };\n' $lset
+ printf '\tASSIGN_SECTION { IS_NAME= link_set_stop_%s };\n' $lset
+ printf '\tOS_ORDER+= link_set_start_%s\n' $lset
+ printf '\tlink_set_%s\n' $lset
+ printf '\tlink_set_stop_%s;\n' $lset
+done
+echo '};'
+
+exec 1 linksyms_sun.c
+printf '/* $NetBSD: sunldgen.sh,v 1.1 2013/03/15 12:12:16 pooka Exp $ */\n\n'
+for lset in ${LINKSETS}; do
+ printf 'int __start_link_set_%s[0]\n' $lset
+ printf '\t__attribute__((__section__(link_set_start_%s)));\n' $lset
+ printf 'int __link_set_dummy_%s[0]\n' $lset
+ printf '\t__attribute__((__section__(link_set_%s)));\n' $lset
+ printf 'int __stop_link_set_%s[0]\n' $lset
+ printf '\t__attribute__((__section__(link_set_stop_%s)));\n\n' $lset
+done
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 15 12:13:07 UTC 2013
Added Files:
src/sys/rump: ldscript_sun.rump linksyms_sun.c
Log Message:
Generate support for sun ld.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/ldscript_sun.rump \
src/sys/rump/linksyms_sun.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/ldscript_sun.rump
diff -u /dev/null src/sys/rump/ldscript_sun.rump:1.1
--- /dev/null Fri Mar 15 12:13:07 2013
+++ src/sys/rump/ldscript_sun.rump Fri Mar 15 12:13:07 2013
@@ -0,0 +1,67 @@
+# $NetBSD: ldscript_sun.rump,v 1.1 2013/03/15 12:13:07 pooka Exp $
+
+$mapfile_version 2
+LOAD_SEGMENT rumpkern_linksets {
+ ASSIGN_SECTION { IS_NAME= link_set_start_rump_components };
+ ASSIGN_SECTION { IS_NAME= link_set_rump_components };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_rump_components };
+ OS_ORDER+= link_set_start_rump_components
+ link_set_rump_components
+ link_set_stop_rump_components;
+
+ ASSIGN_SECTION { IS_NAME= link_set_start_evcnts };
+ ASSIGN_SECTION { IS_NAME= link_set_evcnts };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_evcnts };
+ OS_ORDER+= link_set_start_evcnts
+ link_set_evcnts
+ link_set_stop_evcnts;
+
+ ASSIGN_SECTION { IS_NAME= link_set_start_prop_linkpools };
+ ASSIGN_SECTION { IS_NAME= link_set_prop_linkpools };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_prop_linkpools };
+ OS_ORDER+= link_set_start_prop_linkpools
+ link_set_prop_linkpools
+ link_set_stop_prop_linkpools;
+
+ ASSIGN_SECTION { IS_NAME= link_set_start_modules };
+ ASSIGN_SECTION { IS_NAME= link_set_modules };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_modules };
+ OS_ORDER+= link_set_start_modules
+ link_set_modules
+ link_set_stop_modules;
+
+ ASSIGN_SECTION { IS_NAME= link_set_start_sysctl_funcs };
+ ASSIGN_SECTION { IS_NAME= link_set_sysctl_funcs };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_sysctl_funcs };
+ OS_ORDER+= link_set_start_sysctl_funcs
+ link_set_sysctl_funcs
+ link_set_stop_sysctl_funcs;
+
+ ASSIGN_SECTION { IS_NAME= link_set_start_bufq_strats };
+ ASSIGN_SECTION { IS_NAME= link_set_bufq_strats };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_bufq_strats };
+ OS_ORDER+= link_set_start_bufq_strats
+ link_set_bufq_strats
+ link_set_stop_bufq_strats;
+
+ ASSIGN_SECTION { IS_NAME= link_set_start_domains };
+ ASSIGN_SECTION { IS_NAME= link_set_domains };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_domains };
+ OS_ORDER+= link_set_start_domains
+ link_set_domains
+ link_set_stop_domains;
+
+ ASSIGN_SECTION { IS_NAME= link_set_start_dkwedge_methods };
+ ASSIGN_SECTION { IS_NAME= link_set_dkwedge_methods };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_dkwedge_methods };
+ OS_ORDER+= link_set_start_dkwedge_methods
+ link_set_dkwedge_methods
+ link_set_stop_dkwedge_methods;
+
+ ASSIGN_SECTION { IS_NAME= link_set_start_ieee80211_funcs };
+ ASSIGN_SECTION { IS_NAME= link_set_ieee80211_funcs };
+ ASSIGN_SECTION { IS_NAME= link_set_stop_ieee80211_funcs };
+ OS_ORDER+= link_set_start_ieee80211_funcs
+ link_set_ieee80211_funcs
+ link_set_stop_ieee80211_funcs;
+};
Index: src/sys/rump/linksyms_sun.c
diff -u /dev/null src/sys/rump/linksyms_sun.c:1.1
--- /dev/null Fri Mar 15 12:13:07 2013
+++ src/sys/rump/linksyms_sun.c Fri Mar 15 12:13:07 2013
@@ -0,0 +1,65 @@
+/* $NetBSD: linksyms_sun.c,v 1.1 2013/03/15 12:13:07 pooka Exp $ */
+
+int __start_link_set_rump_components[0]
+ __attribute__((__section__(link_set_start_rump_components)));
+int __link_set_dummy_rump_components[0]
+ __attribute__((__section__(link_set_rump_components)));
+int __stop_link_set_rump_components[0]
+ __attribute__((__section__(link_set_stop_rump_components)));
+
+int __start_link_set_evcnts[0]
+ __attribute__((__section__(link_set_start_evcnts)));
+int __link_set_dummy_evcnts[0]
+ __attribute__((__section__(link_set_evcnts)));
+int __stop_link_set_evcnts[0]
+ __attribute__((__section__(link_set_stop_evcnts)));
+
+int __start_link_set_prop_linkpools[0]
+ __attribute__((__section__(link_set_start_prop_linkpools)));
+int __link_set_dummy_prop_linkpools[0]
+ __attribute__((__section__(link_set_prop_linkpools)));
+int __stop_link_set_prop_linkpools[0]
+ __attribute__((__section__(link_set_stop_prop_linkpools)));
+
+int __start_link_set_modules[0]
+ __attribute__((__section__(link_set_start_modules)));
+int __link_set_dummy_modules[0]
+ __attribute__((__section__(link_set_modules)));
+int __stop_link_set_modules[0]
+ __attribute__((__section__(link_set_stop_modules)));
+
+int __start_link_set_sysctl_funcs[0]
+ __attribute__((__section__(link_set_start_sysctl_funcs)));
+int __link_set_dummy_sysctl_funcs[0]
+ __attribute__((__section__(link_set_sysctl_funcs)));
+int __stop_link_set_sysctl_funcs[0]
+ __attribute__((__section__(link_set_stop_sysctl_funcs)));
+
+int __start_link_set_bufq_strats[0]
+
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 15 12:15:52 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Use correct ldscript etc. for Sun ld.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.71 src/sys/rump/Makefile.rump:1.72
--- src/sys/rump/Makefile.rump:1.71 Fri Mar 15 11:15:22 2013
+++ src/sys/rump/Makefile.rump Fri Mar 15 12:15:52 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.71 2013/03/15 11:15:22 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.72 2013/03/15 12:15:52 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -37,7 +37,14 @@ CPPFLAGS+= -I${RUMPTOP}/../arch
CPPFLAGS+= -I${RUMPTOP}/..
.endif
+# my ld or yours?
+.ifdef HAVE_SUN_LD
+LDFLAGS+= -Wl,-M ${RUMPTOP}/ldscript_sun.rump
+SRCS+= linksyms_sun.c
+PATH: ${RUMPTOP}
+.else
LDFLAGS+= -Wl,-T ${RUMPTOP}/ldscript.rump
+.fi
RUMP_DIAGNOSTIC?=yes
.if ${RUMP_DIAGNOSTIC} == yes
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 15 12:18:41 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
On second thought, let's use make syntax in makefiles ...
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.72 src/sys/rump/Makefile.rump:1.73
--- src/sys/rump/Makefile.rump:1.72 Fri Mar 15 12:15:52 2013
+++ src/sys/rump/Makefile.rump Fri Mar 15 12:18:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.72 2013/03/15 12:15:52 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.73 2013/03/15 12:18:41 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -44,7 +44,7 @@ SRCS+= linksyms_sun.c
PATH: ${RUMPTOP}
.else
LDFLAGS+= -Wl,-T ${RUMPTOP}/ldscript.rump
-.fi
+.endif
RUMP_DIAGNOSTIC?=yes
.if ${RUMP_DIAGNOSTIC} == yes
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 15 12:42:18 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
one more typofix
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.73 src/sys/rump/Makefile.rump:1.74
--- src/sys/rump/Makefile.rump:1.73 Fri Mar 15 12:18:41 2013
+++ src/sys/rump/Makefile.rump Fri Mar 15 12:42:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.73 2013/03/15 12:18:41 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.74 2013/03/15 12:42:18 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -41,7 +41,7 @@ CPPFLAGS+= -I${RUMPTOP}/..
.ifdef HAVE_SUN_LD
LDFLAGS+= -Wl,-M ${RUMPTOP}/ldscript_sun.rump
SRCS+= linksyms_sun.c
-PATH: ${RUMPTOP}
+.PATH: ${RUMPTOP}
.else
LDFLAGS+= -Wl,-T ${RUMPTOP}/ldscript.rump
.endif
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: njoly
Date: Fri Mar 15 14:27:41 UTC 2013
Modified Files:
src/lib/libterminfo: term.h
Log Message:
Fix cp error in string descriptions.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libterminfo/term.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/term.h
diff -u src/lib/libterminfo/term.h:1.14 src/lib/libterminfo/term.h:1.15
--- src/lib/libterminfo/term.h:1.14 Fri Jan 25 17:28:50 2013
+++ src/lib/libterminfo/term.h Fri Mar 15 14:27:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.14 2013/01/25 17:28:50 roy Exp $ */
+/* $NetBSD: term.h,v 1.15 2013/03/15 14:27:41 njoly Exp $ */
/*
* Copyright (c) 2009, 2010, 2011, 2013 The NetBSD Foundation, Inc.
@@ -1812,7 +1812,7 @@ enum TISTRS{
* lab_f6: Labels on function key f6 if not f6
* lab_f7: Labels on function key f7 if not f7
* lab_f8: Labels on function key f8 if not f8
- * lab_f8: Labels on function key f9 if not f9
+ * lab_f9: Labels on function key f9 if not f9
* lab_f10: Labels on function key f10 if not f10
* label_format: Label format
* label_off: Turn off soft labels
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src
Committed By: martin
Date: Fri Mar 15 16:14:13 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libscsitest: scsitest.c
Log Message:
For the MMC GET_CONFIGURATION command, return a nulled feature header.
Fixes PR kern/47646.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libscsitest/scsitest.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libscsitest/scsitest.c
diff -u src/sys/rump/dev/lib/libscsitest/scsitest.c:1.5 src/sys/rump/dev/lib/libscsitest/scsitest.c:1.6
--- src/sys/rump/dev/lib/libscsitest/scsitest.c:1.5 Sat Oct 27 17:18:40 2012
+++ src/sys/rump/dev/lib/libscsitest/scsitest.c Fri Mar 15 16:14:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scsitest.c,v 1.5 2012/10/27 17:18:40 chs Exp $ */
+/* $NetBSD: scsitest.c,v 1.6 2013/03/15 16:14:12 martin Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.5 2012/10/27 17:18:40 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.6 2013/03/15 16:14:12 martin Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -176,7 +176,7 @@ scsitest_request(struct scsipi_channel *
break;
}
case GET_CONFIGURATION: {
-
+ memset(xs-data, 0, sizeof(struct scsipi_get_conf_data));
break;
}
case SCSI_READ_6_COMMAND: {
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: martin Date: Fri Mar 15 16:16:12 UTC 2013 Modified Files: src/sys/dev/scsipi: cd.c Log Message: Prompted by PR kern/47646, zero the value buffer before running the GET_CONFIGURATION command and check for an unexpectedly large feature length answer afterwards. To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/sys/dev/scsipi/cd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/scsipi/cd.c diff -u src/sys/dev/scsipi/cd.c:1.309 src/sys/dev/scsipi/cd.c:1.310 --- src/sys/dev/scsipi/cd.c:1.309 Sun May 6 17:23:10 2012 +++ src/sys/dev/scsipi/cd.c Fri Mar 15 16:16:12 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cd.c,v 1.309 2012/05/06 17:23:10 martin Exp $ */ +/* $NetBSD: cd.c,v 1.310 2013/03/15 16:16:12 martin Exp $ */ /*- * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation, @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.309 2012/05/06 17:23:10 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.310 2013/03/15 16:16:12 martin Exp $); #include sys/param.h #include sys/systm.h @@ -3033,6 +3033,7 @@ mmc_getdiscinfo(struct scsipi_periph *pe gc_cmd.opcode = GET_CONFIGURATION; _lto2b(last_feature, gc_cmd.start_at_feature); _lto2b(feat_tbl_len, gc_cmd.data_len); + memset(gc, 0, feat_tbl_len); error = scsipi_command(periph, (void *)gc_cmd, sizeof(gc_cmd), @@ -3044,7 +3045,7 @@ mmc_getdiscinfo(struct scsipi_periph *pe } features_len = _4btol(gc-data_len); - if (features_len 4) + if (features_len 4 || features_len feat_tbl_len) break; pos = 0;
CVS commit: src/tests/dev/scsipi
Module Name:src Committed By: martin Date: Fri Mar 15 16:18:50 UTC 2013 Modified Files: src/tests/dev/scsipi: t_cd.c Log Message: The CD emulator has been fixed, no longer expect the test to die. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/dev/scsipi/t_cd.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/dev/scsipi/t_cd.c diff -u src/tests/dev/scsipi/t_cd.c:1.5 src/tests/dev/scsipi/t_cd.c:1.6 --- src/tests/dev/scsipi/t_cd.c:1.5 Thu Mar 14 06:43:32 2013 +++ src/tests/dev/scsipi/t_cd.c Fri Mar 15 16:18:49 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: t_cd.c,v 1.5 2013/03/14 06:43:32 jmmv Exp $ */ +/* $NetBSD: t_cd.c,v 1.6 2013/03/15 16:18:49 martin Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -56,8 +56,12 @@ ATF_TC_BODY(noisyeject, tc) RL(part = getrawpartition()); fname[strlen(fname)-1] = 'a' + part; rump_init(); + /* + * Rump CD emulation has been fixed, so no longer a problem. + * atf_tc_expect_signal(SIGSEGV, PR kern/47646: Broken test or a real problem in rump or the driver); + */ RL(fd = rump_sys_open(fname, O_RDWR)); RL(rump_sys_ioctl(fd, DIOCEJECT, arg));
CVS commit: [netbsd-5] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:48:08 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #1854): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.27.2.4 -r1.1.1.27.2.5 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.12.3 -r1.1.1.17.12.4 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.2.7 -r1.1.1.44.2.8 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.6 -r1.17.2.7 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.2.4 -r1.1.1.38.2.5 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.2.7 -r1.1.1.42.2.8 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.2.6 -r1.1.1.42.2.7 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.2.4 -r1.1.1.33.2.5 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.2.4 src/share/zoneinfo/africa:1.1.1.27.2.5 --- src/share/zoneinfo/africa:1.1.1.27.2.4 Thu Mar 14 19:59:51 2013 +++ src/share/zoneinfo/africa Fri Mar 15 18:48:07 2013 @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # t...@iana.org for general use in the future). -# From Paul Eggert (2006-03-22): +# From Paul Eggert (2013-02-21): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -25,6 +25,10 @@ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which # I found in the UCLA library. # +# For data circa 1899, a common source is: +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 +# http://www.jstor.org/stable/1774359. +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -116,8 +120,12 @@ Zone Africa/Porto-Novo 0:10:28 - LMT 191 1:00 - WAT # Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar 2:00 - CAT 1943 Sep 19 2:00 2:00 1:00 CAST 1944 Mar 19 2:00 2:00 - CAT @@ -189,6 +197,11 @@ Zone Africa/Djibouti 2:52:36 - LMT 1911 # Egypt +# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh +# observatory; round to nearest. Milne also says that the official time for +# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this +# did not apply to Cairo, Alexandria, or Port Said. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Egypt 1940 only - Jul 15 0:00 1:00 S Rule Egypt 1940 only - Oct 1 0:00 0 - @@ -329,7 +342,7 @@ Rule Egypt 2010 only - Sep 10 0:00 1:00 Rule Egypt 2010 only - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Cairo 2:05:00 - LMT 1900 Oct +Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt EE%sT # Equatorial Guinea Index: src/share/zoneinfo/antarctica diff -u
CVS commit: [netbsd-5-1] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:48:46 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5-1]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #1854): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.27.10.4 -r1.1.1.27.10.5 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.20.3 -r1.1.1.17.20.4 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.10.7 -r1.1.1.44.10.8 src/share/zoneinfo/asia cvs rdiff -u -r1.17.10.6 -r1.17.10.7 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.10.4 -r1.1.1.38.10.5 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.10.7 -r1.1.1.42.10.8 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.10.6 -r1.1.1.42.10.7 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.10.4 -r1.1.1.33.10.5 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.10.4 src/share/zoneinfo/africa:1.1.1.27.10.5 --- src/share/zoneinfo/africa:1.1.1.27.10.4 Thu Mar 14 20:03:22 2013 +++ src/share/zoneinfo/africa Fri Mar 15 18:48:45 2013 @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # t...@iana.org for general use in the future). -# From Paul Eggert (2006-03-22): +# From Paul Eggert (2013-02-21): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -25,6 +25,10 @@ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which # I found in the UCLA library. # +# For data circa 1899, a common source is: +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 +# http://www.jstor.org/stable/1774359. +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -116,8 +120,12 @@ Zone Africa/Porto-Novo 0:10:28 - LMT 191 1:00 - WAT # Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar 2:00 - CAT 1943 Sep 19 2:00 2:00 1:00 CAST 1944 Mar 19 2:00 2:00 - CAT @@ -189,6 +197,11 @@ Zone Africa/Djibouti 2:52:36 - LMT 1911 # Egypt +# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh +# observatory; round to nearest. Milne also says that the official time for +# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this +# did not apply to Cairo, Alexandria, or Port Said. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Egypt 1940 only - Jul 15 0:00 1:00 S Rule Egypt 1940 only - Oct 1 0:00 0 - @@ -329,7 +342,7 @@ Rule Egypt 2010 only - Sep 10 0:00 1:00 Rule Egypt 2010 only - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Cairo 2:05:00 - LMT 1900 Oct +Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt EE%sT # Equatorial Guinea Index:
CVS commit: [netbsd-5-2] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:49:09 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5-2]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #1854): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.27.2.3.2.1 -r1.1.1.27.2.3.2.2 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.12.3 -r1.1.1.17.12.3.2.1 \ src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.2.7 -r1.1.1.44.2.7.2.1 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.6 -r1.17.2.6.2.1 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.2.4 -r1.1.1.38.2.4.2.1 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.2.6.2.1 -r1.1.1.42.2.6.2.2 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.2.5.2.1 -r1.1.1.42.2.5.2.2 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.2.4 -r1.1.1.33.2.4.2.1 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.2.3.2.1 src/share/zoneinfo/africa:1.1.1.27.2.3.2.2 --- src/share/zoneinfo/africa:1.1.1.27.2.3.2.1 Thu Mar 14 20:01:28 2013 +++ src/share/zoneinfo/africa Fri Mar 15 18:49:08 2013 @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # t...@iana.org for general use in the future). -# From Paul Eggert (2006-03-22): +# From Paul Eggert (2013-02-21): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -25,6 +25,10 @@ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which # I found in the UCLA library. # +# For data circa 1899, a common source is: +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 +# http://www.jstor.org/stable/1774359. +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -116,8 +120,12 @@ Zone Africa/Porto-Novo 0:10:28 - LMT 191 1:00 - WAT # Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar 2:00 - CAT 1943 Sep 19 2:00 2:00 1:00 CAST 1944 Mar 19 2:00 2:00 - CAT @@ -189,6 +197,11 @@ Zone Africa/Djibouti 2:52:36 - LMT 1911 # Egypt +# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh +# observatory; round to nearest. Milne also says that the official time for +# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this +# did not apply to Cairo, Alexandria, or Port Said. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Egypt 1940 only - Jul 15 0:00 1:00 S Rule Egypt 1940 only - Oct 1 0:00 0 - @@ -329,7 +342,7 @@ Rule Egypt 2010 only - Sep 10 0:00 1:00 Rule Egypt 2010 only - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Cairo 2:05:00 - LMT 1900 Oct +Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt EE%sT
CVS commit: [netbsd-6] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:49:53 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #845): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.30.4.3 -r1.1.1.30.4.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.19.4.2 -r1.1.1.19.4.3 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.50.4.6 -r1.1.1.50.4.7 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.6 -r1.23.4.7 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.4 -r1.1.1.44.4.5 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.49.4.6 -r1.1.1.49.4.7 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.46.4.6 -r1.1.1.46.4.7 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.3 -r1.1.1.39.4.4 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.30.4.3 src/share/zoneinfo/africa:1.1.1.30.4.4 --- src/share/zoneinfo/africa:1.1.1.30.4.3 Thu Mar 14 19:16:42 2013 +++ src/share/zoneinfo/africa Fri Mar 15 18:49:52 2013 @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # t...@iana.org for general use in the future). -# From Paul Eggert (2006-03-22): +# From Paul Eggert (2013-02-21): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -25,6 +25,10 @@ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which # I found in the UCLA library. # +# For data circa 1899, a common source is: +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 +# http://www.jstor.org/stable/1774359. +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -116,8 +120,12 @@ Zone Africa/Porto-Novo 0:10:28 - LMT 191 1:00 - WAT # Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar 2:00 - CAT 1943 Sep 19 2:00 2:00 1:00 CAST 1944 Mar 19 2:00 2:00 - CAT @@ -189,6 +197,11 @@ Zone Africa/Djibouti 2:52:36 - LMT 1911 # Egypt +# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh +# observatory; round to nearest. Milne also says that the official time for +# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this +# did not apply to Cairo, Alexandria, or Port Said. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Egypt 1940 only - Jul 15 0:00 1:00 S Rule Egypt 1940 only - Oct 1 0:00 0 - @@ -329,7 +342,7 @@ Rule Egypt 2010 only - Sep 10 0:00 1:00 Rule Egypt 2010 only - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Cairo 2:05:00 - LMT 1900 Oct +Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt EE%sT # Equatorial Guinea Index: src/share/zoneinfo/antarctica diff -u
CVS commit: [netbsd-6-0] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:50:19 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6-0]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #845): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.30.4.1.4.2 -r1.1.1.30.4.1.4.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.19.4.2 -r1.1.1.19.4.2.4.1 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.50.4.3.4.3 -r1.1.1.50.4.3.4.4 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.4.2.2 -r1.23.4.4.2.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.3.4.1 -r1.1.1.44.4.3.4.2 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.49.4.4.4.2 -r1.1.1.49.4.4.4.3 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.46.4.3.4.3 -r1.1.1.46.4.3.4.4 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.3 -r1.1.1.39.4.3.4.1 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.30.4.1.4.2 src/share/zoneinfo/africa:1.1.1.30.4.1.4.3 --- src/share/zoneinfo/africa:1.1.1.30.4.1.4.2 Thu Mar 14 19:47:55 2013 +++ src/share/zoneinfo/africa Fri Mar 15 18:50:18 2013 @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # t...@iana.org for general use in the future). -# From Paul Eggert (2006-03-22): +# From Paul Eggert (2013-02-21): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -25,6 +25,10 @@ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which # I found in the UCLA library. # +# For data circa 1899, a common source is: +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 +# http://www.jstor.org/stable/1774359. +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -116,8 +120,12 @@ Zone Africa/Porto-Novo 0:10:28 - LMT 191 1:00 - WAT # Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar 2:00 - CAT 1943 Sep 19 2:00 2:00 1:00 CAST 1944 Mar 19 2:00 2:00 - CAT @@ -189,6 +197,11 @@ Zone Africa/Djibouti 2:52:36 - LMT 1911 # Egypt +# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh +# observatory; round to nearest. Milne also says that the official time for +# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this +# did not apply to Cairo, Alexandria, or Port Said. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Egypt 1940 only - Jul 15 0:00 1:00 S Rule Egypt 1940 only - Oct 1 0:00 0 - @@ -329,7 +342,7 @@ Rule Egypt 2010 only - Sep 10 0:00 1:00 Rule Egypt 2010 only - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Cairo 2:05:00 - LMT 1900 Oct +Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 15 18:52:54 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: Update changelist for ticket 845. To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-6.0.2 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-6.0.2 diff -u src/doc/CHANGES-6.0.2:1.1.2.23 src/doc/CHANGES-6.0.2:1.1.2.24 --- src/doc/CHANGES-6.0.2:1.1.2.23 Thu Mar 14 22:37:37 2013 +++ src/doc/CHANGES-6.0.2 Fri Mar 15 18:52:53 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.2,v 1.1.2.23 2013/03/14 22:37:37 riz Exp $ +# $NetBSD: CHANGES-6.0.2,v 1.1.2.24 2013/03/15 18:52:53 riz Exp $ A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2 release: @@ -130,8 +130,13 @@ external/historical/nawk/dist/tran.c 1. doc/3RDPARTY patch share/zoneinfo/africapatch +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch distrib/sets/lists/base/mi patch Merge tzdata2013a and tzdata2013b from
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Fri Mar 15 18:53:30 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Update changelist for ticket 845. To generate a diff of this commit: cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.111 src/doc/CHANGES-6.1:1.1.2.112 --- src/doc/CHANGES-6.1:1.1.2.111 Thu Mar 14 22:37:10 2013 +++ src/doc/CHANGES-6.1 Fri Mar 15 18:53:29 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.111 2013/03/14 22:37:10 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.112 2013/03/15 18:53:29 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8617,8 +8617,13 @@ sys/kern/init_sysctl.c1.195 via patc doc/3RDPARTY patch share/zoneinfo/africapatch +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch distrib/sets/lists/base/mi patch Merge tzdata2013a and tzdata2013b from
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Fri Mar 15 18:54:06 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Update changelist for ticket 1854. To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-5.3 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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.6 src/doc/CHANGES-5.3:1.1.2.7 --- src/doc/CHANGES-5.3:1.1.2.6 Thu Mar 14 20:00:12 2013 +++ src/doc/CHANGES-5.3 Fri Mar 15 18:54:05 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.6 2013/03/14 20:00:12 riz Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.7 2013/03/15 18:54:05 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -172,8 +172,13 @@ sys/external/bsd/ipf/netinet/ip_fil_netb doc/3RDPARTY patch share/zoneinfo/africapatch +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch distrib/sets/lists/base/mi patch Merge tzdata2013a and tzdata2013b from
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Fri Mar 15 18:54:45 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Update changelist for ticket 1854. To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-5.1.3 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-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.36 src/doc/CHANGES-5.1.3:1.1.2.37 --- src/doc/CHANGES-5.1.3:1.1.2.36 Thu Mar 14 20:03:57 2013 +++ src/doc/CHANGES-5.1.3 Fri Mar 15 18:54:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.36 2013/03/14 20:03:57 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.37 2013/03/15 18:54:45 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2351,8 +2351,13 @@ sys/external/bsd/ipf/netinet/ip_fil_netb doc/3RDPARTY patch share/zoneinfo/africapatch +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch distrib/sets/lists/base/mi patch Merge tzdata2013a and tzdata2013b from
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Fri Mar 15 18:55:18 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Update changelist for ticket 1854. To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-5.2.1 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-5.2.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.4 src/doc/CHANGES-5.2.1:1.1.2.5 --- src/doc/CHANGES-5.2.1:1.1.2.4 Thu Mar 14 20:02:21 2013 +++ src/doc/CHANGES-5.2.1 Fri Mar 15 18:55:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.4 2013/03/14 20:02:21 riz Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.5 2013/03/15 18:55:18 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -65,8 +65,13 @@ sys/external/bsd/ipf/netinet/ip_fil_netb doc/3RDPARTY patch share/zoneinfo/africapatch +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch distrib/sets/lists/base/mi patch Merge tzdata2013a and tzdata2013b from
CVS commit: src/share/man
Module Name:src
Committed By: njoly
Date: Fri Mar 15 19:32:32 UTC 2013
Modified Files:
src/share/man/man4/man4.x86: coretemp.4
src/share/man/man5: floppytab.5 netconfig.5 rpc.5
src/share/man/man7: security.7
src/share/man/man9: mca.9 sysmon_envsys.9
Log Message:
Fix a few file system paths to use Pa macro.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.x86/coretemp.4
cvs rdiff -u -r1.3 -r1.4 src/share/man/man5/floppytab.5
cvs rdiff -u -r1.8 -r1.9 src/share/man/man5/netconfig.5
cvs rdiff -u -r1.10 -r1.11 src/share/man/man5/rpc.5
cvs rdiff -u -r1.8 -r1.9 src/share/man/man7/security.7
cvs rdiff -u -r1.10 -r1.11 src/share/man/man9/mca.9
cvs rdiff -u -r1.43 -r1.44 src/share/man/man9/sysmon_envsys.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/man4.x86/coretemp.4
diff -u src/share/man/man4/man4.x86/coretemp.4:1.1 src/share/man/man4/man4.x86/coretemp.4:1.2
--- src/share/man/man4/man4.x86/coretemp.4:1.1 Wed Feb 23 08:52:16 2011
+++ src/share/man/man4/man4.x86/coretemp.4 Fri Mar 15 19:32:30 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: coretemp.4,v 1.1 2011/02/23 08:52:16 jruoho Exp $
+.\ $NetBSD: coretemp.4,v 1.2 2013/03/15 19:32:30 njoly Exp $
.\-
.\ Copyright (c) 2007 Juan Romero Pardines.
.\ Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
@@ -57,7 +57,7 @@ event to the
.Xr powerd 8
daemon.
The script
-.Fa /etc/powerd/scripts/sensor_temperature
+.Pa /etc/powerd/scripts/sensor_temperature
will be executed by the daemon (if running) when the limit has been reached.
.Sh SEE ALSO
.Xr envsys 4 ,
Index: src/share/man/man5/floppytab.5
diff -u src/share/man/man5/floppytab.5:1.3 src/share/man/man5/floppytab.5:1.4
--- src/share/man/man5/floppytab.5:1.3 Mon Jun 6 18:01:15 2011
+++ src/share/man/man5/floppytab.5 Fri Mar 15 19:32:31 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: floppytab.5,v 1.3 2011/06/06 18:01:15 wiz Exp $
+.\ $NetBSD: floppytab.5,v 1.4 2013/03/15 19:32:31 njoly Exp $
.\
.\ Copyright (c) 2011 Jukka Ruohonen
.\ All rights reserved.
@@ -44,7 +44,7 @@ When invoked with the
flag,
.Xr fdformat 1
can use the known floppy formats from
-.Fa /etc/floppytab
+.Pa /etc/floppytab
directly.
.Sh FILES
.Bl -tag -width /etc/floppytab -compact
Index: src/share/man/man5/netconfig.5
diff -u src/share/man/man5/netconfig.5:1.8 src/share/man/man5/netconfig.5:1.9
--- src/share/man/man5/netconfig.5:1.8 Sun May 13 15:49:43 2012
+++ src/share/man/man5/netconfig.5 Fri Mar 15 19:32:31 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: netconfig.5,v 1.8 2012/05/13 15:49:43 wiz Exp $
+.\ $NetBSD: netconfig.5,v 1.9 2013/03/15 19:32:31 njoly Exp $
.Dd November 17, 2000
.Dt NETCONFIG 5
.Os
@@ -6,7 +6,7 @@
.Nm netconfig
.Nd network configuration data base
.Sh SYNOPSIS
-.Fa /etc/netconfig
+.Pa /etc/netconfig
.Sh DESCRIPTION
The
.Nm
@@ -117,7 +117,7 @@ struct netconfig {
};
.Ed
.Sh FILES
-.Nm /etc/netconfig
+.Pa /etc/netconfig
.Sh SEE ALSO
.Xr getnetconfig 3 ,
.Xr getnetpath 3
Index: src/share/man/man5/rpc.5
diff -u src/share/man/man5/rpc.5:1.10 src/share/man/man5/rpc.5:1.11
--- src/share/man/man5/rpc.5:1.10 Sun May 13 15:48:50 2012
+++ src/share/man/man5/rpc.5 Fri Mar 15 19:32:31 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: rpc.5,v 1.10 2012/05/13 15:48:50 wiz Exp $
+.\ $NetBSD: rpc.5,v 1.11 2013/03/15 19:32:31 njoly Exp $
.\ @(#)rpc.4 1.17 93/08/30 SMI; from SVr4
.\ Copyright 1989 ATT
.Dd December 10, 1991
@@ -8,7 +8,7 @@
.Nm rpc
.Nd rpc program number data base
.Sh SYNOPSIS
-.Fa /etc/rpc
+.Pa /etc/rpc
.Sh DESCRIPTION
The
.Nm
@@ -30,7 +30,7 @@ indicates the beginning of a comment;
characters up to the end of the line are not interpreted
by routines which search the file.
.Sh FILES
-.Nm /etc/rpc
+.Pa /etc/rpc
.Sh EXAMPLES
Below is an example of an RPC data base:
.Pp
Index: src/share/man/man7/security.7
diff -u src/share/man/man7/security.7:1.8 src/share/man/man7/security.7:1.9
--- src/share/man/man7/security.7:1.8 Wed Mar 30 11:41:48 2011
+++ src/share/man/man7/security.7 Fri Mar 15 19:32:31 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: security.7,v 1.8 2011/03/30 11:41:48 jruoho Exp $
+.\ $NetBSD: security.7,v 1.9 2013/03/15 19:32:31 njoly Exp $
.\
.\ Copyright (c) 2006, 2011 Elad Efrat e...@netbsd.org
.\ All rights reserved.
@@ -429,7 +429,7 @@ In particular, it is possible to configu
to automatically audit all third-party packages installed via
.Xr pkgsrc 7 .
To audit for any known vulnerabilities on daily basis, set the following in
-.Fa /etc/daily.conf :
+.Pa /etc/daily.conf :
.Bd -literal -offset indent
fetch_pkg_vulnerabilities=YES
.Ed
Index: src/share/man/man9/mca.9
diff -u src/share/man/man9/mca.9:1.10 src/share/man/man9/mca.9:1.11
--- src/share/man/man9/mca.9:1.10 Mon May 30 01:50:07 2011
+++ src/share/man/man9/mca.9 Fri Mar 15 19:32:31 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: mca.9,v 1.10 2011/05/30 01:50:07 dyoung Exp $
+.\ $NetBSD:
CVS commit: src/usr.sbin/eeprom
Module Name:src
Committed By: nakayama
Date: Fri Mar 15 20:22:44 UTC 2013
Modified Files:
src/usr.sbin/eeprom: Makefile defs.h eehandlers.c main.c ophandlers.c
Log Message:
Use explicitly defined macros in Makefile to determine to use
eeprom and/or openprom handlers, instead of predefined compiler
macros (__sun__, __sparc__ ...).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/eeprom/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/eeprom/defs.h
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/eeprom/eehandlers.c
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/eeprom/main.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/eeprom/ophandlers.c
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/eeprom/Makefile
diff -u src/usr.sbin/eeprom/Makefile:1.17 src/usr.sbin/eeprom/Makefile:1.18
--- src/usr.sbin/eeprom/Makefile:1.17 Thu Dec 15 07:51:29 2011
+++ src/usr.sbin/eeprom/Makefile Fri Mar 15 20:22:44 2013
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $NetBSD: Makefile,v 1.17 2011/12/15 07:51:29 macallan Exp $
+# $NetBSD: Makefile,v 1.18 2013/03/15 20:22:44 nakayama Exp $
.if ${MACHINE} == sun3 || ${MACHINE} == sun3x \
|| ${MACHINE} == sparc || ${MACHINE} == sparc64 \
@@ -13,10 +13,12 @@ DPADD+=${LIBUTIL}
.if ${MACHINE} == sparc || ${MACHINE} == sparc64
SRCS+= ophandlers.c
+CPPFLAGS+= -DUSE_OPENPROM
.endif
.if ${MACHINE} == sun3 || ${MACHINE} == sun3x || ${MACHINE} == sparc
SRCS+= eehandlers.c
+CPPFLAGS+= -DUSE_EEPROM
.endif
.if ${MACHINE} == macppc || ${MACHINE} == shark
Index: src/usr.sbin/eeprom/defs.h
diff -u src/usr.sbin/eeprom/defs.h:1.13 src/usr.sbin/eeprom/defs.h:1.14
--- src/usr.sbin/eeprom/defs.h:1.13 Wed Apr 29 09:13:58 2009
+++ src/usr.sbin/eeprom/defs.h Fri Mar 15 20:22:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.13 2009/04/29 09:13:58 nakayama Exp $ */
+/* $NetBSD: defs.h,v 1.14 2013/03/15 20:22:44 nakayama Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@ struct strvaltabent {
u_char sv_val; /* ... and the value */
};
-#ifdef __sparc__
+#ifdef USE_OPENPROM
struct opiocdesc;
/*
* This is an entry in a table which describes a set of `exceptions'.
@@ -88,7 +88,7 @@ struct extabent {
struct opiocdesc *, char *);
/* handler function for this entry */
};
-#endif /* __sparc__ */
+#endif
#ifdef USE_OPENFIRM
struct extabent {
@@ -129,13 +129,11 @@ u_char ee_checksum (u_char *, size_t);
void ee_updatechecksums (void);
void ee_verifychecksums (void);
-#ifdef __sparc__
/* Sparc Openprom handlers. */
char *op_handler (char *, char *);
void op_action (char *, char *);
void op_dump (void);
int check_for_openprom (void);
-#endif /* __sparc__ */
/* OpenFirmware handlers. */
char *of_handler (char *, char *);
Index: src/usr.sbin/eeprom/eehandlers.c
diff -u src/usr.sbin/eeprom/eehandlers.c:1.16 src/usr.sbin/eeprom/eehandlers.c:1.17
--- src/usr.sbin/eeprom/eehandlers.c:1.16 Sun Feb 3 15:30:04 2013
+++ src/usr.sbin/eeprom/eehandlers.c Fri Mar 15 20:22:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: eehandlers.c,v 1.16 2013/02/03 15:30:04 christos Exp $ */
+/* $NetBSD: eehandlers.c,v 1.17 2013/03/15 20:22:44 nakayama Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,9 +43,6 @@
#include sys/inttypes.h
#include machine/eeprom.h
-#ifdef __sparc__
-#include machine/openpromio.h
-#endif /* __sparc__ */
#include defs.h
Index: src/usr.sbin/eeprom/main.c
diff -u src/usr.sbin/eeprom/main.c:1.21 src/usr.sbin/eeprom/main.c:1.22
--- src/usr.sbin/eeprom/main.c:1.21 Wed Apr 29 09:13:58 2009
+++ src/usr.sbin/eeprom/main.c Fri Mar 15 20:22:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.21 2009/04/29 09:13:58 nakayama Exp $ */
+/* $NetBSD: main.c,v 1.22 2013/03/15 20:22:44 nakayama Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1996\
The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: main.c,v 1.21 2009/04/29 09:13:58 nakayama Exp $);
+__RCSID($NetBSD: main.c,v 1.22 2013/03/15 20:22:44 nakayama Exp $);
#endif
#include sys/param.h
@@ -43,16 +43,15 @@ __RCSID($NetBSD: main.c,v 1.21 2009/04/
#include stdlib.h
#include unistd.h
-#ifdef __sun__
+#if defined(USE_EEPROM) || defined(USE_OPENPROM)
#include machine/eeprom.h
#endif
#include defs.h
#include pathnames.h
-#if defined(__sparc__)
-# define USE_OPENPROM
-# if defined(__arch64__)
+#ifdef USE_OPENPROM
+# ifndef USE_EEPROM
# define ee_action(a,b)
# define ee_dump()
# define ee_updatechecksums() (void)0
Index: src/usr.sbin/eeprom/ophandlers.c
diff -u src/usr.sbin/eeprom/ophandlers.c:1.11 src/usr.sbin/eeprom/ophandlers.c:1.12
--- src/usr.sbin/eeprom/ophandlers.c:1.11 Tue Jan 4 09:25:21 2011
+++ src/usr.sbin/eeprom/ophandlers.c Fri Mar 15 20:22:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ophandlers.c,v
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Fri Mar 15 23:26:27 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 src/sys/sys [netbsd-6]: param.h Log Message: Welcome to 6.1_RC2! To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-6.1 cvs rdiff -u -r1.408.2.8 -r1.408.2.9 src/sys/sys/param.h 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.112 src/doc/CHANGES-6.1:1.1.2.113 --- src/doc/CHANGES-6.1:1.1.2.112 Fri Mar 15 18:53:29 2013 +++ src/doc/CHANGES-6.1 Fri Mar 15 23:26:27 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.112 2013/03/15 18:53:29 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.113 2013/03/15 23:26:27 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8725,3 +8725,8 @@ lib/libc/arch/alpha/gen/__setjmp14.S 1. such as those in /rescue. [martin, ticket #846] +sys/sys/param.h patched by hand + + Welcome to 6.1_RC2! + [riz] + Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.8 src/sys/sys/param.h:1.408.2.9 --- src/sys/sys/param.h:1.408.2.8 Tue Feb 19 04:52:48 2013 +++ src/sys/sys/param.h Fri Mar 15 23:26:27 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.8 2013/02/19 04:52:48 riz Exp $ */ +/* $NetBSD: param.h,v 1.408.2.9 2013/03/15 23:26:27 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 60100 /* NetBSD 6.1_RC1 */ +#define __NetBSD_Version__ 60100 /* NetBSD 6.1_RC2 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Sat Mar 16 00:59:15 UTC 2013 Modified Files: src/lib/libc/time: Makefile tz-link.htm Log Message: apply 2013b To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/Makefile cvs rdiff -u -r1.9 -r1.10 src/lib/libc/time/tz-link.htm 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/time/Makefile diff -u src/lib/libc/time/Makefile:1.11 src/lib/libc/time/Makefile:1.12 --- src/lib/libc/time/Makefile:1.11 Sat Mar 2 16:56:28 2013 +++ src/lib/libc/time/Makefile Fri Mar 15 20:59:14 2013 @@ -6,7 +6,7 @@ PACKAGE= tzcode # Version numbers of the code and data distributions. -VERSION= 2013a +VERSION= 2013b # Email address for bug reports. BUGEMAIL= t...@iana.org Index: src/lib/libc/time/tz-link.htm diff -u src/lib/libc/time/tz-link.htm:1.9 src/lib/libc/time/tz-link.htm:1.10 --- src/lib/libc/time/tz-link.htm:1.9 Sat Mar 2 16:24:28 2013 +++ src/lib/libc/time/tz-link.htm Fri Mar 15 20:59:14 2013 @@ -8,7 +8,7 @@ meta http-equiv=Content-type content='text/html; charset=US-ASCII' meta name=DC.Creator content=Eggert, Paul meta name=DC.Contributor content=Olson, Arthur David -meta name=DC.Date content=2013-02-21 +meta name=DC.Date content=2013-03-11 meta name=DC.Description content=Sources of information about time zones and daylight saving time meta name=DC.Identifier @@ -18,13 +18,6 @@ /head body h1Sources for Time Zone and Daylight Saving Time Data/h1 -p -This file is in the public domain, so clarified as of -2009-05-17 by Arthur David Olson. -/p -p -Please send corrections to this web page to the -a href=mailto:t...@iana.orgtime zone mailing list/a./p h2The codetz/code database/h2 p The a href=http://en.wikipedia.org/wiki/Public_domain;public-domain/a @@ -39,24 +32,28 @@ title=Coordinated Universal TimeUTC/ a href=http://en.wikipedia.org/wiki/Daylight_saving;daylight-saving/a rules. This database (often called codezoneinfo/code or a -href=http://en.wikipedia.org/wiki/TZ_database;codetz/code/a) +href=http://en.wikipedia.org/wiki/Tz_database;codetz/code/a) is used by several implementations, including a href=http://www.gnu.org/software/libc/;the abbr title=GNU's Not UnixGNU/abbr -C Library/a used in -a href=http://www.linux.org/;abbrGNU/abbr/Linux/a, +C Library/a (used in +a href=http://www.linux.org/;abbrGNU/abbr/Linux/a), +a href=http://www.android.com/;Android/a, a href=http://www.freebsd.org/;FreeBSD/a, a href=http://netbsd.org/;NetBSD/a, a href=http://openbsd.org/;OpenBSD/a, a href=http://cygwin.com/;Cygwin/a, a href=http://www.delorie.com/djgpp/;abbr title=DJ's GNU Programming PlatformDJGPP/abbr/a, +a href=http://en.wikipedia.org/wiki/WebOS;webOS/a, a href=http://ibm.com/aix;AIX/a, -a href=http://www.apple.com/macosx/;Mac OS X/a, +a href=http://en.wikipedia.org/wiki/BlackBerry_10;BlackBerry 10/a, +a href=http://www.apple.com/ios/;iOS/a, a href=http://h71000.www7.hp.com/;OpenVMS/a, a href=http://oracle.com/database;Oracle Database/a, -a href=http://sun.com/software/solaris;Solaris/a, +a href=http://www.apple.com/osx/;OS X/a, +a href=http://oracle.com/solaris;Solaris/a, a href=http://h30097.www3.hp.com/;Tru64/a, and a href=http://sco.com/products/unixware;UnixWare/a./p p @@ -93,6 +90,7 @@ Convenience links to the a href=ftp://ftp.iana.org/tz/tzcode-latest.tar.gz;latest code/a and a href=ftp://ftp.iana.org/tz/tzdata-latest.tar.gz;latest data/a revisions +are also available. The following a href=http://en.wikipedia.org/wiki/Unix_shell;shell/a commands download these files to a abbrGNU/abbr/Linux or similar host; @@ -128,7 +126,10 @@ messages/a sent to the mailing list, href=https://mm.icann.org/mailman/listinfo/tz;subscribe/a to it, and browse the a href=http://mm.icann.org/pipermail/tz/;archive of old -+messages/a./p +messages/a. For further information about updates, please see +a href=http://tools.ietf.org/html/rfc6557;Procedures for +Maintaining the Time Zone Database/a (Internet abbr title=Request +For CommentsRFC/abbr 6557)./p p The Web has several other sources for time zone and daylight saving time data. Here are some links that may be of interest. @@ -153,7 +154,7 @@ Time Zones/a lets you sort zone names links that refer to a particular point in time and can be displayed in multiple timezones./li lia href=http://daylight-savings-time.info/;Daylight Saving Time info/a -+shows a graph of time +shows a graph of time difference versus time for any pair of locations./li liThe a href=http://worldtimeengine.com/;World Time Engine/a also contains data about time zone boundaries; it supports queries via place @@ -164,14 +165,9 @@ tz data files./li /ul h2Other time zone database formats/h2 ul -liThe a href=ftp://ftp.rfc-editor.org/in-notes/rfc2445.txt; +liThe a href=http://tools.ietf.org/html/rfc5545; Internet Calendaring and Scheduling Core Object Specification
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Mar 16 01:00:18 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1011 -r1.1012 src/doc/3RDPARTY cvs rdiff -u -r1.1801 -r1.1802 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.1011 src/doc/3RDPARTY:1.1012 --- src/doc/3RDPARTY:1.1011 Tue Mar 12 10:53:44 2013 +++ src/doc/3RDPARTY Fri Mar 15 21:00:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1011 2013/03/12 14:53:44 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.1012 2013/03/16 01:00:16 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1248,7 +1248,7 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2013a / tzdata2013b +Version: tzcode2013b / tzdata2013b Current Vers: tzcode2013b / tzdata2013b Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1801 src/doc/CHANGES:1.1802 --- src/doc/CHANGES:1.1801 Tue Mar 12 10:54:01 2013 +++ src/doc/CHANGES Fri Mar 15 21:00:17 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1801 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1802 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -209,3 +209,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: libc: Update to tzcode2013a. [christos 20130302] zoneinfo: Import tzdata2013a. [apb 20130303] zoneinfo: Import tzdata2013b. [apb 20130312] + libc: Update to tzcode2013b. [christos 20130315]
CVS commit: src
Module Name:src
Committed By: jmmv
Date: Sat Mar 16 01:26:53 UTC 2013
Modified Files:
src/doc: CHANGES
src/share/man/man4/man4.x86: vmt.4
src/sys/arch/x86/x86: vmt.c
Log Message:
Synchronize the clock periodically in vmt(4).
Add periodic clock synchronization to vmt(4) so that the guest clock
remains synchronized even when the host is suspended (which is a very
typical situation in a laptop).
Do this by default once per minute, but provide a sysctl to tune this
value (machdep.vmt0.clock_sync.period).
Sent to tech-kern@ for review and addressed a couple of issues.
To generate a diff of this commit:
cvs rdiff -u -r1.1802 -r1.1803 src/doc/CHANGES
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.x86/vmt.4
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/x86/vmt.c
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.1802 src/doc/CHANGES:1.1803
--- src/doc/CHANGES:1.1802 Sat Mar 16 01:00:17 2013
+++ src/doc/CHANGES Sat Mar 16 01:26:52 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1802 $
+# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1803 $
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -210,3 +210,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
zoneinfo: Import tzdata2013a. [apb 20130303]
zoneinfo: Import tzdata2013b. [apb 20130312]
libc: Update to tzcode2013b. [christos 20130315]
+ vmt(4): Synchronize the clock periodically to ensure it remains
+ up-to-date even when the host is suspended. [jmmv 20130316]
Index: src/share/man/man4/man4.x86/vmt.4
diff -u src/share/man/man4/man4.x86/vmt.4:1.3 src/share/man/man4/man4.x86/vmt.4:1.4
--- src/share/man/man4/man4.x86/vmt.4:1.3 Tue Oct 18 14:25:06 2011
+++ src/share/man/man4/man4.x86/vmt.4 Sat Mar 16 01:26:53 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: vmt.4,v 1.3 2011/10/18 14:25:06 wiz Exp $
+.\ $NetBSD: vmt.4,v 1.4 2013/03/16 01:26:53 jmmv Exp $
.\ $OpenBSD: vmt.4,v 1.4 2010/10/26 05:07:31 jmc Exp $
.\
.\ Copyright (c) 2008 Marco Peereboom ma...@openbsd.org
@@ -15,7 +15,7 @@
.\ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
.\ ACTION OF CONTRACT, NEGLIGENCE OR TORTIOUS ACTION, ARISING OUT OF
.\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd October 18, 2011
+.Dd March 16, 2013
.Dt VMT 4 x86
.Os
.Sh NAME
@@ -44,6 +44,25 @@ host.
.Pp
.Nm
reports the guest's hostname and first non-loopback IP address to the host.
+.Ss Clock synchronization
+The
+.Nm
+driver synchronizes the virtual machine's clock with the host clock in the
+following situations:
+.Bl -bullet
+.It
+When the virtual machine resumes after having been suspended.
+.It
+Periodically with the interval indicated by the
+.Va machdep.vmt0.clock_sync.period
+.Xr sysctl 8
+variable.
+This is done so that the virtual machine can keep its clock synchronized
+when the host is suspended, because in this case the
+.Nm
+driver receives no notification of such an event.
+Setting this tunable to zero disables clock synchronization.
+.El
.Sh SEE ALSO
.\ .Xr cpu 4 ,
.Xr powerd 8
Index: src/sys/arch/x86/x86/vmt.c
diff -u src/sys/arch/x86/x86/vmt.c:1.7 src/sys/arch/x86/x86/vmt.c:1.8
--- src/sys/arch/x86/x86/vmt.c:1.7 Fri Oct 21 10:10:28 2011
+++ src/sys/arch/x86/x86/vmt.c Sat Mar 16 01:26:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt.c,v 1.7 2011/10/21 10:10:28 jmcneill Exp $ */
+/* $NetBSD: vmt.c,v 1.8 2013/03/16 01:26:53 jmmv Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -36,6 +36,7 @@
#include sys/socket.h
#include sys/timetc.h
#include sys/module.h
+#include sys/sysctl.h
#include net/if.h
#include netinet/in.h
@@ -182,6 +183,7 @@ struct vmt_event {
struct vmt_softc {
device_t sc_dev;
+ struct sysctllog *sc_log;
struct vm_rpc sc_tclo_rpc;
bool sc_tclo_rpc_open;
char *sc_rpc_buf;
@@ -193,6 +195,10 @@ struct vmt_softc {
struct callout sc_tick;
struct callout sc_tclo_tick;
+#define VMT_CLOCK_SYNC_PERIOD_SECONDS 60
+ int sc_clock_sync_period_seconds;
+ struct callout sc_clock_sync_tick;
+
struct vmt_event sc_ev_power;
struct vmt_event sc_ev_reset;
struct vmt_event sc_ev_sleep;
@@ -204,6 +210,10 @@ struct vmt_softc {
CFATTACH_DECL_NEW(vmt, sizeof(struct vmt_softc),
vmt_match, vmt_attach, vmt_detach, NULL);
+static int vmt_sysctl_setup_root(device_t);
+static int vmt_sysctl_setup_clock_sync(device_t, const struct sysctlnode *);
+static int vmt_sysctl_update_clock_sync_period(SYSCTLFN_PROTO);
+
static void vm_cmd(struct vm_backdoor *);
static void vm_ins(struct vm_backdoor *);
static void vm_outs(struct vm_backdoor *);
@@ -230,6 +240,7 @@ static void vmt_sync_guest_clock(struct
static void vmt_tick(void *);
static void vmt_tclo_tick(void *);
+static void vmt_clock_sync_tick(void *);
static bool vmt_shutdown(device_t, int);
static void
CVS commit: src/tools/binstall
Module Name:src
Committed By: christos
Date: Sat Mar 16 02:51:25 UTC 2013
Modified Files:
src/tools/binstall: Makefile
Log Message:
Fix the real problem, Makefile.host was included before the HOST_MKDEP
setup so it prevented correct CPPFLAGS from being used.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tools/binstall/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/binstall/Makefile
diff -u src/tools/binstall/Makefile:1.9 src/tools/binstall/Makefile:1.10
--- src/tools/binstall/Makefile:1.9 Sun Dec 2 07:39:55 2012
+++ src/tools/binstall/Makefile Fri Mar 15 22:51:25 2013
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/12/02 12:39:55 apb Exp $
+# $NetBSD: Makefile,v 1.10 2013/03/16 02:51:25 christos Exp $
+
+.include bsd.own.mk
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-install
HOST_SRCDIR= usr.bin/xinstall
@@ -9,7 +11,6 @@ CPPFLAGS+= -DTARGET_STRIP=\${STRIP}\
# from ${TOOLDIR}.
NOCOMPATLIB=
-.include ${.CURDIR}/../Makefile.host
# Use uninstalled copy of host-mkdep
HOST_MKDEP_OBJ!= cd ${.CURDIR}/../host-mkdep ${PRINTOBJDIR}
@@ -21,5 +22,8 @@ COMPATLIB_UNINSTALLED= yes
COMPATOBJ!= cd ${NETBSDSRCDIR}/tools/compat ${PRINTOBJDIR}
.-include ${COMPATOBJ}/defs.mk
+.include ${.CURDIR}/../Makefile.host
+
# Use uninstalled copy of the install program
INSTALL= ./xinstall
+
CVS commit: src/tools/host-mkdep
Module Name:src
Committed By: christos
Date: Sat Mar 16 02:51:56 UTC 2013
Modified Files:
src/tools/host-mkdep: host-mkdep.in
Log Message:
Put back error checking in a simpler form thanks to uwe
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/tools/host-mkdep/host-mkdep.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/host-mkdep/host-mkdep.in
diff -u src/tools/host-mkdep/host-mkdep.in:1.27 src/tools/host-mkdep/host-mkdep.in:1.28
--- src/tools/host-mkdep/host-mkdep.in:1.27 Thu Mar 14 10:55:35 2013
+++ src/tools/host-mkdep/host-mkdep.in Fri Mar 15 22:51:56 2013
@@ -1,6 +1,6 @@
#!@BSHELL@ -
#
-# $NetBSD: host-mkdep.in,v 1.27 2013/03/14 14:55:35 joerg Exp $
+# $NetBSD: host-mkdep.in,v 1.28 2013/03/16 02:51:56 christos Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -231,7 +231,7 @@ else
file=${file%.*}
set_objlist $file
- @CPP@ $@ $f | @AWK@ '
+ ((@CPP@ $@ $f; echo $? 3) | @AWK@ '
/^#/ {
# Be as tolerant as possible.
sub(/^#(line)? [ 0-9]*\?/, )
@@ -247,7 +247,7 @@ else
print '$objlist' : $0
'$AWK_OPTIONAL'
}
- ' $TMP
+ ' $TMP) 31 | (read a; exit $a)
done
fi
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Sat Mar 16 04:21:19 UTC 2013
Modified Files:
src/external/bsd/atf/dist/atf-c: pkg_config_test.sh
src/external/bsd/atf/dist/atf-c++: pkg_config_test.sh
Log Message:
Mark the atf/atf-{c,c++}/pkg_config_test:version tests as needing atf-version.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-c/pkg_config_test.sh
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh
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/atf/dist/atf-c/pkg_config_test.sh
diff -u src/external/bsd/atf/dist/atf-c/pkg_config_test.sh:1.1.1.3 src/external/bsd/atf/dist/atf-c/pkg_config_test.sh:1.2
--- src/external/bsd/atf/dist/atf-c/pkg_config_test.sh:1.1.1.3 Mon Jan 16 22:36:32 2012
+++ src/external/bsd/atf/dist/atf-c/pkg_config_test.sh Sat Mar 16 04:21:19 2013
@@ -59,7 +59,7 @@ atf_test_case version
version_head()
{
atf_set descr Checks that the version in atf-c is correct
-atf_set require.progs pkg-config
+atf_set require.progs atf-version pkg-config
}
version_body()
{
Index: src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh
diff -u src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh:1.1.1.4 src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh:1.2
--- src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh:1.1.1.4 Mon Jan 16 22:36:45 2012
+++ src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh Sat Mar 16 04:21:19 2013
@@ -59,7 +59,7 @@ atf_test_case version
version_head()
{
atf_set descr Checks that the version in atf-c++ is correct
-atf_set require.progs pkg-config
+atf_set require.progs atf-version pkg-config
}
version_body()
{
CVS commit: src/tests/fs/common
Module Name:src
Committed By: jmmv
Date: Sat Mar 16 05:25:00 UTC 2013
Modified Files:
src/tests/fs/common: h_fsmacros.h
Log Message:
Mark the zfs tests as requiring root.
This is wrong. The zfs tests already use rump so they should not require
root. However, I've already spent much more time than I wanted trying to
figure out why that's the case without much luck. If you can find why,
just remove this hack.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/tests/fs/common/h_fsmacros.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.36 src/tests/fs/common/h_fsmacros.h:1.37
--- src/tests/fs/common/h_fsmacros.h:1.36 Mon Aug 20 16:39:46 2012
+++ src/tests/fs/common/h_fsmacros.h Sat Mar 16 05:24:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: h_fsmacros.h,v 1.36 2012/08/20 16:39:46 pooka Exp $ */
+/* $NetBSD: h_fsmacros.h,v 1.37 2013/03/16 05:24:59 jmmv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -109,6 +109,10 @@ do { \
atf_tc_set_md_var(tc, descr, type test for desc); \
atf_tc_set_md_var(tc, X-fs.type, #fs); \
atf_tc_set_md_var(tc, X-fs.mntname, type); \
+ if (strcmp(#fs, zfs) == 0) {\
+ /* This should not be necessary. */ \
+ atf_tc_set_md_var(tc, require.user, root); \
+ } \
}\
void *fs##func##tmp; \
\
@@ -131,6 +135,10 @@ do { \
atf_tc_set_md_var(tc, descr,_type_ test for _desc_);\
atf_tc_set_md_var(tc, X-fs.type, #_fs_); \
atf_tc_set_md_var(tc, X-fs.mntname, _type_); \
+ if (strcmp(#_fs_, zfs) == 0) { \
+ /* This should not be necessary. */ \
+ atf_tc_set_md_var(tc, require.user, root); \
+ } \
}\
void *_fs_##_func_##tmp; \
\
CVS commit: src/tests/fs/vfs
Module Name:src
Committed By: jmmv
Date: Sat Mar 16 05:45:37 UTC 2013
Modified Files:
src/tests/fs/vfs: t_full.c t_unpriv.c t_vnops.c
Log Message:
Mark a bunch of routinely-broken ZFS tests as expected failures. Point
them at PR kern/47656.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/vfs/t_full.c
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/vfs/t_unpriv.c
cvs rdiff -u -r1.33 -r1.34 src/tests/fs/vfs/t_vnops.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/fs/vfs/t_full.c
diff -u src/tests/fs/vfs/t_full.c:1.7 src/tests/fs/vfs/t_full.c:1.8
--- src/tests/fs/vfs/t_full.c:1.7 Thu Mar 17 19:48:37 2011
+++ src/tests/fs/vfs/t_full.c Sat Mar 16 05:45:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_full.c,v 1.7 2011/03/17 19:48:37 jmmv Exp $ */
+/* $NetBSD: t_full.c,v 1.8 2013/03/16 05:45:37 jmmv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -77,6 +77,8 @@ fillfs(const atf_tc_t *tc, const char *m
if (n == -1)
break;
}
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
if (n == -1) {
if (errno != ENOSPC)
atf_tc_fail_errno(write);
Index: src/tests/fs/vfs/t_unpriv.c
diff -u src/tests/fs/vfs/t_unpriv.c:1.9 src/tests/fs/vfs/t_unpriv.c:1.10
--- src/tests/fs/vfs/t_unpriv.c:1.9 Wed Apr 4 18:53:34 2012
+++ src/tests/fs/vfs/t_unpriv.c Sat Mar 16 05:45:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_unpriv.c,v 1.9 2012/04/04 18:53:34 njoly Exp $ */
+/* $NetBSD: t_unpriv.c,v 1.10 2013/03/16 05:45:37 jmmv Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -54,6 +54,8 @@ owner(const atf_tc_t *tc, const char *mp
rump_pub_lwproc_rfork(RUMP_RFCFDG);
if (rump_sys_setuid(1) == -1)
atf_tc_fail_errno(setuid);
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
if (rump_sys_chown(., 1, -1) != -1 || errno != EPERM)
atf_tc_fail_errno(chown);
if (rump_sys_chmod(., ) != -1 || errno != EPERM)
@@ -93,6 +95,8 @@ dirperms(const atf_tc_t *tc, const char
rump_pub_lwproc_rfork(RUMP_RFCFDG);
if (rump_sys_setuid(1) == -1)
atf_tc_fail_errno(setuid);
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
if (rump_sys_open(name, O_RDWR|O_CREAT, 0666) != -1 || errno != EACCES)
atf_tc_fail_errno(open);
rump_pub_lwproc_releaselwp();
@@ -135,6 +139,8 @@ times(const atf_tc_t *tc, const char *mp
rump_pub_lwproc_rfork(RUMP_RFCFDG);
if (rump_sys_setuid(1) == -1)
atf_tc_fail_errno(setuid);
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
if (rump_sys_utimes(name, NULL) != -1 || errno != EACCES)
atf_tc_fail_errno(utimes);
rump_pub_lwproc_releaselwp();
@@ -174,6 +180,8 @@ flags(const atf_tc_t *tc, const char *mp
if (rump_sys_stat(name, st) == -1)
atf_tc_fail_errno(stat);
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
if (rump_sys_chflags(name, st.st_flags) == -1) {
if (errno == EOPNOTSUPP)
atf_tc_skip(file flags not supported by file system);
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.33 src/tests/fs/vfs/t_vnops.c:1.34
--- src/tests/fs/vfs/t_vnops.c:1.33 Tue Mar 20 18:20:49 2012
+++ src/tests/fs/vfs/t_vnops.c Sat Mar 16 05:45:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.33 2012/03/20 18:20:49 njoly Exp $ */
+/* $NetBSD: t_vnops.c,v 1.34 2013/03/16 05:45:37 jmmv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -142,6 +142,8 @@ dir_notempty(const atf_tc_t *tc, const c
rump_sys_close(fd);
rv = rump_sys_rmdir(pb);
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
if (rv != -1 || errno != ENOTEMPTY)
atf_tc_fail(non-empty directory removed succesfully);
@@ -237,6 +239,8 @@ rename_dir(const atf_tc_t *tc, const cha
md(pb1, mp, dir3/.);
if (rump_sys_rename(pb1, pb3) != -1 || errno != EINVAL)
atf_tc_fail_errno(rename 2);
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
if (rump_sys_rename(pb3, pb1) != -1 || errno != EISDIR)
atf_tc_fail_errno(rename 3);
@@ -563,6 +567,8 @@ attrs(const atf_tc_t *tc, const char *mp
RL(rump_sys_stat(TESTFILE, sb2));
#define CHECK(a) ATF_REQUIRE_EQ(sb.a, sb2.a)
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))) {
CHECK(st_uid);
CHECK(st_gid);
@@ -601,6 +607,8 @@ fcntl_lock(const atf_tc_t *tc, const cha
RL(rump_sys_ftruncate(fd, 8192));
/* PR kern/43321 */
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail(PR kern/47656: Test known to be broken);
RL(rump_sys_fcntl(fd, F_SETLK, l));
/* Next, we fork and try to lock the same area */
@@ -734,6 +742,9 @@ fcntl_getlock_pids(const atf_tc_t *tc, c
RL(rump_sys_ftruncate(fd[i], sz));
+ if (FSTYPE_ZFS(tc))
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Mar 15 06:18:14 UTC 2013 Modified Files: src/sys/dev/mii: brgphy.c miivar.h Log Message: Add BCM5756, BCM5717C, BCM5719C, BCM5720C and BCM57780. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/dev/mii/brgphy.c src/sys/dev/mii/miivar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 15 11:15:23 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Use -isysroot ${DESTDIR} for RUMPCOMP_USER when run as part of build.sh
so as to catch the necessary headers, which, unlike in the buildrump.sh
case, are not supposed to be intermingled with the ones provided by
the host.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src Committed By: pooka Date: Fri Mar 15 11:30:23 UTC 2013 Modified Files: src/sys/rump/net/lib/libvirtif: Makefile if_virt.c Log Message: Rerevert to preprevious now that this builds with build.sh To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libvirtif/Makefile cvs rdiff -u -r1.29 -r1.30 src/sys/rump/net/lib/libvirtif/if_virt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump
Module Name:src Committed By: pooka Date: Fri Mar 15 12:09:59 UTC 2013 Modified Files: src/sys/rump/librump/rumpdev: Makefile.rumpdev src/sys/rump/librump/rumpkern: Makefile.rumpkern src/sys/rump/librump/rumpnet: Makefile.rumpnet src/sys/rump/librump/rumpvfs: Makefile.rumpvfs Log Message: Allow Makefile.rump to append to SRCS. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpdev/Makefile.rumpdev cvs rdiff -u -r1.123 -r1.124 src/sys/rump/librump/rumpkern/Makefile.rumpkern cvs rdiff -u -r1.12 -r1.13 src/sys/rump/librump/rumpnet/Makefile.rumpnet cvs rdiff -u -r1.35 -r1.36 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Mar 15 12:12:16 UTC 2013 Added Files: src/sys/rump: sunldgen.sh Log Message: Support generating support for Sun ld. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/rump/sunldgen.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Mar 15 12:13:07 UTC 2013 Added Files: src/sys/rump: ldscript_sun.rump linksyms_sun.c Log Message: Generate support for sun ld. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/rump/ldscript_sun.rump \ src/sys/rump/linksyms_sun.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Mar 15 12:15:52 UTC 2013 Modified Files: src/sys/rump: Makefile.rump Log Message: Use correct ldscript etc. for Sun ld. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/rump/Makefile.rump Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Mar 15 12:18:41 UTC 2013 Modified Files: src/sys/rump: Makefile.rump Log Message: On second thought, let's use make syntax in makefiles ... To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/rump/Makefile.rump Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Mar 15 12:42:18 UTC 2013 Modified Files: src/sys/rump: Makefile.rump Log Message: one more typofix To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/rump/Makefile.rump Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libterminfo
Module Name:src Committed By: njoly Date: Fri Mar 15 14:27:41 UTC 2013 Modified Files: src/lib/libterminfo: term.h Log Message: Fix cp error in string descriptions. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libterminfo/term.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src Committed By: martin Date: Fri Mar 15 16:14:13 UTC 2013 Modified Files: src/sys/rump/dev/lib/libscsitest: scsitest.c Log Message: For the MMC GET_CONFIGURATION command, return a nulled feature header. Fixes PR kern/47646. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libscsitest/scsitest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: martin Date: Fri Mar 15 16:16:12 UTC 2013 Modified Files: src/sys/dev/scsipi: cd.c Log Message: Prompted by PR kern/47646, zero the value buffer before running the GET_CONFIGURATION command and check for an unexpectedly large feature length answer afterwards. To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/sys/dev/scsipi/cd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/dev/scsipi
Module Name:src Committed By: martin Date: Fri Mar 15 16:18:50 UTC 2013 Modified Files: src/tests/dev/scsipi: t_cd.c Log Message: The CD emulator has been fixed, no longer expect the test to die. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/dev/scsipi/t_cd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:48:46 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5-1]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #1854): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.27.10.4 -r1.1.1.27.10.5 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.20.3 -r1.1.1.17.20.4 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.10.7 -r1.1.1.44.10.8 src/share/zoneinfo/asia cvs rdiff -u -r1.17.10.6 -r1.17.10.7 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.10.4 -r1.1.1.38.10.5 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.10.7 -r1.1.1.42.10.8 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.10.6 -r1.1.1.42.10.7 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.10.4 -r1.1.1.33.10.5 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:49:09 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5-2]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #1854): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.27.2.3.2.1 -r1.1.1.27.2.3.2.2 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.12.3 -r1.1.1.17.12.3.2.1 \ src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.2.7 -r1.1.1.44.2.7.2.1 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.6 -r1.17.2.6.2.1 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.2.4 -r1.1.1.38.2.4.2.1 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.2.6.2.1 -r1.1.1.42.2.6.2.2 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.2.5.2.1 -r1.1.1.42.2.5.2.2 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.2.4 -r1.1.1.33.2.4.2.1 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:49:53 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #845): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.30.4.3 -r1.1.1.30.4.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.19.4.2 -r1.1.1.19.4.3 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.50.4.6 -r1.1.1.50.4.7 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.6 -r1.23.4.7 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.4 -r1.1.1.44.4.5 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.49.4.6 -r1.1.1.49.4.7 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.46.4.6 -r1.1.1.46.4.7 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.3 -r1.1.1.39.4.4 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/share/zoneinfo
Module Name:src Committed By: riz Date: Fri Mar 15 18:50:19 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6-0]: africa antarctica asia australasia europe northamerica southamerica zone.tab Log Message: Apply changes (requested by apb in ticket #845): Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz Changes from tzdata2012j to tzdata2013a: Change affecting binary data format: The zone offset at the end of version-2-format zone files is now allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.) Changes affecting current and future time stamps: Chile's 2013 rules, and we guess rules for 2014 and later, will be the same as 2012, namely Apr Sun=23 03:00 UTC to Sep Sun=2 04:00 UTC. (Thanks to Steffen Thorsen and Robert Elz.) New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen. (Thanks to Tobias Conradi and Arthur David Olson.) Many changes affect historical time stamps before 1940. These were deduced from: Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 http://www.jstor.org/stable/1774359. Changes from tzdata2012j to tzdata2013a: Changes affecting current and future time stamps: Haiti uses US daylight-saving rules this year, and presumably future years. This changes time stamps starting today. (Thanks to Steffen Thorsen.) Paraguay will end DST on March 24 this year. (Thanks to Steffen Thorsen.) For now, assume it's just this year. Morocco does not observe DST during Ramadan; try to predict Ramadan in Morocco as best we can. (Thanks to Erik Homoet for the heads-up.) Changes affecting commentary: Update URLs in tz-link page. Add URLs for webOS, BB10, iOS. Update URL for Solaris. Mention Internet RFC 6557. Update Internet RFCs 2445-5545, 2822-5322. Switch from FTP to HTTP for Internet RFCs. To generate a diff of this commit: cvs rdiff -u -r1.1.1.30.4.1.4.2 -r1.1.1.30.4.1.4.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.19.4.2 -r1.1.1.19.4.2.4.1 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.50.4.3.4.3 -r1.1.1.50.4.3.4.4 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.4.2.2 -r1.23.4.4.2.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.44.4.3.4.1 -r1.1.1.44.4.3.4.2 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.49.4.4.4.2 -r1.1.1.49.4.4.4.3 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.46.4.3.4.3 -r1.1.1.46.4.3.4.4 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.3 -r1.1.1.39.4.3.4.1 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Fri Mar 15 18:52:54 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: Update changelist for ticket 845. To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-6.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Fri Mar 15 18:53:30 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Update changelist for ticket 845. To generate a diff of this commit: cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-6.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Fri Mar 15 18:54:45 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Update changelist for ticket 1854. To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man
Module Name:src Committed By: njoly Date: Fri Mar 15 19:32:32 UTC 2013 Modified Files: src/share/man/man4/man4.x86: coretemp.4 src/share/man/man5: floppytab.5 netconfig.5 rpc.5 src/share/man/man7: security.7 src/share/man/man9: mca.9 sysmon_envsys.9 Log Message: Fix a few file system paths to use Pa macro. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.x86/coretemp.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man5/floppytab.5 cvs rdiff -u -r1.8 -r1.9 src/share/man/man5/netconfig.5 cvs rdiff -u -r1.10 -r1.11 src/share/man/man5/rpc.5 cvs rdiff -u -r1.8 -r1.9 src/share/man/man7/security.7 cvs rdiff -u -r1.10 -r1.11 src/share/man/man9/mca.9 cvs rdiff -u -r1.43 -r1.44 src/share/man/man9/sysmon_envsys.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/eeprom
Module Name:src Committed By: nakayama Date: Fri Mar 15 20:22:44 UTC 2013 Modified Files: src/usr.sbin/eeprom: Makefile defs.h eehandlers.c main.c ophandlers.c Log Message: Use explicitly defined macros in Makefile to determine to use eeprom and/or openprom handlers, instead of predefined compiler macros (__sun__, __sparc__ ...). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/eeprom/Makefile cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/eeprom/defs.h cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/eeprom/eehandlers.c cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/eeprom/main.c cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/eeprom/ophandlers.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Fri Mar 15 23:26:27 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 src/sys/sys [netbsd-6]: param.h Log Message: Welcome to 6.1_RC2! To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-6.1 cvs rdiff -u -r1.408.2.8 -r1.408.2.9 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Sat Mar 16 00:59:15 UTC 2013 Modified Files: src/lib/libc/time: Makefile tz-link.htm Log Message: apply 2013b To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/Makefile cvs rdiff -u -r1.9 -r1.10 src/lib/libc/time/tz-link.htm 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: christos Date: Sat Mar 16 01:00:18 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1011 -r1.1012 src/doc/3RDPARTY cvs rdiff -u -r1.1801 -r1.1802 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
Module Name:src Committed By: jmmv Date: Sat Mar 16 01:26:53 UTC 2013 Modified Files: src/doc: CHANGES src/share/man/man4/man4.x86: vmt.4 src/sys/arch/x86/x86: vmt.c Log Message: Synchronize the clock periodically in vmt(4). Add periodic clock synchronization to vmt(4) so that the guest clock remains synchronized even when the host is suspended (which is a very typical situation in a laptop). Do this by default once per minute, but provide a sysctl to tune this value (machdep.vmt0.clock_sync.period). Sent to tech-kern@ for review and addressed a couple of issues. To generate a diff of this commit: cvs rdiff -u -r1.1802 -r1.1803 src/doc/CHANGES cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.x86/vmt.4 cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/x86/vmt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/binstall
Module Name:src Committed By: christos Date: Sat Mar 16 02:51:25 UTC 2013 Modified Files: src/tools/binstall: Makefile Log Message: Fix the real problem, Makefile.host was included before the HOST_MKDEP setup so it prevented correct CPPFLAGS from being used. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tools/binstall/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/host-mkdep
Module Name:src Committed By: christos Date: Sat Mar 16 02:51:56 UTC 2013 Modified Files: src/tools/host-mkdep: host-mkdep.in Log Message: Put back error checking in a simpler form thanks to uwe To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/tools/host-mkdep/host-mkdep.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Sat Mar 16 04:21:19 UTC 2013
Modified Files:
src/external/bsd/atf/dist/atf-c: pkg_config_test.sh
src/external/bsd/atf/dist/atf-c++: pkg_config_test.sh
Log Message:
Mark the atf/atf-{c,c++}/pkg_config_test:version tests as needing atf-version.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-c/pkg_config_test.sh
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/tests/fs/common
Module Name:src Committed By: jmmv Date: Sat Mar 16 05:25:00 UTC 2013 Modified Files: src/tests/fs/common: h_fsmacros.h Log Message: Mark the zfs tests as requiring root. This is wrong. The zfs tests already use rump so they should not require root. However, I've already spent much more time than I wanted trying to figure out why that's the case without much luck. If you can find why, just remove this hack. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/tests/fs/common/h_fsmacros.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/vfs
Module Name:src Committed By: jmmv Date: Sat Mar 16 05:45:37 UTC 2013 Modified Files: src/tests/fs/vfs: t_full.c t_unpriv.c t_vnops.c Log Message: Mark a bunch of routinely-broken ZFS tests as expected failures. Point them at PR kern/47656. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/fs/vfs/t_full.c cvs rdiff -u -r1.9 -r1.10 src/tests/fs/vfs/t_unpriv.c cvs rdiff -u -r1.33 -r1.34 src/tests/fs/vfs/t_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
